From b5a2ef89fde0aba1861f5715b04fcaba96e6cf0a Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Fri, 12 Nov 2021 14:51:21 +0100
Subject: [PATCH] delete secrets if file is deleted
---
apiserver/storage/JsonFileStorageAdapter.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/apiserver/storage/JsonFileStorageAdapter.py b/apiserver/storage/JsonFileStorageAdapter.py
index b147253..04b6cc0 100644
--- a/apiserver/storage/JsonFileStorageAdapter.py
+++ b/apiserver/storage/JsonFileStorageAdapter.py
@@ -135,9 +135,13 @@ class JsonFileStorageAdapter(AbstractLocationDataStorageAdapter):
def delete(self, n_type: LocationDataType, oid: str, usr: str):
full_path = self.__get_object_path(value=n_type.value, oid=oid)
- log.debug("Deleted object %s by user '%s'.", oid, usr)
+ secrets_path = self.__get_secrets_path(n_type, oid)
+ log.debug("Deleted object %s/%s by user '%s'.", oid, usr)
os.remove(full_path)
-
+ if (os.path.isfile(secrets_path)):
+ log.debug("Deleted secrets from object %s/%s by user '%s", n_type, oid, usr)
+ os.remove(secrets_path)
+
def list_secrets(self, n_type: LocationDataType, oid:str, usr: str):
""" list all available secrets for this object"""
secrets_path = self.__get_secrets_path(value=n_type.value, oid=oid)
--
GitLab