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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 15 15:55:06 2016
New Revision: 8156

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8156&view=rev
Log:
IDP-951 - Username transforms are not being chained correctly.

Username transforms are not being chained correctly.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractExtractionAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractExtractionAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractExtractionAction.java?rev=8156&r1=8155&r2=8156&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractExtractionAction.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractExtractionAction.java	Tue Mar 15 15:55:06 2016
@@ -135,22 +135,22 @@
         
         if (trim) {
             log.debug("{} Trimming whitespace of input string '{}'", getLogPrefix(), s);
-            s = input.trim();
+            s = s.trim();
         }
         
         if (lowercase) {
             log.debug("{} Converting input string '{}' to lowercase", getLogPrefix(), s);
-            s = input.toLowerCase();
+            s = s.toLowerCase();
         } else if (uppercase) {
             log.debug("{} Converting input string '{}' to uppercase", getLogPrefix(), s);
-            s = input.toUpperCase();
+            s = s.toUpperCase();
         }
         
         if (transforms.isEmpty()) {
             return s;
         }
         
-        for (Pair<Pattern,String> p : transforms) {            
+        for (final Pair<Pattern,String> p : transforms) {            
             final Matcher m = p.getFirst().matcher(s);
             log.debug("{} Applying replacement expression '{}' against input '{}'", getLogPrefix(),
                     p.getFirst().pattern(), s);

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java?rev=8156&r1=8155&r2=8156&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractSubjectCanonicalizationAction.java	Tue Mar 15 15:55:06 2016
@@ -224,15 +224,15 @@
         
         if (trim) {
             log.debug("{} trimming whitespace of input string '{}'", getLogPrefix(), s);
-            s = input.trim();
+            s = s.trim();
         }
         
         if (lowercase) {
             log.debug("{} converting input string '{}' to lowercase", getLogPrefix(), s);
-            s = input.toLowerCase();
+            s = s.toLowerCase();
         } else if (uppercase) {
             log.debug("{} converting input string '{}' to uppercase", getLogPrefix(), s);
-            s = input.toUpperCase();
+            s = s.toUpperCase();
         }
 
         if (transforms.isEmpty()) {

Modified: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java?rev=8156&r1=8155&r2=8156&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java	(original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ExtractRemoteUserTest.java	Tue Mar 15 15:55:06 2016
@@ -110,7 +110,8 @@
     }
 
     @Test public void testTransforms() throws Exception {
-        ((MockHttpServletRequest) action.getHttpServletRequest()).setRemoteUser("Foo at osu.edu");
+        ((MockHttpServletRequest) action.getHttpServletRequest()).setRemoteUser(" Foo at osu.edu ");
+        action.setTrim(true);
         action.setTransforms(Arrays.asList(new Pair<>("^(.+)@osu\\.edu$", "$1")));
         action.setLowercase(true);
         action.initialize();