cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbernha...@apache.org
Subject [1/2] cxf-fediz git commit: [Fediz-146] Disabling wtrealm check for signin response
Date Wed, 20 Jan 2016 17:17:33 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 7b2f203e1 -> 31a6884f3


[Fediz-146] Disabling wtrealm check for signin response


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

Branch: refs/heads/master
Commit: 8009104dae31254937b63e50a6f50a567f1ce5ff
Parents: 7b2f203
Author: Jan Bernhardt <jbernhardt@talend.com>
Authored: Wed Jan 20 14:50:54 2016 +0100
Committer: Jan Bernhardt <jbernhardt@talend.com>
Committed: Wed Jan 20 15:14:44 2016 +0100

----------------------------------------------------------------------
 .../flows/federation-validate-request.xml       | 25 +++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/8009104d/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml b/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
index cff2962..4ea0d9a 100644
--- a/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
+++ b/services/idp/src/main/webapp/WEB-INF/flows/federation-validate-request.xml
@@ -38,35 +38,28 @@
                 result="flowScope.wauth" />
             <set name="flowScope.idpConfig" value="config.getIDP(null)" />
         </on-entry>
-        <if
-            test="requestParameters.wa == 'wsignout1.0' or requestParameters.wa == 'wsignoutcleanup1.0'"
+        <if test="requestParameters.wa == 'wsignout1.0' or requestParameters.wa == 'wsignoutcleanup1.0'"
             then="selectSignOutProcess" />
-        <if
-            test="requestParameters.wa == 'wsignin1.0'" then="selectWsFedProcess" 
+        <if test="requestParameters.wa == 'wsignin1.0'" then="selectWsFedProcess" 
             else="selectSAMLProcess" /> 
     </decision-state>
 
     <decision-state id="selectWsFedProcess">
-        <if
-            test="requestParameters.wtrealm == null or requestParameters.wtrealm.length()
== 0"
-            then="viewBadRequest" />
-        <if
-            test="requestParameters.wresult == null or requestParameters.wresult.isEmpty()"
-            then="signinRequest" else="signinResponse" />
+        <if test="requestParameters.wresult != null and !requestParameters.wresult.isEmpty()"
+            then="signinResponse" />
+        <if test="requestParameters.wtrealm != null and !requestParameters.wtrealm.isEmpty()"
+            then="signinRequest" else="viewBadRequest" />
     </decision-state>
     
     <decision-state id="selectSAMLProcess">
-        <if
-            test="requestParameters.RelayState == null or requestParameters.RelayState.length()
== 0"
+        <if test="requestParameters.RelayState == null or requestParameters.RelayState.length()
== 0"
             then="viewBadRequest" />
-        <if
-            test="requestParameters.SAMLResponse == null or requestParameters.SAMLResponse.length()
== 0"
+        <if test="requestParameters.SAMLResponse == null or requestParameters.SAMLResponse.length()
== 0"
             then="viewBadRequest" else="signinResponse" />
     </decision-state>
 	
     <decision-state id="selectSignOutProcess">
-        <if
-            test="requestParameters.wa == 'wsignout1.0' and flowScope.idpConfig.rpSingleSignOutConfirmation
== true
+        <if test="requestParameters.wa == 'wsignout1.0' and flowScope.idpConfig.rpSingleSignOutConfirmation
== true
             or requestParameters.wa == 'wsignoutcleanup1.0' and flowScope.idpConfig.rpSingleSignOutCleanupConfirmation
== true"
             then="viewSignoutConfirmation" else="invalidateSessionAction" />
     </decision-state>


Mime
View raw message