CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-03 05:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fix concurrency issues in secret manager

Browse source
This commit is contained in:
crschnick 2024-03-01 08:52:23 +00:00
parent 86df8b8803
commit 30ebddc904
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/io/xpipe/app/util/SecretManager.java
View file

@ -13,7 +13,7 @@ public class SecretManager {
private static final Map<SecretReference, SecretValue> secrets = new HashMap<>(); private static final Map<SecretReference, SecretValue> secrets = new HashMap<>();
private static final Set<SecretQueryProgress> progress = new HashSet<>(); private static final Set<SecretQueryProgress> progress = new HashSet<>();
public static Optional<SecretQueryProgress> getProgress(UUID requestId, UUID storeId) { public static synchronized Optional<SecretQueryProgress> getProgress(UUID requestId, UUID storeId) {
return progress.stream() return progress.stream()
.filter(secretQueryProgress -> .filter(secretQueryProgress ->
secretQueryProgress.getRequestId().equals(requestId) secretQueryProgress.getRequestId().equals(requestId)
@ -21,14 +21,14 @@ public class SecretManager {
.findFirst(); .findFirst();
} }
public static Optional<SecretQueryProgress> getProgress(UUID requestId) { public static synchronized Optional<SecretQueryProgress> getProgress(UUID requestId) {
return progress.stream() return progress.stream()
.filter(secretQueryProgress -> .filter(secretQueryProgress ->
secretQueryProgress.getRequestId().equals(requestId)) secretQueryProgress.getRequestId().equals(requestId))
.findFirst(); .findFirst();
} }
public static SecretQueryProgress expectElevationPrompt( public static synchronized SecretQueryProgress expectElevationPrompt(
UUID request, UUID secretId, CountDown countDown, boolean askIfNeeded) { UUID request, UUID secretId, CountDown countDown, boolean askIfNeeded) {
var p = new SecretQueryProgress( var p = new SecretQueryProgress(
request, request,
@ -40,7 +40,7 @@ public class SecretManager {
return p; return p;
} }
public static SecretQueryProgress expectAskpass( public static synchronized SecretQueryProgress expectAskpass(
UUID request, UUID storeId, List<SecretQuery> suppliers, SecretQuery fallback, CountDown countDown) { UUID request, UUID storeId, List<SecretQuery> suppliers, SecretQuery fallback, CountDown countDown) {
var p = new SecretQueryProgress(request, storeId, suppliers, fallback, countDown); var p = new SecretQueryProgress(request, storeId, suppliers, fallback, countDown);
progress.add(p); progress.add(p);
@ -69,7 +69,7 @@ public class SecretManager {
return r; return r;
} }
public static void completeRequest(UUID request) { public static synchronized void completeRequest(UUID request) {
if (progress.removeIf( if (progress.removeIf(
secretQueryProgress -> secretQueryProgress.getRequestId().equals(request))) { secretQueryProgress -> secretQueryProgress.getRequestId().equals(request))) {
TrackEvent.withTrace("Completed secret request") TrackEvent.withTrace("Completed secret request")
@ -78,22 +78,22 @@ public class SecretManager {
} }
} }
public static void clearAll(Object store) { public static synchronized void clearAll(Object store) {
var id = UuidHelper.generateFromObject(store); var id = UuidHelper.generateFromObject(store);
secrets.entrySet() secrets.entrySet()
.removeIf(secretReferenceSecretValueEntry -> .removeIf(secretReferenceSecretValueEntry ->
secretReferenceSecretValueEntry.getKey().getSecretId().equals(id)); secretReferenceSecretValueEntry.getKey().getSecretId().equals(id));
} }
public static void clear(SecretReference ref) { public static synchronized void clear(SecretReference ref) {
secrets.remove(ref); secrets.remove(ref);
} }
public static void set(SecretReference ref, SecretValue value) { public static synchronized void set(SecretReference ref, SecretValue value) {
secrets.put(ref, value); secrets.put(ref, value);
} }
public static Optional<SecretValue> get(SecretReference ref) { public static synchronized Optional<SecretValue> get(SecretReference ref) {
return Optional.ofNullable(secrets.get(ref)); return Optional.ofNullable(secrets.get(ref));
} }
} }