Fix wreply parsing on logout
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a8f7d07e Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a8f7d07e Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a8f7d07e Branch: refs/heads/1.3.x-fixes Commit: a8f7d07e4d65eec66ed4e15252b98d53a2f484be Parents: 6733ea6 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Nov 28 15:24:27 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Nov 28 17:39:00 2016 +0000 ---------------------------------------------------------------------- .../WEB-INF/flows/federation-validate-request.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a8f7d07e/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 35ce933..bee5ce0 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 @@ -72,7 +72,7 @@ <action-state id="validateWReplyForSignout"> <evaluate expression="commonsURLValidator.isValid(flowRequestContext, flowScope.wreply)"/> <transition on="yes" to="selectSignOutProcess" /> - <transition on="no" to="viewBadRequest" /> + <transition on="no" to="viewBadRequestAndLogout" /> </action-state> <decision-state id="selectSignOutProcess"> @@ -190,6 +190,16 @@ <!--<set name="requestScope.reason" value="flowRequestContext.currentTransition" />--> </on-entry> </end-state> + + <end-state id="viewBadRequestAndLogout" view="genericerror"> + <on-entry> + <evaluate expression="homeRealmReminder.removeCookie(flowRequestContext)" /> + <evaluate expression="logoutAction.submit(flowRequestContext)" /> + <evaluate + expression="externalContext.nativeResponse.setStatus(400,flowRequestContext.currentTransition.toString())" /> + <!--<set name="requestScope.reason" value="flowRequestContext.currentTransition" />--> + </on-entry> + </end-state> <!-- abnormal exit point : Http 500 Internal Server Error --> <end-state id="scInternalServerError" view="genericerror">
