safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-31 00:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ticket #66 - XMLReader.parse() can throw an exception if string given is a path and not a URI. Using Reader as InputSource, forcing interpretation of string as local path.

Browse Source
This commit is contained in:
Michael Jumper
2011-12-08 23:36:38 -08:00
parent cd7ffd4e63
commit 94590d847f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
View File

@@ -19,9 +19,12 @@ package net.sourceforge.guacamole.net.basic;
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import java.io.BufferedReader;
import net.sourceforge.guacamole.net.auth.AuthenticationProvider; import net.sourceforge.guacamole.net.auth.AuthenticationProvider;
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.Reader;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Collections; import java.util.Collections;
@@ -35,6 +38,7 @@ import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
@@ -66,12 +70,18 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider<U
// Parse document // Parse document
try { try {
// Set up parser
BasicUserMappingContentHandler contentHandler = new BasicUserMappingContentHandler(); BasicUserMappingContentHandler contentHandler = new BasicUserMappingContentHandler();
XMLReader parser = XMLReaderFactory.createXMLReader(); XMLReader parser = XMLReaderFactory.createXMLReader();
parser.setContentHandler(contentHandler); parser.setContentHandler(contentHandler);
parser.parse(mapFile.getAbsolutePath());
// Read and parse file
Reader reader = new BufferedReader(new FileReader(mapFile));
parser.parse(new InputSource(reader));
reader.close();
// Init mapping and record mod time of file
mappingTime = mapFile.lastModified(); mappingTime = mapFile.lastModified();
mapping = contentHandler.getUserMapping(); mapping = contentHandler.getUserMapping();