[Jboss-cvs] JBossAS SVN: r56806 - in branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss: security/auth/spi test

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-09-13 13:26:37 -0400 (Wed, 13 Sep 2006)
New Revision: 56806

Modified:
   branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
   branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/test/LoginModulesTestCase.java
Log:
JBAS-3650, Cleanup the try block around the role principal creation

Modified: branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java	2006-09-13 17:10:21 UTC (rev 56805)
+++ branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java	2006-09-13 17:26:37 UTC (rev 56806)
@@ -425,41 +425,34 @@
 	            for (int n = 0; n < roles.size(); n ++)
 	            {
 	               String roleName = (String) roles.get(n);
-	               try
-	               {
-	                  if (roleAttributeIsDN)
-	                  {
-	                     // Query the roleDN location for the value of roleNameAttributeID
-	                     String roleDN = roleName;
-	                     String[] returnAttribute = {roleNameAttributeID};
-	                     log.trace("Using roleDN: " + roleDN);
-	                     try
-	                     {
-	                        Attributes result2 = ctx.getAttributes(roleDN, returnAttribute);
-	                        Attribute roles2 = result2.get(roleNameAttributeID);
-	                        if( roles2 != null )
-	                        {
-	                           for(int m = 0; m < roles2.size(); m ++)
-                              {
-   	                           roleName = (String) roles2.get(m);
-                                 addRole(roleName);
-                              }
-	                        }
-	                     }
-	                     catch (NamingException e)
-	                     {
-	                        log.trace("Failed to query roleNameAttrName", e);
-	                     }
-	                  }
-                     else
+                  if (roleAttributeIsDN)
+                  {
+                     // Query the roleDN location for the value of roleNameAttributeID
+                     String roleDN = roleName;
+                     String[] returnAttribute = {roleNameAttributeID};
+                     log.trace("Using roleDN: " + roleDN);
+                     try
                      {
-   	                  addRole(roleName);
+                        Attributes result2 = ctx.getAttributes(roleDN, returnAttribute);
+                        Attribute roles2 = result2.get(roleNameAttributeID);
+                        if( roles2 != null )
+                        {
+                           for(int m = 0; m < roles2.size(); m ++)
+                           {
+	                           roleName = (String) roles2.get(m);
+                              addRole(roleName);
+                           }
+                        }
                      }
-	               }
-	               catch (Exception e)
-	               {
-	                  log.debug("Failed to create principal: " + roleName, e);
-	               }
+                     catch (NamingException e)
+                     {
+                        log.trace("Failed to query roleNameAttrName", e);
+                     }
+                  }
+                  else
+                  {
+	                  addRole(roleName);
+                  }
 	            }
 	         }
 	

Modified: branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/test/LoginModulesTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/test/LoginModulesTestCase.java	2006-09-13 17:10:21 UTC (rev 56805)
+++ branches/JBoss_4_0_3_SP1_JBAS-3650/security/src/main/org/jboss/test/LoginModulesTestCase.java	2006-09-13 17:26:37 UTC (rev 56806)
@@ -219,8 +219,8 @@
             baseFilter="(uid={0})"
             rolesCtxDN="ou=Roles,o=example2,dc=jboss,dc=org";
             roleFilter="(uid={0})"
-            roleAttributeIsDN="cn"
             roleAttributeID="memberOf"
+            roleAttributeIsDN="true"
             roleNameAttributeID="cn"
             roleRecursion=0
       };