Skip to content

Add expiry check only for SaltStoreWriter #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abuabraham-ttd merged 1 commit into from
Mar 13, 2025
Merged

Add expiry check only for SaltStoreWriter #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/main/java/com/uid2/admin/store/writer/SaltStoreWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ protected List<RotatingSaltProvider.SaltSnapshot> getSnapshots(RotatingSaltProvi
List<RotatingSaltProvider.SaltSnapshot> filteredSnapshots = new ArrayList<>();

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());
Expand Down Expand Up @@ -95,13 +99,7 @@ public void upload(RotatingSaltProvider.SaltSnapshot data) throws Exception {
List<RotatingSaltProvider.SaltSnapshot> snapshots = this.getSnapshots(data);

for (RotatingSaltProvider.SaltSnapshot snapshot : snapshots) {
if (!now.isBefore(snapshot.getExpires())) {
LOGGER.info("Skipping expired snapshot, effective=" + snapshot.getEffective() + ", expires=" + snapshot.getExpires());
continue;
}

final String location = getSaltSnapshotLocation(snapshot);

final JsonObject snapshotMetadata = new JsonObject();
snapshotMetadata.put("effective", snapshot.getEffective().toEpochMilli());
snapshotMetadata.put("expires", snapshot.getExpires().toEpochMilli());
Expand Down