ynerant/django-cas-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SOme python3 compatibility

Browse Source
This commit is contained in:
Valentin Samir 2016-07-01 00:09:51 +02:00
parent 219171fe41
commit a5ed74ee56
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cas_server/tests/test_utils.py
View File

@ -97,7 +97,7 @@ class CheckPasswordCase(TestCase):
utils.LdapHashUserPassword.hash( utils.LdapHashUserPassword.hash(
b"{CRYPT}", b"{CRYPT}",
self.password1, self.password1,
"$6$UVVAQvrMyXMF3FF3", b"$6$UVVAQvrMyXMF3FF3",
charset="utf8" charset="utf8"
) )
) )
@ -122,7 +122,7 @@ class CheckPasswordCase(TestCase):
with self.assertRaises(utils.LdapHashUserPassword.BadScheme): with self.assertRaises(utils.LdapHashUserPassword.BadScheme):
utils.LdapHashUserPassword.hash(scheme, self.password1) utils.LdapHashUserPassword.hash(scheme, self.password1)
with self.assertRaises(utils.LdapHashUserPassword.BadSalt): with self.assertRaises(utils.LdapHashUserPassword.BadSalt):
utils.LdapHashUserPassword.hash(b'{CRYPT}', self.password1, "$truc$toto") utils.LdapHashUserPassword.hash(b'{CRYPT}', self.password1, b"$truc$toto")
# then try to check hash with bad hashes # then try to check hash with bad hashes
with self.assertRaises(utils.LdapHashUserPassword.BadHash): with self.assertRaises(utils.LdapHashUserPassword.BadHash):

8
cas_server/utils.py
View File

@ -85,7 +85,13 @@ def update_url(url, params):
url_parts = list(urlparse(url)) url_parts = list(urlparse(url))
query = dict(parse_qsl(url_parts[4])) query = dict(parse_qsl(url_parts[4]))
query.update(params) query.update(params)
url_parts[4] = urlencode(query) # make the params order deterministic
query = list(query.items())
query.sort()
url_query = urlencode(query)
if not isinstance(url_query, bytes):
url_query = url_query.encode("utf-8")
url_parts[4] = url_query
return urlunparse(url_parts).decode('utf-8') return urlunparse(url_parts).decode('utf-8')