ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-12 21:32:29 +03:00
Code Issues Projects Releases Wiki Activity

Fixes Frontier oAuth2 initiation

Browse Source
This commit is contained in:
Athanasius 2019-09-11 12:11:02 +01:00
parent 9910024004
commit 457c533980
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
companion.py
View File

@ -14,6 +14,7 @@ import json
import numbers import numbers
import os import os
from os.path import dirname, isfile, join from os.path import dirname, isfile, join
import random
import sys import sys
import time import time
from traceback import print_exc from traceback import print_exc
@ -196,8 +197,10 @@ class Auth(object):
# New request # New request
print('Auth\tNew authorization request') print('Auth\tNew authorization request')
self.verifier = self.base64URLEncode(os.urandom(32)) v = random.SystemRandom().getrandbits(8 * 32)
self.state = self.base64URLEncode(os.urandom(8)) self.verifier = self.base64URLEncode(v.to_bytes(32, byteorder='big')).encode('utf-8')
s = random.SystemRandom().getrandbits(8 * 32)
self.state = self.base64URLEncode(s.to_bytes(32, byteorder='big'))
# Won't work under IE: https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/ # Won't work under IE: https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/
webbrowser.open('%s%s?response_type=code&audience=frontier&scope=capi&client_id=%s&code_challenge=%s&code_challenge_method=S256&state=%s&redirect_uri=%s' % (SERVER_AUTH, URL_AUTH, CLIENT_ID, self.base64URLEncode(hashlib.sha256(self.verifier).digest()), self.state, protocolhandler.redirect)) webbrowser.open('%s%s?response_type=code&audience=frontier&scope=capi&client_id=%s&code_challenge=%s&code_challenge_method=S256&state=%s&redirect_uri=%s' % (SERVER_AUTH, URL_AUTH, CLIENT_ID, self.base64URLEncode(hashlib.sha256(self.verifier).digest()), self.state, protocolhandler.redirect))
@ -276,7 +279,7 @@ class Auth(object):
print('Auth\t' + r.url, r.status_code, r.reason and r.reason.decode('utf-8') or 'None', r.text.encode('utf-8')) print('Auth\t' + r.url, r.status_code, r.reason and r.reason.decode('utf-8') or 'None', r.text.encode('utf-8'))
def base64URLEncode(self, text): def base64URLEncode(self, text):
return base64.urlsafe_b64encode(text).replace('=', '') return base64.urlsafe_b64encode(text).decode().replace('=', '')
class Session(object): class Session(object):