SecretService is no longer an interface

sawano · Apr 14, 2017 · d9b4017 · d9b4017
1 parent 917d6cc
commit d9b4017
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 71 deletions.
diff --git a/src/main/java/se/sawano/java/security/otp/SecretService.java b/src/main/java/se/sawano/java/security/otp/SecretService.java
@@ -16,7 +16,34 @@
 
 package se.sawano.java.security.otp;
 
-public interface SecretService {
+import se.sawano.java.security.otp.ShaAlgorithm;
+import se.sawano.java.security.otp.SharedSecret;
+import se.sawano.java.security.otp.impl.DefaultRandomSupplier;
+import se.sawano.java.security.otp.impl.RandomSupplier;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.apache.commons.lang3.Validate.notNull;
+
+public class SecretService {
+
+    private final RandomSupplier random;
+    private final Map<ShaAlgorithm, Integer> algorithmToNumberOfBytes = new HashMap<>();
+
+    public SecretService() {
+        this(new DefaultRandomSupplier());
+    }
+
+    public SecretService(final RandomSupplier random) {
+        notNull(random);
+
+        this.random = random;
+
+        algorithmToNumberOfBytes.put(ShaAlgorithm.SHA1, 20);
+        algorithmToNumberOfBytes.put(ShaAlgorithm.SHA256, 32);
+        algorithmToNumberOfBytes.put(ShaAlgorithm.SHA512, 64);
+    }
 
     /**
      * Create a new shared secret.
@@ -26,6 +53,18 @@ public interface SecretService {
      *
      * @return the newly generated secret
      */
-    SharedSecret generateSharedSecret(ShaAlgorithm algorithm);
+    public SharedSecret generateSharedSecret(final ShaAlgorithm algorithm) {
+        notNull(algorithm);
+
+        return generateSharedSecret(algorithm, algorithmToNumberOfBytes.get(algorithm));
+    }
+
+    public SharedSecret generateSharedSecret(final ShaAlgorithm algorithm, final int numberOfBytes) {
+        final byte[] bytes = new byte[numberOfBytes];
+
+        random.nextBytes(bytes);
+
+        return SharedSecret.from(bytes, algorithm);
+    }
 
 }
diff --git a/src/main/java/se/sawano/java/security/otp/application/VerificationService.java b/src/main/java/se/sawano/java/security/otp/application/VerificationService.java
@@ -18,6 +18,7 @@
 
 import se.sawano.java.security.otp.*;
 import se.sawano.java.security.otp.TOTPService;
+import se.sawano.java.security.otp.SecretService;
 import se.sawano.java.security.otp.user.UserId;
 import se.sawano.java.security.otp.user.persistence.SecretRepository;
 import se.sawano.java.security.otp.user.persistence.TOTPRegistry;

diff --git a/src/main/java/se/sawano/java/security/otp/impl/DefaultSecretService.java b/src/main/java/se/sawano/java/security/otp/impl/DefaultSecretService.java
diff --git a/...y/otp/impl/DefaultSecretServiceTests.java → ...java/security/otp/SecretServiceTests.java b/...y/otp/impl/DefaultSecretServiceTests.java → ...java/security/otp/SecretServiceTests.java
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-package se.sawano.java.security.otp.impl;
+package se.sawano.java.security.otp;
 
 import org.junit.Test;
+import se.sawano.java.security.otp.SecretService;
 import se.sawano.java.security.otp.ShaAlgorithm;
 import se.sawano.java.security.otp.SharedSecret;
+import se.sawano.java.security.otp.impl.RandomSupplier;
 
 import static org.junit.Assert.assertEquals;
 import static se.sawano.java.security.otp.ShaAlgorithm.*;
 
-public class DefaultSecretServiceTests {
+public class SecretServiceTests {
 
     public static final String ASCII_SECRET_FROM_RFC6238 = "12345678901234567890";
     public static final String EXPECTED_SHA1_HEX_SECRET_FROM_RFC_6238_EXAMPLE = "3132333435363738393031323334353637383930";
@@ -73,7 +75,7 @@ private void givenAlgorithm(final ShaAlgorithm algorithm) {
     }
 
     private void whenGeneratingSecret() {
-        final DefaultSecretService secretService = new DefaultSecretService(fakeRandomSupplier());
+        final SecretService secretService = new SecretService(fakeRandomSupplier());
         secret = secretService.generateSharedSecret(algorithm);
     }
 

diff --git a/src/test/java/se/sawano/java/security/otp/TestDataHelper.java b/src/test/java/se/sawano/java/security/otp/TestDataHelper.java
@@ -18,10 +18,6 @@
 
 import org.apache.commons.codec.binary.Base32;
 import org.junit.Test;
-import se.sawano.java.security.otp.SharedSecret;
-import se.sawano.java.security.otp.TOTP;
-import se.sawano.java.security.otp.TOTPService;
-import se.sawano.java.security.otp.impl.DefaultSecretService;
 
 import static se.sawano.java.security.otp.ShaAlgorithm.SHA1;
 import static se.sawano.java.security.otp.ShaAlgorithm.SHA256;
@@ -34,7 +30,7 @@ public class TestDataHelper {
 
     @Test
     public void should_generate_new_secret() throws Exception {
-        final SharedSecret secret = new DefaultSecretService().generateSharedSecret(SHA1);
+        final SharedSecret secret = new SecretService().generateSharedSecret(SHA1);
 
         System.out.println(new Base32(false).encodeAsString(secret.value()));