You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/06/30 13:05:46 UTC
[1/2] cxf git commit: Add the (mandatory) openid scope by default
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 70bfd047a -> 34425010f
Add the (mandatory) openid scope by default
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c4239c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c4239c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c4239c8
Branch: refs/heads/3.1.x-fixes
Commit: 9c4239c88829e7555cd7b9e35b608bbc50a77e27
Parents: 70bfd04
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jun 30 12:12:39 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jun 30 13:48:53 2016 +0100
----------------------------------------------------------------------
.../cxf/rs/security/oidc/rp/OidcClientCodeRequestFilter.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c4239c8/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 f465f1e..8f7cd84 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
@@ -53,6 +53,11 @@ public class OidcClientCodeRequestFilter extends ClientCodeRequestFilter {
private String claims;
private String claimsLocales;
+ public OidcClientCodeRequestFilter() {
+ super();
+ setScopes("openid");
+ }
+
public void setAuthenticationContextRef(String acr) {
this.authenticationContextRef = Arrays.asList(StringUtils.split(acr, " "));
}
[2/2] cxf git commit: Some NPE fixes
Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Thu Jun 30 13:47:51 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
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<String, String> 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());