Merge pull request #311 from derek63/fix-multiple-envs

Fix environment validation, remove special handling for legacy certs
lightblue-platform · Nov 22, 2017 · d203ef8 · d203ef8
2 parents af56cb7 + 4c5cef0
commit d203ef8
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/auth/src/main/java/com/redhat/lightblue/rest/auth/jboss/CertLdapLoginModule.java b/auth/src/main/java/com/redhat/lightblue/rest/auth/jboss/CertLdapLoginModule.java
@@ -170,14 +170,10 @@ protected Group[] getRoleSets() throws LoginException {
 
             LOGGER.debug("Certificate principal:" + certPrincipal);
 
-            //first try getting search name from uid in certificate principle (new certificates)
             String searchName = getLDAPAttribute(certPrincipal, UID);
-            if(StringUtils.isNotBlank(searchName)) {
-                //only try to validate environment if it is a certificate that contains uid
+
+            if(StringUtils.isNotBlank(environment)) {
                 validateEnvironment(certPrincipal);
-            } else {
-                // fallback to getting search name from cn in certificate principle (legacy certificates)
-                searchName = getLDAPAttribute(certPrincipal, CN);
             }
 
             Collection<String> groupNames = rolesProvider.getUserRoles(searchName);