Have the scope resolve the metadata path instead

Author: cody-constine-ttd

src/main/java/com/uid2/shared/store/EncryptedRotatingSaltProvider.java

@@ -1,8 +1,10 @@
 package com.uid2.shared.store;
 
+import com.uid2.shared.Const;
 import com.uid2.shared.cloud.DownloadCloudStorage;
 import com.uid2.shared.model.SaltEntry;
 import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider;
+import com.uid2.shared.store.scope.StoreScope;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,8 +15,8 @@
 public class EncryptedRotatingSaltProvider extends RotatingSaltProvider {
     private final RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider;
 
-    public EncryptedRotatingSaltProvider(DownloadCloudStorage fileStreamProvider, String metadataPath, RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider) {
-        super(fileStreamProvider, metadataPath);
+    public EncryptedRotatingSaltProvider(DownloadCloudStorage fileStreamProvider, RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider, StoreScope scope) {
+        super(fileStreamProvider, scope.getMetadataPath().toString());
         this.cloudEncryptionKeyProvider = cloudEncryptionKeyProvider;
     }
 

src/test/java/com/uid2/shared/store/EncryptedRotatingSaltProviderTest.java

@@ -4,6 +4,7 @@
 import com.uid2.shared.encryption.AesGcm;
 import com.uid2.shared.model.CloudEncryptionKey;
 import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider;
+import com.uid2.shared.store.scope.EncryptedScope;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import org.junit.jupiter.api.AfterEach;
@@ -67,6 +68,14 @@ private InputStream getEncryptedStream(String content) {
         return new ByteArrayInputStream(encryptedContent.getBytes(StandardCharsets.UTF_8));
     }
 
+    @Test
+    public void metadataPath() {
+        EncryptedRotatingSaltProvider saltsProvider = new EncryptedRotatingSaltProvider(
+                cloudStorage, keyProvider, new EncryptedScope(new CloudPath("salts/metadata.json"), 1, true));
+
+        assertEquals("salts/encrypted/1_public/metadata.json", saltsProvider.getMetadataPath());
+    }
+
     @Test
     public void loadSaltSingleVersion() throws Exception {
         final String FIRST_LEVEL_SALT = "first_level_salt_value";
@@ -106,13 +115,13 @@ public void loadSaltSingleVersion() throws Exception {
                 "1000006," + effectiveTimeString + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=\n" +
                 "1000007," + effectiveTimeString + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=";
 
-        when(cloudStorage.download("metadata"))
+        when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
                 .thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
         when(cloudStorage.download("salts.txt"))
                 .thenReturn(getEncryptedStream(salts));
 
         EncryptedRotatingSaltProvider saltsProvider = new EncryptedRotatingSaltProvider(
-                cloudStorage, "metadata", keyProvider);
+                cloudStorage, keyProvider, new EncryptedScope(new CloudPath("sites/metadata.json"), 1, true));
 
         final JsonObject loadedMetadata = saltsProvider.getMetadata();
         saltsProvider.loadContent(loadedMetadata);
@@ -157,13 +166,13 @@ public void loadSaltSingleVersion1mil() throws Exception {
             salts.append(i).append(",").append(effectiveTimeString).append(",").append("salt-string").append("\n");
         }
 
-        when(cloudStorage.download("metadata"))
+        when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
                 .thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
         when(cloudStorage.download("salts.txt"))
                 .thenReturn(getEncryptedStream(salts.toString()));
 
         EncryptedRotatingSaltProvider saltsProvider = new EncryptedRotatingSaltProvider(
-                cloudStorage, "metadata", keyProvider);
+                cloudStorage, keyProvider, new EncryptedScope(new CloudPath("sites/metadata.json"), 1, true));
 
         final JsonObject loadedMetadata = saltsProvider.getMetadata();
         saltsProvider.loadContent(loadedMetadata);
@@ -235,15 +244,15 @@ public void loadSaltMultipleVersions() throws Exception {
                 "1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=\n" +
                 "1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=";
 
-        when(cloudStorage.download("metadata"))
+        when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
                 .thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
         when(cloudStorage.download("saltsV1.txt"))
                 .thenReturn(getEncryptedStream(saltsV1));
         when(cloudStorage.download("saltsV2.txt"))
                 .thenReturn(getEncryptedStream(saltsV2));
 
         EncryptedRotatingSaltProvider saltsProvider = new EncryptedRotatingSaltProvider(
-                cloudStorage, "metadata", keyProvider);
+                cloudStorage, keyProvider, new EncryptedScope(new CloudPath("sites/metadata.json"), 1, true));
 
         final JsonObject loadedMetadata = saltsProvider.getMetadata();
         saltsProvider.loadContent(loadedMetadata);
@@ -317,15 +326,15 @@ public void loadSaltMultipleVersionsExpired() throws Exception {
                         "1000006," + effectiveTimeStringV1 + ",MtpALOziEJMtPlCQHk6RHALuWvRvRZpCDBmO0xPAia0=\n" +
                         "1000007," + effectiveTimeStringV1 + ",7tjv+KXaSztTZHEHULacotHQ7IpGBcw6IymoRLObkT4=";
 
-        when(cloudStorage.download("metadata"))
+        when(cloudStorage.download("sites/encrypted/1_public/metadata.json"))
                 .thenReturn(new ByteArrayInputStream(metadataJson.toString().getBytes(StandardCharsets.US_ASCII)));
         when(cloudStorage.download("saltsV1.txt"))
                 .thenReturn(getEncryptedStream(saltsV1));
         when(cloudStorage.download("saltsV2.txt"))
                 .thenReturn(getEncryptedStream(saltsV2));
 
         EncryptedRotatingSaltProvider saltsProvider = new EncryptedRotatingSaltProvider(
-                cloudStorage, "metadata", keyProvider);
+                cloudStorage, keyProvider, new EncryptedScope(new CloudPath("sites/metadata.json"), 1, true));
 
         final JsonObject loadedMetadata = saltsProvider.getMetadata();
         saltsProvider.loadContent(loadedMetadata);