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: Use guacamole.properties for LDAP YAML defaults.

Browse Source
This commit is contained in:
Michael Jumper
2021-10-21 16:07:28 -07:00
parent 160d29df95
commit 55437faad0
2 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,8 +99,16 @@ public class ConfigurationService {
// one concurrent request updates the cache at any given time // one concurrent request updates the cache at any given time
if (currentLastModified > oldLastModified && lastModified.compareAndSet(oldLastModified, currentLastModified)) { if (currentLastModified > oldLastModified && lastModified.compareAndSet(oldLastModified, currentLastModified)) {
try { try {
logger.debug("Reading updated LDAP configuration from \"{}\"...", ldapServers); logger.debug("Reading updated LDAP configuration from \"{}\"...", ldapServers);
cachedConfigurations = mapper.readValue(ldapServers, new TypeReference<Collection<JacksonLDAPConfiguration>>() {}); Collection<JacksonLDAPConfiguration> configs = mapper.readValue(ldapServers, new TypeReference<Collection<JacksonLDAPConfiguration>>() {});
logger.debug("Reading LDAP configuration defaults from guacamole.properties...");
LDAPConfiguration defaultConfig = new EnvironmentLDAPConfiguration(environment);
configs.forEach((config) -> config.setDefaults(defaultConfig));
cachedConfigurations = configs;
} }
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());

53
extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/JacksonLDAPConfiguration.java
View File

@@ -190,7 +190,7 @@ public class JacksonLDAPConfiguration implements LDAPConfiguration {
/** /**
* The default configuration options for all parameters. * The default configuration options for all parameters.
*/ */
private static final LDAPConfiguration DEFAULT = new DefaultLDAPConfiguration(); private LDAPConfiguration defaultConfig = new DefaultLDAPConfiguration();
/** /**
* Returns the given value, if non-null. If null, the given default value * Returns the given value, if non-null. If null, the given default value
@@ -253,6 +253,19 @@ public class JacksonLDAPConfiguration implements LDAPConfiguration {
return value != null ? value : defaultValue; return value != null ? value : defaultValue;
} }
/**
* Sets the LDAPConfiguration that should be used for the default values of
* any configuration options omitted from the YAML. If not set, an instance
* of {@link DefaultLDAPConfiguration} will be used.
*
* @param defaultConfig
* The LDAPConfiguration to use for the default values of any omitted
* configuration options.
*/
public void setDefaults(LDAPConfiguration defaultConfig) {
this.defaultConfig = defaultConfig;
}
@Override @Override
public String appliesTo(String username) throws GuacamoleException { public String appliesTo(String username) throws GuacamoleException {
@@ -268,7 +281,7 @@ public class JacksonLDAPConfiguration implements LDAPConfiguration {
@Override @Override
public String getServerHostname() throws GuacamoleException { public String getServerHostname() throws GuacamoleException {
return withDefault(hostname, DEFAULT.getServerHostname()); return withDefault(hostname, defaultConfig.getServerHostname());
} }
@Override @Override
@@ -278,93 +291,93 @@ public class JacksonLDAPConfiguration implements LDAPConfiguration {
@Override @Override
public List<String> getUsernameAttributes() throws GuacamoleException { public List<String> getUsernameAttributes() throws GuacamoleException {
return withDefault(usernameAttributes, DEFAULT.getUsernameAttributes()); return withDefault(usernameAttributes, defaultConfig.getUsernameAttributes());
} }
@Override @Override
public Dn getUserBaseDN() throws GuacamoleException { public Dn getUserBaseDN() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_USER_BASE_DN.parseValue(userBaseDn), DEFAULT.getUserBaseDN()); return withDefault(LDAPGuacamoleProperties.LDAP_USER_BASE_DN.parseValue(userBaseDn), defaultConfig.getUserBaseDN());
} }
@Override @Override
public Dn getConfigurationBaseDN() throws GuacamoleException { public Dn getConfigurationBaseDN() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_CONFIG_BASE_DN.parseValue(configBaseDn), DEFAULT.getConfigurationBaseDN()); return withDefault(LDAPGuacamoleProperties.LDAP_CONFIG_BASE_DN.parseValue(configBaseDn), defaultConfig.getConfigurationBaseDN());
} }
@Override @Override
public List<String> getGroupNameAttributes() throws GuacamoleException { public List<String> getGroupNameAttributes() throws GuacamoleException {
return withDefault(groupNameAttributes, DEFAULT.getGroupNameAttributes()); return withDefault(groupNameAttributes, defaultConfig.getGroupNameAttributes());
} }
@Override @Override
public Dn getGroupBaseDN() throws GuacamoleException { public Dn getGroupBaseDN() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_GROUP_BASE_DN.parseValue(groupBaseDn), DEFAULT.getGroupBaseDN()); return withDefault(LDAPGuacamoleProperties.LDAP_GROUP_BASE_DN.parseValue(groupBaseDn), defaultConfig.getGroupBaseDN());
} }
@Override @Override
public String getSearchBindDN() throws GuacamoleException { public String getSearchBindDN() throws GuacamoleException {
return withDefault(searchBindDn, DEFAULT.getSearchBindDN()); return withDefault(searchBindDn, defaultConfig.getSearchBindDN());
} }
@Override @Override
public String getSearchBindPassword() throws GuacamoleException { public String getSearchBindPassword() throws GuacamoleException {
return withDefault(searchBindPassword, DEFAULT.getSearchBindDN()); return withDefault(searchBindPassword, defaultConfig.getSearchBindDN());
} }
@Override @Override
public EncryptionMethod getEncryptionMethod() throws GuacamoleException { public EncryptionMethod getEncryptionMethod() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_ENCRYPTION_METHOD.parseValue(encryptionMethod), DEFAULT.getEncryptionMethod()); return withDefault(LDAPGuacamoleProperties.LDAP_ENCRYPTION_METHOD.parseValue(encryptionMethod), defaultConfig.getEncryptionMethod());
} }
@Override @Override
public int getMaxResults() throws GuacamoleException { public int getMaxResults() throws GuacamoleException {
return withDefault(maxSearchResults, DEFAULT.getMaxResults()); return withDefault(maxSearchResults, defaultConfig.getMaxResults());
} }
@Override @Override
public AliasDerefMode getDereferenceAliases() throws GuacamoleException { public AliasDerefMode getDereferenceAliases() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_DEREFERENCE_ALIASES.parseValue(dereferenceAliases), DEFAULT.getDereferenceAliases()); return withDefault(LDAPGuacamoleProperties.LDAP_DEREFERENCE_ALIASES.parseValue(dereferenceAliases), defaultConfig.getDereferenceAliases());
} }
@Override @Override
public boolean getFollowReferrals() throws GuacamoleException { public boolean getFollowReferrals() throws GuacamoleException {
return withDefault(followReferrals, DEFAULT.getFollowReferrals()); return withDefault(followReferrals, defaultConfig.getFollowReferrals());
} }
@Override @Override
public int getMaxReferralHops() throws GuacamoleException { public int getMaxReferralHops() throws GuacamoleException {
return withDefault(maxReferralHops, DEFAULT.getMaxReferralHops()); return withDefault(maxReferralHops, defaultConfig.getMaxReferralHops());
} }
@Override @Override
public ExprNode getUserSearchFilter() throws GuacamoleException { public ExprNode getUserSearchFilter() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_USER_SEARCH_FILTER.parseValue(userSearchFilter), DEFAULT.getUserSearchFilter()); return withDefault(LDAPGuacamoleProperties.LDAP_USER_SEARCH_FILTER.parseValue(userSearchFilter), defaultConfig.getUserSearchFilter());
} }
@Override @Override
public ExprNode getGroupSearchFilter() throws GuacamoleException { public ExprNode getGroupSearchFilter() throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_GROUP_SEARCH_FILTER.parseValue(groupSearchFilter), DEFAULT.getGroupSearchFilter()); return withDefault(LDAPGuacamoleProperties.LDAP_GROUP_SEARCH_FILTER.parseValue(groupSearchFilter), defaultConfig.getGroupSearchFilter());
} }
@Override @Override
public int getOperationTimeout() throws GuacamoleException { public int getOperationTimeout() throws GuacamoleException {
return withDefault(operationTimeout, DEFAULT.getOperationTimeout()); return withDefault(operationTimeout, defaultConfig.getOperationTimeout());
} }
@Override @Override
public List<String> getAttributes() throws GuacamoleException { public List<String> getAttributes() throws GuacamoleException {
return withDefault(userAttributes, DEFAULT.getAttributes()); return withDefault(userAttributes, defaultConfig.getAttributes());
} }
@Override @Override
public String getMemberAttribute() throws GuacamoleException { public String getMemberAttribute() throws GuacamoleException {
return withDefault(memberAttribute, DEFAULT.getMemberAttribute()); return withDefault(memberAttribute, defaultConfig.getMemberAttribute());
} }
@Override @Override
public MemberAttributeType getMemberAttributeType() public MemberAttributeType getMemberAttributeType()
throws GuacamoleException { throws GuacamoleException {
return withDefault(LDAPGuacamoleProperties.LDAP_MEMBER_ATTRIBUTE_TYPE.parseValue(memberAttributeType), DEFAULT.getMemberAttributeType()); return withDefault(LDAPGuacamoleProperties.LDAP_MEMBER_ATTRIBUTE_TYPE.parseValue(memberAttributeType), defaultConfig.getMemberAttributeType());
} }
} }