Cbc UI d2 4454 cloud encryption operator #1175
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package com.uid2.operator.reader; | ||
|
|
||
| import com.uid2.shared.cloud.DownloadCloudStorage; | ||
| import com.uid2.shared.store.ScopedStoreReader; | ||
| import com.uid2.shared.store.parser.Parser; | ||
| import com.uid2.shared.store.parser.ParsingResult; | ||
| import com.uid2.shared.store.scope.StoreScope; | ||
| import io.vertx.core.json.JsonArray; | ||
| import io.vertx.core.json.JsonObject; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.InputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| public class ApiStoreReader<T> extends ScopedStoreReader<T> { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(ApiStoreReader.class); | ||
|
|
||
| public ApiStoreReader(DownloadCloudStorage fileStreamProvider, StoreScope scope, Parser<T> parser, String dataTypeName) { | ||
| super(fileStreamProvider, scope, parser, dataTypeName); | ||
| } | ||
|
|
||
| @Override | ||
| public long loadContent(JsonObject contents, String dataType) throws Exception { | ||
| if (contents == null) { | ||
| throw new IllegalArgumentException(String.format("No contents provided for loading data type %s, cannot load content", dataType)); | ||
| } | ||
|
|
||
| try { | ||
| JsonArray dataArray = contents.getJsonArray(dataType); | ||
| if (dataArray == null) { | ||
| throw new IllegalArgumentException("No array found in the contents"); | ||
| } | ||
|
|
||
| String jsonString = dataArray.toString(); | ||
| InputStream inputStream = new ByteArrayInputStream(jsonString.getBytes(StandardCharsets.UTF_8)); | ||
|
|
||
| ParsingResult<T> parsed = parser.deserialize(inputStream); | ||
| latestSnapshot.set(parsed.getData()); | ||
|
|
||
| final int count = parsed.getCount(); | ||
| latestEntryCount.set(count); | ||
| LOGGER.info(String.format("Loaded %d %s", count, dataTypeName)); | ||
| return count; | ||
| } catch (Exception e) { | ||
| LOGGER.error(String.format("Unable to load %s", dataTypeName)); | ||
| throw e; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package com.uid2.operator.reader; | ||
|
|
||
| import com.uid2.shared.cloud.DownloadCloudStorage; | ||
| import com.uid2.shared.model.CloudEncryptionKey; | ||
| import com.uid2.shared.store.CloudPath; | ||
| import com.uid2.shared.store.parser.CloudEncryptionKeyParser; | ||
| import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider; | ||
| import com.uid2.shared.store.scope.StoreScope; | ||
| import io.vertx.core.json.JsonObject; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.*; | ||
|
|
||
| public class RotatingCloudEncryptionKeyApiProvider extends RotatingCloudEncryptionKeyProvider { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(RotatingCloudEncryptionKeyApiProvider.class); | ||
|
|
||
| public ApiStoreReader<Map<Integer, CloudEncryptionKey>> apiStoreReader; | ||
|
|
||
| public RotatingCloudEncryptionKeyApiProvider(DownloadCloudStorage fileStreamProvider, StoreScope scope) { | ||
| super(fileStreamProvider, scope); | ||
| this.apiStoreReader = new ApiStoreReader<>(fileStreamProvider, scope, new CloudEncryptionKeyParser(), "cloud_encryption_keys"); | ||
| } | ||
|
|
||
| @Override | ||
| public JsonObject getMetadata() throws Exception { | ||
| return apiStoreReader.getMetadata(); | ||
| } | ||
|
|
||
| @Override | ||
| public CloudPath getMetadataPath() { | ||
| return apiStoreReader.getMetadataPath(); | ||
| } | ||
|
|
||
| @Override | ||
| public long loadContent(JsonObject metadata) throws Exception { | ||
| return apiStoreReader.loadContent(metadata, "cloudEncryptionKeys"); | ||
| } | ||
|
|
||
| @Override | ||
| public long getVersion(JsonObject metadata) { | ||
| return Instant.now().getEpochSecond(); | ||
|
There was a problem hiding this comment. why isn't it metadata.getLong("version") ? There was a problem hiding this comment. Because this is using an API to get the data not a file, so there is no metadata to look the version up in. So I just used the time here to force a refresh everytime There was a problem hiding this comment. This probably needs a comment explaining why you are doing this as I feel we will forget |
||
| } | ||
|
|
||
| @Override | ||
| public Map<Integer, CloudEncryptionKey> getAll() { | ||
| Map<Integer, CloudEncryptionKey> keys = apiStoreReader.getSnapshot(); | ||
| return keys != null ? keys : new HashMap<>(); | ||
| } | ||
|
|
||
| @Override | ||
| public void loadContent() throws Exception { | ||
| this.loadContent(this.getMetadata()); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| [ { | ||
|
There was a problem hiding this comment. Indentation format like this: https://github.com/IABTechLab/uid2-admin/blob/main/src/main/resources/localstack/s3/core/keys/keys.json? |
||
| "id" : 1, | ||
| "siteId" : 999, | ||
| "activates" : 1720641670, | ||
| "created" : 1720641670, | ||
| "secret" : "mydrCudb2PZOm01Qn0SpthltmexHUAA11Hy1m+uxjVw=" | ||
| }, { | ||
| "id" : 2, | ||
| "siteId" : 999, | ||
| "activates" : 1720728070, | ||
| "created" : 1720641670, | ||
| "secret" : "FtdslrFSsvVXOuhOWGwEI+0QTkCvM8SGZAP3k2u3PgY=" | ||
| }, { | ||
| "id" : 3, | ||
| "siteId" : 999, | ||
| "activates" : 1720814470, | ||
| "created" : 1720641670, | ||
| "secret" : "/7zO6QbKrhZKIV36G+cU9UR4hZUVg5bD+KjbczICjHw=" | ||
| }, { | ||
| "id" : 4, | ||
| "siteId" : 123, | ||
| "activates" : 1720641671, | ||
| "created" : 1720641671, | ||
| "secret" : "XjiqRlWQQJGLr7xfV1qbueKwyzt881GVohuUkQt/ht4=" | ||
| }, { | ||
| "id" : 5, | ||
| "siteId" : 123, | ||
| "activates" : 1720728071, | ||
| "created" : 1720641671, | ||
| "secret" : "QmpIf5NzO+UROjl5XjB/BmF6paefM8n6ub9B2plC9aI=" | ||
| }, { | ||
| "id" : 6, | ||
| "siteId" : 123, | ||
| "activates" : 1720814471, | ||
| "created" : 1720641671, | ||
| "secret" : "40w9UMSYxGm+KldOWOXhBGI8QgjvUUQjivtkP4VpKV8=" | ||
| }, { | ||
| "id" : 7, | ||
| "siteId" : 124, | ||
| "activates" : 1720641671, | ||
| "created" : 1720641671, | ||
| "secret" : "QdwD0kQV1BwmLRD0PH1YpqgaOrgpVTfu08o98mSZ6uE=" | ||
| }, { | ||
| "id" : 8, | ||
| "siteId" : 124, | ||
| "activates" : 1720728071, | ||
| "created" : 1720641671, | ||
| "secret" : "yCVCM/HLf9/6k+aUNrx7w17VbyfSzI8JykLQLSR+CW0=" | ||
| }, { | ||
| "id" : 9, | ||
| "siteId" : 124, | ||
| "activates" : 1720814471, | ||
| "created" : 1720641671, | ||
| "secret" : "JqHl8BrTyx9XpR2lYj/5xvUpzgnibGeomETTwF4rn1U=" | ||
| }, { | ||
| "id" : 10, | ||
| "siteId" : 127, | ||
| "activates" : 1720641671, | ||
| "created" : 1720641671, | ||
| "secret" : "JqiG1b34AvrdO3Aj6cCcjOBJMijrDzTmrR+p9ZtP2es=" | ||
| }, { | ||
| "id" : 11, | ||
| "siteId" : 127, | ||
| "activates" : 1720728072, | ||
| "created" : 1720641672, | ||
| "secret" : "lp1CyHdfc7K0aO5JGpA+Ve5Z/V5LImtGEQwCg/YB0kY=" | ||
| }, { | ||
| "id" : 12, | ||
| "siteId" : 127, | ||
| "activates" : 1720814472, | ||
| "created" : 1720641672, | ||
| "secret" : "G99rFYJF+dnSlk/xG6fuC3WNqQxTLJbDIdVyPMbGQ6s=" | ||
| } ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "version": 1, | ||
| "generated": 1620253519, | ||
| "cloud_encryption_keys": { | ||
| "location": "/com.uid2.core/test/cloud_encryption_keys/cloud_encryption_keys.json" | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does this need to be public?