Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 06C88200BD8 for ; Wed, 7 Dec 2016 13:13:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 05AB2160B0A; Wed, 7 Dec 2016 12:13:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 32E3F160B30 for ; Wed, 7 Dec 2016 13:13:19 +0100 (CET) Received: (qmail 53307 invoked by uid 500); 7 Dec 2016 12:13:18 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 53130 invoked by uid 99); 7 Dec 2016 12:13:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2016 12:13:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6773F17BC; Wed, 7 Dec 2016 12:13:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 07 Dec 2016 12:13:21 -0000 Message-Id: <8c5d8adebcf742c79c9e017e7a889ad6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cxf-fediz git commit: Fixing Jetty plugins archived-at: Wed, 07 Dec 2016 12:13:20 -0000 Fixing Jetty plugins Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/dba87be3 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/dba87be3 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/dba87be3 Branch: refs/heads/master Commit: dba87be392cf25381d376bdca09a9f1ff8ba974a Parents: 2d903b5 Author: Colm O hEigeartaigh Authored: Wed Dec 7 11:33:39 2016 +0000 Committer: Colm O hEigeartaigh Committed: Wed Dec 7 11:33:39 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/fediz/jetty8/FederationAuthenticator.java | 5 +++-- .../org/apache/cxf/fediz/jetty9/FederationAuthenticator.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/dba87be3/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java index 3206871..dfeab1d 100644 --- a/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java +++ b/plugins/jetty8/src/main/java/org/apache/cxf/fediz/jetty8/FederationAuthenticator.java @@ -277,7 +277,7 @@ public class FederationAuthenticator extends LoginAuthenticator { inputStream.close(); responseOutputStream.flush(); return Authentication.SEND_SUCCESS; - } else if (action != null) { + } else if (!FederationConstants.ACTION_SIGNOUT.equals(action) && action != null) { LOG.warn("Not supported action found in parameter wa: " + action); response.sendError(HttpServletResponse.SC_BAD_REQUEST); return Authentication.UNAUTHENTICATED; @@ -295,8 +295,9 @@ public class FederationAuthenticator extends LoginAuthenticator { else { //logout + boolean logout = FederationConstants.ACTION_SIGNOUT.equals(action); String logoutUrl = fedConfig.getLogoutURL(); - if (logoutUrl != null && !logoutUrl.isEmpty() && uri.equals(contextName + logoutUrl)) { + if (logout || logoutUrl != null && !logoutUrl.isEmpty() && uri.equals(contextName + logoutUrl)) { session.invalidate(); FedizProcessor wfProc = http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/dba87be3/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java ---------------------------------------------------------------------- diff --git a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java index a08754b..7205e44 100644 --- a/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java +++ b/plugins/jetty9/src/main/java/org/apache/cxf/fediz/jetty9/FederationAuthenticator.java @@ -276,7 +276,7 @@ public class FederationAuthenticator extends LoginAuthenticator { inputStream.close(); responseOutputStream.flush(); return Authentication.SEND_SUCCESS; - } else if (action != null) { + } else if (!FederationConstants.ACTION_SIGNOUT.equals(action) && action != null) { LOG.warn("Not supported action found in parameter wa: " + action); response.sendError(HttpServletResponse.SC_BAD_REQUEST); return Authentication.UNAUTHENTICATED; @@ -294,8 +294,9 @@ public class FederationAuthenticator extends LoginAuthenticator { else { //logout + boolean logout = FederationConstants.ACTION_SIGNOUT.equals(action); String logoutUrl = fedConfig.getLogoutURL(); - if (logoutUrl != null && !logoutUrl.isEmpty() && uri.equals(contextName + logoutUrl)) { + if (logout || logoutUrl != null && !logoutUrl.isEmpty() && uri.equals(contextName + logoutUrl)) { session.invalidate(); FedizProcessor wfProc =