cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6487] Renaming UserInfo filter
Date Fri, 10 Jul 2015 12:30:03 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 685cc8975 -> a68344edc


[CXF-6487] Renaming UserInfo filter


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a68344ed
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a68344ed
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a68344ed

Branch: refs/heads/3.0.x-fixes
Commit: a68344edcef0893022fca10299029e0962dd502e
Parents: 685cc89
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri Jul 10 13:28:43 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri Jul 10 13:29:45 2015 +0100

----------------------------------------------------------------------
 .../oidc/idp/IdTokenCodeResponseFilter.java     | 60 ++++++++++++++++++++
 .../oidc/idp/UserInfoCodeResponseFilter.java    | 60 --------------------
 2 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a68344ed/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenCodeResponseFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenCodeResponseFilter.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenCodeResponseFilter.java
new file mode 100644
index 0000000..3272b6b
--- /dev/null
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenCodeResponseFilter.java
@@ -0,0 +1,60 @@
+/**
+ * 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.rs.security.oidc.idp;
+
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
+import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactProducer;
+import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider;
+import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
+import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
+import org.apache.cxf.rs.security.oauth2.provider.AccessTokenResponseFilter;
+import org.apache.cxf.rs.security.oidc.common.IdToken;
+import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
+
+public class IdTokenCodeResponseFilter extends AbstractJwsJweProducer implements AccessTokenResponseFilter
{
+    private UserInfoProvider userInfoProvider;
+    private String issuer;
+    @Override
+    public void process(ClientAccessToken ct, ServerAccessToken st) {
+        IdToken token = 
+            userInfoProvider.getIdToken(st.getClient().getClientId(), st.getSubject(), st.getScopes());
+        token.setIssuer(issuer);
+        token.setAudience(st.getClient().getClientId());
+        
+        JwsJwtCompactProducer producer = new JwsJwtCompactProducer(token);
+        JwsSignatureProvider theSigProvider = getInitializedSigProvider(st.getClient(), true);
+        String idToken = producer.signWith(theSigProvider);
+        
+        JweEncryptionProvider theEncryptionProvider = getInitializedEncryptionProvider(st.getClient(),
false);
+        if (theEncryptionProvider != null) {
+            idToken = theEncryptionProvider.encrypt(StringUtils.toBytesUTF8(idToken), null);
+        }
+        ct.getParameters().put(OidcUtils.ID_TOKEN, idToken);
+        
+    }
+    
+    public void setIssuer(String issuer) {
+        this.issuer = issuer;
+    }
+    public void setUserInfoProvider(UserInfoProvider userInfoProvider) {
+        this.userInfoProvider = userInfoProvider;
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/a68344ed/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoCodeResponseFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoCodeResponseFilter.java
b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoCodeResponseFilter.java
deleted file mode 100644
index 42bf9ff..0000000
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/UserInfoCodeResponseFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * 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.rs.security.oidc.idp;
-
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
-import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactProducer;
-import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider;
-import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
-import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
-import org.apache.cxf.rs.security.oauth2.provider.AccessTokenResponseFilter;
-import org.apache.cxf.rs.security.oidc.common.IdToken;
-import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
-
-public class UserInfoCodeResponseFilter extends AbstractJwsJweProducer implements AccessTokenResponseFilter
{
-    private UserInfoProvider userInfoProvider;
-    private String issuer;
-    @Override
-    public void process(ClientAccessToken ct, ServerAccessToken st) {
-        IdToken token = 
-            userInfoProvider.getIdToken(st.getClient().getClientId(), st.getSubject(), st.getScopes());
-        token.setIssuer(issuer);
-        token.setAudience(st.getClient().getClientId());
-        
-        JwsJwtCompactProducer producer = new JwsJwtCompactProducer(token);
-        JwsSignatureProvider theSigProvider = getInitializedSigProvider(st.getClient(), true);
-        String idToken = producer.signWith(theSigProvider);
-        
-        JweEncryptionProvider theEncryptionProvider = getInitializedEncryptionProvider(st.getClient(),
false);
-        if (theEncryptionProvider != null) {
-            idToken = theEncryptionProvider.encrypt(StringUtils.toBytesUTF8(idToken), null);
-        }
-        ct.getParameters().put(OidcUtils.ID_TOKEN, idToken);
-        
-    }
-    
-    public void setIssuer(String issuer) {
-        this.issuer = issuer;
-    }
-    public void setUserInfoProvider(UserInfoProvider userInfoProvider) {
-        this.userInfoProvider = userInfoProvider;
-    }
-    
-}


Mime
View raw message