coheigea commented on a change in pull request #35: FEDIZ-232 added flag to disable RequestState verification URL: https://github.com/apache/cxf-fediz/pull/35#discussion_r236355604
########## File path: plugins/spring/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationFilter.java ########## @@ -132,20 +132,24 @@ private String getState(ServletRequest request) { private RequestState verifySavedState(HttpServletRequest request) { HttpSession session = request.getSession(false); + boolean enforceValidState = + federationConfig == null || federationConfig.getFedizContext().isRequestStateValidation(); - if (session == null) { - logger.warn("The received state does not match the state saved in the context"); - throw new BadCredentialsException("The received state does not match the state saved in the context"); - } - - RequestState savedRequestState = (RequestState) session.getAttribute(SAVED_CONTEXT); - String state = getState(request); - if (savedRequestState == null || !savedRequestState.getState().equals(state)) { + if (session == null && enforceValidState) { logger.warn("The received state does not match the state saved in the context"); throw new BadCredentialsException("The received state does not match the state saved in the context"); + } else if (session != null) { + RequestState savedRequestState = (RequestState) session.getAttribute(SAVED_CONTEXT); + session.removeAttribute(SAVED_CONTEXT); + String state = getState(request); + + if (enforceValidState && (savedRequestState == null || !savedRequestState.getState().equals(state))) { Review comment: I think the logic here could be improved a bit (and for the other plugins). If we have !enforceValidState then I still think we should throw an exception if savedRequestState is non null + !savedRequestState.getState().equals(state))). ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services