GUACAMOLE-1239: Remove per-extension configuration for case-sensitivity, retaining only global configuration.

extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/ConfigurationService.java

@@ -54,25 +54,4 @@ public class ConfigurationService {
         );
     }
 
-    /**
-     * Returns true if the usernames provided to the header authentication
-     * module should be treated as case-sensitive, or false if usernames
-     * should be treated as case-insensitive. This will default to the global
-     * Guacamole configuration for case-sensitivity, which defaults to true, but
-     * can be overridden for this extension, if desired.
-     * 
-     * @return
-     *     true if usernames should be treated as case-sensitive, otherwise
-     *     false.
-     * 
-     * @throws GuacamoleException 
-     *     If guacamole.properties cannot be parsed.
-     */
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        return environment.getProperty(
-            HTTPHeaderGuacamoleProperties.HTTP_AUTH_CASE_SENSITIVE_USERNAMES,
-            environment.getCaseSensitiveUsernames()
-        );
-    }
-
 }

extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/HTTPHeaderGuacamoleProperties.java

@@ -19,7 +19,6 @@
 
 package org.apache.guacamole.auth.header;
 
-import org.apache.guacamole.properties.BooleanGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
 
 
@@ -45,16 +44,4 @@ public class HTTPHeaderGuacamoleProperties {
 
     };
 
-    /**
-     * A property used to configure whether or not usernames within the header
-     * module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty HTTP_AUTH_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-        
-        @Override
-        public String getName() { return "http-auth-case-sensitive-usernames"; }
-        
-    };
-
 }

extensions/guacamole-auth-header/src/main/java/org/apache/guacamole/auth/header/user/AuthenticatedUser.java

@@ -20,13 +20,9 @@
 package org.apache.guacamole.auth.header.user;
 
 import com.google.inject.Inject;
-import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.header.ConfigurationService;
 import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
 import org.apache.guacamole.net.auth.AuthenticationProvider;
 import org.apache.guacamole.net.auth.Credentials;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An HTTP header implementation of AuthenticatedUser, associating a
@@ -35,11 +31,6 @@ import org.slf4j.LoggerFactory;
  */
 public class AuthenticatedUser extends AbstractAuthenticatedUser {
     
-    /**
-     * Logger for this class.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticatedUser.class);
-    
     /**
      * Reference to the authentication provider associated with this
      * authenticated user.
@@ -47,12 +38,6 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
     @Inject
     private AuthenticationProvider authProvider;
 
-    /**
-     * Service for retrieving header configuration information.
-     */
-    @Inject
-    private ConfigurationService confService;
-
     /**
      * The credentials provided when this user was authenticated.
      */
@@ -73,19 +58,6 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
         setIdentifier(username.toLowerCase());
     }
     
-    @Override
-    public boolean isCaseSensitive() {
-        try {
-            return confService.getCaseSensitiveUsernames();
-        }
-        catch (GuacamoleException e) {
-            LOGGER.error("Error when trying to retrieve header configuration: {}."
-                    + " Usernames comparison will be case-sensitive.", e);
-            LOGGER.debug("Exception caught when retrieving header configuration.", e);
-            return true;
-        }
-    }
-    
     @Override
     public AuthenticationProvider getAuthenticationProvider() {
         return authProvider;

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLEnvironment.java

@@ -443,15 +443,4 @@ public class MySQLEnvironment extends JDBCEnvironment {
         );
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // Return the configured value for the property, or the global value.
-        return getProperty(
-                MySQLGuacamoleProperties.MYSQL_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames()
-        );
-        
-    }
-
 }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/conf/MySQLGuacamoleProperties.java

@@ -303,18 +303,4 @@ public class MySQLGuacamoleProperties {
 
     };
     
-    /**
-     * A property used to configure whether or not usernames within the MySQL
-     * JDBC module should be treated as case-sensitive. Be aware that MySQL's
-     * default database collations do not do case-sensitive comparisons, so in
-     * many cases they will effectively be case-insensitive.
-     */
-    public static final BooleanGuacamoleProperty MYSQL_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-    
-        @Override
-        public String getName() { return "mysql-case-sensitive-usernames"; }
-                
-    };
-    
 }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/conf/PostgreSQLEnvironment.java

@@ -22,8 +22,6 @@ package org.apache.guacamole.auth.postgresql.conf;
 import java.io.File;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.auth.jdbc.JDBCEnvironment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.guacamole.auth.jdbc.security.PasswordPolicy;
 import org.apache.ibatis.session.SqlSession;
 
@@ -33,11 +31,6 @@ import org.apache.ibatis.session.SqlSession;
  */
 public class PostgreSQLEnvironment extends JDBCEnvironment {
 
-    /**
-     * Logger for this class.
-     */
-    private static final Logger logger = LoggerFactory.getLogger(PostgreSQLEnvironment.class);
-
     /**
      * The default host to connect to, if POSTGRESQL_HOSTNAME is not specified.
      */
@@ -399,19 +392,4 @@ public class PostgreSQLEnvironment extends JDBCEnvironment {
                 true);
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // By default, PostgreSQL does perform case-sensitive string comparisons.
-        // Even though usernames are generally not case-sensitive across
-        // most authenticaiton systems, we've elected to maintain case-
-        // sensitivity in this module in order to avoid surprising anyone who
-        // may be relying upon it.
-        return getProperty(
-                PostgreSQLGuacamoleProperties.POSTGRESQL_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames()
-        );
-        
-    }
-
 }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/conf/SQLServerEnvironment.java

@@ -329,18 +329,4 @@ public class SQLServerEnvironment extends JDBCEnvironment {
                 false);
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // Get the configured or default value of the property.
-        boolean caseSensitiveUsernames = getProperty(
-                SQLServerGuacamoleProperties.SQLSERVER_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames()
-        );
-        
-        // Return as configured
-        return caseSensitiveUsernames;
-        
-    }
-
 }

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/java/org/apache/guacamole/auth/sqlserver/conf/SQLServerGuacamoleProperties.java

@@ -258,19 +258,4 @@ public class SQLServerGuacamoleProperties {
 
     };
 
-    /**
-     * A property used to configure whether or not usernames within the SQL
-     * Server JDBC module should be treated as case-sensitive. While Guacamole
-     * will treat usernames as case-sensitive by default, SQL Server's default
-     * database collations do not do case-sensitive string comparisons, so in
-     * many cases this will effectively result in case-insensitive usernames.
-     */
-    public static final BooleanGuacamoleProperty SQLSERVER_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-                
-        @Override
-        public String getName() { return "sqlserver-case-sensitive-usernames" ; }
-                
-    };
-
 }

extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/ConfigurationService.java

@@ -24,7 +24,6 @@ import java.util.Collection;
 import java.util.Collections;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.Environment;
-import org.apache.guacamole.properties.BooleanGuacamoleProperty;
 import org.apache.guacamole.properties.ByteArrayProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
 
@@ -40,20 +39,6 @@ public class ConfigurationService {
     @Inject
     private Environment environment;
     
-    /**
-     * A property used to configure whether or not usernames within the JSON
-     * module should be treated as case-sensitive.
-     */
-    private static final BooleanGuacamoleProperty JSON_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-      
-        @Override
-        public String getName() {
-            return "json-case-sensitive-usernames";
-        }
-        
-    };
-    
     /**
      * The encryption key to use for all decryption and signature verification.
      */
@@ -80,25 +65,6 @@ public class ConfigurationService {
 
     };
 
-    /**
-     * Returns true if the usernames provided to the JSON authentication
-     * module should be treated as case-sensitive, or false if usernames
-     * should be treated as case-insensitive. The default will be taken from
-     * the global Guacamole configuration, which defaults to true, but
-     * can be overridden for this extension.
-     * 
-     * @return
-     *     true if usernames should be treated as case-sensitive, otherwise
-     *     false.
-     * 
-     * @throws GuacamoleException 
-     *     If guacamole.properties cannot be parsed.
-     */
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        return environment.getProperty(JSON_CASE_SENSITIVE_USERNAMES,
-                environment.getCaseSensitiveUsernames());
-    }
-
     /**
      * Returns the symmetric key which will be used to encrypt and sign all
      * JSON data and should be used to decrypt and verify any received JSON

extensions/guacamole-auth-json/src/main/java/org/apache/guacamole/auth/json/user/AuthenticatedUser.java

@@ -20,8 +20,6 @@
 package org.apache.guacamole.auth.json.user;
 
 import com.google.inject.Inject;
-import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.auth.json.ConfigurationService;
 import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
 import org.apache.guacamole.net.auth.AuthenticationProvider;
 import org.apache.guacamole.net.auth.Credentials;
@@ -47,13 +45,6 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
     @Inject
     private AuthenticationProvider authProvider;
 
-    /**
-     * Reference to the configuration service associated with this
-     * authentication provider.
-     */
-    @Inject
-    private ConfigurationService confService;
-
     /**
      * The credentials provided when this user was authenticated.
      */
@@ -83,19 +74,6 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
         setIdentifier(userData.getUsername());
     }
 
-    @Override
-    public boolean isCaseSensitive() {
-        try {
-            return confService.getCaseSensitiveUsernames();
-        }
-        catch (GuacamoleException e) {
-            LOGGER.error("Error when attempting to get the JSON configuration: {}. "
-                    + "Username comparisons will be case-sensitive.", e.getMessage());
-            LOGGER.debug("Exception caught while retrieving JSON configuration.", e);
-            return true;
-        }
-    }
-
     @Override
     public AuthenticationProvider getAuthenticationProvider() {
         return authProvider;

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ConnectedLDAPConfiguration.java

@@ -224,9 +224,4 @@ public class ConnectedLDAPConfiguration implements LDAPConfiguration, AutoClosea
         return config.getMemberAttributeType();
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        return config.getCaseSensitiveUsernames();
-    }
-
 }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/DefaultLDAPConfiguration.java

@@ -19,7 +19,6 @@
 
 package org.apache.guacamole.auth.ldap.conf;
 
-import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.List;
 import org.apache.directory.api.ldap.model.filter.ExprNode;
@@ -28,7 +27,6 @@ import org.apache.directory.api.ldap.model.message.AliasDerefMode;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.GuacamoleServerException;
-import org.apache.guacamole.environment.Environment;
 
 /**
  * LDAPConfiguration implementation that returns the default values for all
@@ -37,12 +35,6 @@ import org.apache.guacamole.environment.Environment;
  */
 public class DefaultLDAPConfiguration implements LDAPConfiguration {
     
-    /**
-     * The environment in which Guacamole is running.
-     */
-    @Inject
-    private Environment environment;
-    
     @Override
     public String appliesTo(String username) {
         return null;
@@ -159,9 +151,4 @@ public class DefaultLDAPConfiguration implements LDAPConfiguration {
         return MemberAttributeType.DN;
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        return environment.getCaseSensitiveUsernames();
-    }
-
 }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/EnvironmentLDAPConfiguration.java

@@ -234,18 +234,4 @@ public class EnvironmentLDAPConfiguration implements LDAPConfiguration {
         );
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // Most LDAP directories do not factor in case when comparing usernames,
-        // however, in order to avoid surprising anyone who may rely on this
-        // behavior in Guacamole, this is currently defaulted the overall
-        // Guacamole configuration (default of true), but can be over-ridden
-        // for the LDAP extension specifically, if desired.
-        return environment.getProperty(
-                LDAPGuacamoleProperties.LDAP_CASE_SENSITIVE_USERNAMES,
-                environment.getCaseSensitiveUsernames()
-        );
-    }
-
 }

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

@@ -447,10 +447,4 @@ public class JacksonLDAPConfiguration implements LDAPConfiguration {
                 memberAttributeType, defaultConfig::getMemberAttributeType);
     }
 
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        return withDefault(LDAPGuacamoleProperties.LDAP_CASE_SENSITIVE_USERNAMES,
-                caseSensitiveUsernames, defaultConfig::getCaseSensitiveUsernames);
-    }
-
 }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LDAPConfiguration.java

@@ -334,20 +334,4 @@ public interface LDAPConfiguration {
      */
     MemberAttributeType getMemberAttributeType() throws GuacamoleException;
 
-    /**
-     * Returns true if the usernames provided to the LDAP authentication
-     * module should be treated as case-sensitive, or false if usernames
-     * should be treated as case-insensitive. The default is true, usernames
-     * will be case-sensitive in keeping with the past behavior of Guacamole
-     * prior to the addition of this option.
-     * 
-     * @return
-     *     true if usernames should be treated as case-sensitive, otherwise
-     *     false.
-     * 
-     * @throws GuacamoleException 
-     *     If guacamole.properties cannot be parsed.
-     */
-    boolean getCaseSensitiveUsernames() throws GuacamoleException;
-
 }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/LDAPGuacamoleProperties.java

@@ -307,16 +307,4 @@ public class LDAPGuacamoleProperties {
 
     };
 
-    /**
-     * A property used to configure whether or not usernames within the LDAP
-     * module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty LDAP_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-    
-        @Override
-        public String getName() { return "ldap-case-sensitive-usernames"; }
-                
-    };
-
 }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/user/LDAPAuthenticatedUser.java

@@ -29,8 +29,6 @@ import org.apache.guacamole.auth.ldap.ConnectedLDAPConfiguration;
 import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
 import org.apache.guacamole.net.auth.AuthenticationProvider;
 import org.apache.guacamole.net.auth.Credentials;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An LDAP-specific implementation of AuthenticatedUser, associating a
@@ -38,11 +36,6 @@ import org.slf4j.LoggerFactory;
  */
 public class LDAPAuthenticatedUser extends AbstractAuthenticatedUser {
 
-    /**
-     * The logger for this class.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(LDAPAuthenticatedUser.class);
-    
     /**
      * Reference to the authentication provider associated with this
      * authenticated user.
@@ -143,23 +136,6 @@ public class LDAPAuthenticatedUser extends AbstractAuthenticatedUser {
         return config;
     }
     
-    @Override
-    public boolean isCaseSensitive() {
-        try {
-            return config.getCaseSensitiveUsernames();
-        }
-        catch (GuacamoleException e) {
-            // LDAP authentication is almost universally case-insensitive,
-            // however, we're maintaining case-sensitivity within Guacamole
-            // at the moment in order to avoid surprising anyone with this change.
-            // Case-sensitivity can be disabled as a configuration option.
-            LOGGER.error("Error retrieving configuration for username case-sensitivity: {}. "
-                    + "Username comparisons will be done case-sensitively.", e.getMessage());
-            LOGGER.debug("Caught exception when retrieving case-sensitivity configuration.", e);
-            return true;
-        }
-    }
-    
     @Override
     public AuthenticationProvider getAuthenticationProvider() {
         return authProvider;

extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/ConfigurationService.java

@@ -363,25 +363,4 @@ public class ConfigurationService {
         }
     }
 
-    /**
-     * Returns true if the usernames provided to the RADIUS authentication
-     * module should be treated as case-sensitive, or false if usernames
-     * should be treated as case-insensitive. The default value is read from
-     * Guacamole's global configuration, which defaults to true, but can be
-     * overridden for the RADIUS extension, if desired.
-     * 
-     * @return
-     *     true if usernames should be treated as case-sensitive, otherwise
-     *     false.
-     * 
-     * @throws GuacamoleException 
-     *     If guacamole.properties cannot be parsed.
-     */
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        return environment.getProperty(
-                RadiusGuacamoleProperties.RADIUS_CASE_SENSITIVE_USERNAMES,
-                environment.getCaseSensitiveUsernames()
-        );
-    }
-
 }

extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/RadiusGuacamoleProperties.java

@@ -205,17 +205,4 @@ public class RadiusGuacamoleProperties {
         
     };
 
-    /**
-     * A property used to configure whether or not usernames within the RADIUS
-     * module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty RADIUS_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-        
-        @Override
-        public String getName() { return "radius-case-sensitive-usernames"; }
-        
-    };
-
-
 }

extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/user/AuthenticatedUser.java

@@ -63,7 +63,7 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
      */
     public void init(Credentials credentials) {
         this.credentials = credentials;
-        setIdentifier(credentials.getUsername().toLowerCase());
+        setIdentifier(credentials.getUsername());
     }
 
     @Override
@@ -76,17 +76,4 @@ public class AuthenticatedUser extends AbstractAuthenticatedUser {
         return credentials;
     }
 
-    @Override
-    public boolean isCaseSensitive() {
-        try {
-            return confService.getCaseSensitiveUsernames();
-        }
-        catch (GuacamoleException e) {
-            LOGGER.error("Error retrieving configuration for username case sensiivity. "
-                + "Usernames will be processed as case-sensitive.");
-            LOGGER.debug("Exception caught while retrieving RADIUS configuration.", e);
-            return true;
-        }
-    }
-
 }

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/java/org/apache/guacamole/auth/sso/user/SSOAuthenticatedUser.java

@@ -23,13 +23,9 @@ import com.google.inject.Inject;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import org.apache.guacamole.GuacamoleException;
-import org.apache.guacamole.environment.Environment;
 import org.apache.guacamole.net.auth.AbstractAuthenticatedUser;
 import org.apache.guacamole.net.auth.AuthenticationProvider;
 import org.apache.guacamole.net.auth.Credentials;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * An AuthenticatedUser whose identity has been supplied by an arbitrary SSO
@@ -39,11 +35,6 @@ import org.slf4j.LoggerFactory;
  */
 public class SSOAuthenticatedUser extends AbstractAuthenticatedUser {
     
-    /**
-     * Logger for this class.
-     */
-    private static final Logger LOGGER = LoggerFactory.getLogger(SSOAuthenticatedUser.class);
-    
     /**
      * Reference to the authentication provider associated with this
      * authenticated user.
@@ -51,12 +42,6 @@ public class SSOAuthenticatedUser extends AbstractAuthenticatedUser {
     @Inject
     private AuthenticationProvider authProvider;
 
-    /**
-     * The environment in which this instance of Guacamole is running.
-     */
-    @Inject
-    private Environment environment;
-
     /**
      * The credentials provided when this user was authenticated.
      */
@@ -128,21 +113,4 @@ public class SSOAuthenticatedUser extends AbstractAuthenticatedUser {
         return effectiveGroups;
     }
 
-    @Override
-    public boolean isCaseSensitive() {
-        try {
-            return environment.getCaseSensitiveUsernames();
-        }
-        catch (GuacamoleException e) {
-            // Most SSO systems do not consider usernames to be case-sensitive;
-            // however, in order to avoid any surprises created by the introduction
-            // of case-sensitivity, we've opted to continue to evaluate these
-            // usernames in a case-sensitive manner by default.
-            LOGGER.error("Error occurred when trying to retrieve case-sensitivity configuration: {}. "
-                    + "Usernames comparisons will be done in a case-sensitive manner.", e.getMessage());
-            LOGGER.debug("Exception caught when trying to access the case-sensitivity property.", e);
-            return true;
-        }
-    }
-
 }

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASEnvironment.java

@@ -19,7 +19,6 @@
 
 package org.apache.guacamole.auth.cas.conf;
 
-import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.DelegatingEnvironment;
 import org.apache.guacamole.environment.LocalEnvironment;
 
@@ -37,17 +36,4 @@ public class CASEnvironment extends DelegatingEnvironment {
         super(LocalEnvironment.getInstance());
     }
     
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // While most SSO systems do not consider usernames case-sensitive,
-        // this defaults to the global Guacamole configuration, which defaults
-        // to true, in order to avoid surprising or breaking environments that
-        // may rely on this behavior. This can be overridden for the entire
-        // Guacamole instance or for this extension.
-        return getProperty(CASGuacamoleProperties.CAS_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames());
-        
-    }
-    
 }

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/java/org/apache/guacamole/auth/cas/conf/CASGuacamoleProperties.java

@@ -20,7 +20,6 @@
 package org.apache.guacamole.auth.cas.conf;
 
 import org.apache.guacamole.auth.cas.group.GroupFormat;
-import org.apache.guacamole.properties.BooleanGuacamoleProperty;
 import org.apache.guacamole.properties.EnumGuacamoleProperty;
 import org.apache.guacamole.properties.URIGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
@@ -119,16 +118,4 @@ public class CASGuacamoleProperties {
 
     };
 
-    /**
-     * A property used to configure whether or not usernames within the CAS SSO
-     * module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty CAS_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-    
-        @Override
-        public String getName() { return "cas-case-sensitive-usernames"; }
-                
-    };
-
 }

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/ConfigurationService.java

@@ -26,7 +26,6 @@ import java.util.Collections;
 import java.util.List;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.Environment;
-import org.apache.guacamole.properties.BooleanGuacamoleProperty;
 import org.apache.guacamole.properties.IntegerGuacamoleProperty;
 import org.apache.guacamole.properties.StringGuacamoleProperty;
 import org.apache.guacamole.properties.URIGuacamoleProperty;
@@ -221,18 +220,6 @@ public class ConfigurationService {
         
     };
 
-    /**
-     * A property used to configure whether or not usernames within the OpenID
-     * SSO module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty OPENID_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-    
-        @Override
-        public String getName() { return "openid-case-sensitive-usernames"; }
-                
-    };
-
     /**
      * The Guacamole server environment.
      */

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/java/org/apache/guacamole/auth/openid/conf/OpenIDEnvironment.java

@@ -19,7 +19,6 @@
 
 package org.apache.guacamole.auth.openid.conf;
 
-import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.DelegatingEnvironment;
 import org.apache.guacamole.environment.LocalEnvironment;
 
@@ -37,17 +36,4 @@ public class OpenIDEnvironment extends DelegatingEnvironment {
         super(LocalEnvironment.getInstance());
     }
     
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // While most SSO systems do not consider usernames case-sensitive,
-        // this defaults to the global Guacamole configuration, which defaults
-        // to true, in order to avoid surprising or breaking environments that
-        // may rely on this behavior. This can be overridden for the entire
-        // Guacamole instance or for this extension.
-        return getProperty(ConfigurationService.OPENID_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames());
-        
-    }
-    
 }

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/conf/ConfigurationService.java

@@ -190,18 +190,6 @@ public class ConfigurationService {
 
     };
 
-    /**
-     * A property used to configure whether or not usernames within the SAML SSO
-     * module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty SAML_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-    
-        @Override
-        public String getName() { return "saml-case-sensitive-usernames"; }
-                
-    };
-
     /**
      * The Guacamole server environment.
      */

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/conf/SAMLEnvironment.java

@@ -19,7 +19,6 @@
 
 package org.apache.guacamole.auth.saml.conf;
 
-import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.DelegatingEnvironment;
 import org.apache.guacamole.environment.LocalEnvironment;
 
@@ -37,17 +36,4 @@ public class SAMLEnvironment extends DelegatingEnvironment {
         super(LocalEnvironment.getInstance());
     }
     
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // While most SSO systems do not consider usernames case-sensitive,
-        // this defaults to the global Guacamole configuration, which defaults
-        // to true, in order to avoid surprising or breaking environments that
-        // may rely on this behavior. This can be overridden for the entire
-        // Guacamole instance or for this extension.
-        return getProperty(ConfigurationService.SAML_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames());
-        
-    }
-    
 }

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/src/main/java/org/apache/guacamole/auth/ssl/conf/ConfigurationService.java

@@ -188,18 +188,6 @@ public class ConfigurationService {
 
     };
 
-    /**
-     * A property used to configure whether or not usernames within the SSL SSO
-     * module should be treated as case-sensitive.
-     */
-    public static final BooleanGuacamoleProperty SSL_CASE_SENSITIVE_USERNAMES =
-            new BooleanGuacamoleProperty() {
-    
-        @Override
-        public String getName() { return "ssl-case-sensitive-usernames"; }
-                
-    };
-
     /**
      * The Guacamole server environment.
      */

extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/src/main/java/org/apache/guacamole/auth/ssl/conf/SSLEnvironment.java

@@ -37,17 +37,4 @@ public class SSLEnvironment extends DelegatingEnvironment {
         super(LocalEnvironment.getInstance());
     }
     
-    @Override
-    public boolean getCaseSensitiveUsernames() throws GuacamoleException {
-        
-        // While most SSO systems do not consider usernames case-sensitive,
-        // this defaults to the global Guacamole configuration, which defaults
-        // to true, in order to avoid surprising or breaking environments that
-        // may rely on this behavior. This can be overridden for the entire
-        // Guacamole instance or for this extension.
-        return getProperty(ConfigurationService.SSL_CASE_SENSITIVE_USERNAMES,
-                super.getCaseSensitiveUsernames());
-        
-    }
-    
 }

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/AbstractAuthenticatedUser.java

@@ -21,6 +21,11 @@ package org.apache.guacamole.net.auth;
 
 import java.util.Collections;
 import java.util.Set;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Basic implementation of an AuthenticatedUser which uses the username to
@@ -29,6 +34,17 @@ import java.util.Set;
 public abstract class AbstractAuthenticatedUser extends AbstractIdentifiable
         implements AuthenticatedUser {
 
+    /**
+     * The logger for this class.
+     */
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthenticatedUser.class);
+    
+    /**
+     * The server environment in which this Guacamole Client instance is
+     * running.
+     */
+    private final Environment environment = LocalEnvironment.getInstance();
+    
     // Prior functionality now resides within AbstractIdentifiable
 
     @Override
@@ -36,6 +52,21 @@ public abstract class AbstractAuthenticatedUser extends AbstractIdentifiable
         return Collections.<String>emptySet();
     }
 
+    @Override
+    public boolean isCaseSensitive() {
+        try {
+            return environment.getCaseSensitiveUsernames();
+        }
+        catch (GuacamoleException e) {
+            LOGGER.warn("Exception attempting to read the Guacamole configuration, "
+                      + "usernames will be treated as case-sensitive.", e.getMessage());
+            LOGGER.debug("Received GuacamoleException attempting to retrieve the "
+                       + "case-sensitivity setting for usernames. Defaulting to"
+                       + "case-sensitive usernames.", e);
+            return true;
+        }
+    }
+    
     @Override
     public void invalidate() {
         // Nothing to invalidate

guacamole-ext/src/main/java/org/apache/guacamole/net/auth/DelegatingUser.java

@@ -83,6 +83,11 @@ public class DelegatingUser implements User {
         return user.isDisabled();
     }
     
+    @Override
+    public boolean isCaseSensitive() {
+        return user.isCaseSensitive();
+    }
+    
     @Override
     public void setDisabled(boolean disabled) {
         user.setDisabled(disabled);