Skip to content

Commit 44e8129

Browse files
cody-constine-ttdcody-constine-ttd
authored
Merge pull request #343 from IABTechLab/cbc-UID2-4379-rename-s3-encryption-cloud-encryption
Rename in admin
2 parents 6d7605f + 287c3ec commit 44e8129

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+705
-766
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ 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
88

99

‎.github/workflows/validate-image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
jobs:
2121
build-publish-docker:
2222
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v3
23-
with:
23+
with:
2424
failure_severity: ${{ inputs.failure_severity || 'CRITICAL,HIGH' }}
2525
fail_on_error: ${{ inputs.fail_on_error || true }}
2626
java_version: 21

‎conf/local-config.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"keysets_metadata_path": "keysets/metadata.json",
1919
"admin_keysets_metadata_path": "admin_keysets/metadata.json",
2020
"keyset_keys_metadata_path": "keyset_keys/metadata.json",
21-
"s3_keys_metadata_path": "s3encryption_keys/metadata.json",
21+
"cloud_encryption_keys_metadata_path": "cloud_encryption_keys/metadata.json",
2222
"aws_access_key_id": "no access key needed for test",
2323
"aws_secret_access_key": "no secret key needed for test",
2424
"client_side_keypair_public_prefix": "UID2-X-L-",
@@ -44,6 +44,6 @@
4444
"role_okta_group_map_maintainer": "developer",
4545
"role_okta_group_map_privileged": "developer",
4646
"role_okta_group_map_super_user": "developer",
47-
"s3_key_activates_in_seconds": 86400,
48-
"s3_key_count_per_site": 2
47+
"cloud_encryption_key_activates_in_seconds": 86400,
48+
"cloud_encryption_key_count_per_site": 2
4949
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"keysets_metadata_path": "keysets/metadata.json",
1919
"admin_keysets_metadata_path": "admin_keysets/metadata.json",
2020
"keyset_keys_metadata_path": "keyset_keys/metadata.json",
21-
"s3_keys_metadata_path": "s3encryption_keys/metadata.json",
21+
"cloud_keys_metadata_path": "cloud_encryption_keys/metadata.json",
2222
"aws_access_key_id": "no access key needed for test",
2323
"aws_secret_access_key": "no secret key needed for test",
2424
"client_side_keypair_public_prefix": "UID2-X-L-",
@@ -44,6 +44,6 @@
4444
"role_okta_group_map_maintainer": "developer",
4545
"role_okta_group_map_privileged": "developer",
4646
"role_okta_group_map_super_user": "developer",
47-
"s3_key_activates_in_seconds": 86400,
48-
"s3_key_count_per_site": 2
47+
"cloud_encryption_key_activates_in_seconds": 86400,
48+
"cloud_encryption_key_count_per_site": 2
4949
}

‎pom.xml‎

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

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-admin</artifactId>
9-
<version>5.15.24</version>
9+
<version>5.15.25-alpha-94-SNAPSHOT</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,7 +16,7 @@
1616
<!-- check micrometer.version vertx-micrometer-metrics consumes before bumping up -->
1717
<micrometer.version>1.12.2</micrometer.version>
1818
<junit-jupiter.version>5.11.2</junit-jupiter.version>
19-
<uid2-shared.version>7.21.7</uid2-shared.version>
19+
<uid2-shared.version>8.0.0</uid2-shared.version>
2020
<okta-jwt.version>0.5.10</okta-jwt.version>
2121
<image.version>${project.version}</image.version>
2222
</properties>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.uid2.admin.legacy.RotatingLegacyClientKeyProvider;
1414
import com.uid2.admin.managers.KeysetManager;
1515
import com.uid2.admin.monitoring.DataStoreMetrics;
16-
import com.uid2.admin.managers.S3KeyManager;
16+
import com.uid2.admin.managers.CloudEncryptionKeyManager;
1717
import com.uid2.admin.secret.*;
1818
import com.uid2.admin.store.*;
1919
import com.uid2.admin.store.reader.RotatingAdminKeysetStore;
@@ -197,18 +197,18 @@ public void run() {
197197
operatorKeyProvider.loadContent(operatorKeyProvider.getMetadata());
198198
OperatorKeyStoreWriter operatorKeyStoreWriter = new OperatorKeyStoreWriter(operatorKeyProvider, fileManager, jsonWriter, versionGenerator);
199199

200-
CloudPath s3KeyMetadataPath = new CloudPath(config.getString(Const.Config.S3keysMetadataPathProp));
201-
GlobalScope s3KeyGlobalScope = new GlobalScope(s3KeyMetadataPath);
202-
RotatingS3KeyProvider s3KeyProvider = new RotatingS3KeyProvider(cloudStorage, s3KeyGlobalScope);
203-
S3KeyStoreWriter s3KeyStoreWriter = new S3KeyStoreWriter(s3KeyProvider, fileManager, jsonWriter, versionGenerator, clock, s3KeyGlobalScope);
200+
CloudPath cloudEncryptionKeyMetadataPath = new CloudPath(config.getString(Const.Config.CloudEncryptionKeysMetadataPathProp));
201+
GlobalScope cloudEncryptionKeyGlobalScope = new GlobalScope(cloudEncryptionKeyMetadataPath);
202+
RotatingCloudEncryptionKeyProvider RotatingCloudEncryptionKeyProvider = new RotatingCloudEncryptionKeyProvider(cloudStorage, cloudEncryptionKeyGlobalScope);
203+
CloudEncryptionKeyStoreWriter cloudEncryptionKeyStoreWriter = new CloudEncryptionKeyStoreWriter(RotatingCloudEncryptionKeyProvider, fileManager, jsonWriter, versionGenerator, clock, cloudEncryptionKeyGlobalScope);
204204
IKeyGenerator keyGenerator = new SecureKeyGenerator();
205-
S3KeyManager s3KeyManager = new S3KeyManager(s3KeyProvider, s3KeyStoreWriter,keyGenerator);
205+
CloudEncryptionKeyManager cloudEncryptionKeyManager = new CloudEncryptionKeyManager(RotatingCloudEncryptionKeyProvider, cloudEncryptionKeyStoreWriter,keyGenerator);
206206
try {
207-
s3KeyProvider.loadContent();
207+
RotatingCloudEncryptionKeyProvider.loadContent();
208208
} catch (CloudStorageException e) {
209209
if (e.getMessage().contains("The specified key does not exist")) {
210-
s3KeyStoreWriter.upload(new HashMap<>(), null);
211-
s3KeyProvider.loadContent();
210+
cloudEncryptionKeyStoreWriter.upload(new HashMap<>(), null);
211+
RotatingCloudEncryptionKeyProvider.loadContent();
212212
} else {
213213
throw e;
214214
}
@@ -255,11 +255,11 @@ public void run() {
255255
clientSideKeypairService,
256256
new ServiceService(auth, writeLock, serviceStoreWriter, serviceProvider, siteProvider, serviceLinkProvider),
257257
new ServiceLinkService(auth, writeLock, serviceLinkStoreWriter, serviceLinkProvider, serviceProvider, siteProvider),
258-
new OperatorKeyService(config, auth, writeLock, operatorKeyStoreWriter, operatorKeyProvider, siteProvider, keyGenerator, keyHasher, s3KeyManager),
258+
new OperatorKeyService(config, auth, writeLock, operatorKeyStoreWriter, operatorKeyProvider, siteProvider, keyGenerator, keyHasher, cloudEncryptionKeyManager),
259259
new SaltService(auth, writeLock, saltStoreWriter, saltProvider, saltRotation),
260260
new SiteService(auth, writeLock, siteStoreWriter, siteProvider, clientKeyProvider),
261261
new PartnerConfigService(auth, writeLock, partnerStoreWriter, partnerConfigProvider),
262-
new PrivateSiteDataRefreshService(auth, jobDispatcher, writeLock, config, s3KeyProvider),
262+
new PrivateSiteDataRefreshService(auth, jobDispatcher, writeLock, config, RotatingCloudEncryptionKeyProvider),
263263
new JobDispatcherService(auth, jobDispatcher),
264264
new SearchService(auth, clientKeyProvider, operatorKeyProvider)
265265
};
@@ -286,8 +286,8 @@ public void run() {
286286
}
287287

288288
synchronized (writeLock) {
289-
s3KeyManager.generateKeysForOperators(operatorKeyProvider.getAll(), config.getLong("s3_key_activates_in_seconds"), config.getInteger("s3_key_count_per_site"));
290-
s3KeyProvider.loadContent();
289+
cloudEncryptionKeyManager.generateKeysForOperators(operatorKeyProvider.getAll(), config.getLong("cloud_encryption_key_activates_in_seconds"), config.getInteger("cloud_encryption_key_count_per_site"));
290+
RotatingCloudEncryptionKeyProvider.loadContent();
291291
}
292292

293293
/*
@@ -336,7 +336,7 @@ public void run() {
336336
CompletableFuture<Boolean> privateSiteDataSyncJobFuture = jobDispatcher.executeNextJob();
337337
privateSiteDataSyncJobFuture.get();
338338

339-
EncryptedFilesSyncJob encryptedFilesSyncJob = new EncryptedFilesSyncJob(config, writeLock,s3KeyProvider);
339+
EncryptedFilesSyncJob encryptedFilesSyncJob = new EncryptedFilesSyncJob(config, writeLock,RotatingCloudEncryptionKeyProvider);
340340
jobDispatcher.enqueue(encryptedFilesSyncJob);
341341
CompletableFuture<Boolean> encryptedFilesSyncJobFuture = jobDispatcher.executeNextJob();
342342
encryptedFilesSyncJobFuture.get();

‎src/main/java/com/uid2/admin/job/EncryptionJob/ClientKeyEncryptionJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public ClientKeyEncryptionJob(
2626

2727
@Override
2828
public String getId() {
29-
return "s3-encryption-sync-clientKeys";
29+
return "cloud-encryption-sync-clientKeys";
3030
}
3131

3232
@Override

‎src/main/java/com/uid2/admin/job/EncryptionJob/EncryptionKeyEncryptionJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public EncryptionKeyEncryptionJob(
4040

4141
@Override
4242
public String getId() {
43-
return "s3-encryption-sync-encryptionKeys";
43+
return "cloud-encryption-sync-encryptionKeys";
4444
}
4545

4646
@Override

‎src/main/java/com/uid2/admin/job/EncryptionJob/KeyAclEncryptionJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public KeyAclEncryptionJob(
2727

2828
@Override
2929
public String getId() {
30-
return "s3-encryption-sync-keyAcls";
30+
return "cloud-encryption-sync-keyAcls";
3131
}
3232

3333
@Override

‎src/main/java/com/uid2/admin/job/EncryptionJob/KeysetKeyEncryptionJob.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public KeysetKeyEncryptionJob(Collection<OperatorKey> globalOperators,
3535

3636
@Override
3737
public String getId() {
38-
return "s3-encryption-sync-keysetKeys";
38+
return "cloud-encryption-sync-keysetKeys";
3939
}
4040

4141
@Override

0 commit comments

Comments
 (0)