You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/04/04 12:01:12 UTC

[cxf] branch master updated: cxf-rt-rs-security-jose: fix PVS-Studio errors/warnings

This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new f033e22  cxf-rt-rs-security-jose: fix PVS-Studio errors/warnings
f033e22 is described below

commit f033e229524d3bd3a4207a800d7026ee9cd4e383
Author: amarkevich <am...@talend.com>
AuthorDate: Wed Apr 3 15:41:37 2019 +0300

    cxf-rt-rs-security-jose: fix PVS-Studio errors/warnings
---
 .../jose/jaxrs/AbstractJweJsonWriterProvider.java  |  2 +-
 .../jose/jaxrs/JwsJsonWriterInterceptor.java       |  2 +-
 .../cxf/rs/security/jose/common/JoseUtils.java     |  8 +--
 .../cxf/rs/security/jose/jwa/AlgorithmUtils.java   | 83 ++++++++--------------
 .../security/jose/jwe/AbstractJweEncryption.java   |  2 +-
 .../cxf/rs/security/jose/jwe/JweJsonConsumer.java  |  4 +-
 .../apache/cxf/rs/security/jose/jwe/JweUtils.java  |  4 --
 7 files changed, 38 insertions(+), 67 deletions(-)

diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
index c8fda2e..9418c08 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonWriterProvider.java
@@ -148,7 +148,7 @@ public class AbstractJweJsonWriterProvider {
         } else {
             ContentEncryptionProvider ctProvider = JweUtils.getContentEncryptionProvider(ctAlgo, true);
             for (int i = 0; i < keyProviders.size(); i++) {
-                JweEncryptionProvider encProvider = new JweEncryption(keyProviders.get(0), ctProvider);
+                JweEncryptionProvider encProvider = new JweEncryption(keyProviders.get(i), ctProvider);
                 theEncProviders.add(encProvider);
             }
         }
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
index 8aa4c9e..cc4a074 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
@@ -93,7 +93,7 @@ public class JwsJsonWriterInterceptor extends AbstractJwsJsonWriterProvider impl
                 ctx.setOutputStream(jwsStream);
             }
             ctx.proceed();
-            if (encodePayload) {
+            if (base64Stream != null) {
                 base64Stream.flush();
             }
             jwsStream.flush();
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
index 60fcb90..330543b 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
@@ -24,6 +24,7 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -77,12 +78,7 @@ public final class JoseUtils {
         Message message = PhaseInterceptorChain.getCurrentMessage();
         Object requestContext = message.get(JoseConstants.JOSE_CONTEXT_PROPERTY);
         Object headerContext = headers.getHeader(JoseConstants.JOSE_CONTEXT_PROPERTY);
-        if (requestContext == null && headerContext == null) {
-            return;
-        }
-        if (requestContext == null && headerContext != null
-            || requestContext != null && headerContext == null
-            || !requestContext.equals(headerContext)) {
+        if (!Objects.equals(requestContext, headerContext)) {
             LOG.warning("Invalid JOSE context property");
             throw new JoseException();
         }
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
index 1af4543..f5edd13 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
@@ -150,62 +150,37 @@ public final class AlgorithmUtils {
                                                                 ECDH_ES_A192KW_ALGO,
                                                                 ECDH_ES_A256KW_ALGO)));
 
-    private static final Map<String, String> JAVA_TO_JWA_NAMES;
-    private static final Map<String, String> JWA_TO_JAVA_NAMES;
+    private static final Map<String, String> JAVA_TO_JWA_NAMES = new HashMap<>();
+    private static final Map<String, String> JWA_TO_JAVA_NAMES = new HashMap<>();
     static {
-        JAVA_TO_JWA_NAMES = new HashMap<>();
-        JAVA_TO_JWA_NAMES.put(HMAC_SHA_256_JAVA, HMAC_SHA_256_ALGO);
-        JAVA_TO_JWA_NAMES.put(HMAC_SHA_384_JAVA, HMAC_SHA_384_ALGO);
-        JAVA_TO_JWA_NAMES.put(HMAC_SHA_512_JAVA, HMAC_SHA_512_ALGO);
-        JAVA_TO_JWA_NAMES.put(RS_SHA_256_JAVA, RS_SHA_256_ALGO);
-        JAVA_TO_JWA_NAMES.put(RS_SHA_384_JAVA, RS_SHA_384_ALGO);
-        JAVA_TO_JWA_NAMES.put(RS_SHA_512_JAVA, RS_SHA_512_ALGO);
-        JAVA_TO_JWA_NAMES.put(PS_SHA_256_JAVA, PS_SHA_256_ALGO);
-        JAVA_TO_JWA_NAMES.put(PS_SHA_384_JAVA, PS_SHA_384_ALGO);
-        JAVA_TO_JWA_NAMES.put(PS_SHA_512_JAVA, PS_SHA_512_ALGO);
-        JAVA_TO_JWA_NAMES.put(ES_SHA_256_JAVA, ES_SHA_256_ALGO);
-        JAVA_TO_JWA_NAMES.put(ES_SHA_384_JAVA, ES_SHA_384_ALGO);
-        JAVA_TO_JWA_NAMES.put(ES_SHA_512_JAVA, ES_SHA_512_ALGO);
-        JAVA_TO_JWA_NAMES.put(RSA_OAEP_ALGO_JAVA, RSA_OAEP_ALGO);
-        JAVA_TO_JWA_NAMES.put(RSA_OAEP_256_ALGO_JAVA, RSA_OAEP_256_ALGO);
-        JAVA_TO_JWA_NAMES.put(RSA_1_5_ALGO_JAVA, RSA1_5_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_GCM_ALGO_JAVA, A256GCM_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_GCM_ALGO_JAVA, A192GCM_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_GCM_ALGO_JAVA, A128GCM_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_WRAP_ALGO_JAVA, A128KW_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_WRAP_ALGO_JAVA, A192KW_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_WRAP_ALGO_JAVA, A256KW_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_CBC_ALGO_JAVA, A128CBC_HS256_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_CBC_ALGO_JAVA, A192CBC_HS384_ALGO);
-        JAVA_TO_JWA_NAMES.put(AES_CBC_ALGO_JAVA, A256CBC_HS512_ALGO);
-        JWA_TO_JAVA_NAMES = new HashMap<>();
-        JWA_TO_JAVA_NAMES.put(HMAC_SHA_256_ALGO, HMAC_SHA_256_JAVA);
-        JWA_TO_JAVA_NAMES.put(HMAC_SHA_384_ALGO, HMAC_SHA_384_JAVA);
-        JWA_TO_JAVA_NAMES.put(HMAC_SHA_512_ALGO, HMAC_SHA_512_JAVA);
-        JWA_TO_JAVA_NAMES.put(RS_SHA_256_ALGO, RS_SHA_256_JAVA);
-        JWA_TO_JAVA_NAMES.put(RS_SHA_384_ALGO, RS_SHA_384_JAVA);
-        JWA_TO_JAVA_NAMES.put(RS_SHA_512_ALGO, RS_SHA_512_JAVA);
-        JWA_TO_JAVA_NAMES.put(PS_SHA_256_ALGO, PS_SHA_256_JAVA);
-        JWA_TO_JAVA_NAMES.put(PS_SHA_384_ALGO, PS_SHA_384_JAVA);
-        JWA_TO_JAVA_NAMES.put(PS_SHA_512_ALGO, PS_SHA_512_JAVA);
-        JWA_TO_JAVA_NAMES.put(ES_SHA_256_ALGO, ES_SHA_256_JAVA);
-        JWA_TO_JAVA_NAMES.put(ES_SHA_384_ALGO, ES_SHA_384_JAVA);
-        JWA_TO_JAVA_NAMES.put(ES_SHA_512_ALGO, ES_SHA_512_JAVA);
-        JWA_TO_JAVA_NAMES.put(RSA_OAEP_ALGO, RSA_OAEP_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(RSA_OAEP_256_ALGO, RSA_OAEP_256_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(RSA1_5_ALGO, RSA_1_5_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A128KW_ALGO, AES_WRAP_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A192KW_ALGO, AES_WRAP_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A256KW_ALGO, AES_WRAP_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A256GCM_ALGO, AES_GCM_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A192GCM_ALGO, AES_GCM_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A128GCM_ALGO, AES_GCM_ALGO_JAVA);
+        putAlgo(HMAC_SHA_256_JAVA, HMAC_SHA_256_ALGO);
+        putAlgo(HMAC_SHA_384_JAVA, HMAC_SHA_384_ALGO);
+        putAlgo(HMAC_SHA_512_JAVA, HMAC_SHA_512_ALGO);
+        putAlgo(RS_SHA_256_JAVA, RS_SHA_256_ALGO);
+        putAlgo(RS_SHA_384_JAVA, RS_SHA_384_ALGO);
+        putAlgo(RS_SHA_512_JAVA, RS_SHA_512_ALGO);
+        putAlgo(PS_SHA_256_JAVA, PS_SHA_256_ALGO);
+        putAlgo(PS_SHA_384_JAVA, PS_SHA_384_ALGO);
+        putAlgo(PS_SHA_512_JAVA, PS_SHA_512_ALGO);
+        putAlgo(ES_SHA_256_JAVA, ES_SHA_256_ALGO);
+        putAlgo(ES_SHA_384_JAVA, ES_SHA_384_ALGO);
+        putAlgo(ES_SHA_512_JAVA, ES_SHA_512_ALGO);
+        putAlgo(RSA_OAEP_ALGO_JAVA, RSA_OAEP_ALGO);
+        putAlgo(RSA_OAEP_256_ALGO_JAVA, RSA_OAEP_256_ALGO);
+        putAlgo(RSA_1_5_ALGO_JAVA, RSA1_5_ALGO);
+        putAlgo(AES_GCM_ALGO_JAVA, A256GCM_ALGO);
+        putAlgo(AES_GCM_ALGO_JAVA, A192GCM_ALGO);
+        putAlgo(AES_GCM_ALGO_JAVA, A128GCM_ALGO);
+        putAlgo(AES_WRAP_ALGO_JAVA, A128KW_ALGO);
+        putAlgo(AES_WRAP_ALGO_JAVA, A192KW_ALGO);
+        putAlgo(AES_WRAP_ALGO_JAVA, A256KW_ALGO);
+        putAlgo(AES_CBC_ALGO_JAVA, A128CBC_HS256_ALGO);
+        putAlgo(AES_CBC_ALGO_JAVA, A192CBC_HS384_ALGO);
+        putAlgo(AES_CBC_ALGO_JAVA, A256CBC_HS512_ALGO);
+
         JWA_TO_JAVA_NAMES.put(A256GCMKW_ALGO, AES_GCM_ALGO_JAVA);
         JWA_TO_JAVA_NAMES.put(A192GCMKW_ALGO, AES_GCM_ALGO_JAVA);
         JWA_TO_JAVA_NAMES.put(A128GCMKW_ALGO, AES_GCM_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A128CBC_HS256_ALGO, AES_CBC_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A192CBC_HS384_ALGO, AES_CBC_ALGO_JAVA);
-        JWA_TO_JAVA_NAMES.put(A256CBC_HS512_ALGO, AES_CBC_ALGO_JAVA);
         JWA_TO_JAVA_NAMES.put(PBES2_HS256_A128KW_ALGO, AES_WRAP_ALGO_JAVA);
         JWA_TO_JAVA_NAMES.put(PBES2_HS384_A192KW_ALGO, AES_WRAP_ALGO_JAVA);
         JWA_TO_JAVA_NAMES.put(PBES2_HS512_A256KW_ALGO, AES_WRAP_ALGO_JAVA);
@@ -308,4 +283,8 @@ public final class AlgorithmUtils {
         return javaName;
     }
 
+    private static void putAlgo(String java, String algo) {
+        JAVA_TO_JWA_NAMES.put(java, algo);
+        JWA_TO_JAVA_NAMES.put(algo, java);
+    }
 }
\ No newline at end of file
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index da15f7d..591f759 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -217,7 +217,7 @@ public abstract class AbstractJweEncryption implements JweEncryptionProvider {
             state.theIv = theIv;
             state.theHeaders = theHeaders;
             state.protectedHeadersJson = protectedHeadersJson;
-            state.aad = jweInput != null ? jweInput.getAad() : null;
+            state.aad = jweInput.getAad();
             state.secretKey = theCek;
         }
 
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
index 937ce5f..87bb1ed 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumer.java
@@ -60,12 +60,12 @@ public class JweJsonConsumer {
         return decryptWith(jwe, entry);
     }
     public JweDecryptionOutput decryptWith(JweDecryptionProvider jwe, JweJsonEncryptionEntry entry) {
-        JweDecryptionInput jweDecryptionInput = getJweDecryptionInput(jwe, entry);
+        JweDecryptionInput jweDecryptionInput = getJweDecryptionInput(entry);
         byte[] content = jwe.decrypt(jweDecryptionInput);
         return new JweDecryptionOutput(jweDecryptionInput.getJweHeaders(), content);
     }
 
-    private JweDecryptionInput getJweDecryptionInput(JweDecryptionProvider jwe, JweJsonEncryptionEntry entry) {
+    private JweDecryptionInput getJweDecryptionInput(JweJsonEncryptionEntry entry) {
         if (entry == null) {
             LOG.warning("JWE JSON Entry is not available");
             throw new JweException(JweException.Error.INVALID_JSON_JWE);
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index 4243b17..b2b91e0 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -344,10 +344,6 @@ public final class JweUtils {
     }
     public static JweDecryption getEcDirectKeyJweDecryption(JsonWebKey key, ContentAlgorithm ctAlgo) {
         if (AlgorithmUtils.isEcdhEsDirect(key.getAlgorithm())) {
-            String curve = key.getStringProperty(JsonWebKey.EC_CURVE);
-            if (curve == null) {
-                curve = JsonWebKey.EC_CURVE_P256;
-            }
             ECPrivateKey ecKey = JwkUtils.toECPrivateKey(key);
             return new EcdhDirectKeyJweDecryption(ecKey, ctAlgo);
         }