Robot
/
freebox-revolution-monitoring
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Conditional import and hmac use for python2 and python3

This commit is contained in:
Dashie 2016-12-17 00:31:39 +01:00
parent c209db3e9e
commit 08a13794fc
No known key found for this signature in database
GPG Key ID: C2D57B325840B755
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freebox_monitor.py
View File

@ -11,9 +11,14 @@ import json
import hmac import hmac
import time import time
import argparse import argparse
import ConfigParser
import sys import sys
if sys.version_info >= (3,0):
import configparser as configp
else:
import ConfigParser as configp
from hashlib import sha1 from hashlib import sha1
import requests import requests
@ -123,7 +128,10 @@ def get_and_print_metrics(creds, s_switch, s_ports, s_sys):
challenge = resp['result']['challenge'] challenge = resp['result']['challenge']
# Generate session password # Generate session password
h = hmac.new(creds['app_token'], challenge, sha1) if sys.version_info >= (3, 0):
h = hmac.new(bytearray(creds['app_token'], 'ASCII'), bytearray(challenge, 'ASCII'), sha1)
else:
h = hmac.new(creds['app_token'], challenge, sha1)
password = h.hexdigest() password = h.hexdigest()
# Fetch session_token # Fetch session_token
@ -252,13 +260,13 @@ def get_auth():
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
cfg_file = os.path.join(script_dir, ".credentials") cfg_file = os.path.join(script_dir, ".credentials")
f = ConfigParser.RawConfigParser() f = configp.RawConfigParser()
f.read(cfg_file) f.read(cfg_file)
try: try:
_ = f.get("general", "track_id") _ = f.get("general", "track_id")
_ = f.get("general", "app_token") _ = f.get("general", "app_token")
except ConfigParser.NoSectionError as err: except configp.NoSectionError as err:
print("Config is invalid, auth not done.") print("Config is invalid, auth not done.")
return None return None
@ -269,7 +277,7 @@ def get_auth():
def write_auth(auth_infos): def write_auth(auth_infos):
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
cfg_file = os.path.join(script_dir, ".credentials") cfg_file = os.path.join(script_dir, ".credentials")
f = ConfigParser.RawConfigParser() f = configp.RawConfigParser()
f.add_section("general") f.add_section("general")
f.set("general", "track_id", auth_infos['track_id']) f.set("general", "track_id", auth_infos['track_id'])
f.set("general", "app_token", auth_infos["app_token"]) f.set("general", "app_token", auth_infos["app_token"])