From bd5f7f4707c982d07882495dc8d75273d5b008e4 Mon Sep 17 00:00:00 2001 From: CJHarms Date: Mon, 19 Aug 2019 10:12:25 +0200 Subject: [PATCH] Update FFAgent.py Passing the Headers directly instead of a Dict to prevent "reordering" with Python <3.7. --- plugins/FFAgent/FFAgent.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/FFAgent/FFAgent.py b/plugins/FFAgent/FFAgent.py index bd3b949..9b4c74c 100644 --- a/plugins/FFAgent/FFAgent.py +++ b/plugins/FFAgent/FFAgent.py @@ -124,20 +124,20 @@ def run(typ,freq,data): alarmData = json.dumps(alarmData) logging.debug(alarmData) - - alarmHeaders = json.dumps({ + + alarmHeaders = { "Content-Type": "application/json", "webApiToken": webApiToken, "accessToken": accessToken, "selectiveCallCode": selectiveCallCode, "hmac": hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest() - }) + } logging.debug(alarmHeaders) if globalVars.config.get("FFAgent", "live") == "1": - r = requests.post(url, data=alarmData, headers=alarmHeaders, verify=serverCertFile, cert=(clientCertFile, clientCertPass)) + r = requests.post(url, data=alarmData, headers={"Content-Type": "application/json", "webApiToken": webApiToken, "accessToken": accessToken, "selectiveCallCode": selectiveCallCode, "hmac": hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest()}, verify=serverCertFile, cert=(clientCertFile, clientCertPass)) else: - r = requests.post(url, data=alarmData, headers=alarmHeaders, verify=serverCertFile) + r = requests.post(url, data=alarmData, headers={"Content-Type": "application/json", "webApiToken": webApiToken, "accessToken": accessToken, "selectiveCallCode": selectiveCallCode, "hmac": hmac.new(webApiKey, webApiToken + selectiveCallCode + accessToken + alarmData, digestmod=hashlib.sha256).hexdigest()}, verify=serverCertFile) except: logging.error("cannot send FFAgent request")