cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From owu...@apache.org
Subject git commit: [FEDIZ-88] wreply parameter must be optional
Date Thu, 02 Oct 2014 11:06:56 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 47d30af6d -> 387092865


[FEDIZ-88] wreply parameter must be optional


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/38709286
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/38709286
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/38709286

Branch: refs/heads/master
Commit: 387092865a8795c34f25f79f3154906b3ff62cfc
Parents: 47d30af
Author: Oliver Wulff <owulff@talend.com>
Authored: Thu Oct 2 13:05:45 2014 +0200
Committer: Oliver Wulff <owulff@talend.com>
Committed: Thu Oct 2 13:05:45 2014 +0200

----------------------------------------------------------------------
 .../webapp/WEB-INF/federation-validate-request.xml   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/38709286/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
index 455ec71..d4a3a21 100644
--- a/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
@@ -124,7 +124,7 @@
         </on-entry>
         <evaluate expression="signInParamCacheAction.storeRPUrlInSession(flowRequestContext)"
                 result="flowScope.res"/>
-        <transition to="formResponseView" />
+        <transition to="isWReplyProvided" />
         <transition on-exception="org.apache.cxf.fediz.core.exception.ProcessingException"
to="viewBadRequest" />
         <transition on-exception="java.lang.Throwable" to="scInternalServerError" />
     </action-state>
@@ -135,13 +135,22 @@
         <transition to="redirectToTrustedIDP" />
         <transition on-exception="java.lang.Throwable" to="scInternalServerError" />
     </action-state>
-    
+
+    <action-state id="isWReplyProvided">
+        <evaluate expression="flowScope.wreply != null" />
+        <transition on="yes" to="formResponseView" >
+            <set name="flowScope.signinResponseUrl" value="flowScope.wreply" />
+        </transition>
+        <transition on="no" to="formResponseView" >
+            <set name="flowScope.signinResponseUrl" value="flowScope.wtrealm" />
+        </transition>
+    </action-state>
 
     <!-- normal exit point for login -->
     <!-- browser redirection (self-submitted form 'signinresponseform.jsp') -->
     <end-state id="formResponseView" view="signinresponseform">
         <on-entry>
-            <evaluate expression="flowScope.wreply" result="requestScope.fedAction" />
+            <evaluate expression="flowScope.signinResponseUrl" result="requestScope.fedAction"
/>
             <evaluate expression="flowScope.wtrealm" result="requestScope.fedWTrealm"
/>
             <evaluate expression="flowScope.wctx" result="requestScope.fedWCtx" />
             <evaluate expression="flowScope.rpToken" result="requestScope.fedWResult"
/>


Mime
View raw message