Repository: cxf-fediz Updated Branches: refs/heads/1.1.x-fixes 1a8c5a0d2 -> 564c2450a
[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/564c2450 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/564c2450 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/564c2450 Branch: refs/heads/1.1.x-fixes Commit: 564c2450a92d9608860aec21406bcb8e4b514482 Parents: 1a8c5a0 Author: Oliver Wulff <[email protected]> Authored: Thu Oct 2 23:49:49 2014 +0200 Committer: Oliver Wulff <[email protected]> Committed: Thu Oct 2 23:49:49 2014 +0200 ---------------------------------------------------------------------- .../webapp/WEB-INF/federation-validate-request.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/564c2450/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 cfe165e..3e89125 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 @@ -99,15 +99,26 @@ <evaluate expression="stsClientForRpAction.submit(flowRequestContext)" result="flowScope.rpToken" result-type="java.lang.String" /> - <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> + <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" />
