Dev pow

src/main/java/net/helix/hlx/crypto/Sha3.java

@@ -1,5 +1,6 @@
 package net.helix.hlx.crypto;
 
+import org.bouncycastle.crypto.digests.SHA3Digest;
 import org.bouncycastle.jcajce.provider.digest.SHA3;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,4 +56,14 @@ public void reset() {
         this.sha.reset();
     }
 
+    public static byte[] getStandardHash(byte[] message) {
+        SHA3Digest digest = new SHA3Digest(256);
+        byte[] hash = new byte[digest.getDigestSize()];
+        if (message.length != 0) {
+            digest.update(message, 0, message.length);
+        }
+        digest.doFinal(hash, 0);
+        return hash;
+    }
+
 }

src/main/java/net/helix/hlx/utils/MapIdentityManager.java

@@ -5,8 +5,6 @@
 import io.undertow.security.idm.IdentityManager;
 import io.undertow.security.idm.PasswordCredential;
 import net.helix.hlx.crypto.Sha3;
-import net.helix.hlx.crypto.Sponge;
-import net.helix.hlx.crypto.SpongeFactory;
 import org.bouncycastle.util.encoders.Hex;
 
 import java.security.Principal;
@@ -48,19 +46,13 @@ public Account verify(Credential credential) {
     private boolean verifyCredential(Account account, Credential credential) {
         if (credential instanceof PasswordCredential) {
             char[] givenPassword = ((PasswordCredential) credential).getPassword();
-            byte[] bytes = Hex.encode(new String(givenPassword).getBytes());
-            byte[] hash_bytes = new byte[Sha3.HASH_LENGTH];
-            Sponge sha3;
-            sha3 = SpongeFactory.create(SpongeFactory.Mode.S256);
-            sha3.absorb(bytes, 0, bytes.length);
-            sha3.squeeze(hash_bytes, 0, Sha3.HASH_LENGTH);
-            String out_bytes = Hex.toHexString(hash_bytes);
-            char[] char_out_bytes = out_bytes.toCharArray();
             char[] expectedPassword = users.get(account.getPrincipal().getName()); 
             boolean verified = Arrays.equals(givenPassword, expectedPassword);
             // Password can either be clear text or the crypto of the password
             if (!verified) {
-                verified = Arrays.equals(char_out_bytes, expectedPassword);
+                byte[] bytes = new String(givenPassword).getBytes();
+                givenPassword = Hex.toHexString(Sha3.getStandardHash(bytes)).toCharArray();
+                verified = Arrays.equals(givenPassword, expectedPassword);
             }            
             return verified;
         }

src/test/java/net/helix/hlx/crypto/Sha3Test.java

@@ -15,6 +15,25 @@ public class Sha3Test {
     final String txHex = "bf443967e93cf9e5ec3a5b1fa029527deb45da2627e80050d45fc9f0003679055f1b6ca9f25ac70f44f09c4aacb155a2340cbff3043070e382ddb62da72aa650f76b0f8b494203204954053afa20aec27417ba3419b68236cdc538091c6a6cf1854ea1147ee2f39128a5b8cdbf6c30b0e9553f07499ee74dcf88b53ae08b11fdcc376b14c76bfcd90122c2deccbfbba1dcf46041f0d34c88f15f96c25ce902ff7d25e7ab4cb50f29304c2adf498de522973bf123f865a84c4386e886fc370377aafd1f5f45f4b95b21fa2dc6629f2e879ec80ccf658c4a128d335f83fd4e0746313a91f31cadcd0384c973401bd5d1008d8e3446fa906f6fa849f6cad209725d8fa076845d65787c0a51f9f97be5046c89f7c0c4b1805375e6b9140d2851dfbcb51b29842ea135cc9f853062f72c19b3f4a68c2363b3e8ff64086706383540f8a4f2155dbf9170d7cb1cec664d8d3421ea749d963852b867ed080633568aa7a502e693253b5d31fe2c6969ca589e4ba224b118b9362416a7dcb81343b77038792ce5f786a1b53d06c9e40c3be09e6268d9af6ed3d1b755f5304e489a8c229de68c4e47bd0cf9e47ad5ad42471bbf5dd2eaad857b7a515f28f450f119a35cfcb24217067d6252d9775925888b80e2a5be4cdabdc615cbe2aa561c68f0d8e5866c0201cfa66bd231ade44b197d7345ec5dc8f63c93cbaa2604ae4d5efe69eafcb0ce88b9c3fefb96b3245e44275013b58f95046e9af97c458064c47543fa028ef62475ae6c64d8e4cc36d9ea77ff4587618770f71911b4c7c4d955138446830087fe0ca66fc87a8dc8500334e7f9cbc67f28d844db7ad8a400140e16f2afbd6b64e22fb619e5c493af0a694b50c6b2dd651abaf812a516da7f74a3e8832e3ae14311ced1b0a5988e9751e904b890463a00d28098a2c2bd5b927b93a2d6da7623debf8499174638625dbb4f8ead72a346ba36212f20b8d09cf63b28bc8fc6116cf78ab349b0c8cdab6fc0e22abc7e1647b9f583343bf4873aebbf4d95898db3bc9fac7c3b5f6a16bfdfdeb3e11dfd4b8640c523afcfa6f4c8118746e41950e829da7bce0f244626d0036f3e2139f839f1d77a454de5bd0d72a8db671f45ee994c02e1edc3228201f4174d1ee059f7a7daeb18999a583574b8c426b30dfc85730e746fc8af5875a08f35a0b91199fe8b9f9706c469c9785e1d5ff20592bf4296b66d2ff7d0f38a8bf098714d62a460cc3b7a0a09a6883500941f31cdc6f3ba9d4322021e306a40f96e8d7a8f720fb94e724c3cdd5e2a982d848e608305846a5ae5a550f4caf27c45299c2435c31705cdf76071d3982f5ff66c348fe2026f90ab1452a13d7860fd32ec42e2e14bba0dc30ab0ece27a878b3209df1f58d261def6eb064edf8363369851fd1fe5f238255125369cfebe8c4b081c3dd4a0b8b1f5206e63f9073f88c5f5af47ef4797206c5c39d7413682d09f5a08a965b84a6f2fa8e87a4c76bd2f3e21ee60f2c8992d9ccfd19775fce735b7f45491fc7e2387de8e96234497f8d2f31c44f803a52fbb0aa94b0da9b30b441b39926e93f7f184d13e22f433073a022c6167c5ce3ecbba91982dec6ce9b3a03c605e5fd7480f8cfdfe2546068d67c0135a6a834f54d2ae66faa1b0faab32e2367849c2b70e207aed53608b6aac94cfe3786a79a8bf4d9051e3b7404a5e66758b2c8ee8e361a1e443dc06ee8e16c0fc4af13cb8467864b70458ca9390d512b694bd8f306526852f1602fc03";
     final String hashHex = "9ba652a5a82e42d701680b8213fd06a59741f36058bb7210120ae38da10a2673";
 
+    @Test
+    public void getStandardHashTest(){
+        String message = "Hello world!";
+        String messageHashHex = "d6ea8f9a1f22e1298e5a9506bd066f23cc56001f5d36582344a628649df53ae8";
+        byte[] messageBytes = message.getBytes();
+        Assert.assertTrue(messageBytes.length % Sha3.HASH_LENGTH != 0);
+        Assert.assertArrayEquals(Sha3.getStandardHash(messageBytes), Hex.decode(messageHashHex));
+
+        byte[] standardHash = Sha3.getStandardHash(txHex.getBytes());
+        Assert.assertArrayEquals(standardHash, Hex.decode(hashHex));
+
+        byte[] testBytes = txHex.getBytes();
+        byte[] testBytesOut = new byte[Sha3.HASH_LENGTH];
+        Sponge sha3 = SpongeFactory.create(SpongeFactory.Mode.S256);
+        sha3.absorb(testBytes,0, testBytes.length);
+        sha3.squeeze(testBytesOut, 0, Sha3.HASH_LENGTH);
+        Assert.assertArrayEquals(standardHash, testBytesOut);
+    }
+
     @Test
     public void sha3Test(){
         byte[] testBytes = txHex.getBytes();

src/test/java/net/helix/hlx/utils/MapIdentityManagerTest.java

@@ -0,0 +1,51 @@
+package net.helix.hlx.utils;
+
+import java.util.HashMap;
+import io.undertow.security.idm.Account;
+import io.undertow.security.idm.PasswordCredential;
+import io.undertow.security.idm.X509CertificateCredential;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+
+
+public class MapIdentityManagerTest {
+
+    private final String testUser = "testUser";
+    private final char[] testPassword = "testPassword".toCharArray();
+
+    @Test
+    public void verifyAccountWithClearTextPasswordTest() {
+        HashMap<String, char[]> users = new HashMap<>();
+        users.put(testUser, testPassword);
+        MapIdentityManager identityManager = new MapIdentityManager(users);
+        Account account = identityManager.verify(testUser, new PasswordCredential(testPassword));
+
+        assertEquals("testUser needs equal to user returned by account", testUser, account.getPrincipal().getName());
+        assertThat("Roles must not be implemented", account.getRoles(), is(empty()));
+    }
+
+    @Test
+    public void verifyAccountWithHex() {
+        HashMap<String, char[]> users = new HashMap<>();
+        users.put(testUser, "1502ddbd9e4262cdae9dde5c3709a64ea4aa38418452474016ff6d97770173cc".toCharArray());
+        MapIdentityManager identityManager = new MapIdentityManager(users);
+        Account account = identityManager.verify(testUser, new PasswordCredential(testPassword));
+
+        assertEquals("testUser needs equal to user returned by account", testUser, account.getPrincipal().getName());
+    }
+
+    @Test
+    public void verifyAccountWithUnsupportedCredentialTypeTest() {
+        HashMap<String, char[]> users = new HashMap<>();
+        users.put(testUser, testPassword);
+        MapIdentityManager identityManager = new MapIdentityManager(users);
+        Account account = identityManager.verify(testUser, new X509CertificateCredential(null));
+
+        assertNull("Must be null, because credential type is not supported", account);
+    }
+
+}