[java-identity-provider] branch master updated: Add language callback to JAAS validator.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a7be32be4a0604eb9a6c812944e3b38298cfa1c3

The following commit(s) were added to refs/heads/master by this push:
       new  a7be32b   Add language callback to JAAS validator.
a7be32b is described below

commit a7be32be4a0604eb9a6c812944e3b38298cfa1c3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 31 15:30:59 2019 -0400

    Add language callback to JAAS validator.
---
 .../authn/impl/ValidateUsernamePasswordAgainstJAAS.java  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
index b4e814f..cdf2d4e 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
@@ -30,6 +30,7 @@ import javax.annotation.Nullable;
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.LanguageCallback;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
@@ -368,9 +369,10 @@ public class ValidateUsernamePasswordAgainstJAAS extends AbstractUsernamePasswor
     }
         
     /**
-     * A callback handler that provides static name and password data to a JAAS login process.
+     * A callback handler that provides name and password data to a JAAS login process,
+     * along with other miscellany.
      * 
-     * This handler only supports {@link NameCallback} and {@link PasswordCallback}.
+     * This handler supports {@link NameCallback}, {@link PasswordCallback}, and {@link LanguageCalback}.
      */
     protected class SimpleCallbackHandler implements CallbackHandler {
 
@@ -395,8 +397,16 @@ public class ValidateUsernamePasswordAgainstJAAS extends AbstractUsernamePasswor
                 } else if (cb instanceof PasswordCallback) {
                     final PasswordCallback pcb = (PasswordCallback) cb;
                     pcb.setPassword(getUsernamePasswordContext().getPassword().toCharArray());
+                } else if (cb instanceof LanguageCallback) {
+                    if (getHttpServletRequest() != null) {
+                        final LanguageCallback lcb = (LanguageCallback) cb;
+                        lcb.setLocale(getHttpServletRequest().getLocale());
+                    } else {
+                        log.warn("{} Language callback invoked, no HttpServletRequest available", getLogPrefix());
+                    }
                 }
             }
         }
     }
-}
+
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.