Skip to content

Commit

Permalink
switch to base64 from hex for more compact ids
Browse files Browse the repository at this point in the history
  • Loading branch information
edcrewe committed Jan 4, 2013
1 parent e89da21 commit 30b7f6f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions cookieless/middleware.py
@@ -1,10 +1,9 @@
#-*- coding:utf-8 -*-import time
import re, time
import re

import django.dispatch
from django.core.urlresolvers import resolve
from django.conf import settings
from django.utils.http import cookie_date
from django.utils.importlib import import_module
from django.http import HttpResponseRedirect
from django.contrib.sessions.middleware import SessionMiddleware
Expand Down
6 changes: 3 additions & 3 deletions cookieless/utils.py
Expand Up @@ -25,7 +25,7 @@ def encrypt(self, request, sessionid):
if not sessionid:
return ''
secret = self._secret(request)
return crypt(secret, sessionid).encode('hex')
return crypt(secret, sessionid).encode('base64')

def decrypt(self, request, sessionid):
""" Avoid showing plain sessionids
Expand All @@ -44,7 +44,7 @@ def decrypt(self, request, sessionid):
if url.hostname not in self.settings['HOSTS']:
err = '%s is unauthorised' % url.hostname
raise Exception(err)
session_key = crypt(secret, sessionid.decode('hex'))
session_key = crypt(secret, sessionid.decode('base64'))
try:
return unicode(session_key)
except:
Expand Down Expand Up @@ -75,6 +75,6 @@ def _secret(self, request):
try:
new_secret += secret[i].encode('ascii')
except:
new_secret += secret[i].encode('hex')[0]
new_secret += secret[i].encode('base64')[0]
secret = new_secret[:16]
return secret

0 comments on commit 30b7f6f

Please sign in to comment.