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/771a586a Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/771a586a Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/771a586a Branch: refs/heads/master Commit: 771a586a8d6e882fa1a99d03ad59ac44e4f3f3f5 Parents: 6112d1a 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 15:24:27 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/771a586a/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 578be04..8e3f3dd 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 @@ -82,7 +82,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"> @@ -199,6 +199,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">
