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

Clean up auth provider.

Browse Source
This commit is contained in:
Michael Jumper
2012-12-24 18:28:44 -08:00
parent fac38e1fc2
commit 320b9056c7
1 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,11 +53,18 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider {
private Logger logger = LoggerFactory.getLogger(BasicFileAuthenticationProvider.class); private Logger logger = LoggerFactory.getLogger(BasicFileAuthenticationProvider.class);
private long mappingTime; /**
private UserMapping mapping; * The time the user mapping file was last modified.
*/
private long mod_time;
/** /**
* The filename of the XML file to read the user mapping from. * The parsed UserMapping read when the user mapping file was last parsed.
*/
private UserMapping user_mapping;
/**
* The filename of the XML file to read the user user_mapping from.
*/ */
public static final FileGuacamoleProperty BASIC_USER_MAPPING = new FileGuacamoleProperty() { public static final FileGuacamoleProperty BASIC_USER_MAPPING = new FileGuacamoleProperty() {
@@ -66,43 +73,53 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider {
}; };
private File getUserMappingFile() throws GuacamoleException { /**
* Returns a UserMapping containing all authorization data given within
* the XML file specified by the "basic-user-mapping" property in
* guacamole.properties. If the XML file has been modified or has not yet
* been read, this function may reread the file.
*
* @return A UserMapping containing all authorization data within the
* user mapping XML file.
* @throws GuacamoleException If the user mapping property is missing or
* an error occurs while parsing the XML file.
*/
private UserMapping getUserMapping() throws GuacamoleException {
// Get user mapping file // Get user user_mapping file
return GuacamoleProperties.getProperty(BASIC_USER_MAPPING); File user_mapping_file =
GuacamoleProperties.getRequiredProperty(BASIC_USER_MAPPING);
} // If user_mapping not yet read, or user_mapping has been modified, reread
if (user_mapping == null ||
(user_mapping_file.exists()
&& mod_time < user_mapping_file.lastModified())) {
public synchronized void init() throws GuacamoleException { logger.info("Reading user mapping file: {}", user_mapping_file);
// Get user mapping file
File mapFile = getUserMappingFile();
if (mapFile == null)
throw new GuacamoleException("Missing \"basic-user-mapping\" parameter required for basic login.");
logger.info("Reading user mapping file: {}", mapFile);
// Parse document // Parse document
try { try {
// Get handler for root element
UserMappingTagHandler userMappingHandler = UserMappingTagHandler userMappingHandler =
new UserMappingTagHandler(); new UserMappingTagHandler();
// Set up parser // Set up document handler
DocumentHandler contentHandler = new DocumentHandler( DocumentHandler contentHandler = new DocumentHandler(
"user-mapping", userMappingHandler); "user-mapping", userMappingHandler);
// Set up XML parser
XMLReader parser = XMLReaderFactory.createXMLReader(); XMLReader parser = XMLReaderFactory.createXMLReader();
parser.setContentHandler(contentHandler); parser.setContentHandler(contentHandler);
// Read and parse file // Read and parse file
Reader reader = new BufferedReader(new FileReader(mapFile)); Reader reader = new BufferedReader(new FileReader(user_mapping_file));
parser.parse(new InputSource(reader)); parser.parse(new InputSource(reader));
reader.close(); reader.close();
// Init mapping and record mod time of file // Store mod time and user mapping
mappingTime = mapFile.lastModified(); mod_time = user_mapping_file.lastModified();
mapping = userMappingHandler.asUserMapping(); user_mapping = userMappingHandler.asUserMapping();
} }
catch (IOException e) { catch (IOException e) {
@@ -114,29 +131,16 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider {
} }
// Return (possibly cached) user mapping
return user_mapping;
}
@Override @Override
public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentials credentials) throws GuacamoleException { public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentials credentials) throws GuacamoleException {
// Check mapping file mod time
File userMappingFile = getUserMappingFile();
if (userMappingFile.exists() && mappingTime < userMappingFile.lastModified()) {
// If modified recently, gain exclusive access and recheck
synchronized (this) {
if (userMappingFile.exists() && mappingTime < userMappingFile.lastModified()) {
logger.info("User mapping file {} has been modified.", userMappingFile);
init(); // If still not up to date, re-init
}
}
}
// If no mapping available, report as such
if (mapping == null)
throw new GuacamoleException("User mapping could not be read.");
// Validate and return info for given user and pass // Validate and return info for given user and pass
Authorization auth = mapping.getAuthorization(credentials.getUsername()); Authorization auth = getUserMapping().getAuthorization(credentials.getUsername());
if (auth != null && auth.validate(credentials.getUsername(), credentials.getPassword())) if (auth != null && auth.validate(credentials.getUsername(), credentials.getPassword()))
return auth.getConfigurations(); return auth.getConfigurations();