[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: rdw
Date: Fri May  2 08:09:52 2014
New Revision: 5829

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5829&view=rev
Log:
Clean up some bugs in the handling of credentials' usage type

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java?rev=5829&r1=5828&r2=5829&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractBasicCredentialFactoryBean.java Fri May  2 08:09:52 2014
@@ -27,6 +27,7 @@
 
 import org.cryptacular.util.KeyPairUtil;
 import org.opensaml.security.credential.BasicCredential;
+import org.opensaml.security.credential.UsageType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
@@ -65,6 +66,9 @@
         }
         if(null != secretKey) {
             credential.setSecretKey(secretKey);
+        }
+        if (null != getUsageType()) {
+            credential.setUsageType(UsageType.valueOf(getUsageType()));
         }
         return credential;
     }

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java?rev=5829&r1=5828&r2=5829&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialFactoryBean.java Fri May  2 08:09:52 2014
@@ -88,7 +88,11 @@
      * @param type usage type of the credential
      */
     public void setUsageType(@Nullable final String type) {
-        usageType = type;
+        if (null != type) {
+            usageType = type.toUpperCase();
+        } else {
+            usageType = type;
+        }
     }
 
     /**

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialParser.java?rev=5829&r1=5828&r2=5829&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/AbstractCredentialParser.java Fri May  2 08:09:52 2014
@@ -25,7 +25,6 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
-import org.opensaml.security.credential.UsageType;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedList;
@@ -67,11 +66,7 @@
      */
     protected void parseAttributes(final Element element, final BeanDefinitionBuilder builder) {
         final String usage = StringSupport.trimOrNull(element.getAttributeNS(null, "usage"));
-        if (usage != null) {
-            builder.addPropertyValue("usageType", UsageType.valueOf(usage.toUpperCase()));
-        } else {
-            builder.addPropertyValue("usageType", UsageType.UNSPECIFIED);
-        }
+        builder.addPropertyValue("usageType", usage);
 
         final String entityID = StringSupport.trimOrNull(element.getAttributeNS(null, "entityID"));
         if (entityID != null) {