cxf git commit: Adding the renamed resources
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 89b7bb172 -> c3399966e
Adding the renamed resources
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c3399966
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c3399966
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c3399966
Branch: refs/heads/3.1.x-fixes
Commit: c3399966e4060837fd17511d604a26c8d12dad7c
Parents: 89b7bb1
Author: Sergey Beryozkin
Authored: Fri Feb 5 14:20:40 2016 +
Committer: Sergey Beryozkin
Committed: Fri Feb 5 14:21:19 2016 +
--
.../rs/security/jose/jwt/JoseJwtConsumer.java | 107 +++
.../rs/security/jose/jwt/JoseJwtProducer.java | 91 +
.../oauth2/provider/OAuthJoseJwtConsumer.java | 60 ++
.../oauth2/provider/OAuthJoseJwtProducer.java | 71 +++
.../provider/OAuthServerJoseJwtProducer.java| 65 +++
.../security/oidc/rp/OidcClaimsValidator.java | 192 +++
6 files changed, 586 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c3399966/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
--
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
new file mode 100644
index 000..35a6eee
--- /dev/null
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
@@ -0,0 +1,107 @@
+/**
+ * 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.jose.jwt;
+
+import org.apache.cxf.rs.security.jose.common.AbstractJoseConsumer;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryptionOutput;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
+import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
+import org.apache.cxf.rs.security.jose.jwe.JweJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
+
+public class JoseJwtConsumer extends AbstractJoseConsumer {
+private boolean jwsRequired = true;
+private boolean jweRequired;
+
+public JwtToken getJwtToken(String wrappedJwtToken) {
+return getJwtToken(wrappedJwtToken, null, null);
+}
+public JwtToken getJwtToken(String wrappedJwtToken,
+ JweDecryptionProvider theDecryptor,
+ JwsSignatureVerifier theSigVerifier) {
+if (!isJwsRequired() && !isJweRequired()) {
+throw new JwtException("Unable to process JWT");
+}
+
+JweHeaders jweHeaders = new JweHeaders();
+if (isJweRequired()) {
+JweJwtCompactConsumer jwtConsumer = new
JweJwtCompactConsumer(wrappedJwtToken);
+
+if (theDecryptor == null) {
+theDecryptor =
getInitializedDecryptionProvider(jwtConsumer.getHeaders());
+}
+if (theDecryptor == null) {
+throw new JwtException("Unable to decrypt JWT");
+}
+
+if (!isJwsRequired()) {
+return jwtConsumer.decryptWith(theDecryptor);
+}
+
+JweDecryptionOutput decOutput =
theDecryptor.decrypt(wrappedJwtToken);
+wrappedJwtToken = decOutput.getContentText();
+jweHeaders = decOutput.getHeaders();
+}
+
+JwsJwtCompactConsumer jwtConsumer = new
JwsJwtCompactConsumer(wrappedJwtToken);
+JwtToken jwt = jwtConsumer.getJwtToken();
+// Store the encryption headers as well
+jwt = new JwtToken(jwt.getJwsHeaders(), jweHeaders, jwt.getClaims());
+
+if (isJwsRequired()) {
+if (theSigVerifier == null) {
+theSigVerifier = getInitializedSignatureVerifier(jwt);
cxf git commit: Adding the renamed resources
Repository: cxf
Updated Branches:
refs/heads/master 5c8c5f5b0 -> dcf440746
Adding the renamed resources
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dcf44074
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dcf44074
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dcf44074
Branch: refs/heads/master
Commit: dcf4407466d5c307feb5f3be387ed8667dba6e32
Parents: 5c8c5f5
Author: Sergey Beryozkin
Authored: Fri Feb 5 14:20:40 2016 +
Committer: Sergey Beryozkin
Committed: Fri Feb 5 14:20:40 2016 +
--
.../rs/security/jose/jwt/JoseJwtConsumer.java | 107 +++
.../rs/security/jose/jwt/JoseJwtProducer.java | 91 +
.../oauth2/provider/OAuthJoseJwtConsumer.java | 60 ++
.../oauth2/provider/OAuthJoseJwtProducer.java | 71 +++
.../provider/OAuthServerJoseJwtProducer.java| 65 +++
.../security/oidc/rp/OidcClaimsValidator.java | 192 +++
6 files changed, 586 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/dcf44074/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
--
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
new file mode 100644
index 000..35a6eee
--- /dev/null
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JoseJwtConsumer.java
@@ -0,0 +1,107 @@
+/**
+ * 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.jose.jwt;
+
+import org.apache.cxf.rs.security.jose.common.AbstractJoseConsumer;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryptionOutput;
+import org.apache.cxf.rs.security.jose.jwe.JweDecryptionProvider;
+import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
+import org.apache.cxf.rs.security.jose.jwe.JweJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer;
+import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier;
+
+public class JoseJwtConsumer extends AbstractJoseConsumer {
+private boolean jwsRequired = true;
+private boolean jweRequired;
+
+public JwtToken getJwtToken(String wrappedJwtToken) {
+return getJwtToken(wrappedJwtToken, null, null);
+}
+public JwtToken getJwtToken(String wrappedJwtToken,
+ JweDecryptionProvider theDecryptor,
+ JwsSignatureVerifier theSigVerifier) {
+if (!isJwsRequired() && !isJweRequired()) {
+throw new JwtException("Unable to process JWT");
+}
+
+JweHeaders jweHeaders = new JweHeaders();
+if (isJweRequired()) {
+JweJwtCompactConsumer jwtConsumer = new
JweJwtCompactConsumer(wrappedJwtToken);
+
+if (theDecryptor == null) {
+theDecryptor =
getInitializedDecryptionProvider(jwtConsumer.getHeaders());
+}
+if (theDecryptor == null) {
+throw new JwtException("Unable to decrypt JWT");
+}
+
+if (!isJwsRequired()) {
+return jwtConsumer.decryptWith(theDecryptor);
+}
+
+JweDecryptionOutput decOutput =
theDecryptor.decrypt(wrappedJwtToken);
+wrappedJwtToken = decOutput.getContentText();
+jweHeaders = decOutput.getHeaders();
+}
+
+JwsJwtCompactConsumer jwtConsumer = new
JwsJwtCompactConsumer(wrappedJwtToken);
+JwtToken jwt = jwtConsumer.getJwtToken();
+// Store the encryption headers as well
+jwt = new JwtToken(jwt.getJwsHeaders(), jweHeaders, jwt.getClaims());
+
+if (isJwsRequired()) {
+if (theSigVerifier == null) {
+theSigVerifier = getInitializedSignatureVerifier(jwt);
+
