Skip to content

Commit 7bfd915

Browse files
cody-constine-ttdcody-constine-ttd
committed
Finished rename
1 parent 557b4f8 commit 7bfd915

File tree

8 files changed

+73
-75
lines changed

8 files changed

+73
-75
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.0</uid2-shared.version>
27+
<uid2-shared.version>7.21.8-alpha-159-SNAPSHOT</uid2-shared.version>
2828
<image.version>${project.version}</image.version>
2929
</properties>
3030

‎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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
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;
5555

5656
import static com.uid2.shared.Const.Config.EnforceJwtProp;
5757

@@ -79,7 +79,7 @@ public class CoreVerticle extends AbstractVerticle {
7979
private final ISaltMetadataProvider saltMetadataProvider;
8080
private final IPartnerMetadataProvider partnerMetadataProvider;
8181
private final OperatorJWTTokenProvider operatorJWTTokenProvider;
82-
private final RotatingS3KeyProvider s3KeyProvider;
82+
private final RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider;
8383

8484
public CoreVerticle(ICloudStorage cloudStorage,
8585
IAuthorizableProvider authProvider,
@@ -88,7 +88,7 @@ public CoreVerticle(ICloudStorage cloudStorage,
8888
IEnclaveIdentifierProvider enclaveIdentifierProvider,
8989
OperatorJWTTokenProvider operatorJWTTokenProvider,
9090
JwtService jwtService,
91-
RotatingS3KeyProvider s3KeyProvider) throws Exception {
91+
RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider) throws Exception {
9292
this.operatorJWTTokenProvider = operatorJWTTokenProvider;
9393
this.healthComponent.setHealthStatus(false, "not started");
9494

@@ -98,7 +98,7 @@ public CoreVerticle(ICloudStorage cloudStorage,
9898
this.attestationTokenService = attestationTokenService;
9999
this.enclaveIdentifierProvider = enclaveIdentifierProvider;
100100
this.enclaveIdentifierProvider.addListener(this.attestationService);
101-
this.s3KeyProvider = s3KeyProvider;
101+
this.cloudEncryptionKeyProvider = cloudEncryptionKeyProvider;
102102

103103
final String jwtAudience = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
104104
final String jwtIssuer = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
@@ -178,7 +178,7 @@ private Router createRoutesSetup() {
178178
router.post("/attest")
179179
.handler(new AttestationFailureHandler())
180180
.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));
181+
router.get("/cloud_encryption_keys/retrieve").handler(auth.handle(attestationMiddleware.handle(this::handleCloudEncryptionKeysRetrieval), Role.OPERATOR));
182182
router.get("/sites/refresh").handler(auth.handle(attestationMiddleware.handle(this::handleSiteRefresh), Role.OPERATOR));
183183
router.get("/key/refresh").handler(auth.handle(attestationMiddleware.handle(this::handleKeyRefresh), Role.OPERATOR));
184184
router.get("/key/acl/refresh").handler(auth.handle(attestationMiddleware.handle(this::handleKeyAclRefresh), Role.OPERATOR));
@@ -609,24 +609,24 @@ private void handleEnclaveUnregister(RoutingContext rc) {
609609
handleEnclaveChange(rc, true);
610610
}
611611

612-
void handleS3EncryptionKeysRetrieval(RoutingContext rc) {
612+
void handleCloudEncryptionKeysRetrieval(RoutingContext rc) {
613613
try {
614614
OperatorInfo info = OperatorInfo.getOperatorInfo(rc);
615615
int siteId = info.getSiteId();
616-
List<S3Key> s3Keys = s3KeyProvider.getKeys(siteId);
616+
List<CloudEncryptionKey> cloudEncryptionKeys = cloudEncryptionKeyProvider.getKeys(siteId);
617617

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

623623
JsonObject response = new JsonObject()
624-
.put("s3Keys", new JsonArray(s3Keys));
624+
.put("cloudEncryptionKeys", new JsonArray(cloudEncryptionKeys));
625625

626626
rc.response().putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
627627
.end(response.encode());
628628
} catch (Exception e) {
629-
logger.error("Error in handleRefreshS3Keys: ", e);
629+
logger.error("Error in handleRefreshCloudEncryptionKeys: ", e);
630630
Error("error", 500, rc, "error generating attestation token");
631631
}
632632
}

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.

‎src/test/java/com/uid2/core/vertx/TestCoreVerticle.java‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.uid2.shared.secure.AttestationFailure;
1515
import com.uid2.shared.secure.AttestationResult;
1616
import com.uid2.shared.secure.ICoreAttestationService;
17-
import com.uid2.shared.store.reader.RotatingS3KeyProvider;
17+
import com.uid2.shared.store.reader.RotatingCloudEncryptionKeyProvider;
1818
import io.vertx.core.*;
1919
import io.vertx.core.buffer.Buffer;
2020
import io.vertx.core.json.JsonArray;
@@ -24,8 +24,6 @@
2424
import io.vertx.junit5.VertxExtension;
2525
import io.vertx.junit5.VertxTestContext;
2626

27-
import static com.uid2.core.service.KeyMetadataProvider.KeysMetadataPathName;
28-
import static com.uid2.shared.Const.Config.KeysetsMetadataPathProp;
2927
import static org.junit.jupiter.api.Assertions.*;
3028

3129
import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +47,7 @@
4947
import java.util.*;
5048
import java.util.concurrent.Callable;
5149

52-
import com.uid2.shared.model.S3Key;
50+
import com.uid2.shared.model.CloudEncryptionKey;
5351
import java.util.Arrays;
5452

5553
import static org.mockito.Mockito.*;
@@ -71,7 +69,7 @@ public class TestCoreVerticle {
7169
@Mock
7270
private JwtService jwtService;
7371
@Mock
74-
private RotatingS3KeyProvider s3KeyProvider;
72+
private RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider;
7573

7674
private AttestationService attestationService;
7775

@@ -118,7 +116,7 @@ void deployVerticle(TestInfo info, Vertx vertx, VertxTestContext testContext) th
118116
}
119117
});
120118

121-
CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, s3KeyProvider);
119+
CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, cloudEncryptionKeyProvider);
122120
vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
123121

124122
}
@@ -641,7 +639,7 @@ void wrongMethodForEndpoint(Vertx vertx, VertxTestContext testContext) {
641639

642640
@Test
643641
void wrongMethodForEndpointS3(Vertx vertx, VertxTestContext testContext) {
644-
post(vertx, "/s3encryption_keys/retrieve", makeAttestationRequestJson(null, null), ar -> {
642+
post(vertx, "/cloud_encryption_keys/retrieve", makeAttestationRequestJson(null, null), ar -> {
645643
try {
646644
HttpResponse response = ar.result();
647645
assertEquals(405, response.statusCode());
@@ -655,37 +653,37 @@ void wrongMethodForEndpointS3(Vertx vertx, VertxTestContext testContext) {
655653

656654
@Tag("dontForceJwt")
657655
@Test
658-
void s3encryptionKeyRetrieveSuccess(Vertx vertx, VertxTestContext testContext) {
656+
void cloudEncryptionKeyRetrieveSuccess(Vertx vertx, VertxTestContext testContext) {
659657
fakeAuth(attestationProtocolPublic, Role.OPERATOR);
660658
addAttestationProvider(attestationProtocolPublic);
661659
onHandleAttestationRequest(() -> {
662660
byte[] resultPublicKey = null;
663661
return Future.succeededFuture(new AttestationResult(resultPublicKey, "test"));
664662
});
665663

666-
S3Key key = new S3Key(1, 88, 1687635529, 1687808329, "newSecret");
664+
CloudEncryptionKey key = new CloudEncryptionKey(1, 88, 1687635529, 1687808329, "newSecret");
667665

668-
List<S3Key> keys = Arrays.asList(key);
669-
when(s3KeyProvider.getKeys(88)).thenReturn(keys);
666+
List<CloudEncryptionKey> keys = Arrays.asList(key);
667+
when(cloudEncryptionKeyProvider.getKeys(88)).thenReturn(keys);
670668

671-
get(vertx, "s3encryption_keys/retrieve", ar -> {
669+
get(vertx, "cloud_encryption_keys/retrieve", ar -> {
672670
try {
673671
if (ar.succeeded()) {
674672
HttpResponse<Buffer> response = ar.result();
675673
assertEquals(200, response.statusCode());
676674

677675
JsonObject json = response.bodyAsJsonObject();
678-
JsonArray s3KeysArray = json.getJsonArray("s3Keys");
676+
JsonArray cloudEncryptionKeysArray = json.getJsonArray("cloudEncryptionKeys");
679677

680-
assertNotNull(s3KeysArray);
681-
assertEquals(1, s3KeysArray.size());
678+
assertNotNull( cloudEncryptionKeysArray);
679+
assertEquals(1, cloudEncryptionKeysArray.size());
682680

683-
JsonObject s3KeyJson = s3KeysArray.getJsonObject(0);
684-
assertEquals(1, s3KeyJson.getInteger("id"));
685-
assertEquals(88, s3KeyJson.getInteger("siteId"));
686-
assertEquals(1687635529, s3KeyJson.getLong("activates"));
687-
assertEquals(1687808329, s3KeyJson.getLong("created"));
688-
assertEquals("newSecret", s3KeyJson.getString("secret"));
681+
JsonObject cloudEncryptionKeyJson = cloudEncryptionKeysArray.getJsonObject(0);
682+
assertEquals(1, cloudEncryptionKeyJson.getInteger("id"));
683+
assertEquals(88, cloudEncryptionKeyJson.getInteger("siteId"));
684+
assertEquals(1687635529, cloudEncryptionKeyJson.getLong("activates"));
685+
assertEquals(1687808329, cloudEncryptionKeyJson.getLong("created"));
686+
assertEquals("newSecret", cloudEncryptionKeyJson.getString("secret"));
689687

690688
testContext.completeNow();
691689
} else {
@@ -700,41 +698,41 @@ void s3encryptionKeyRetrieveSuccess(Vertx vertx, VertxTestContext testContext) {
700698

701699
@Tag("dontForceJwt")
702700
@Test
703-
void s3encryptionKeyRetrieveSuccessWithThreeKeys(Vertx vertx, VertxTestContext testContext) {
701+
void cloudEncryptionencryptionKeyRetrieveSuccessWithThreeKeys(Vertx vertx, VertxTestContext testContext) {
704702
fakeAuth(attestationProtocolPublic, Role.OPERATOR);
705703
addAttestationProvider(attestationProtocolPublic);
706704
onHandleAttestationRequest(() -> {
707705
byte[] resultPublicKey = null;
708706
return Future.succeededFuture(new AttestationResult(resultPublicKey, "test"));
709707
});
710708

711-
// Create 3 S3Key objects
712-
S3Key key1 = new S3Key(1, 88, 1687635529, 1687808329, "secret1");
713-
S3Key key2 = new S3Key(2, 88, 1687635530, 1687808330, "secret2");
714-
S3Key key3 = new S3Key(3, 88, 1687635531, 1687808331, "secret3");
709+
// Create 3 CloudEncryptionKey objects
710+
CloudEncryptionKey key1 = new CloudEncryptionKey(1, 88, 1687635529, 1687808329, "secret1");
711+
CloudEncryptionKey key2 = new CloudEncryptionKey(2, 88, 1687635530, 1687808330, "secret2");
712+
CloudEncryptionKey key3 = new CloudEncryptionKey(3, 88, 1687635531, 1687808331, "secret3");
715713

716-
List<S3Key> keys = Arrays.asList(key1, key2, key3);
717-
when(s3KeyProvider.getKeys(88)).thenReturn(keys);
714+
List<CloudEncryptionKey> keys = Arrays.asList(key1, key2, key3);
715+
when(cloudEncryptionKeyProvider.getKeys(88)).thenReturn(keys);
718716

719-
get(vertx, "s3encryption_keys/retrieve", ar -> {
717+
get(vertx, "cloud_encryption_keys/retrieve", ar -> {
720718
try {
721719
if (ar.succeeded()) {
722720
HttpResponse<Buffer> response = ar.result();
723721
assertEquals(200, response.statusCode());
724722

725723
JsonObject json = response.bodyAsJsonObject();
726-
JsonArray s3KeysArray = json.getJsonArray("s3Keys");
724+
JsonArray cloudEncryptionKeysArray = json.getJsonArray("cloudEncryptionKeys");
727725

728-
assertNotNull(s3KeysArray);
729-
assertEquals(3, s3KeysArray.size());
726+
assertNotNull(cloudEncryptionKeysArray);
727+
assertEquals(3, cloudEncryptionKeysArray.size());
730728

731729
for (int i = 0; i < 3; i++) {
732-
JsonObject s3KeyJson = s3KeysArray.getJsonObject(i);
733-
assertEquals(i + 1, s3KeyJson.getInteger("id"));
734-
assertEquals(88, s3KeyJson.getInteger("siteId"));
735-
assertEquals(1687635529 + i, s3KeyJson.getLong("activates"));
736-
assertEquals(1687808329 + i, s3KeyJson.getLong("created"));
737-
assertEquals("secret" + (i + 1), s3KeyJson.getString("secret"));
730+
JsonObject cloudEncryptionKeyJson = cloudEncryptionKeysArray.getJsonObject(i);
731+
assertEquals(i + 1, cloudEncryptionKeyJson.getInteger("id"));
732+
assertEquals(88, cloudEncryptionKeyJson.getInteger("siteId"));
733+
assertEquals(1687635529 + i, cloudEncryptionKeyJson.getLong("activates"));
734+
assertEquals(1687808329 + i, cloudEncryptionKeyJson.getLong("created"));
735+
assertEquals("secret" + (i + 1), cloudEncryptionKeyJson.getString("secret"));
738736
}
739737

740738
testContext.completeNow();
@@ -749,7 +747,7 @@ void s3encryptionKeyRetrieveSuccessWithThreeKeys(Vertx vertx, VertxTestContext t
749747

750748
@Tag("dontForceJwt")
751749
@Test
752-
void s3encryptionKeyRetrieveNoKeysOrError(Vertx vertx, VertxTestContext testContext) {
750+
void cloudEncryptionKeyRetrieveNoKeysOrError(Vertx vertx, VertxTestContext testContext) {
753751
fakeAuth(attestationProtocolPublic, Role.OPERATOR);
754752
addAttestationProvider(attestationProtocolPublic);
755753
onHandleAttestationRequest(() -> {
@@ -758,22 +756,22 @@ void s3encryptionKeyRetrieveNoKeysOrError(Vertx vertx, VertxTestContext testCont
758756
});
759757

760758
// Test case 1: No keys found
761-
when(s3KeyProvider.getKeys(anyInt())).thenReturn(Collections.emptyList());
759+
when(cloudEncryptionKeyProvider.getKeys(anyInt())).thenReturn(Collections.emptyList());
762760

763-
get(vertx, "s3encryption_keys/retrieve", ar -> {
761+
get(vertx, "cloud_encryption_keys/retrieve", ar -> {
764762
try {
765763
if (ar.succeeded()) {
766764
HttpResponse<Buffer> response = ar.result();
767765
assertEquals(500, response.statusCode());
768766

769767
JsonObject json = response.bodyAsJsonObject();
770-
assertEquals("No S3 keys found", json.getString("status"));
771-
assertTrue(json.getString("message").contains("No S3 keys found for siteId:"));
768+
assertEquals("No Cloud Encryption keys found", json.getString("status"));
769+
assertTrue(json.getString("message").contains("No Cloud Encryption keys found for siteId:"));
772770

773771
// Test case 2: Exception thrown
774-
when(s3KeyProvider.getKeys(anyInt())).thenThrow(new RuntimeException("Test exception"));
772+
when(cloudEncryptionKeyProvider.getKeys(anyInt())).thenThrow(new RuntimeException("Test exception"));
775773

776-
get(vertx, "s3encryption_keys/retrieve", ar2 -> {
774+
get(vertx, "cloud_encryption_keys/retrieve", ar2 -> {
777775
if (ar2.succeeded()) {
778776
HttpResponse<Buffer> response2 = ar2.result();
779777
assertEquals(500, response2.statusCode());

‎src/test/resources/com.uid2.core/model/test-config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@
2323
"att_token_enc_salt": "<salt-for-attestation-token>",
2424
"att_token_lifetime_seconds": 120,
2525
"provide_private_site_data": true,
26-
"s3_keys_metadata_path": "s3encryption_keys/metadata.json"
26+
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json"
2727
}

0 commit comments

Comments
 (0)