mbirth/tcl_ota_check
Archived
1
0
Fork 0
Code Pull Requests Activity

Show stage when erroring. Use https for header download.

Browse Source
This commit is contained in:
Markus Birth 2017-09-01 13:37:54 +02:00
parent 250d6e4a27
commit 2710bd7103
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tclcheck.py
View File

@ -81,7 +81,7 @@ class FotaCheck:
if req.status_code == 200: if req.status_code == 200:
return req.text return req.text
else: else:
print(repr(req)) print("CHECK: " + repr(req))
print(repr(req.headers)) print(repr(req.headers))
print(repr(req.text)) print(repr(req.text))
raise SystemExit raise SystemExit
@ -164,7 +164,7 @@ class FotaCheck:
if req.status_code == 200: if req.status_code == 200:
return req.text return req.text
else: else:
print(repr(req)) print("REQUEST: " + repr(req))
print(repr(req.headers)) print(repr(req.headers))
print(repr(req.text)) print(repr(req.text))
raise SystemExit raise SystemExit
@ -187,16 +187,18 @@ class FotaCheck:
encs[b"cGFzc3dvcmQ="] = b"cWFydUQ0b2s=" encs[b"cGFzc3dvcmQ="] = b"cWFydUQ0b2s="
params = {base64.b64decode(key): base64.b64decode(val) for key, val in encs.items()} params = {base64.b64decode(key): base64.b64decode(val) for key, val in encs.items()}
params[b"address"] = bytes(address, "utf-8") params[b"address"] = bytes(address, "utf-8")
url = "http://" + encslave + "/encrypt_header.php" url = "https://" + encslave + "/encrypt_header.php"
req = self.sess.post(url, data=params) req = self.sess.post(url, data=params, verify=False)
# Expect "HTTP 206 Partial Content" response
if req.status_code == 206: # partial if req.status_code == 206: # partial
#return req.content #return req.content
contentlength = int(req.headers["Content-Length"]) contentlength = int(req.headers["Content-Length"])
sentinel = "\nHEADER FOUND" if contentlength == 4194320 else "\nNO HEADER FOUND" sentinel = "\nHEADER FOUND" if contentlength == 4194320 else "\nNO HEADER FOUND"
return sentinel return sentinel
else: else:
print(repr(req)) print("ENCRYPT: " + repr(req))
print(repr(req.headers)) print(repr(req.headers))
print(repr(req.text))
raise SystemExit raise SystemExit
@ -217,6 +219,7 @@ if __name__ == "__main__":
fc.serid = "3531510" fc.serid = "3531510"
#fc.osvs = "7.1.1" #fc.osvs = "7.1.1"
fc.cltp = 10 fc.cltp = 10
#fc.cltp = 2010
check_xml = fc.do_check() check_xml = fc.do_check()
#print(fc.pretty_xml(check_xml)) #print(fc.pretty_xml(check_xml))