Skip to content

Commit aeaba3a

Browse files
cody-constine-ttdcody-constine-ttd
authored
Merge pull request #164 from IABTechLab/cbc-UID2-4379-rename-s3-encryption-cloud-encryption
Started the rename of core too
2 parents c5678be + 7063cfd commit aeaba3a

File tree

14 files changed

+82
-86
lines changed

14 files changed

+82
-86
lines changed

‎.github/workflows/check-stable-dependency.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ on: [pull_request, workflow_dispatch]
33

44
jobs:
55
check_dependency:
6-
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v2
6+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v3
77
secrets: inherit

‎conf/default-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
"att_token_enc_key": null,
1818
"att_token_enc_salt": null,
1919
"enforceJwt": false,
20-
"s3_keys_metadata_path": null
20+
"cloud_encryption_keys_metadata_path": null
2121
}

‎conf/integ-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
"keyset_keys_metadata_path": "uid2/keyset_keys/metadata.json",
1919
"salts_metadata_path": "uid2/salts/metadata.json",
2020
"enforceJwt": false,
21-
"s3_keys_metadata_path": "uid2/s3encryption_keys/metadata.json"
21+
"cloud_encryption_keys_metadata_path": "uid2/cloud_encryption_keys/metadata.json"
2222
}

‎conf/local-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
"att_token_enc_salt": "<salt-for-attestation-token>",
2020
"provide_private_site_data": true,
2121
"enforceJwt": false,
22-
"s3_keys_metadata_path": "/com.uid2.core/test/s3encryption_keys/metadata.json"
22+
"cloud_encryption_keys_metadata_path": "/com.uid2.core/test/cloud_encryption_keys/metadata.json"
2323
}

‎conf/local-e2e-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
"aws_kms_jwt_signing_public_keys": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvwB41qI5Fe41PDbXqcX5uOvSvfKh8l9QV0O3M+NsB4lKqQEP0t1hfoiXTpOgKz1ArYxHsQ2LeXifX4uwEbYJFlpVM+tyQkTWQjBOw6fsLYK2Xk4X2ylNXUUf7x3SDiOVxyvTh3OZW9kqrDBN9JxSoraNLyfw0hhW0SHpfs699SehgbQ7QWep/gVlKRLIz0XAXaZNw24s79ORcQlrCE6YD0PgQmpI/dK5xMML82n6y3qcTlywlGaU7OGIMdD+CTXA3BcOkgXeqZTXNaX1u6jCTa1lvAczun6avp5VZ4TFiuPo+y4rJ3GU+14cyT5NckEcaTKSvd86UdwK5Id9tl3bQIDAQAB",
3434
"core_public_url": "http://localhost:8088",
3535
"optout_url": "http://localhost:8081",
36-
"s3_keys_metadata_path": "s3encryption_keys/metadata.json"
36+
"cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json"
3737
}

‎conf/local-e2e-docker-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
"aws_kms_jwt_signing_public_keys": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvwB41qI5Fe41PDbXqcX5uOvSvfKh8l9QV0O3M+NsB4lKqQEP0t1hfoiXTpOgKz1ArYxHsQ2LeXifX4uwEbYJFlpVM+tyQkTWQjBOw6fsLYK2Xk4X2ylNXUUf7x3SDiOVxyvTh3OZW9kqrDBN9JxSoraNLyfw0hhW0SHpfs699SehgbQ7QWep/gVlKRLIz0XAXaZNw24s79ORcQlrCE6YD0PgQmpI/dK5xMML82n6y3qcTlywlGaU7OGIMdD+CTXA3BcOkgXeqZTXNaX1u6jCTa1lvAczun6avp5VZ4TFiuPo+y4rJ3GU+14cyT5NckEcaTKSvd86UdwK5Id9tl3bQIDAQAB",
3333
"core_public_url": "http://core:8088",
3434
"optout_url": "http://optout:8081",
35-
"s3_keys_metadata_path": "s3encryption_keys/metadata.json"
35+
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json"
3636
}

‎pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-core</artifactId>
9-
<version>2.20.14</version>
9+
<version>2.20.19-alpha-58-SNAPSHOT</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -24,7 +24,7 @@
2424
<vertx.verticle>com.uid2.core.vertx.CoreVerticle</vertx.verticle>
2525
<launcher.class>io.vertx.core.Launcher</launcher.class>
2626

27-
<uid2-shared.version>7.21.7</uid2-shared.version>
27+
<uid2-shared.version>8.0.0</uid2-shared.version>
2828
<image.version>${project.version}</image.version>
2929
</properties>
3030

@@ -97,11 +97,6 @@
9797
<artifactId>vertx-web-client</artifactId>
9898
<version>${vertx.version}</version>
9999
</dependency>
100-
<dependency>
101-
<groupId>com.google.auth</groupId>
102-
<artifactId>google-auth-library-oauth2-http</artifactId>
103-
<version>1.23.0</version>
104-
</dependency>
105100
<dependency>
106101
<groupId>io.vertx</groupId>
107102
<artifactId>vertx-micrometer-metrics</artifactId>

‎src/main/java/com/uid2/core/Main.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import com.uid2.shared.attest.JwtService;
1515
import com.uid2.shared.auth.EnclaveIdentifierProvider;
1616
import com.uid2.shared.auth.RotatingOperatorKeyProvider;
17-
import com.uid2.shared.store.reader.RotatingS3KeyProvider;
18-
import com.uid2.shared.model.S3Key;
17+
import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider;
18+
import com.uid2.shared.model.CloudEncryptionKey;
1919
import com.uid2.shared.cloud.CloudUtils;
2020
import com.uid2.shared.cloud.EmbeddedResourceStorage;
2121
import com.uid2.shared.cloud.ICloudStorage;
@@ -106,7 +106,7 @@ public static void main(String[] args) {
106106

107107
RotatingStoreVerticle enclaveRotatingVerticle = null;
108108
RotatingStoreVerticle operatorRotatingVerticle = null;
109-
RotatingStoreVerticle s3KeyRotatingVerticle = null;
109+
RotatingStoreVerticle cloudEncryptionKeyRotatingVerticle = null;
110110
CoreVerticle coreVerticle = null;
111111
try {
112112
CloudPath operatorMetadataPath = new CloudPath(config.getString(Const.Config.OperatorsMetadataPathProp));
@@ -118,10 +118,10 @@ public static void main(String[] args) {
118118
EnclaveIdentifierProvider enclaveIdProvider = new EnclaveIdentifierProvider(cloudStorage, enclaveMetadataPath);
119119
enclaveRotatingVerticle = new RotatingStoreVerticle("enclaves", 60000, enclaveIdProvider);
120120

121-
CloudPath s3KeyMetadataPath = new CloudPath(config.getString(Const.Config.S3keysMetadataPathProp));
122-
GlobalScope s3KeyScope = new GlobalScope(s3KeyMetadataPath);
123-
RotatingS3KeyProvider s3KeyProvider = new RotatingS3KeyProvider(cloudStorage, s3KeyScope);
124-
s3KeyRotatingVerticle = new RotatingStoreVerticle("s3encryption_keys", 60000, s3KeyProvider);
121+
CloudPath cloudEncryptionKeyMetadataPath = new CloudPath(config.getString(Const.Config.CloudEncryptionKeysMetadataPathProp));
122+
GlobalScope cloudEncryptionKeyScope = new GlobalScope(cloudEncryptionKeyMetadataPath);
123+
RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider = new RotatingCloudEncryptionKeyProvider(cloudStorage, cloudEncryptionKeyScope);
124+
cloudEncryptionKeyRotatingVerticle = new RotatingStoreVerticle("cloud_encryption_keys", 60000, cloudEncryptionKeyProvider);
125125

126126
String corePublicUrl = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
127127
AttestationService attestationService = new AttestationService()
@@ -157,15 +157,15 @@ public static void main(String[] args) {
157157

158158
JwtService jwtService = new JwtService(config);
159159

160-
coreVerticle = new CoreVerticle(cloudStorage, operatorKeyProvider, attestationService, attestationTokenService, enclaveIdProvider, operatorJWTTokenProvider, jwtService, s3KeyProvider);
160+
coreVerticle = new CoreVerticle(cloudStorage, operatorKeyProvider, attestationService, attestationTokenService, enclaveIdProvider, operatorJWTTokenProvider, jwtService, cloudEncryptionKeyProvider);
161161
} catch (Exception e) {
162162
System.out.println("failed to initialize core verticle: " + e.getMessage());
163163
System.exit(-1);
164164
}
165165

166166
vertx.deployVerticle(enclaveRotatingVerticle);
167167
vertx.deployVerticle(operatorRotatingVerticle);
168-
vertx.deployVerticle(s3KeyRotatingVerticle);
168+
vertx.deployVerticle(cloudEncryptionKeyRotatingVerticle);
169169
vertx.deployVerticle(coreVerticle);
170170
});
171171
}

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@
5050
import java.time.Instant;
5151
import java.util.*;
5252

53-
import com.uid2.shared.store.reader.RotatingS3KeyProvider;
54-
import com.uid2.shared.model.S3Key;
53+
import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider;
54+
import com.uid2.shared.model.CloudEncryptionKey;
55+
5556

5657
import static com.uid2.shared.Const.Config.EnforceJwtProp;
5758

@@ -79,7 +80,7 @@ public class CoreVerticle extends AbstractVerticle {
7980
private final ISaltMetadataProvider saltMetadataProvider;
8081
private final IPartnerMetadataProvider partnerMetadataProvider;
8182
private final OperatorJWTTokenProvider operatorJWTTokenProvider;
82-
private final RotatingS3KeyProvider s3KeyProvider;
83+
private final RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider;
8384

8485
public CoreVerticle(ICloudStorage cloudStorage,
8586
IAuthorizableProvider authProvider,
@@ -88,7 +89,7 @@ public CoreVerticle(ICloudStorage cloudStorage,
8889
IEnclaveIdentifierProvider enclaveIdentifierProvider,
8990
OperatorJWTTokenProvider operatorJWTTokenProvider,
9091
JwtService jwtService,
91-
RotatingS3KeyProvider s3KeyProvider) throws Exception {
92+
RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider) throws Exception {
9293
this.operatorJWTTokenProvider = operatorJWTTokenProvider;
9394
this.healthComponent.setHealthStatus(false, "not started");
9495

@@ -98,7 +99,7 @@ public CoreVerticle(ICloudStorage cloudStorage,
9899
this.attestationTokenService = attestationTokenService;
99100
this.enclaveIdentifierProvider = enclaveIdentifierProvider;
100101
this.enclaveIdentifierProvider.addListener(this.attestationService);
101-
this.s3KeyProvider = s3KeyProvider;
102+
this.cloudEncryptionKeyProvider = cloudEncryptionKeyProvider;
102103

103104
final String jwtAudience = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
104105
final String jwtIssuer = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
@@ -178,7 +179,7 @@ private Router createRoutesSetup() {
178179
router.post("/attest")
179180
.handler(new AttestationFailureHandler())
180181
.handler(auth.handle(this::handleAttestAsync, Role.OPERATOR, Role.OPTOUT_SERVICE));
181-
router.get("/s3encryption_keys/retrieve").handler(auth.handle(attestationMiddleware.handle(this::handleS3EncryptionKeysRetrieval), Role.OPERATOR));
182+
router.get("/cloud_encryption_keys/retrieve").handler(auth.handle(attestationMiddleware.handle(this::handleCloudEncryptionKeysRetrieval), Role.OPERATOR));
182183
router.get("/sites/refresh").handler(auth.handle(attestationMiddleware.handle(this::handleSiteRefresh), Role.OPERATOR));
183184
router.get("/key/refresh").handler(auth.handle(attestationMiddleware.handle(this::handleKeyRefresh), Role.OPERATOR));
184185
router.get("/key/acl/refresh").handler(auth.handle(attestationMiddleware.handle(this::handleKeyAclRefresh), Role.OPERATOR));
@@ -609,24 +610,24 @@ private void handleEnclaveUnregister(RoutingContext rc) {
609610
handleEnclaveChange(rc, true);
610611
}
611612

612-
void handleS3EncryptionKeysRetrieval(RoutingContext rc) {
613+
void handleCloudEncryptionKeysRetrieval(RoutingContext rc) {
613614
try {
614615
OperatorInfo info = OperatorInfo.getOperatorInfo(rc);
615616
int siteId = info.getSiteId();
616-
List<S3Key> s3Keys = s3KeyProvider.getKeys(siteId);
617+
List<CloudEncryptionKey> cloudEncryptionKeys = cloudEncryptionKeyProvider.getKeys(siteId);
617618

618-
if (s3Keys == null || s3Keys.isEmpty()) {
619-
Error("No S3 keys found", 500, rc, "No S3 keys found for siteId: " + siteId);
619+
if (cloudEncryptionKeys == null || cloudEncryptionKeys.isEmpty()) {
620+
Error("No Cloud Encryption keys found", 500, rc, "No Cloud Encryption keys found for siteId: " + siteId);
620621
return;
621622
}
622623

623624
JsonObject response = new JsonObject()
624-
.put("s3Keys", new JsonArray(s3Keys));
625+
.put("cloudEncryptionKeys", new JsonArray(cloudEncryptionKeys));
625626

626627
rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
627628
.end(response.encode());
628629
} catch (Exception e) {
629-
logger.error("Error in handleRefreshS3Keys: ", e);
630+
logger.error("Error in handleRefreshCloudEncryptionKeys: ", e);
630631
Error("error", 500, rc, "error generating attestation token");
631632
}
632633
}

‎src/main/resources/com.uid2.core/test/s3encryption_keys/s3encryption_keys.json renamed to ‎src/main/resources/com.uid2.core/test/cloud_encryption_keys/cloud_encryption_keys.json

File renamed without changes.

‎src/main/resources/com.uid2.core/test/cloud_encryption_keys/metadata.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"version": 1,
3+
"generated": 1620253519,
4+
"cloud_encryption_keys": {
5+
"location": "/com.uid2.core/test/cloud_encryption_keys/cloud_encryption_keys.json"
6+
}
7+
}

‎src/main/resources/com.uid2.core/test/s3encryption_keys/metadata.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)