Reverted AbstractJoseConsumer/Producer with JwsHeader/JweHeader changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e277a222 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e277a222 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e277a222 Branch: refs/heads/master Commit: e277a22202c087737ab5601de31c54b635fb225b Parents: ecf6a38 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Nov 4 15:33:01 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Nov 4 15:33:01 2015 +0000 ---------------------------------------------------------------------- .../jose/common/AbstractJoseConsumer.java | 62 ++++++++++++++++++++ .../jose/common/AbstractJoseProducer.java | 53 +++++++++++++++++ .../jose/jwt/AbstractJoseJwtConsumer.java | 38 +----------- .../jose/jwt/AbstractJoseJwtProducer.java | 30 +--------- 4 files changed, 119 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e277a222/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseConsumer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseConsumer.java new file mode 100644 index 0000000..b8454b0 --- /dev/null +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseConsumer.java @@ -0,0 +1,62 @@ +/** + * 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.common; + +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.JweUtils; +import org.apache.cxf.rs.security.jose.jws.JwsHeaders; +import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier; +import org.apache.cxf.rs.security.jose.jws.JwsUtils; + +public abstract class AbstractJoseConsumer { + private JweDecryptionProvider jweDecryptor; + private JwsSignatureVerifier jwsVerifier; + + public void setJweDecryptor(JweDecryptionProvider jweDecryptor) { + this.jweDecryptor = jweDecryptor; + } + + public JweDecryptionProvider getJweDecryptor() { + return jweDecryptor; + } + + public void setJwsVerifier(JwsSignatureVerifier theJwsVerifier) { + this.jwsVerifier = theJwsVerifier; + } + + public JwsSignatureVerifier getJwsVerifier() { + return jwsVerifier; + } + + protected JweDecryptionProvider getInitializedDecryptionProvider(JweHeaders jweHeaders) { + if (jweDecryptor != null) { + return jweDecryptor; + } + return JweUtils.loadDecryptionProvider(jweHeaders, false); + } + protected JwsSignatureVerifier getInitializedSignatureVerifier(JwsHeaders jwsHeaders) { + if (jwsVerifier != null) { + return jwsVerifier; + } + + return JwsUtils.loadSignatureVerifier(jwsHeaders, false); + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/e277a222/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseProducer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseProducer.java new file mode 100644 index 0000000..bad28f1 --- /dev/null +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/AbstractJoseProducer.java @@ -0,0 +1,53 @@ +/** + * 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.common; + +import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider; +import org.apache.cxf.rs.security.jose.jwe.JweHeaders; +import org.apache.cxf.rs.security.jose.jwe.JweUtils; +import org.apache.cxf.rs.security.jose.jws.JwsHeaders; +import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider; +import org.apache.cxf.rs.security.jose.jws.JwsUtils; + +public abstract class AbstractJoseProducer { + private JwsSignatureProvider sigProvider; + private JweEncryptionProvider encryptionProvider; + + protected JwsSignatureProvider getInitializedSignatureProvider(JwsHeaders jwsHeaders) { + if (sigProvider != null) { + return sigProvider; + } + + return JwsUtils.loadSignatureProvider(jwsHeaders, false); + } + protected JweEncryptionProvider getInitializedEncryptionProvider(JweHeaders jweHeaders) { + if (encryptionProvider != null) { + return encryptionProvider; + } + return JweUtils.loadEncryptionProvider(jweHeaders, false); + } + + public void setEncryptionProvider(JweEncryptionProvider encryptionProvider) { + this.encryptionProvider = encryptionProvider; + } + + public void setSignatureProvider(JwsSignatureProvider signatureProvider) { + this.sigProvider = signatureProvider; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/e277a222/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java index 0eb4a8e..1623b6a 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtConsumer.java @@ -18,19 +18,15 @@ */ 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.jwe.JweUtils; -import org.apache.cxf.rs.security.jose.jws.JwsHeaders; import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactConsumer; import org.apache.cxf.rs.security.jose.jws.JwsSignatureVerifier; -import org.apache.cxf.rs.security.jose.jws.JwsUtils; -public abstract class AbstractJoseJwtConsumer { - private JweDecryptionProvider jweDecryptor; - private JwsSignatureVerifier jwsVerifier; +public abstract class AbstractJoseJwtConsumer extends AbstractJoseConsumer { private boolean jwsRequired = true; private boolean jweRequired; @@ -85,20 +81,6 @@ public abstract class AbstractJoseJwtConsumer { validateToken(jwt); return jwt; } - protected JwsSignatureVerifier getInitializedSignatureVerifier(JwsHeaders jwsHeaders) { - if (jwsVerifier != null) { - return jwsVerifier; - } - - return JwsUtils.loadSignatureVerifier(jwsHeaders, false); - } - - protected JweDecryptionProvider getInitializedDecryptionProvider(JweHeaders jweHeaders) { - if (jweDecryptor != null) { - return jweDecryptor; - } - return JweUtils.loadDecryptionProvider(jweHeaders, false); - } protected void validateToken(JwtToken jwt) { } @@ -118,20 +100,4 @@ public abstract class AbstractJoseJwtConsumer { this.jweRequired = jweRequired; } - public void setJweDecryptor(JweDecryptionProvider jweDecryptor) { - this.jweDecryptor = jweDecryptor; - } - - public JweDecryptionProvider getJweDecryptor() { - return jweDecryptor; - } - - public void setJwsVerifier(JwsSignatureVerifier theJwsVerifier) { - this.jwsVerifier = theJwsVerifier; - } - - public JwsSignatureVerifier getJwsVerifier() { - return jwsVerifier; - } - } http://git-wip-us.apache.org/repos/asf/cxf/blob/e277a222/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtProducer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtProducer.java index 0f72bbe..f65ca2c 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtProducer.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/AbstractJoseJwtProducer.java @@ -19,18 +19,13 @@ package org.apache.cxf.rs.security.jose.jwt; import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.rs.security.jose.common.AbstractJoseProducer; import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider; -import org.apache.cxf.rs.security.jose.jwe.JweHeaders; import org.apache.cxf.rs.security.jose.jwe.JweJwtCompactProducer; -import org.apache.cxf.rs.security.jose.jwe.JweUtils; -import org.apache.cxf.rs.security.jose.jws.JwsHeaders; import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactProducer; import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider; -import org.apache.cxf.rs.security.jose.jws.JwsUtils; -public abstract class AbstractJoseJwtProducer { - private JwsSignatureProvider sigProvider; - private JweEncryptionProvider encryptionProvider; +public abstract class AbstractJoseJwtProducer extends AbstractJoseProducer { private boolean jwsRequired = true; private boolean jweRequired; @@ -76,20 +71,6 @@ public abstract class AbstractJoseJwtProducer { } return data; } - - protected JwsSignatureProvider getInitializedSignatureProvider(JwsHeaders jwsHeaders) { - if (sigProvider != null) { - return sigProvider; - } - - return JwsUtils.loadSignatureProvider(jwsHeaders, false); - } - protected JweEncryptionProvider getInitializedEncryptionProvider(JweHeaders jweHeaders) { - if (encryptionProvider != null) { - return encryptionProvider; - } - return JweUtils.loadEncryptionProvider(jweHeaders, false); - } public boolean isJwsRequired() { return jwsRequired; @@ -107,11 +88,4 @@ public abstract class AbstractJoseJwtProducer { this.jweRequired = jweRequired; } - public void setEncryptionProvider(JweEncryptionProvider encryptionProvider) { - this.encryptionProvider = encryptionProvider; - } - - public void setSignatureProvider(JwsSignatureProvider signatureProvider) { - this.sigProvider = signatureProvider; - } }
