[Fediz-146] Disabling wtrealm check for signin response
Conflicts:
services/idp/src/main/webapp/WEB-INF/federation-validate-request.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/71a1c653
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/71a1c653
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/71a1c653
Branch: refs/heads/1.2.x-fixes
Commit: 71a1c653c897447d70b23407ced38dfb067132db
Parents: b6bc005
Author: Jan Bernhardt <[email protected]>
Authored: Wed Jan 20 14:50:54 2016 +0100
Committer: Jan Bernhardt <[email protected]>
Committed: Tue Feb 9 08:19:37 2016 +0100
----------------------------------------------------------------------
.../main/webapp/WEB-INF/federation-validate-request.xml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/71a1c653/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 6970a39..ffded3a 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
@@ -47,12 +47,10 @@
</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">
@@ -63,7 +61,7 @@
test="requestParameters.SAMLResponse == null or
requestParameters.SAMLResponse.length() == 0"
then="viewBadRequest" else="signinResponse" />
</decision-state>
-
+
<decision-state id="selectSignOutProcess">
<on-entry>
<evaluate
expression="@org.apache.cxf.fediz.service.idp.util.WebUtils@getHttpHeader(flowRequestContext,
'Referer')" result="flowScope.wreply"/>
