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 27898200B45 for ; Thu, 30 Jun 2016 15:05:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 26371160A51; Thu, 30 Jun 2016 13:05:48 +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 77D0A160A52 for ; Thu, 30 Jun 2016 15:05:47 +0200 (CEST) Received: (qmail 72075 invoked by uid 500); 30 Jun 2016 13:05:46 -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 72065 invoked by uid 99); 30 Jun 2016 13:05:46 -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, 30 Jun 2016 13:05:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80687E00DB; Thu, 30 Jun 2016 13:05:46 +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, 30 Jun 2016 13:05:47 -0000 Message-Id: In-Reply-To: <9be9bbd467244e13a5775059dcf23ce4@git.apache.org> References: <9be9bbd467244e13a5775059dcf23ce4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Some NPE fixes archived-at: Thu, 30 Jun 2016 13:05:48 -0000 Some NPE fixes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/34425010 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/34425010 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/34425010 Branch: refs/heads/3.1.x-fixes Commit: 34425010f5c6e50255bcc188db5bd6dd5bed3b97 Parents: 9c4239c Author: Colm O hEigeartaigh Authored: Thu Jun 30 13:47:51 2016 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jun 30 13:48:54 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java | 4 ++++ .../cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java | 3 +++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/34425010/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java index e00ce0b..3f42117 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthClientUtils.java @@ -275,6 +275,10 @@ public final class OAuthClientUtils { boolean setAuthorizationHeader) throws OAuthServiceException { + if (accessTokenService == null) { + throw new OAuthServiceException(OAuthConstants.SERVER_ERROR); + } + Form form = new Form(grant.toMap()); if (extraParams != null) { for (Map.Entry entry : extraParams.entrySet()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/34425010/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java index 8f7cd84..015be15 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java @@ -72,6 +72,9 @@ public class OidcClientCodeRequestFilter extends ClientCodeRequestFilter { } OidcClientTokenContextImpl ctx = new OidcClientTokenContextImpl(); if (at != null) { + if (idTokenReader == null) { + throw new OAuthServiceException(OAuthConstants.SERVER_ERROR); + } IdToken idToken = idTokenReader.getIdToken(at, requestParams.getFirst(OAuthConstants.AUTHORIZATION_CODE_VALUE), getConsumer());