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

GUACAMOLE-957: Cache LDAP configuration YAML until modified.

Browse Source
This commit is contained in:
Michael Jumper
2021-10-21 15:08:28 -07:00
parent 0fc7c03d70
commit f322dc3f3e
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java
View File

@@ -23,10 +23,12 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleServerException; import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.environment.Environment; import org.apache.guacamole.environment.Environment;
@@ -36,6 +38,7 @@ import org.slf4j.LoggerFactory;
/** /**
* Service for retrieving configuration information regarding LDAP servers. * Service for retrieving configuration information regarding LDAP servers.
*/ */
@Singleton
public class ConfigurationService { public class ConfigurationService {
/** /**
@@ -54,6 +57,17 @@ public class ConfigurationService {
*/ */
private static final String LDAP_SERVERS_YML = "ldap-servers.yml"; private static final String LDAP_SERVERS_YML = "ldap-servers.yml";
/**
* The timestamp that the {@link #LDAP_SERVERS_YML} was last modified when
* it was read, as would be returned by {@link File#lastModified()}.
*/
private final AtomicLong lastModified = new AtomicLong(0);
/**
* The cached copy of the configuration read from {@link #LDAP_SERVERS_YML}.
*/
private Collection<JacksonLDAPConfiguration> cachedConfigurations = Collections.emptyList();
/** /**
* The Guacamole server environment. * The Guacamole server environment.
*/ */
@@ -77,15 +91,28 @@ public class ConfigurationService {
// Read configuration from YAML, if available // Read configuration from YAML, if available
File ldapServers = new File(environment.getGuacamoleHome(), LDAP_SERVERS_YML); File ldapServers = new File(environment.getGuacamoleHome(), LDAP_SERVERS_YML);
if (ldapServers.exists()) { if (ldapServers.exists()) {
long oldLastModified = lastModified.get();
long currentLastModified = ldapServers.lastModified();
// Update cached copy of YAML if things have changed, ensuring only
// one concurrent request updates the cache at any given time
if (currentLastModified > oldLastModified && lastModified.compareAndSet(oldLastModified, currentLastModified)) {
try { try {
logger.debug("Reading LDAP configuration from \"{}\"...", ldapServers); logger.debug("Reading updated LDAP configuration from \"{}\"...", ldapServers);
return mapper.readValue(ldapServers, new TypeReference<Collection<JacksonLDAPConfiguration>>() {}); cachedConfigurations = mapper.readValue(ldapServers, new TypeReference<Collection<JacksonLDAPConfiguration>>() {});
} }
catch (IOException e) { catch (IOException e) {
logger.error("\"{}\" could not be read/parsed: {}", ldapServers, e.getMessage()); logger.error("\"{}\" could not be read/parsed: {}", ldapServers, e.getMessage());
throw new GuacamoleServerException("Cannot read LDAP configuration from \"" + ldapServers + "\"", e); throw new GuacamoleServerException("Cannot read LDAP configuration from \"" + ldapServers + "\"", e);
} }
} }
else
logger.debug("Using cached LDAP configuration from \"{}\".", ldapServers);
return cachedConfigurations;
}
// Use guacamole.properties if not using YAML // Use guacamole.properties if not using YAML
logger.debug("Reading LDAP configuration from guacamole.properties..."); logger.debug("Reading LDAP configuration from guacamole.properties...");