[cxf-fediz] branch 1.4.x-fixes updated: FEDIZ-236 - Support SAML SSO for Tomcat7

[coheigea]

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 1.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/1.4.x-fixes by this push:
     new 1a7037a  FEDIZ-236 - Support SAML SSO for Tomcat7
1a7037a is described below

commit 1a7037ad96830fb90c583b5c4c6ec88129709d9f
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Jan 31 14:53:18 2019 +0000

    FEDIZ-236 - Support SAML SSO for Tomcat7
---
 .../org/apache/cxf/fediz/tomcat7/FederationAuthenticator.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationAuthenticator.java
 
b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationAuthenticator.java
index 6b39c13..a244139 100644
--- 
a/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationAuthenticator.java
+++ 
b/plugins/tomcat7/src/main/java/org/apache/cxf/fediz/tomcat7/FederationAuthenticator.java
@@ -212,7 +212,7 @@ public class FederationAuthenticator extends 
FormAuthenticator {
             FedizPrincipal principal = signinHandler.handleRequest(request, 
response);
             if (principal != null) {
                 LOG.debug("Authentication of '{}' was successful", principal);
-                resumeRequest(request, response);
+                resumeRequest(signinHandler.getContextParameter(request), 
request, response);
             } else {
                 response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
             }
@@ -236,10 +236,10 @@ public class FederationAuthenticator extends 
FormAuthenticator {
         return false;
     }
 
-    protected void resumeRequest(HttpServletRequest request, 
HttpServletResponse response) throws IOException {
-        String contextId = 
request.getParameter(FederationConstants.PARAM_CONTEXT);
+    protected void resumeRequest(String contextId, HttpServletRequest request, 
+                                 HttpServletResponse response) throws 
IOException {
         if (contextId == null) {
-            LOG.warn("The 'wctx' parameter has not been provided back with 
signin request.");
+            LOG.warn("The context parameter has not been provided back with 
signin request.");
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
 
         } else {