From d15aaf843b10d76ff12dd88848d8eb33e75b3fc0 Mon Sep 17 00:00:00 2001
From: Bert Palm <bert.palm@ufz.de>
Date: Mon, 24 Feb 2025 12:51:15 +0100
Subject: [PATCH] fixed missing decrypt key when calling decrypt in some sync
scripts
---
src/sync_bosch_api.py | 4 ++--
src/sync_tsystems_api.py | 5 ++---
src/sync_ttn_api.py | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/sync_bosch_api.py b/src/sync_bosch_api.py
index 9b1bb8ac..6bbca841 100755
--- a/src/sync_bosch_api.py
+++ b/src/sync_bosch_api.py
@@ -9,7 +9,7 @@ import requests
from datetime import datetime, timedelta, timezone
from urllib.request import Request, urlopen
-from timeio.crypto import decrypt
+from timeio.crypto import decrypt, get_crypt_key
import timeio.mqtt as mqtt
from timeio.journaling import Journal
@@ -96,7 +96,7 @@ def main(thing_uuid, parameters, target_uri):
logger.info(f"Start fetching Bosch data for thing {thing_uuid}")
params = json.loads(parameters.replace("'", '"'))
- pw_dec = decrypt(params["password"])
+ pw_dec = decrypt(params["password"], get_crypt_key())
timestamp_from, timestamp_to = get_utc_timestamps(params["period"])
url = f"""{params["endpoint"]}/{params["sensor_id"]}/{timestamp_from}/{timestamp_to}"""
response = make_request(url, params["username"], pw_dec)
diff --git a/src/sync_tsystems_api.py b/src/sync_tsystems_api.py
index b6590ca6..8bb67767 100755
--- a/src/sync_tsystems_api.py
+++ b/src/sync_tsystems_api.py
@@ -5,10 +5,9 @@ import click
import logging
import json
import os
-import sys
from datetime import datetime, timedelta, timezone
-from timeio.crypto import decrypt
+from timeio.crypto import decrypt, get_crypt_key
import timeio.mqtt as mqtt
from timeio.journaling import Journal
@@ -100,7 +99,7 @@ def main(thing_uuid, parameters, target_uri):
logger.info(f"Start fetching TSystems data for thing {thing_uuid}")
params = json.loads(parameters.replace("'", '"'))
- pw_dec = decrypt(params["password"])
+ pw_dec = decrypt(params["password"], get_crypt_key())
response = request_tsystems_api(
params["group"], params["station_id"], params["username"], pw_dec
)
diff --git a/src/sync_ttn_api.py b/src/sync_ttn_api.py
index c0a87a3c..9dc99595 100755
--- a/src/sync_ttn_api.py
+++ b/src/sync_ttn_api.py
@@ -7,7 +7,7 @@ import logging
import requests
import click
-from timeio.crypto import decrypt
+from timeio.crypto import decrypt, get_crypt_key
import timeio.mqtt as mqtt
from timeio.journaling import Journal
@@ -34,7 +34,7 @@ def main(thing_uuid: str, parameters: str, target_uri: str):
logger.info(f"Start fetching TTN data for thing {thing_uuid}")
params = json.loads(parameters.replace("'", '"'))
- api_key_dec = decrypt(params["api_key"])
+ api_key_dec = decrypt(params["api_key"], get_crypt_key())
res = requests.get(
params["endpoint_uri"],
--
GitLab