[jboss-cvs] Picketbox SVN: r379 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role.

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

Author: pskopek at redhat.com
Date: 2013-01-23 06:47:47 -0500 (Wed, 23 Jan 2013)
New Revision: 379

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/LdapRolesMappingProvider.java
Log:
[SECURITY-712] Added vault support in "bindCredential" option.

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/LdapRolesMappingProvider.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/LdapRolesMappingProvider.java	2013-01-15 17:54:30 UTC (rev 378)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/LdapRolesMappingProvider.java	2013-01-23 11:47:47 UTC (rev 379)
@@ -42,6 +42,8 @@
 import org.jboss.security.Util;
 import org.jboss.security.identity.RoleGroup;
 import org.jboss.security.identity.plugins.SimpleRole;
+import org.jboss.security.vault.SecurityVaultException;
+import org.jboss.security.vault.SecurityVaultUtil;
 
 /**
  * A mapping provider that assigns roles to an user using a LDAP server to search for the roles. 
@@ -116,6 +118,19 @@
                throw PicketBoxMessages.MESSAGES.failedToDecodeBindCredential(e);
             }
          }
+         
+         //Check if the credential is vaultified
+         if(bindCredential != null && SecurityVaultUtil.isVaultFormat(bindCredential))
+         {
+            try {
+               bindCredential = SecurityVaultUtil.getValueAsString(bindCredential);
+            }
+            catch (SecurityVaultException ve) 
+            {
+               throw new IllegalArgumentException(PicketBoxMessages.MESSAGES.unableToGetPasswordFromVault());
+            }
+         }
+         
          roleFilter = (String) options.get(ROLE_FILTER_OPT);
          roleAttributeID = (String) options.get(ROLE_ATTRIBUTE_ID_OPT);
          if (roleAttributeID == null)