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 0291918E30 for ; Fri, 22 Jan 2016 17:16:32 +0000 (UTC) Received: (qmail 94968 invoked by uid 500); 22 Jan 2016 17:16:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 94908 invoked by uid 500); 22 Jan 2016 17:16:31 -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 94899 invoked by uid 99); 22 Jan 2016 17:16:31 -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; Fri, 22 Jan 2016 17:16:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 910CDE0098; Fri, 22 Jan 2016 17:16:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf-fediz git commit: Fixing a copy and paste issue Date: Fri, 22 Jan 2016 17:16:31 +0000 (UTC) Repository: cxf-fediz Updated Branches: refs/heads/master 6fd6e6145 -> 45fb82d76 Fixing a copy and paste issue Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/45fb82d7 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/45fb82d7 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/45fb82d7 Branch: refs/heads/master Commit: 45fb82d764830bdad290ebbd4f389d95d21835ea Parents: 6fd6e61 Author: Sergey Beryozkin Authored: Fri Jan 22 17:16:17 2016 +0000 Committer: Sergey Beryozkin Committed: Fri Jan 22 17:16:17 2016 +0000 ---------------------------------------------------------------------- .../cxf/fediz/service/oidc/ClientRegistrationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/45fb82d7/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java index 026d9ed..cee659a 100644 --- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java +++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRegistrationService.java @@ -207,6 +207,7 @@ public class ClientRegistrationService { if (!("confidential".equals(appType) || "public".equals(appType))) { throw new InvalidRegistrationException("An invalid client type was specified: " + appType); } + if (redirectURI != null && !"".equals(redirectURI) && !isValidURI(redirectURI, false)) { throw new InvalidRegistrationException("An invalid redirect URI was specified: " + redirectURI); } @@ -237,8 +238,8 @@ public class ClientRegistrationService { List registeredAuds = new LinkedList(); for (String aud : auds) { // make sure it is a proper URI - if (audience != null && !"".equals(audience) && !isValidURI(audience, true)) { - throw new InvalidRegistrationException("An invalid audience URI was specified: " + audience); + if (!"".equals(aud) && !isValidURI(aud, true)) { + throw new InvalidRegistrationException("An invalid audience URI was specified: " + aud); } registeredAuds.add(aud); }