Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 240D119C6A for ; Thu, 7 Apr 2016 11:25:35 +0000 (UTC) Received: (qmail 85172 invoked by uid 500); 7 Apr 2016 11:25:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 85106 invoked by uid 500); 7 Apr 2016 11:25:35 -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 85091 invoked by uid 99); 7 Apr 2016 11:25:34 -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; Thu, 07 Apr 2016 11:25:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB194DFD5B; Thu, 7 Apr 2016 11:25:34 +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: Thu, 07 Apr 2016 11:25:34 -0000 Message-Id: <823776142bcd4f7c96bd98e89c615763@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cxf git commit: Using equals instead of matches Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 3f4457435 -> 8cfbd97e0 Using equals instead of matches Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c57a949a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c57a949a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c57a949a Branch: refs/heads/3.1.x-fixes Commit: c57a949a2eeff2152162cb3927e075b57480e89e Parents: 3f44574 Author: Colm O hEigeartaigh Authored: Thu Apr 7 11:50:46 2016 +0100 Committer: Colm O hEigeartaigh Committed: Thu Apr 7 11:52:01 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c57a949a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java index 457beae..1416dd4 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthRequestFilter.java @@ -134,7 +134,7 @@ public class OAuthRequestFilter extends AbstractAccessTokenValidator if (accessTokenV.getClientIpAddress() != null) { String remoteAddress = getMessageContext().getHttpServletRequest().getRemoteAddr(); - if (remoteAddress == null || accessTokenV.getClientIpAddress().matches(remoteAddress)) { + if (remoteAddress == null || accessTokenV.getClientIpAddress().equals(remoteAddress)) { String message = "Client IP Address is invalid"; LOG.warning(message); throw ExceptionUtils.toForbiddenException(null, null);