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/05/06 15:18:46 UTC
[1/2] cxf-fediz git commit: Refactor the OAuth based TrustedIdp
protocol handlers to reuse the same code
Repository: cxf-fediz
Updated Branches:
refs/heads/master d13dd56e8 -> 571d322ea
Refactor the OAuth based TrustedIdp protocol handlers to reuse the same code
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ea471dc5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ea471dc5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ea471dc5
Branch: refs/heads/master
Commit: ea471dc5fa72242a2b25f5858fcff20e7b707915
Parents: d13dd56
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri May 6 14:51:52 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri May 6 14:51:52 2016 +0100
----------------------------------------------------------------------
...AbstractTrustedIdpOAuth2ProtocolHandler.java | 207 ++++++++++++++++++
.../TrustedIdpFacebookProtocolHandler.java | 102 +++------
.../TrustedIdpOIDCProtocolHandler.java | 218 +++----------------
3 files changed, 268 insertions(+), 259 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ea471dc5/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/AbstractTrustedIdpOAuth2ProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/AbstractTrustedIdpOAuth2ProtocolHandler.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/AbstractTrustedIdpOAuth2ProtocolHandler.java
new file mode 100644
index 0000000..84a70ca
--- /dev/null
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/AbstractTrustedIdpOAuth2ProtocolHandler.java
@@ -0,0 +1,207 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.fediz.service.idp.protocols;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.Date;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.cxf.fediz.core.util.CertsUtils;
+import org.apache.cxf.fediz.service.idp.IdpConstants;
+import org.apache.cxf.fediz.service.idp.domain.Idp;
+import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
+import org.apache.wss4j.common.crypto.Crypto;
+import org.apache.wss4j.common.saml.SAMLCallback;
+import org.apache.wss4j.common.saml.SAMLUtil;
+import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.wss4j.common.saml.bean.ConditionsBean;
+import org.apache.wss4j.common.saml.bean.SubjectBean;
+import org.apache.wss4j.common.saml.bean.Version;
+import org.apache.wss4j.common.saml.builder.SAML2Constants;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.webflow.execution.RequestContext;
+
+public abstract class AbstractTrustedIdpOAuth2ProtocolHandler extends AbstractTrustedIdpProtocolHandler {
+
+ /**
+ * The client_id value to send to the IdP.
+ */
+ public static final String CLIENT_ID = "client.id";
+
+ /**
+ * The secret associated with the client to authenticate to the IdP.
+ */
+ public static final String CLIENT_SECRET = "client.secret";
+
+ /**
+ * The Token endpoint. The authorization endpoint is specified by TrustedIdp.url.
+ */
+ public static final String TOKEN_ENDPOINT = "token.endpoint";
+
+ /**
+ * Additional (space-separated) parameters to be sent in the "scope" to the authorization endpoint.
+ * The default value depends on the subclass.
+ */
+ public static final String SCOPE = "scope";
+
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractTrustedIdpOAuth2ProtocolHandler.class);
+
+ @Override
+ public URL mapSignInRequest(RequestContext context, Idp idp, TrustedIdp trustedIdp) {
+
+ String clientId = getProperty(trustedIdp, CLIENT_ID);
+ if (clientId == null || clientId.isEmpty()) {
+ LOG.warn("A CLIENT_ID must be configured for OAuth 2.0");
+ throw new IllegalStateException("No CLIENT_ID specified");
+ }
+
+ String scope = getScope(trustedIdp);
+ LOG.debug("Using scope: {}", scope);
+
+ try {
+ StringBuilder sb = new StringBuilder();
+ sb.append(trustedIdp.getUrl());
+ sb.append("?");
+ sb.append("response_type").append('=');
+ sb.append("code");
+ sb.append("&");
+ sb.append("client_id").append('=');
+ sb.append(clientId);
+ sb.append("&");
+ sb.append("redirect_uri").append('=');
+ sb.append(URLEncoder.encode(idp.getIdpUrl().toString(), "UTF-8"));
+ sb.append("&");
+ sb.append("scope").append('=');
+ sb.append(URLEncoder.encode(scope, "UTF-8"));
+
+ String state = context.getFlowScope().getString(IdpConstants.TRUSTED_IDP_CONTEXT);
+ sb.append("&").append("state").append('=');
+ sb.append(state);
+
+ return new URL(sb.toString());
+ } catch (MalformedURLException ex) {
+ LOG.error("Invalid Redirect URL for Trusted Idp", ex);
+ throw new IllegalStateException("Invalid Redirect URL for Trusted Idp");
+ } catch (UnsupportedEncodingException ex) {
+ LOG.error("Invalid Redirect URL for Trusted Idp", ex);
+ throw new IllegalStateException("Invalid Redirect URL for Trusted Idp");
+ }
+ }
+
+ protected SamlAssertionWrapper createSamlAssertion(Idp idp, TrustedIdp trustedIdp, String subjectName,
+ Date notBefore,
+ Date expires) throws Exception {
+ SamlCallbackHandler callbackHandler = new SamlCallbackHandler();
+ String issuer = idp.getServiceDisplayName();
+ if (issuer == null) {
+ issuer = idp.getRealm();
+ }
+ if (issuer != null) {
+ callbackHandler.setIssuer(issuer);
+ }
+
+ // Subject
+ SubjectBean subjectBean =
+ new SubjectBean(subjectName, SAML2Constants.NAMEID_FORMAT_UNSPECIFIED, SAML2Constants.CONF_BEARER);
+ callbackHandler.setSubjectBean(subjectBean);
+
+ // Conditions
+ ConditionsBean conditionsBean = new ConditionsBean();
+ conditionsBean.setNotAfter(new DateTime(expires));
+ if (notBefore != null) {
+ DateTime notBeforeDT = new DateTime(notBefore);
+ conditionsBean.setNotBefore(notBeforeDT);
+ } else {
+ conditionsBean.setNotBefore(new DateTime());
+ }
+ callbackHandler.setConditionsBean(conditionsBean);
+
+ SAMLCallback samlCallback = new SAMLCallback();
+ SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
+
+ SamlAssertionWrapper assertion = new SamlAssertionWrapper(samlCallback);
+
+ Crypto crypto = CertsUtils.getCryptoFromCertificate(idp.getCertificate());
+ assertion.signAssertion(crypto.getDefaultX509Identifier(), idp.getCertificatePassword(),
+ crypto, false);
+
+ return assertion;
+ }
+
+ private static class SamlCallbackHandler implements CallbackHandler {
+ private ConditionsBean conditionsBean;
+ private SubjectBean subjectBean;
+ private String issuer;
+
+ /**
+ * Set the SubjectBean
+ */
+ public void setSubjectBean(SubjectBean subjectBean) {
+ this.subjectBean = subjectBean;
+ }
+
+ /**
+ * Set the ConditionsBean
+ */
+ public void setConditionsBean(ConditionsBean conditionsBean) {
+ this.conditionsBean = conditionsBean;
+ }
+
+ /**
+ * Set the issuer name
+ */
+ public void setIssuer(String issuerName) {
+ this.issuer = issuerName;
+ }
+
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (Callback callback : callbacks) {
+ if (callback instanceof SAMLCallback) {
+ SAMLCallback samlCallback = (SAMLCallback) callback;
+
+ // Set the Subject
+ if (subjectBean != null) {
+ samlCallback.setSubject(subjectBean);
+ }
+ samlCallback.setSamlVersion(Version.SAML_20);
+
+ // Set the issuer
+ samlCallback.setIssuer(issuer);
+
+ // Set the conditions
+ samlCallback.setConditions(conditionsBean);
+ }
+ }
+ }
+
+ }
+
+ abstract String getScope(TrustedIdp trustedIdp);
+
+}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ea471dc5/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
index bdff2a5..ec29010 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
@@ -20,16 +20,13 @@
package org.apache.cxf.fediz.service.idp.protocols;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
+import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
-import org.apache.cxf.fediz.service.idp.IdpConstants;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
import org.apache.cxf.fediz.service.idp.util.WebUtils;
@@ -48,24 +45,14 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.webflow.execution.RequestContext;
+/**
+ * Extension of AbstractTrustedIdpOAuth2ProtocolHandler for Facebook Connect.
+ * Default values:
+ * - scope: email
+ * - token.endpoint: https://graph.facebook.com/v2.6/oauth/access_token
+ */
@Component
-public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpProtocolHandler {
-
- /**
- * The client_id value to send to the Facebook IdP.
- */
- public static final String CLIENT_ID = "client.id";
-
- /**
- * The secret associated with the client to authenticate to the Facebook IdP.
- */
- public static final String CLIENT_SECRET = "client.secret";
-
- /**
- * The Token endpoint. The authorization endpoint is specified by TrustedIdp.url. If not
- * specified it defaults to "https://graph.facebook.com/v2.6/oauth/access_token".
- */
- public static final String TOKEN_ENDPOINT = "token.endpoint";
+public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpOAuth2ProtocolHandler {
/**
* The facebook API endpoint for querying claims (such as email address). If not specified
@@ -79,12 +66,6 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpProtoco
*/
public static final String SUBJECT_CLAIM = "subject.claim";
- /**
- * Additional (comma-separated) parameters to be sent in the "scope" to the authorization endpoint.
- * Fediz will automatically use "email" for this value.
- */
- public static final String SCOPE = "scope";
-
public static final String PROTOCOL = "facebook-connect";
private static final Logger LOG = LoggerFactory.getLogger(TrustedIdpFacebookProtocolHandler.class);
@@ -95,55 +76,6 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpProtoco
}
@Override
- public URL mapSignInRequest(RequestContext context, Idp idp, TrustedIdp trustedIdp) {
-
- String clientId = getProperty(trustedIdp, CLIENT_ID);
- if (clientId == null || clientId.isEmpty()) {
- LOG.warn("A CLIENT_ID must be configured to use the TrustedIdpFacebookProtocolHandler");
- throw new IllegalStateException("No CLIENT_ID specified");
- }
-
- String scope = getProperty(trustedIdp, SCOPE);
- if (scope != null) {
- scope = scope.trim();
- }
-
- if (scope == null || scope.isEmpty()) {
- scope = "email";
- }
- LOG.debug("Using scope: {}", scope);
-
- try {
- StringBuilder sb = new StringBuilder();
- sb.append(trustedIdp.getUrl());
- sb.append("?");
- sb.append("response_type").append('=');
- sb.append("code");
- sb.append("&");
- sb.append("client_id").append('=');
- sb.append(clientId);
- sb.append("&");
- sb.append("redirect_uri").append('=');
- sb.append(URLEncoder.encode(idp.getIdpUrl().toString(), "UTF-8"));
- sb.append("&");
- sb.append("scope").append('=');
- sb.append(URLEncoder.encode(scope, "UTF-8"));
-
- String state = context.getFlowScope().getString(IdpConstants.TRUSTED_IDP_CONTEXT);
- sb.append("&").append("state").append('=');
- sb.append(state);
-
- return new URL(sb.toString());
- } catch (MalformedURLException ex) {
- LOG.error("Invalid Redirect URL for Trusted Idp", ex);
- throw new IllegalStateException("Invalid Redirect URL for Trusted Idp");
- } catch (UnsupportedEncodingException ex) {
- LOG.error("Invalid Redirect URL for Trusted Idp", ex);
- throw new IllegalStateException("Invalid Redirect URL for Trusted Idp");
- }
- }
-
- @Override
public SecurityToken mapSignInResponse(RequestContext context, Idp idp, TrustedIdp trustedIdp) {
String code = (String) WebUtils.getAttributeFromFlowScope(context,
@@ -220,7 +152,12 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpProtoco
}
client.query("fields", subjectName);
JsonMapObject mapObject = client.get(JsonMapObject.class);
- System.out.println("SUBJ: " + mapObject.getProperty(subjectName));
+ try {
+ System.out.println("SUBJ: " + URLDecoder.decode((String)mapObject.getProperty(subjectName), "UTF-8"));
+ } catch (UnsupportedEncodingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
/*
try {
String whr = (String) WebUtils.getAttributeFromFlowScope(context,
@@ -287,4 +224,15 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpProtoco
return null;
}
+ protected String getScope(TrustedIdp trustedIdp) {
+ String scope = getProperty(trustedIdp, SCOPE);
+ if (scope != null) {
+ scope = scope.trim();
+ }
+
+ if (scope == null || scope.isEmpty()) {
+ scope = "email";
+ }
+ return scope;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ea471dc5/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
index 1359a8b..e2a50b2 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpOIDCProtocolHandler.java
@@ -20,10 +20,6 @@
package org.apache.cxf.fediz.service.idp.protocols;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -31,9 +27,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
@@ -44,7 +37,6 @@ import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.core.exception.ProcessingException;
import org.apache.cxf.fediz.core.util.CertsUtils;
import org.apache.cxf.fediz.core.util.DOMUtils;
-import org.apache.cxf.fediz.service.idp.IdpConstants;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
import org.apache.cxf.fediz.service.idp.util.WebUtils;
@@ -65,39 +57,21 @@ import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
-import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.ext.WSSecurityException;
-import org.apache.wss4j.common.saml.SAMLCallback;
-import org.apache.wss4j.common.saml.SAMLUtil;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.common.saml.bean.ConditionsBean;
-import org.apache.wss4j.common.saml.bean.SubjectBean;
-import org.apache.wss4j.common.saml.bean.Version;
-import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.xml.security.exceptions.Base64DecodingException;
-import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.webflow.execution.RequestContext;
+/**
+ * Extension of AbstractTrustedIdpOAuth2ProtocolHandler for OpenId Connect.
+ * Default values:
+ * - scope: openid
+ */
@Component
-public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpProtocolHandler {
-
- /**
- * The client_id value to send to the OIDC IdP.
- */
- public static final String CLIENT_ID = "client.id";
-
- /**
- * The secret associated with the client to authenticate to the OIDC IdP.
- */
- public static final String CLIENT_SECRET = "client.secret";
-
- /**
- * The Token endpoint. The authorization endpoint is specified by TrustedIdp.url.
- */
- public static final String TOKEN_ENDPOINT = "token.endpoint";
+public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpOAuth2ProtocolHandler {
/**
* The signature algorithm to use in verifying the IdToken. The default is "RS256".
@@ -131,58 +105,6 @@ public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpProtocolHan
}
@Override
- public URL mapSignInRequest(RequestContext context, Idp idp, TrustedIdp trustedIdp) {
-
- String clientId = getProperty(trustedIdp, CLIENT_ID);
- if (clientId == null || clientId.isEmpty()) {
- LOG.warn("A CLIENT_ID must be configured to use the OIDCProtocolHandler");
- throw new IllegalStateException("No CLIENT_ID specified");
- }
-
- String scope = getProperty(trustedIdp, SCOPE);
- if (scope != null) {
- scope = scope.trim();
- if (!scope.contains("openid")) {
- scope = "openid " + scope;
- }
- }
-
- if (scope == null || scope.isEmpty()) {
- scope = "openid";
- }
- LOG.debug("Using scope: {}", scope);
-
- try {
- StringBuilder sb = new StringBuilder();
- sb.append(trustedIdp.getUrl());
- sb.append("?");
- sb.append("response_type").append('=');
- sb.append("code");
- sb.append("&");
- sb.append("client_id").append('=');
- sb.append(clientId);
- sb.append("&");
- sb.append("redirect_uri").append('=');
- sb.append(URLEncoder.encode(idp.getIdpUrl().toString(), "UTF-8"));
- sb.append("&");
- sb.append("scope").append('=');
- sb.append(URLEncoder.encode(scope, "UTF-8"));
-
- String state = context.getFlowScope().getString(IdpConstants.TRUSTED_IDP_CONTEXT);
- sb.append("&").append("state").append('=');
- sb.append(state);
-
- return new URL(sb.toString());
- } catch (MalformedURLException ex) {
- LOG.error("Invalid Redirect URL for Trusted Idp", ex);
- throw new IllegalStateException("Invalid Redirect URL for Trusted Idp");
- } catch (UnsupportedEncodingException ex) {
- LOG.error("Invalid Redirect URL for Trusted Idp", ex);
- throw new IllegalStateException("Invalid Redirect URL for Trusted Idp");
- }
- }
-
- @Override
public SecurityToken mapSignInResponse(RequestContext context, Idp idp, TrustedIdp trustedIdp) {
String code = (String) WebUtils.getAttributeFromFlowScope(context,
@@ -267,10 +189,30 @@ public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpProtocolHan
validateToken(jwt, clientId);
Date created = new Date((long)jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT) * 1000L);
+ Date notBefore = null;
+ if (jwt.getClaim(JwtConstants.CLAIM_NOT_BEFORE) != null) {
+ notBefore = new Date((long)jwt.getClaim(JwtConstants.CLAIM_NOT_BEFORE) * 1000L);
+ }
+
Date expires = new Date((long)jwt.getClaim(JwtConstants.CLAIM_EXPIRY) * 1000L);
+ // Subject
+ String subjectName = getProperty(trustedIdp, SUBJECT_CLAIM);
+ LOG.debug("Trying to extract subject name using the claim name {}", subjectName);
+ if (subjectName == null || jwt.getClaim(subjectName) == null) {
+ LOG.debug("No claim available in the token for {}", subjectName);
+ subjectName = "preferred_username";
+ LOG.debug("Falling back to use subject claim name {}", subjectName);
+ if (subjectName == null || jwt.getClaim(subjectName) == null) {
+ subjectName = JwtConstants.CLAIM_SUBJECT;
+ LOG.debug("No claim available in the token for preferred_username. "
+ + "Falling back to use {}", subjectName);
+ }
+ }
+
// Convert into a SAML Token
- SamlAssertionWrapper assertion = createSamlAssertion(idp, trustedIdp, jwt, created, expires);
+ SamlAssertionWrapper assertion =
+ createSamlAssertion(idp, trustedIdp, (String)jwt.getClaim(subjectName), notBefore, expires);
Document doc = DOMUtils.createDocument();
Element token = assertion.toDOM(doc);
@@ -374,107 +316,19 @@ public class TrustedIdpOIDCProtocolHandler extends AbstractTrustedIdpProtocolHan
return false;
}
- protected SamlAssertionWrapper createSamlAssertion(Idp idp, TrustedIdp trustedIdp, JwtToken token,
- Date created,
- Date expires) throws Exception {
- SamlCallbackHandler callbackHandler = new SamlCallbackHandler();
- String issuer = idp.getServiceDisplayName();
- if (issuer == null) {
- issuer = idp.getRealm();
- }
- if (issuer != null) {
- callbackHandler.setIssuer(issuer);
- }
-
- // Subject
- String subjectName = getProperty(trustedIdp, SUBJECT_CLAIM);
- LOG.debug("Trying to extract subject name using the claim name {}", subjectName);
- if (subjectName == null || token.getClaim(subjectName) == null) {
- LOG.debug("No claim available in the token for {}", subjectName);
- subjectName = "preferred_username";
- LOG.debug("Falling back to use subject claim name {}", subjectName);
- if (subjectName == null || token.getClaim(subjectName) == null) {
- subjectName = JwtConstants.CLAIM_SUBJECT;
- LOG.debug("No claim available in the token for preferred_username. "
- + "Falling back to use {}", subjectName);
+ protected String getScope(TrustedIdp trustedIdp) {
+ String scope = getProperty(trustedIdp, SCOPE);
+ if (scope != null) {
+ scope = scope.trim();
+ if (!scope.contains("openid")) {
+ scope = "openid " + scope;
}
}
- SubjectBean subjectBean =
- new SubjectBean((String)token.getClaim(subjectName),
- SAML2Constants.NAMEID_FORMAT_UNSPECIFIED,
- SAML2Constants.CONF_BEARER);
- callbackHandler.setSubjectBean(subjectBean);
-
- // Conditions
- ConditionsBean conditionsBean = new ConditionsBean();
- conditionsBean.setNotAfter(new DateTime(expires));
- if (token.getClaim(JwtConstants.CLAIM_NOT_BEFORE) != null) {
- DateTime notBefore = new DateTime((long)token.getClaim(JwtConstants.CLAIM_NOT_BEFORE) * 1000L);
- conditionsBean.setNotBefore(notBefore);
- } else {
- conditionsBean.setNotBefore(new DateTime());
- }
- callbackHandler.setConditionsBean(conditionsBean);
-
- SAMLCallback samlCallback = new SAMLCallback();
- SAMLUtil.doSAMLCallback(callbackHandler, samlCallback);
-
- SamlAssertionWrapper assertion = new SamlAssertionWrapper(samlCallback);
-
- Crypto crypto = CertsUtils.getCryptoFromCertificate(idp.getCertificate());
- assertion.signAssertion(crypto.getDefaultX509Identifier(), idp.getCertificatePassword(),
- crypto, false);
-
- return assertion;
- }
-
- private static class SamlCallbackHandler implements CallbackHandler {
- private ConditionsBean conditionsBean;
- private SubjectBean subjectBean;
- private String issuer;
-
- /**
- * Set the SubjectBean
- */
- public void setSubjectBean(SubjectBean subjectBean) {
- this.subjectBean = subjectBean;
- }
-
- /**
- * Set the ConditionsBean
- */
- public void setConditionsBean(ConditionsBean conditionsBean) {
- this.conditionsBean = conditionsBean;
- }
-
- /**
- * Set the issuer name
- */
- public void setIssuer(String issuerName) {
- this.issuer = issuerName;
- }
-
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (Callback callback : callbacks) {
- if (callback instanceof SAMLCallback) {
- SAMLCallback samlCallback = (SAMLCallback) callback;
-
- // Set the Subject
- if (subjectBean != null) {
- samlCallback.setSubject(subjectBean);
- }
- samlCallback.setSamlVersion(Version.SAML_20);
-
- // Set the issuer
- samlCallback.setIssuer(issuer);
-
- // Set the conditions
- samlCallback.setConditions(conditionsBean);
- }
- }
+ if (scope == null || scope.isEmpty()) {
+ scope = "openid";
}
-
+ return scope;
}
}
[2/2] cxf-fediz git commit: [FEDIZ-76] - Finished Facebook support
Posted by co...@apache.org.
[FEDIZ-76] - Finished Facebook support
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/571d322e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/571d322e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/571d322e
Branch: refs/heads/master
Commit: 571d322ea59f5bfe31d35314501f10e23eaaeadb
Parents: ea471dc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri May 6 16:18:19 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri May 6 16:18:19 2016 +0100
----------------------------------------------------------------------
.../TrustedIdpFacebookProtocolHandler.java | 167 +++++++++----------
1 file changed, 78 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/571d322e/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
----------------------------------------------------------------------
diff --git a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
index ec29010..643eb7c 100644
--- a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
+++ b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/protocols/TrustedIdpFacebookProtocolHandler.java
@@ -19,17 +19,22 @@
package org.apache.cxf.fediz.service.idp.protocols;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
import java.util.List;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.service.idp.domain.Idp;
import org.apache.cxf.fediz.service.idp.domain.TrustedIdp;
import org.apache.cxf.fediz.service.idp.util.WebUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxrs.client.ClientConfiguration;
@@ -40,6 +45,8 @@ import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
import org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.ws.security.tokenstore.SecurityToken;
+import org.apache.wss4j.common.saml.SamlAssertionWrapper;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -100,31 +107,8 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpOAuth2P
}
// Here we need to get the AccessToken using the authorization code
- List<Object> providers = new ArrayList<Object>();
- providers.add(new OAuthJSONProvider());
-
- WebClient client =
- WebClient.create(tokenEndpoint, providers, "cxf-tls.xml");
-
- ClientConfiguration config = WebClient.getConfig(client);
-
- if (LOG.isDebugEnabled()) {
- config.getOutInterceptors().add(new LoggingOutInterceptor());
- config.getInInterceptors().add(new LoggingInInterceptor());
- }
-
- client.type("application/x-www-form-urlencoded");
- client.accept("application/json");
-
- Form form = new Form();
- form.param("grant_type", "authorization_code");
- form.param("code", code);
- form.param("client_id", clientId);
- form.param("redirect_uri", idp.getIdpUrl().toString());
- form.param("client_secret", clientSecret);
- Response response = client.post(form);
-
- ClientAccessToken accessToken = response.readEntity(ClientAccessToken.class);
+ ClientAccessToken accessToken = getAccessTokenUsingCode(tokenEndpoint, code, clientId,
+ clientSecret, idp.getIdpUrl().toString());
if (accessToken == null || accessToken.getTokenKey() == null) {
LOG.warn("No Access Token received from the Facebook IdP");
return null;
@@ -132,33 +116,7 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpOAuth2P
// Now we need to invoke on the API endpoint using the access token to get the
// user's claims
- providers.clear();
- providers.add(new JsonMapObjectProvider());
- client = WebClient.create(apiEndpoint, providers, "cxf-tls.xml");
- client.path("/me");
- config = WebClient.getConfig(client);
-
- if (LOG.isDebugEnabled()) {
- config.getOutInterceptors().add(new LoggingOutInterceptor());
- config.getInInterceptors().add(new LoggingInInterceptor());
- }
-
- client.accept("application/json");
- client.query("access_token", accessToken.getTokenKey());
-
- String subjectName = getProperty(trustedIdp, SUBJECT_CLAIM);
- if (subjectName == null || subjectName.isEmpty()) {
- subjectName = "email";
- }
- client.query("fields", subjectName);
- JsonMapObject mapObject = client.get(JsonMapObject.class);
- try {
- System.out.println("SUBJ: " + URLDecoder.decode((String)mapObject.getProperty(subjectName), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- /*
+ String subjectName = getSubjectName(apiEndpoint, accessToken.getTokenKey(), trustedIdp);
try {
String whr = (String) WebUtils.getAttributeFromFlowScope(context,
FederationConstants.PARAM_HOME_REALM);
@@ -167,49 +125,22 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpOAuth2P
throw new IllegalStateException("Home realm is null");
}
- // Parse the received Token
- JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
- JwtToken jwt = jwtConsumer.getJwtToken();
-
- if (jwt != null && jwt.getClaims() != null && LOG.isDebugEnabled()) {
- LOG.debug("Received Claims:");
- for (Map.Entry<String, Object> claim : jwt.getClaims().asMap().entrySet()) {
- LOG.debug(claim.getKey() + ": " + claim.getValue());
- }
- }
-
- if (jwt != null && jwt.getJwsHeaders() != null && LOG.isDebugEnabled()) {
- LOG.debug("Received JWS Headers:");
- for (Map.Entry<String, Object> header : jwt.getJwsHeaders().asMap().entrySet()) {
- LOG.debug(header.getKey() + ": " + header.getValue());
- }
- }
-
- if (!validateSignature(trustedIdp, jwtConsumer)) {
- LOG.warn("Signature does not validate");
- return null;
- }
-
- // Make sure the received token is valid according to the spec
- validateToken(jwt, clientId);
-
- Date created = new Date((long)jwt.getClaim(JwtConstants.CLAIM_ISSUED_AT) * 1000L);
- Date expires = new Date((long)jwt.getClaim(JwtConstants.CLAIM_EXPIRY) * 1000L);
-
// Convert into a SAML Token
- SamlAssertionWrapper assertion = createSamlAssertion(idp, trustedIdp, jwt, created, expires);
+ Date expires = new Date();
+ expires.setTime(expires.getTime() + (accessToken.getExpiresIn() * 1000L));
+ SecurityToken idpToken = new SecurityToken(IDGenerator.generateID(null), null, expires);
+ SamlAssertionWrapper assertion =
+ createSamlAssertion(idp, trustedIdp, subjectName, null, expires);
Document doc = DOMUtils.createDocument();
Element token = assertion.toDOM(doc);
// Create new Security token with new id.
// Parameters for freshness computation are copied from original IDP_TOKEN
- SecurityToken idpToken = new SecurityToken(assertion.getId(), created, expires);
idpToken.setToken(token);
- LOG.info("[IDP_TOKEN={}] for user '{}' created from [RP_TOKEN={}] issued by home realm [{}/{}]",
+ LOG.info("[IDP_TOKEN={}] for user '{}' issued by home realm [{}]",
assertion.getId(), assertion.getSaml2().getSubject().getNameID().getValue(),
- jwt.getClaim(JwtConstants.CLAIM_JWT_ID), whr, jwt.getClaim(JwtConstants.CLAIM_ISSUER));
- LOG.debug("Created date={}", created);
+ whr);
LOG.debug("Expired date={}", expires);
return idpToken;
@@ -219,11 +150,69 @@ public class TrustedIdpFacebookProtocolHandler extends AbstractTrustedIdpOAuth2P
LOG.warn("Unexpected exception occured", ex);
throw new IllegalStateException("Unexpected exception occured: " + ex.getMessage());
}
- */
}
return null;
}
+ private ClientAccessToken getAccessTokenUsingCode(String tokenEndpoint, String code, String clientId,
+ String clientSecret, String redirectURI) {
+ // Here we need to get the AccessToken using the authorization code
+ List<Object> providers = new ArrayList<Object>();
+ providers.add(new OAuthJSONProvider());
+
+ WebClient client =
+ WebClient.create(tokenEndpoint, providers, "cxf-tls.xml");
+
+ ClientConfiguration config = WebClient.getConfig(client);
+
+ if (LOG.isDebugEnabled()) {
+ config.getOutInterceptors().add(new LoggingOutInterceptor());
+ config.getInInterceptors().add(new LoggingInInterceptor());
+ }
+
+ client.type("application/x-www-form-urlencoded");
+ client.accept("application/json");
+
+ Form form = new Form();
+ form.param("grant_type", "authorization_code");
+ form.param("code", code);
+ form.param("client_id", clientId);
+ form.param("redirect_uri", redirectURI);
+ form.param("client_secret", clientSecret);
+ Response response = client.post(form);
+
+ return response.readEntity(ClientAccessToken.class);
+ }
+
+ private String getSubjectName(String apiEndpoint, String accessToken, TrustedIdp trustedIdp) {
+ WebClient client = WebClient.create(apiEndpoint,
+ Collections.singletonList(new JsonMapObjectProvider()),
+ "cxf-tls.xml");
+ client.path("/me");
+ ClientConfiguration config = WebClient.getConfig(client);
+
+ if (LOG.isDebugEnabled()) {
+ config.getOutInterceptors().add(new LoggingOutInterceptor());
+ config.getInInterceptors().add(new LoggingInInterceptor());
+ }
+
+ client.accept("application/json");
+ client.query("access_token", accessToken);
+
+ String subjectName = getProperty(trustedIdp, SUBJECT_CLAIM);
+ if (subjectName == null || subjectName.isEmpty()) {
+ subjectName = "email";
+ }
+ client.query("fields", subjectName);
+ JsonMapObject mapObject = client.get(JsonMapObject.class);
+
+ String parsedSubjectName = (String)mapObject.getProperty(subjectName);
+ if (subjectName.contains("email")) {
+ parsedSubjectName = parsedSubjectName.replace("\\u0040", "@");
+ }
+ return parsedSubjectName;
+ }
+
protected String getScope(TrustedIdp trustedIdp) {
String scope = getProperty(trustedIdp, SCOPE);
if (scope != null) {