Merge pull request #47 from /issues/46

Untangle

Author: chenkins

hub/pom.xml

@@ -71,10 +71,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>ch.cyberduck</groupId>
-            <artifactId>binding</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.cyberduck</groupId>
             <artifactId>nio</artifactId>

hub/src/main/java/ch/iterate/hub/core/CreateHubBookmarkAction.java

@@ -25,14 +25,14 @@ public FirstLoginDeviceSetupCallback create() {
             final Constructor<? extends FirstLoginDeviceSetupCallback> constructor
                     = ConstructorUtils.getMatchingAccessibleConstructor(clazz);
             if(null == constructor) {
-                log.warn(String.format("No default controller in %s", constructor.getClass()));
+                log.warn("No default controller in {}", constructor.getClass());
                 // Call default constructor for disabled implementations
                 return clazz.getDeclaredConstructor().newInstance();
             }
             return constructor.newInstance();
         }
         catch(InstantiationException | InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            log.error(String.format("Failure loading callback class %s. %s", clazz, e.getMessage()));
+            log.error("Failure loading callback class {}. {}", clazz, e.getMessage());
             return FirstLoginDeviceSetupCallback.disabled;
         }
     }

hub/src/main/java/ch/iterate/hub/core/CreateVaultBookmarkAction.java

@@ -66,7 +66,7 @@ public static String ecdhEsEncrypt(final JWEPayload payload, final String kid, f
      */
     public static String ecdhEsEncrypt(final JWEPayload payload, final String kid, final ECPublicKey recipientPublicKey, final String apu, final String apv) throws JOSEException, JsonProcessingException {
         final JWEEncrypter jweEncrypter = new ECDHEncrypter(recipientPublicKey);
-        JWEHeader header = new JWEHeader.Builder(ECDHES_DESIGNATION_ALG, ECDHES_DESIGNATION_ENC)
+        final JWEHeader header = new JWEHeader.Builder(ECDHES_DESIGNATION_ALG, ECDHES_DESIGNATION_ENC)
                 .keyID(kid)
                 .agreementPartyUInfo(Base64URL.encode(apu))
                 .agreementPartyVInfo(Base64URL.encode(apv))
@@ -101,7 +101,7 @@ public static String pbes2Encrypt(final JWEPayload payload, final String kid, fi
      */
     public static String pbes2Encrypt(final JWEPayload payload, final String kid, final String password, final String apu, final String apv) throws JsonProcessingException, JOSEException {
         final JWEEncrypter jweEncrypter = new PasswordBasedEncrypter(password, PBES2_SALT_LENGTH, PBES2_ITERATION_COUNT);
-        JWEHeader header = new JWEHeader.Builder(PBES2_DESIGNATION_ALG, PBES2_DESIGNATION_ENC)
+        final JWEHeader header = new JWEHeader.Builder(PBES2_DESIGNATION_ALG, PBES2_DESIGNATION_ENC)
                 .keyID(kid)
                 .agreementPartyUInfo(Base64URL.encode(apu))
                 .agreementPartyVInfo(Base64URL.encode(apv))

hub/src/main/java/ch/iterate/hub/core/FirstLoginDeviceSetupCallbackFactory.java

@@ -38,8 +38,8 @@ public class UvfAccessTokenPayload extends JWEPayload {
     @JsonProperty("recoveryKey")
     String recoveryKey;
 
-    public static UvfAccessTokenPayload fromJWE(String jwe) throws JsonProcessingException {
-        ObjectMapper mapper = new ObjectMapper();
+    public static UvfAccessTokenPayload fromJWE(final String jwe) throws JsonProcessingException {
+        final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonNullableModule());
         return mapper.readValue(jwe, UvfAccessTokenPayload.class);
     }
@@ -53,7 +53,7 @@ public boolean equals(Object o) {
             return false;
         }
 
-        UvfAccessTokenPayload that = (UvfAccessTokenPayload) o;
+        final UvfAccessTokenPayload that = (UvfAccessTokenPayload) o;
         return key.equals(that.key) && Objects.equals(recoveryKey, that.recoveryKey);
     }
 

hub/src/main/java/ch/iterate/hub/core/callback/CreateVaultCallback.java

@@ -87,8 +87,8 @@ public class UvfMetadataPayload extends JWEPayload {
     VaultMetadataJWEBackendDto storage;
 
 
-    public static UvfMetadataPayload fromJWE(String jwe) throws JsonProcessingException {
-        ObjectMapper mapper = new ObjectMapper();
+    public static UvfMetadataPayload fromJWE(final String jwe) throws JsonProcessingException {
+        final ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonNullableModule());
         return mapper.readValue(jwe, UvfMetadataPayload.class);
     }
@@ -122,7 +122,7 @@ public String computeRootDirIdHash(final byte[] rootDirId) {
         final HMac hMac = new HMac(digest);
         hMac.init(new KeyParameter(hmacKey));
         hMac.update(rootDirId, 0, rootDirId.length);
-        byte[] hmacOut = new byte[hMac.getMacSize()];
+        final byte[] hmacOut = new byte[hMac.getMacSize()];
         hMac.doFinal(hmacOut, 0);
         return Base32.toBase32String(Arrays.copyOfRange(hmacOut, 0, 20));
     }
@@ -288,7 +288,7 @@ public UvfMetadataPayload withStorage(final VaultMetadataJWEBackendDto backend)
      * @param jwk The jwk
      */
     public static UvfMetadataPayload decryptWithJWK(final String jwe, final JWK jwk) throws ParseException, JOSEException, JsonProcessingException {
-        JWEObjectJSON jweObject = JWEObjectJSON.parse(jwe);
+        final JWEObjectJSON jweObject = JWEObjectJSON.parse(jwe);
         jweObject.decrypt(new MultiDecrypter(jwk));
         final Payload payload = jweObject.getPayload();
         return UvfMetadataPayload.fromJWE(payload.toString());

hub/src/main/java/ch/iterate/hub/core/callback/CreateVaultModel.java

@@ -134,9 +134,7 @@ public static int computeTrustLevel(final UserDto trustedUser, final TrustedUser
             return signatureChain.size();
         }
         catch(SecurityFailure | NoSuchAlgorithmException | InvalidKeySpecException | NotECKeyException e) {
-            if(log.isWarnEnabled()) {
-                log.warn("WoT signature verification failed.", e);
-            }
+            log.warn("Web of Trust signature chain verification failed for user {}", trustedUser, e);
             return -1; // unverified
         }
     }
@@ -157,27 +155,21 @@ public static Map<TrustedUserDto, Integer> verifyTrusts(final List<TrustedUserDt
         for(final TrustedUserDto trust : trusts) {
             final String trustedUserId = trust.getTrustedUserId();
             if(trustedUserId == null) {
-                if(log.isWarnEnabled()) {
-                    log.warn("Verification for {} failed. No ID found for trustee.", trust);
-                }
+                log.warn("Verification for {} failed. No ID found for trustee.", trust);
                 continue;
             }
             final UserDto user = users.stream().filter(u -> trustedUserId.equals(u.getId())).findFirst().orElse(null);
             final List<String> signatureChain = trust.getSignatureChain();
             if(user == null || signatureChain == null) {
-                if(log.isWarnEnabled()) {
-                    log.warn("Verification for {} failed. No user or no signature chain found.", trust);
-                }
+                log.warn("Verification for {} failed. No user or no signature chain found.", trust);
                 continue;
             }
             try {
                 WoT.verifyRecursive(signatureChain, signerPublicKey, SignedKeys.fromUser(user));
                 verified.put(trust, signatureChain.size());
             }
             catch(SecurityFailure e) {
-                if(log.isWarnEnabled()) {
-                    log.warn(String.format("Verification for %s failed - not granting access.", trust), e);
-                }
+                log.warn("Verification for {} failed - not granting access.", trust, e);
             }
         }
         return verified;