From 45c66b6d89b4593cbf7a258b3d724b76a9fc6679 Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Fri, 12 Nov 2021 15:10:58 +0100
Subject: [PATCH] proper de- and encoding
---
apiserver/storage/EncryptedJsonFileStorageAdapter.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apiserver/storage/EncryptedJsonFileStorageAdapter.py b/apiserver/storage/EncryptedJsonFileStorageAdapter.py
index 12cfcc6..8c76b82 100644
--- a/apiserver/storage/EncryptedJsonFileStorageAdapter.py
+++ b/apiserver/storage/EncryptedJsonFileStorageAdapter.py
@@ -1,5 +1,5 @@
from fastapi.exceptions import HTTPException
-from JsonFileStorageAdapter import JsonFileStorageAdapter, LocationDataType
+from .JsonFileStorageAdapter import JsonFileStorageAdapter, LocationDataType
from cryptography.fernet import Fernet
from apiserver.config.settings import ApiserverSettings
@@ -8,11 +8,11 @@ class EncryptedJsonFileStorageAdapter(JsonFileStorageAdapter):
def encrypt(self, string: str):
f = Fernet(self.encryption_key)
- return f.encrypt(string.encode())
+ return f.encrypt(string.encode()).decode("utf-8")
def decrypt(self, string: str):
f = Fernet(self.encryption_key)
- return f.decrypt(string.encode())
+ return f.decrypt(string.encode()).decode("utf-8")
def __init__(self, settings: ApiserverSettings, encryption_key) -> None:
self.encryption_key = encryption_key
--
GitLab