Repository: cxf-fediz Updated Branches: refs/heads/1.3.x-fixes dda42595e -> a09efb9f1
Fix to previous commit Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a09efb9f Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a09efb9f Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a09efb9f Branch: refs/heads/1.3.x-fixes Commit: a09efb9f1f6a90eac70b19304c72916649241391 Parents: dda4259 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Feb 10 13:14:39 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Feb 10 13:16:07 2017 +0000 ---------------------------------------------------------------------- .../core/processor/FederationProcessorImpl.java | 26 ++++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a09efb9f/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java ---------------------------------------------------------------------- diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java index 67e0108..0044373 100644 --- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java +++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/processor/FederationProcessorImpl.java @@ -518,26 +518,20 @@ public class FederationProcessorImpl extends AbstractFedizProcessor { } } } - + if (logoutRedirectTo == null || logoutRedirectTo.isEmpty()) { + logoutRedirectTo = config.getLogoutRedirectTo(); + } + if (logoutRedirectTo != null && !logoutRedirectTo.isEmpty()) { + if (logoutRedirectTo.startsWith("/")) { + logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo.substring(1)); + } else if (!logoutRedirectTo.startsWith("http") && !logoutRedirectTo.startsWith("https")) { + logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo); + } + LOG.debug("wreply={}", logoutRedirectTo); sb.append('&').append(FederationConstants.PARAM_REPLY).append('='); sb.append(URLEncoder.encode(logoutRedirectTo, "UTF-8")); - } else { - logoutRedirectTo = config.getLogoutRedirectTo(); - if (logoutRedirectTo != null && !logoutRedirectTo.isEmpty()) { - - if (logoutRedirectTo.startsWith("/")) { - logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo.substring(1)); - } else if (!logoutRedirectTo.startsWith("http") && !logoutRedirectTo.startsWith("https")) { - logoutRedirectTo = extractFullContextPath(request).concat(logoutRedirectTo); - } - - LOG.debug("wreply={}", logoutRedirectTo); - sb.append('&').append(FederationConstants.PARAM_REPLY).append('='); - sb.append(URLEncoder.encode(logoutRedirectTo, "UTF-8")); - } ->>>>>>> f7380a4... FEDIZ-189 - Add support for absolute URLs in the logoutRedirectTo parameter } redirectURL = redirectURL + "?" + sb.toString();
