From f4c35391b4f80b9dec2037c2cf413639348c3231 Mon Sep 17 00:00:00 2001 From: CJHarms Date: Thu, 1 Aug 2019 22:20:35 +0200 Subject: [PATCH] Update FFAgent.py Added a OrderedDict to keep the Content-Type first in a URL Request to prevent HTTP 500 Errors from the FF-Agent API. --- plugins/FFAgent/FFAgent.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/plugins/FFAgent/FFAgent.py b/plugins/FFAgent/FFAgent.py index 561ca86..52cae9c 100644 --- a/plugins/FFAgent/FFAgent.py +++ b/plugins/FFAgent/FFAgent.py @@ -12,6 +12,7 @@ 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 @@ -134,6 +135,15 @@ def run(typ,freq,data): } 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: