From 190e7f36feb0f2137f731d08178b05a9612b1411 Mon Sep 17 00:00:00 2001 From: CJHarms Date: Sat, 3 Aug 2019 10:27:45 +0200 Subject: [PATCH] Update FFAgent.py Used json.dumps for the alarmHeaders instead of a OrderedDict to preserve Insertion Order --- plugins/FFAgent/FFAgent.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/plugins/FFAgent/FFAgent.py b/plugins/FFAgent/FFAgent.py index 52cae9c..bd3b949 100644 --- a/plugins/FFAgent/FFAgent.py +++ b/plugins/FFAgent/FFAgent.py @@ -12,7 +12,6 @@ FFAgent-Plugin to send FMS-, ZVEI- and POCSAG - messages to FF-Agent import logging # Global logger import hmac, hashlib import json, requests -import collections from includes import globalVars # Global variables @@ -126,24 +125,15 @@ def run(typ,freq,data): alarmData = json.dumps(alarmData) logging.debug(alarmData) - alarmHeaders = { + alarmHeaders = json.dumps({ "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) - alarmHeaders = collections.OrderedDict(alarmHeaders) - alarmHeadersOrdered = collections.OrderedDict() - alarmHeadersOrdered["Content-Type"]=alarmHeaders["Content-Type"] - alarmHeadersOrdered["webApiToken"]=alarmHeaders["webApiToken"] - alarmHeadersOrdered["accessToken"]=alarmHeaders["accessToken"] - alarmHeadersOrdered["selectiveCallCode"]=alarmHeaders["selectiveCallCode"] - alarmHeadersOrdered["hmac"]=alarmHeaders["hmac"] - logging.debug(alarmHeadersOrdered) - if globalVars.config.get("FFAgent", "live") == "1": r = requests.post(url, data=alarmData, headers=alarmHeaders, verify=serverCertFile, cert=(clientCertFile, clientCertPass)) else: