Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 00:26:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Python3.9 Testing

Browse Source
This commit is contained in:
Ariel Rin
2021-04-08 04:49:15 +00:00
parent 0036e8b280
commit 8c6bdd8ae2
4 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
allianceauth/services/modules/discourse/views.py
View File

@@ -12,20 +12,12 @@ import base64
import hmac
import hashlib
try:
from urllib import unquote, urlencode
except ImportError: #py3
from urllib.parse import unquote, urlencode
try:
from urlparse import parse_qs
except ImportError: #py3
from urllib.parse import parse_qs
from urllib.parse import unquote, urlencode, parse_qs
import logging
logger = logging.getLogger(__name__)
ACCESS_PERM = 'discourse.access_discourse'
@@ -55,7 +47,7 @@ def discourse_sso(request):
# Validate the payload
try:
payload = unquote(payload).encode('utf-8')
decoded = base64.decodestring(payload).decode('utf-8')
decoded = base64.decodebytes(payload).decode('utf-8')
assert 'nonce' in decoded
assert len(payload) > 0
except AssertionError:
@@ -86,7 +78,7 @@ def discourse_sso(request):
if main_char:
params['avatar_url'] = main_char.portrait_url(256)
return_payload = base64.encodestring(urlencode(params).encode('utf-8'))
return_payload = base64.encodebytes(urlencode(params).encode('utf-8'))
h = hmac.new(key, return_payload, digestmod=hashlib.sha256)
query_string = urlencode({'sso': return_payload, 'sig': h.hexdigest()})