VladPolskiy/postgres-web
1
0
Fork 0
mirror of https://github.com/postgres/pgweb.git synced 2025-08-13 13:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for new module/namespace for urllib

Browse Source
This commit is contained in:
Magnus Hagander
2019-01-21 12:23:23 +01:00
parent 95df1aa888
commit 499a40baf7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pgweb/account/views.py
View File

@ -13,7 +13,7 @@ from django.db import transaction
from django.db.models import Q
import base64
import urllib
import urllib.parse
from Crypto.Cipher import AES
from Crypto import Random
import time
@ -470,7 +470,7 @@ def communityauth(request, siteid):
# care that it's characters are what's in base64.
if 'd' in request.GET:
d = request.GET['d']
if d != urllib.quote_plus(d, '=$'):
if d != urllib.parse.quote_plus(d, '=$'):
# Invalid character, so drop it
d = None
else:
@ -525,7 +525,7 @@ def communityauth(request, siteid):
if site.org.require_consent:
if not CommunityAuthConsent.objects.filter(org=site.org, user=request.user).exists():
return HttpResponseRedirect('/account/auth/{0}/consent/?{1}'.format(siteid,
urllib.urlencode({'next': '/account/auth/{0}/{1}'.format(siteid, urldata)})))
urllib.parse.urlencode({'next': '/account/auth/{0}/{1}'.format(siteid, urldata)})))
info = {
'u': request.user.username.encode('utf-8'),
@ -540,7 +540,7 @@ def communityauth(request, siteid):
# Turn this into an URL. Make sure the timestamp is always first, that makes
# the first block more random..
s = "t=%s&%s" % (int(time.time()), urllib.urlencode(info))
s = "t=%s&%s" % (int(time.time()), urllib.parse.urlencode(info))
# Encrypt it with the shared key (and IV!)
r = Random.new()