Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-25 17:40:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update FFAgent.py

Browse source 
Used json.dumps for the alarmHeaders instead of a OrderedDict to preserve Insertion Order
This commit is contained in:
CJHarms 2019-08-03 10:27:45 +02:00
parent f4c35391b4
commit 190e7f36fe
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/FFAgent/FFAgent.py
View file

@ -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: