frodovdr/fritzbox-munin
1
0
Fork 0
mirror of https://github.com/Tafkas/fritzbox-munin.git synced 2023-10-10 11:36:55 +00:00
Code Issues Releases Wiki Activity

fritzbox_helper: Let requests handle GET parameters

Browse Source
This commit is contained in:
Andreas Oberritter 2020-07-15 13:28:35 +02:00
parent d8e7017877
commit 77afcdad3a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fritzbox_helper.py
View File

@ -49,6 +49,7 @@ def get_session_id(server, password, port=80):
print(err) print(err)
sys.exit(1) sys.exit(1)
params = {}
root = etree.fromstring(r.content) root = etree.fromstring(r.content)
session_id = root.xpath('//SessionInfo/SID/text()')[0] session_id = root.xpath('//SessionInfo/SID/text()')[0]
if session_id == "0000000000000000": if session_id == "0000000000000000":
@ -57,15 +58,16 @@ def get_session_id(server, password, port=80):
m = hashlib.md5() m = hashlib.md5()
m.update(challenge_bf) m.update(challenge_bf)
response_bf = '{}-{}'.format(challenge, m.hexdigest().lower()) response_bf = '{}-{}'.format(challenge, m.hexdigest().lower())
params['response'] = response_bf
else: else:
return session_id return session_id
headers = {"Accept": "text/html,application/xhtml+xml,application/xml", headers = {"Accept": "text/html,application/xhtml+xml,application/xml",
"Content-Type": "application/x-www-form-urlencoded"} "Content-Type": "application/x-www-form-urlencoded"}
url = 'http://{}:{}/login_sid.lua?&response={}'.format(server, port, response_bf) url = 'http://{}:{}/login_sid.lua'.format(server, port)
try: try:
r = requests.get(url, headers=headers) r = requests.get(url, headers=headers, params=params)
r.raise_for_status() r.raise_for_status()
except requests.exceptions.HTTPError as err: except requests.exceptions.HTTPError as err:
print(err) print(err)
@ -91,10 +93,11 @@ def get_page_content(server, session_id, page, port=80):
headers = {"Accept": "application/xml", headers = {"Accept": "application/xml",
"Content-Type": "text/plain"} "Content-Type": "text/plain"}
params = {"sid": session_id}
url = 'http://{}:{}/{}?sid={}'.format(server, port, page, session_id) url = 'http://{}:{}/{}'.format(server, port, page)
try: try:
r = requests.get(url, headers=headers) r = requests.get(url, headers=headers, params=params)
r.raise_for_status() r.raise_for_status()
except requests.exceptions.HTTPError as err: except requests.exceptions.HTTPError as err:
print(err) print(err)