[java-idp-testbed] branch master updated: Add NameIDPolicy hook to testbed.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=8117b973d311b08f16cd3ddac2cad13888552bec

The following commit(s) were added to refs/heads/master by this push:
       new  8117b97   Add NameIDPolicy hook to testbed.
8117b97 is described below

commit 8117b973d311b08f16cd3ddac2cad13888552bec
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 3 09:01:12 2019 -0400

    Add NameIDPolicy hook to testbed.
---
 src/main/java/sp/SAML2Controller.java | 20 ++++++++++++++++----
 src/main/webapp/index.html            |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/sp/SAML2Controller.java b/src/main/java/sp/SAML2Controller.java
index 0a114cf..b158740 100644
--- a/src/main/java/sp/SAML2Controller.java
+++ b/src/main/java/sp/SAML2Controller.java
@@ -498,18 +498,30 @@ public class SAML2Controller extends BaseSAMLController {
 		nameIDPolicy.setAllowCreate(true);
 		authnRequest.setNameIDPolicy(nameIDPolicy);
 		
-		if (servletRequest.getParameter("classRef") != null) {
+		String param = StringSupport.trimOrNull(servletRequest.getParameter("nameIDFormat"));
+		if (param != null) {
+		    nameIDPolicy.setFormat(param);
+		}
+		
+		param = StringSupport.trimOrNull(servletRequest.getParameter("spNameQualifier"));
+		if (param != null) {
+		    nameIDPolicy.setSPNameQualifier(param);
+		}
+		
+		param = StringSupport.trimOrNull(servletRequest.getParameter("classRef"));
+		if (param != null) {
             final AuthnContextClassRef ref = (AuthnContextClassRef) builderFactory.getBuilder(
                     AuthnContextClassRef.DEFAULT_ELEMENT_NAME).buildObject(AuthnContextClassRef.DEFAULT_ELEMENT_NAME);
-            ref.setAuthnContextClassRef(servletRequest.getParameter("classRef"));
+            ref.setAuthnContextClassRef(param);
 	        final RequestedAuthnContext rac = (RequestedAuthnContext) builderFactory.getBuilder(
 	                RequestedAuthnContext.DEFAULT_ELEMENT_NAME).buildObject(RequestedAuthnContext.DEFAULT_ELEMENT_NAME);
 	        rac.getAuthnContextClassRefs().add(ref);
 	        authnRequest.setRequestedAuthnContext(rac);
 		}
 		
-		if (servletRequest.getParameter("requesters") != null) {
-		    final String[] requesters = servletRequest.getParameter("requesters").split(",");
+		param = StringSupport.trimOrNull(servletRequest.getParameter("requesters"));
+		if (param != null) {
+		    final String[] requesters = param.split(",");
 		    if (requesters != null && requesters.length > 0) {
 	            final Scoping scoping = (Scoping) builderFactory.getBuilder(
 	                    Scoping.DEFAULT_ELEMENT_NAME).buildObject(Scoping.DEFAULT_ELEMENT_NAME);
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 0882571..7714370 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -27,6 +27,8 @@
     <p>Init SAML 2 SSO, Redirect Binding with:<br/>
     AuthnContextClassRef: <input type="text" name="classRef" size="60"/><br/>
     Scoping: <input type="text" name="requesters" size="60"/><br/>
+    NameID Format: <input type="text" name="nameIDFormat" size="60"/><br/>
+    SPNameQualifier: <input type="text" name="spNameQualifier" size="60"/><br/>
     <input type="submit" name="Submit" value="Run"/>
     </p>
 </form>

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