[java-identity-provider COMMIT] in /trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl: AttributeSource...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jan 18 15:18:37 2015
New Revision: 7265

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7265&view=rev
Log:
Fix warnings, add some defensive checks

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AttributeSourcedSubjectCanonicalization.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromWSSToken.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FilterFlowsByAttribute.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AttributeSourcedSubjectCanonicalization.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AttributeSourcedSubjectCanonicalization.java?rev=7265&r1=7264&r2=7265&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AttributeSourcedSubjectCanonicalization.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AttributeSourcedSubjectCanonicalization.java Sun Jan 18 15:18:37 2015
@@ -164,6 +164,10 @@
             }
             for (final IdPAttributeValue val : attr.getValues()) {
                 if (val instanceof StringAttributeValue) {
+                    if (val.getValue() == null || ((StringAttributeValue) val).getValue().isEmpty()) {
+                        log.debug("{} Ignoring null/empty string value", getLogPrefix());
+                        continue;
+                    }
                     log.debug("{} Using attribute {} string value {} as input to transforms", getLogPrefix(), id,
                             val.getValue());
                     c14nContext.setPrincipalName(applyTransforms(((StringAttributeValue) val).getValue()));

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java?rev=7265&r1=7264&r2=7265&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java Sun Jan 18 15:18:37 2015
@@ -124,7 +124,7 @@
      * 
      * @return a pair containing the username and password, respectively, or null
      */
-    @Nullable protected Pair<String, String> decodeCredentials(@Nonnull @NotEmpty final String encodedCredentials) {
+    @Nullable protected Pair<String,String> decodeCredentials(@Nonnull @NotEmpty final String encodedCredentials) {
         final String decodedUserPass = new String(Base64Support.decode(encodedCredentials), Charsets.US_ASCII);
 
         if (decodedUserPass != null && decodedUserPass.contains(":")) {
@@ -132,7 +132,7 @@
             if (username != null && decodedUserPass.length() > username.length() + 1) {
                 final String password = decodedUserPass.substring(decodedUserPass.indexOf(':') + 1);
                 if (password != null) {
-                    return new Pair<String, String>(username, password);
+                    return new Pair<>(username, password);
                 }
             }
         }

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromWSSToken.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromWSSToken.java?rev=7265&r1=7264&r2=7265&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromWSSToken.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromWSSToken.java Sun Jan 18 15:18:37 2015
@@ -97,7 +97,7 @@
      * 
      * @return the username and password
      */
-    @Nullable private Pair<String, String> extractUsernamePassword(@Nonnull final Envelope message) {
+    @Nullable private Pair<String,String> extractUsernamePassword(@Nonnull final Envelope message) {
         final UsernameToken usernameToken = getUsernameToken(message);
         if (usernameToken == null) {
             return null;
@@ -129,7 +129,7 @@
             log.debug("{} <UsernameToken> does not contain a support <Password>", getLogPrefix());
             return null;
         }
-        return new Pair<String, String>(username.getValue(), password.getValue());
+        return new Pair<>(username.getValue(), password.getValue());
     }
 
     /**


[... 23 lines stripped ...]