Adding logic for salts and clientSideKeys

Author: cody-constine-ttd

src/main/java/com/uid2/core/service/ClientSideKeypairMetadataProvider.java

@@ -1,6 +1,7 @@
 package com.uid2.core.service;
 
 import com.uid2.core.model.SecretStore;
+import com.uid2.core.util.OperatorInfo;
 import com.uid2.shared.cloud.ICloudStorage;
 import com.uid2.shared.store.CloudPath;
 import com.uid2.shared.store.scope.GlobalScope;
@@ -24,7 +25,7 @@ public ClientSideKeypairMetadataProvider(ICloudStorage cloudStorage) {
     }
 
     @Override
-    public String getMetadata() throws Exception {
+    public String getMetadata(OperatorInfo info) throws Exception {
         String pathname = new GlobalScope(new CloudPath(SecretStore.Global.get(ClientSideKeypairMetadataPathName))).getMetadataPath().toString();
         String original = readToEndAsString(metadataStreamProvider.download(pathname));
         JsonObject main = (JsonObject) Json.decodeValue(original);

src/main/java/com/uid2/core/service/IClientSideKeypairMetadataProvider.java

@@ -1,6 +1,8 @@
 package com.uid2.core.service;
 
 
+import com.uid2.core.util.OperatorInfo;
+
 public interface IClientSideKeypairMetadataProvider {
-    String getMetadata() throws Exception;
+    String getMetadata(OperatorInfo info) throws Exception;
 }

src/main/java/com/uid2/core/service/ISaltMetadataProvider.java

@@ -1,5 +1,7 @@
 package com.uid2.core.service;
 
+import com.uid2.core.util.OperatorInfo;
+
 public interface ISaltMetadataProvider {
-    String getMetadata() throws Exception;
+    String getMetadata(OperatorInfo info) throws Exception;
 }

src/main/java/com/uid2/core/service/SaltMetadataProvider.java

@@ -1,6 +1,7 @@
 package com.uid2.core.service;
 
 import com.uid2.core.model.SecretStore;
+import com.uid2.core.util.OperatorInfo;
 import com.uid2.shared.cloud.ICloudStorage;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
@@ -9,6 +10,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+
+import static com.uid2.core.util.MetadataHelper.getMetadataPathName;
 import static com.uid2.core.util.MetadataHelper.readToEndAsString;
 
 public class SaltMetadataProvider implements ISaltMetadataProvider {
@@ -28,8 +31,9 @@ public SaltMetadataProvider(ICloudStorage fileStreamProvider, ICloudStorage down
     }
 
     @Override
-    public String getMetadata() throws Exception {
-        String original = readToEndAsString(metadataStreamProvider.download(SecretStore.Global.get(SaltsMetadataPathName)));
+    public String getMetadata(OperatorInfo info) throws Exception {
+        String pathname = getMetadataPathName(info, SecretStore.Global.get(SaltsMetadataPathName));
+        String original = readToEndAsString(metadataStreamProvider.download(pathname));
         JsonObject main = (JsonObject) Json.decodeValue(original);
         JsonArray salts = main.getJsonArray("salts");
         for(int i=0;i<salts.size();++i) {

src/main/java/com/uid2/core/vertx/CoreVerticle.java

@@ -392,8 +392,9 @@ private void handleSiteRefresh(RoutingContext rc) {
 
     private void handleSaltRefresh(RoutingContext rc) {
         try {
+            OperatorInfo info = OperatorInfo.getOperatorInfo(rc);
             rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-                    .end(saltMetadataProvider.getMetadata());
+                    .end(saltMetadataProvider.getMetadata(info));
         } catch (Exception e) {
             logger.warn("exception in handleSaltRefresh: " + e.getMessage(), e);
             Error("error", 500, rc, "error processing salt refresh");
@@ -463,7 +464,7 @@ private void handleClientSideKeypairRefresh(RoutingContext rc) {
                 return;
             }
             rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-                    .end(clientSideKeypairMetadataProvider.getMetadata());
+                    .end(clientSideKeypairMetadataProvider.getMetadata(info));
         } catch (Exception e) {
             logger.warn("exception in handleClientSideKeypairRefresh: " + e.getMessage(), e);
             Error("error", 500, rc, "error processing client_side_keypairs refresh");