Added more fixes and optimizations

Author: gmsdelmundo

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

@@ -260,7 +260,7 @@ public void run() {
                     new ServiceService(auth, writeLock, serviceStoreWriter, serviceProvider, siteProvider, serviceLinkProvider),
                     new ServiceLinkService(auth, writeLock, serviceLinkStoreWriter, serviceLinkProvider, serviceProvider, siteProvider),
                     new OperatorKeyService(config, auth, writeLock, operatorKeyStoreWriter, operatorKeyProvider, siteProvider, keyGenerator, keyHasher, cloudEncryptionKeyManager),
-                    new SaltService(auth, writeLock, saltStoreWriter, saltProvider, saltRotation, config, jobDispatcher, rotatingCloudEncryptionKeyProvider),
+                    new SaltService(auth, writeLock, saltStoreWriter, saltProvider, saltRotation),
                     new SiteService(auth, writeLock, siteStoreWriter, siteProvider, clientKeyProvider),
                     new PartnerConfigService(auth, writeLock, partnerStoreWriter, partnerConfigProvider),
                     new PrivateSiteDataRefreshService(auth, jobDispatcher, writeLock, config),

src/main/java/com/uid2/admin/job/jobsync/PrivateSiteDataSyncJob.java

@@ -117,7 +117,7 @@ public void execute() throws Exception {
             clientKeyStoreFactory.getGlobalReader().loadContent();
             encryptionKeyStoreFactory.getGlobalReader().loadContent();
             keyAclStoreFactory.getGlobalReader().loadContent();
-            if(config.getBoolean(enableKeysetConfigProp)) {
+            if (config.getBoolean(enableKeysetConfigProp)) {
                 keysetStoreFactory.getGlobalReader().loadContent();
                 keysetKeyStoreFactory.getGlobalReader().loadContent();
             }
@@ -163,7 +163,7 @@ public void execute() throws Exception {
         clientSyncJob.execute();
         encryptionKeySyncJob.execute();
         keyAclSyncJob.execute();
-        if(config.getBoolean(enableKeysetConfigProp)) {
+        if (config.getBoolean(enableKeysetConfigProp)) {
             Map<Integer, Keyset> globalKeysets = keysetStoreFactory.getGlobalReader().getSnapshot().getAllKeysets();
             Collection<KeysetKey> globalKeysetKeys = keysetKeyStoreFactory.getGlobalReader().getSnapshot().getAllKeysetKeys();
             Integer globalMaxKeysetKeyId = keysetKeyStoreFactory.getGlobalReader().getMetadata().getInteger("max_key_id");

src/main/java/com/uid2/admin/salt/SaltRotation.java

@@ -171,7 +171,7 @@ private SaltEntry.KeyMaterial calculateCurrentKeySalt(SaltEntry bucket, boolean
             if (enableV4RawUid) {
                 return new SaltEntry.KeyMaterial(
                         keyIdGenerator.getNextKeyId(),
-                        this.keyGenerator.generateRandomKeyString(24), // TODO: FIX
+                        this.keyGenerator.generateRandomKeyString(24),
                         this.keyGenerator.generateRandomKeyString(32)
                 );
             } else {

src/main/java/com/uid2/admin/store/writer/SaltStoreWriter.java

@@ -48,7 +48,9 @@ public void upload(RotatingSaltProvider.SaltSnapshot data) throws Exception {
     }
 
     public void upload(RotatingSaltProvider.SaltSnapshot data, int iterations) throws Exception {
-        this.buildAndUploadMetadata(this.getSnapshots(data, iterations));
+        List<RotatingSaltProvider.SaltSnapshot> snapshots = this.getSnapshots(data, iterations);
+        this.buildAndUploadMetadata(snapshots);
+        this.deleteOtherSnapshots(snapshots);
         refreshProvider();
     }
 
@@ -103,36 +105,18 @@ private List<RotatingSaltProvider.SaltSnapshot> getSnapshots(RotatingSaltProvide
         return filteredSnapshots;
     }
 
-    private List<RotatingSaltProvider.SaltSnapshot> getSnapshots(RotatingSaltProvider.SaltSnapshot data){
-        if (provider.getSnapshots() == null) {
-            throw new IllegalStateException("Snapshots cannot be null");
-        }
-        final Instant now = Instant.now();
-        List<RotatingSaltProvider.SaltSnapshot> currentSnapshots = provider.getSnapshots();
-        List<RotatingSaltProvider.SaltSnapshot> snapshots = null;
-        snapshots = Stream.concat(currentSnapshots.stream(), Stream.of(data))
-                .sorted(Comparator.comparing(RotatingSaltProvider.SaltSnapshot::getEffective))
-                .toList();
-        RotatingSaltProvider.SaltSnapshot newestEffectiveSnapshot = snapshots.stream()
-                .filter(snapshot -> snapshot.isEffective(now))
-                .reduce((a, b) -> b).orElse(null);
-
-        List<RotatingSaltProvider.SaltSnapshot> filteredSnapshots = new ArrayList<>();
+    private List<RotatingSaltProvider.SaltSnapshot> getSnapshots(RotatingSaltProvider.SaltSnapshot data) {
+        return getSnapshots(data, 0);
+    }
 
-        for (RotatingSaltProvider.SaltSnapshot snapshot : snapshots) {
-            if (!now.isBefore(snapshot.getExpires())) {
-                LOGGER.info("Skipping expired snapshot, effective=" + snapshot.getEffective() + ", expires=" + snapshot.getExpires());
-                continue;
-            }
-            if (newestEffectiveSnapshot != null && snapshot != newestEffectiveSnapshot) {
-                        LOGGER.info("Skipping effective snapshot, effective=" + snapshot.getEffective() + ", expires=" + snapshot.getExpires()
-                                + " in favour of newer snapshot, effective=" + newestEffectiveSnapshot.getEffective() + ", expires=" + newestEffectiveSnapshot.getExpires());
-                continue;
-            }
-            filteredSnapshots.add(snapshot);
-            newestEffectiveSnapshot = null;
+    private void deleteOtherSnapshots(List<RotatingSaltProvider.SaltSnapshot> filteredSnapshots) {
+        List<RotatingSaltProvider.SaltSnapshot> currentSnapshots = provider.getSnapshots();
+        List<RotatingSaltProvider.SaltSnapshot> outdatedSnapshots = currentSnapshots.stream().filter(snapshot -> !filteredSnapshots.contains(snapshot)).toList();
+        try {
+            this.cloudStorage.delete(outdatedSnapshots.stream().map(this::getSaltSnapshotLocation).toList());
+        } catch (Exception e) {
+            LOGGER.error("Error deleting snapshots", e);
         }
-        return filteredSnapshots;
     }
 
     protected JsonObject getMetadata() throws Exception {