Repository: cxf Updated Branches: refs/heads/master 71a43b949 -> 419f09f68
[CXF-5311] Fixing some of interface names Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/419f09f6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/419f09f6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/419f09f6 Branch: refs/heads/master Commit: 419f09f68eb35ddd46255f835b07a6d49640314d Parents: 71a43b9 Author: Sergey Beryozkin <[email protected]> Authored: Fri May 23 11:50:40 2014 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri May 23 11:50:40 2014 +0100 ---------------------------------------------------------------------- .../oauth2/jws/HmacJwsSignatureProvider.java | 2 +- .../security/oauth2/jws/JwsCompactConsumer.java | 2 +- .../security/oauth2/jws/JwsCompactProducer.java | 2 +- .../oauth2/jws/JwsSignatureProvider.java | 25 ++++++++++++++++++++ .../oauth2/jws/JwsSignatureValidator.java | 25 -------------------- .../oauth2/jws/JwsSignatureVerifier.java | 2 +- .../jws/PrivateKeyJwsSignatureProvider.java | 2 +- .../jws/PublicKeyJwsSignatureVerifier.java | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/HmacJwsSignatureProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/HmacJwsSignatureProvider.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/HmacJwsSignatureProvider.java index ced6c19..e2ed53c 100644 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/HmacJwsSignatureProvider.java +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/HmacJwsSignatureProvider.java @@ -26,7 +26,7 @@ import org.apache.cxf.rs.security.oauth2.jwt.JwtHeaders; import org.apache.cxf.rs.security.oauth2.utils.Base64UrlUtility; import org.apache.cxf.rs.security.oauth2.utils.crypto.HmacUtils; -public class HmacJwsSignatureProvider implements JwsSignatureVerifier, JwsSignatureValidator { +public class HmacJwsSignatureProvider implements JwsSignatureProvider, JwsSignatureVerifier { private byte[] key; public HmacJwsSignatureProvider(byte[] key) { this.key = key; http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactConsumer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactConsumer.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactConsumer.java index eb80170..abec1a6 100644 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactConsumer.java +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactConsumer.java @@ -91,7 +91,7 @@ public class JwsCompactConsumer { } return token; } - public boolean verifySignatureWith(JwsSignatureValidator validator) { + public boolean verifySignatureWith(JwsSignatureVerifier validator) { if (!validator.verify(getJwtHeaders(), getUnsignedEncodedToken(), getDecodedSignature())) { throw new SecurityException(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactProducer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactProducer.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactProducer.java index 88ec0f6..d3b6931 100644 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactProducer.java +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsCompactProducer.java @@ -65,7 +65,7 @@ public class JwsCompactProducer { } return getUnsignedEncodedToken() + "." + (noSignature ? "" : signature); } - public void signWith(JwsSignatureVerifier signer) { + public void signWith(JwsSignatureProvider signer) { setSignatureOctets(signer.sign(token.getHeaders(), getUnsignedEncodedToken())); } http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureProvider.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureProvider.java new file mode 100644 index 0000000..6c7a84f --- /dev/null +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureProvider.java @@ -0,0 +1,25 @@ +/** + * 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.oauth2.jws; + +import org.apache.cxf.rs.security.oauth2.jwt.JwtHeaders; + +public interface JwsSignatureProvider { + byte[] sign(JwtHeaders headers, String unsignedText); +} http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureValidator.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureValidator.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureValidator.java deleted file mode 100644 index e6bdc59a..0000000 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureValidator.java +++ /dev/null @@ -1,25 +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.oauth2.jws; - -import org.apache.cxf.rs.security.oauth2.jwt.JwtHeaders; - -public interface JwsSignatureValidator { - boolean verify(JwtHeaders headers, String unsignedText, byte[] signature); -} http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureVerifier.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureVerifier.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureVerifier.java index ed90e48..2134f27 100644 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureVerifier.java +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/JwsSignatureVerifier.java @@ -21,5 +21,5 @@ package org.apache.cxf.rs.security.oauth2.jws; import org.apache.cxf.rs.security.oauth2.jwt.JwtHeaders; public interface JwsSignatureVerifier { - byte[] sign(JwtHeaders headers, String unsignedText); + boolean verify(JwtHeaders headers, String unsignedText, byte[] signature); } http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PrivateKeyJwsSignatureProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PrivateKeyJwsSignatureProvider.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PrivateKeyJwsSignatureProvider.java index 5b1708c..2647915 100644 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PrivateKeyJwsSignatureProvider.java +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PrivateKeyJwsSignatureProvider.java @@ -26,7 +26,7 @@ import org.apache.cxf.rs.security.oauth2.jwt.Algorithm; import org.apache.cxf.rs.security.oauth2.jwt.JwtHeaders; import org.apache.cxf.rs.security.oauth2.utils.crypto.CryptoUtils; -public class PrivateKeyJwsSignatureProvider implements JwsSignatureVerifier { +public class PrivateKeyJwsSignatureProvider implements JwsSignatureProvider { private PrivateKey key; private SecureRandom random; private AlgorithmParameterSpec signatureSpec; http://git-wip-us.apache.org/repos/asf/cxf/blob/419f09f6/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PublicKeyJwsSignatureVerifier.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PublicKeyJwsSignatureVerifier.java b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PublicKeyJwsSignatureVerifier.java index dede646..790faac 100644 --- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PublicKeyJwsSignatureVerifier.java +++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jws/PublicKeyJwsSignatureVerifier.java @@ -25,7 +25,7 @@ import org.apache.cxf.rs.security.oauth2.jwt.Algorithm; import org.apache.cxf.rs.security.oauth2.jwt.JwtHeaders; import org.apache.cxf.rs.security.oauth2.utils.crypto.CryptoUtils; -public class PublicKeyJwsSignatureVerifier implements JwsSignatureValidator { +public class PublicKeyJwsSignatureVerifier implements JwsSignatureVerifier { private PublicKey key; private AlgorithmParameterSpec signatureSpec; public PublicKeyJwsSignatureVerifier(PublicKey key) {
