extended KeyStoreTests for SqliteKeyStore

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

de.srsoftware.oidc.api/src/test/java/de/srsoftware/oidc/api/KeyStoreTest.java

@@ -1,5 +1,5 @@
 /* © SRSoftware 2024 */
-package de.srsoftware.oidc.datastore.file;
+package de.srsoftware.oidc.api;
 
 import static de.srsoftware.oidc.api.Constants.EXPIRATION;
 import static de.srsoftware.utils.Strings.uuid;
@@ -7,48 +7,16 @@ import static org.jose4j.jws.AlgorithmIdentifiers.RSA_USING_SHA256;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import de.srsoftware.oidc.api.KeyManager;
-import de.srsoftware.oidc.api.KeyStorage;
-import de.srsoftware.utils.PasswordHasher;
-import de.srsoftware.utils.UuidHasher;
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.NoSuchAlgorithmException;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
-import java.util.UUID;
 import org.jose4j.jwk.RsaJwkGenerator;
 import org.jose4j.lang.JoseException;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class KeyStoreTest {
+public abstract class KeyStoreTest {
-	private File	   storage = new File("/tmp/" + UUID.randomUUID());
+	protected abstract KeyStorage keyStore();
-	private UuidHasher hasher;
-	private KeyStorage keyStore;
-
-
-	protected PasswordHasher<String> hasher() {
-		if (hasher == null) try {
-				hasher = new UuidHasher();
-			} catch (NoSuchAlgorithmException e) {
-				throw new RuntimeException(e);
-			}
-
-		return hasher;
-	}
-
-	@BeforeEach
-	public void setup() throws IOException {
-		if (storage.exists()) {
-			Files.walk(storage.toPath()).map(Path::toFile).forEach(File::delete);
-			storage.delete();
-		}
-		keyStore = new PlaintextKeyStore(storage.toPath());
-	}
 
 	@Test
 	void testStoreAndLoad() throws JoseException, IOException, KeyManager.KeyCreationException {
@@ -57,8 +25,8 @@ public class KeyStoreTest {
 		key.setAlgorithm(RSA_USING_SHA256);
 		key.setKeyId(keyId);
 		key.setOtherParameter(EXPIRATION, Instant.now().plus(1, ChronoUnit.DAYS).getEpochSecond());
-		keyStore.store(key);
+		keyStore().store(key);
-		var loaded = keyStore.load(keyId);
+		var loaded = keyStore().load(keyId);
 		assertEquals(key.toJson(), loaded.toJson());
 	}
 
@@ -69,16 +37,16 @@ public class KeyStoreTest {
 		key1.setAlgorithm(RSA_USING_SHA256);
 		key1.setKeyId(keyId1);
 		key1.setOtherParameter(EXPIRATION, Instant.now().plus(1, ChronoUnit.DAYS).getEpochSecond());
-		keyStore.store(key1);
+		keyStore().store(key1);
 
 		var keyId2 = uuid();
 		var key2   = RsaJwkGenerator.generateJwk(2048);
 		key2.setAlgorithm(RSA_USING_SHA256);
 		key2.setKeyId(keyId2);
 		key2.setOtherParameter(EXPIRATION, Instant.now().plus(1, ChronoUnit.DAYS).getEpochSecond());
-		keyStore.store(key2);
+		keyStore().store(key2);
 
-		var keyIds = keyStore.listKeys();
+		var keyIds = keyStore().listKeys();
 		assertEquals(2, keyIds.size());
 		assertTrue(keyIds.containsAll(Set.of(keyId1, keyId2)));
 	}
@@ -90,22 +58,22 @@ public class KeyStoreTest {
 		key1.setAlgorithm(RSA_USING_SHA256);
 		key1.setKeyId(keyId1);
 		key1.setOtherParameter(EXPIRATION, Instant.now().plus(1, ChronoUnit.DAYS).getEpochSecond());
-		keyStore.store(key1);
+		keyStore().store(key1);
 
 		var keyId2 = uuid();
 		var key2   = RsaJwkGenerator.generateJwk(2048);
 		key2.setAlgorithm(RSA_USING_SHA256);
 		key2.setKeyId(keyId2);
 		key2.setOtherParameter(EXPIRATION, Instant.now().plus(1, ChronoUnit.DAYS).getEpochSecond());
-		keyStore.store(key2);
+		keyStore().store(key2);
 
-		assertEquals(2, keyStore.listKeys().size());
+		assertEquals(2, keyStore().listKeys().size());
-		keyStore.drop("unknown");
+		keyStore().drop("unknown");
-		assertEquals(2, keyStore.listKeys().size());
+		assertEquals(2, keyStore().listKeys().size());
-		keyStore.drop(keyId2);
+		keyStore().drop(keyId2);
-		assertEquals(1, keyStore.listKeys().size());
+		assertEquals(1, keyStore().listKeys().size());
-		assertTrue(keyStore.listKeys().contains(keyId1));
+		assertTrue(keyStore().listKeys().contains(keyId1));
-		keyStore.drop(keyId1);
+		keyStore().drop(keyId1);
-		assertTrue(keyStore.listKeys().isEmpty());
+		assertTrue(keyStore().listKeys().isEmpty());
 	}
 }

de.srsoftware.oidc.datastore.file/src/test/java/de/srsoftware/oidc/datastore/file/PlaintextKeyStoreTest.java

@@ -0,0 +1,30 @@
+/* © SRSoftware 2024 */
+package de.srsoftware.oidc.datastore.file;
+
+import de.srsoftware.oidc.api.KeyStorage;
+import de.srsoftware.oidc.api.KeyStoreTest;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.UUID;
+import org.junit.jupiter.api.BeforeEach;
+
+public class PlaintextKeyStoreTest extends KeyStoreTest {
+	private KeyStorage keyStore;
+
+	@Override
+	protected KeyStorage keyStore() {
+		return keyStore;
+	}
+
+	@BeforeEach
+	public void setup() throws IOException {
+		var storage = new File("/tmp/" + UUID.randomUUID());
+		if (storage.exists()) {
+			Files.walk(storage.toPath()).map(Path::toFile).forEach(File::delete);
+			storage.delete();
+		}
+		keyStore = new PlaintextKeyStore(storage.toPath());
+	}
+}

de.srsoftware.oidc.datastore.sqlite/src/test/java/de/srsoftware/oidc/datastore/sqlite/SqliteKeyStoreTest.java

@@ -0,0 +1,26 @@
+/* © SRSoftware 2024 */
+package de.srsoftware.oidc.datastore.sqlite;
+
+import static de.srsoftware.utils.Strings.uuid;
+
+import de.srsoftware.oidc.api.KeyStorage;
+import de.srsoftware.oidc.api.KeyStoreTest;
+import java.io.File;
+import java.sql.SQLException;
+import org.junit.jupiter.api.BeforeEach;
+
+public class SqliteKeyStoreTest extends KeyStoreTest {
+	private KeyStorage keyStore;
+
+	@Override
+	protected KeyStorage keyStore() {
+		return keyStore;
+	}
+
+	@BeforeEach
+	public void setup() throws SQLException {
+		var dbFile = new File("/tmp/" + uuid() + ".sqlite");
+		var conn   = new ConnectionProvider().get(dbFile);
+		keyStore   = new SqliteKeyStore(conn);
+	}
+}