Skip to content
This repository has been archived by the owner on Jan 8, 2019. It is now read-only.

Commit

Permalink
Revert "upgrade to django-browserid==0.7.1"
Browse files Browse the repository at this point in the history 
This reverts commit a78e698.
  • Loading branch information
@peterbe
peterbe committed Dec 17, 2012
1 parent 5f367d6 commit 0b784af
Show file tree
Hide file tree
Showing 86 changed files with 609 additions and 15,120 deletions.
6 changes: 2 additions & 4 deletions lib/python/django_browserid/__init__.py
View file
Expand Up @@ -5,7 +5,5 @@
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
"""
__version__ = '0.7.1'

from django_browserid.auth import BrowserIDBackend # NOQA
from django_browserid.base import get_audience, verify # NOQA
from django_browserid.auth import BrowserIDBackend
from django_browserid.base import get_audience, verify
44 changes: 20 additions & 24 deletions lib/python/django_browserid/auth.py
View file
Expand Up @@ -6,24 +6,24 @@
import base64
import hashlib
import logging
from warnings import warn

from django.conf import settings
from django.contrib.auth.models import User
from django.core.exceptions import ImproperlyConfigured
from django.utils.importlib import import_module

from django_browserid.base import verify
from django_browserid.base import get_audience as base_get_audience, verify
from django_browserid.signals import user_created

try:
from django.contrib.auth import get_user_model
except ImportError:
from django.contrib.auth.models import User

def get_user_model(*args, **kwargs):
return User
log = logging.getLogger(__name__)


log = logging.getLogger(__name__)
def get_audience(*args):
warn('Deprecated, please use the standalone function '
'django_browserid.get_audience instead.', DeprecationWarning)
return base_get_audience(*args)


def default_username_algo(email):
Expand All @@ -40,17 +40,14 @@ class BrowserIDBackend(object):
supports_inactive_user = True
supports_object_permissions = False

def __init__(self):
"""
Store the current user model on creation to avoid issues if
settings.AUTH_USER_MODEL changes, which usually only happens during
tests.
"""
self.User = get_user_model()
def verify(self, *args):
warn('Deprecated, please use the standalone function '
'django_browserid.verify instead.', DeprecationWarning)
return verify(*args)

def filter_users_by_email(self, email):
"""Return all users matching the specified email."""
return self.User.objects.filter(email=email)
return User.objects.filter(email=email)

def create_user(self, email):
"""Return object for a newly created user account."""
Expand All @@ -60,7 +57,7 @@ def create_user(self, email):
else:
username = default_username_algo(email)

return self.User.objects.create_user(username, email)
return User.objects.create_user(username, email)

def authenticate(self, assertion=None, audience=None):
"""``django.contrib.auth`` compatible authentication method.
Expand All @@ -84,8 +81,7 @@ def authenticate(self, assertion=None, audience=None):
# log and bail. randomly selecting one seems really wrong.
users = self.filter_users_by_email(email=email)
if len(users) > 1:
log.warn('{0} users with email address {1}.'.format(len(users),
email))
log.warn('%d users with email address %s.' % (len(users), email))
return None
if len(users) == 1:
return users[0]
Expand All @@ -94,7 +90,7 @@ def authenticate(self, assertion=None, audience=None):
if not create_user:
return None
else:
if create_user is True:
if create_user == True:
create_function = self.create_user
else:
# Find the function to call.
Expand All @@ -106,8 +102,8 @@ def authenticate(self, assertion=None, audience=None):

def get_user(self, user_id):
try:
return self.User.objects.get(pk=user_id)
except self.User.DoesNotExist:
return User.objects.get(pk=user_id)
except User.DoesNotExist:
return None

def _load_module(self, path):
Expand All @@ -129,6 +125,6 @@ def _load_module(self, path):
try:
create_user = getattr(mod, attr)
except AttributeError:
raise ImproperlyConfigured('Module {0} does not define a {1} '
'function.'.format(module, attr))
raise ImproperlyConfigured('Module "%s" does not define a "%s" '
'function.' % (module, attr))
return create_user
59 changes: 47 additions & 12 deletions lib/python/django_browserid/base.py
View file
Expand Up @@ -9,7 +9,7 @@
try:
import json
except ImportError:
import simplejson as json # NOQA
import simplejson as json


from django.conf import settings
Expand All @@ -21,7 +21,7 @@


DEFAULT_HTTP_TIMEOUT = 5
DEFAULT_VERIFICATION_URL = 'https://verifier.login.persona.org/verify'
DEFAULT_VERIFICATION_URL = 'https://browserid.org/verify'
OKAY_RESPONSE = 'okay'


Expand All @@ -36,6 +36,17 @@ def get_audience(request):
SITE_URL = 'https://example.com'
SITE_URL = 'http://example.com'
If you don't have a SITE_URL you can also use these varables:
PROTOCOL, DOMAIN, and (optionally) PORT.
Example 1:
PROTOCOL = 'https://'
DOMAIN = 'example.com'
Example 2:
PROTOCOL = 'http://'
DOMAIN = '127.0.0.1'
PORT = '8001'
If none are set, we trust the request to populate the audience.
This is *not secure*!
"""
Expand All @@ -48,11 +59,32 @@ def get_audience(request):
req_proto = 'http://'
req_domain = request.get_host()

# If we don't define it explicitly
if not site_url:
warn('Using DOMAIN and PROTOCOL to specify your BrowserID audience is '
'deprecated. Please use the SITE_URL setting instead.',
DeprecationWarning)

# DOMAIN is example.com req_domain is example.com:8001
domain = getattr(settings, 'DOMAIN', req_domain.split(':')[0])
protocol = getattr(settings, 'PROTOCOL', req_proto)

standards = {'https://': 443, 'http://': 80}
if ':' in req_domain:
req_port = req_domain.split(':')[1]
else:
req_port = None
port = getattr(settings, 'PORT', req_port or standards[protocol])
if port == standards[protocol]:
site_url = ''.join(map(str, (protocol, domain)))
else:
site_url = ''.join(map(str, (protocol, domain, ':', port)))

req_url = "%s%s" % (req_proto, req_domain)
if site_url != "%s%s" % (req_proto, req_domain):
log.warning('Misconfigured SITE_URL? settings has {0}, but '
'actual request was {1} BrowserID may fail on '
'audience'.format(site_url, req_url))
log.warning('Misconfigured SITE_URL? settings has [%s], but '
'actual request was [%s] BrowserID may fail on '
'audience' % (site_url, req_url))
return site_url


Expand All @@ -62,8 +94,10 @@ def _verify_http_request(url, qs):
'proxies': getattr(settings, 'BROWSERID_PROXY_INFO', None),
'verify': not getattr(settings, 'BROWSERID_DISABLE_CERT_CHECK', False),
'headers': {'Content-type': 'application/x-www-form-urlencoded'},
'timeout': getattr(settings, 'BROWSERID_HTTP_TIMEOUT',
DEFAULT_HTTP_TIMEOUT),
'params': {
'timeout': getattr(settings, 'BROWSERID_HTTP_TIMEOUT',
DEFAULT_HTTP_TIMEOUT)
}
}

if parameters['verify']:
Expand All @@ -74,7 +108,8 @@ def _verify_http_request(url, qs):
try:
rv = json.loads(r.content)
except ValueError:
log.debug('Failed to decode JSON. Resp: {0}, Content: {1}'.format(r.status_code, r.content))
log.debug('Failed to decode JSON. Resp: %s, Content: %s' %
(r.status_code, r.content))
return dict(status='failure')

return rv
Expand All @@ -85,7 +120,7 @@ def verify(assertion, audience):
verify_url = getattr(settings, 'BROWSERID_VERIFICATION_URL',
DEFAULT_VERIFICATION_URL)

log.info("Verification URL: {0}".format(verify_url))
log.info("Verification URL: %s" % verify_url)

result = _verify_http_request(verify_url, urllib.urlencode({
'assertion': assertion,
Expand All @@ -95,7 +130,7 @@ def verify(assertion, audience):
if result['status'] == OKAY_RESPONSE:
return result

log.error('BrowserID verification failure. Response: {0} '
'Audience: {1}'.format(result, audience))
log.error("BID assert: {0}".format(assertion))
log.error('BrowserID verification failure. Response: %r '
'Audience: %r' % (result, audience))
log.error("BID assert: %r" % assertion)
return False
2 changes: 1 addition & 1 deletion lib/python/django_browserid/forms.py
View file
Expand Up @@ -10,4 +10,4 @@ class BrowserIDForm(forms.Form):
assertion = forms.CharField(widget=forms.HiddenInput())

class Media:
js = ('browserid/browserid.js', 'https://login.persona.org/include.js')
js = ('browserid/browserid.js', 'https://browserid.org/include.js')
70 changes: 9 additions & 61 deletions lib/python/django_browserid/static/browserid/browserid.js
View file
@@ -1,67 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

(function($) {
'use strict';

$(function() {
// State? Ewwwwww.
var logoutButton = null;
var requestOptions = [
'siteName',
'siteLogo',
'oncancel',
'privacyPolicy',
'returnTo',
'termsOfService'
];

$(document).delegate('.browserid-login, #browserid', 'click', function(e) {
e.preventDefault();

// Arguments to navigator.id.request can be specified by data-attributes
// on the BrowserID link: <a href="#" data-site-name="Site Name">
var options = {};
var $link = $(e.target);
for (var k = 0; k < requestOptions.length; k++) {
var name = requestOptions[k];
var value = $link.data(name);
if (value !== undefined) {
options[name] = value;
}
}

navigator.id.request(options); // Triggers BrowserID login dialog.
});

$('.browserid-logout').bind('click', function(e) {
e.preventDefault();
logoutButton = e.target;
navigator.id.logout(); // Clears User Agent BrowserID state.
});

navigator.id.watch({
onlogin: function(assertion) {
// Don't bother if login just failed.
if (location.search.indexOf('bid_login_failed=1') !== -1) {
navigator.id.logout();
} else if (assertion) {
var $e = $('#id_assertion');
$e.val(assertion.toString());
$e.parent().submit();
}
},

onlogout: function() {
var currentButton = logoutButton;
if (currentButton !== null) {
logoutButton = null;
if (currentButton.href) {
window.location = currentButton.href;
}
}
$(document).ready(function() {
$('#browserid').bind('click', function(e) {
e.preventDefault();
navigator.id.getVerifiedEmail(function(assertion) {
if (assertion) {
var $e = $('#id_assertion');
$e.val(assertion.toString());
$e.parent().submit();
}
});
});
})(jQuery);
});
2 changes: 1 addition & 1 deletion lib/python/django_browserid/tests/__init__.py
View file
Expand Up @@ -31,7 +31,7 @@ def __init__(self, email=None, audience=None):
self.return_value = {
u'audience': audience,
u'email': email,
u'issuer': u'login.persona.org:443',
u'issuer': u'browserid.org:443',
u'status': u'okay' if email is not None else u'failure',
u'valid-until': 1311377222765
}
Expand Down
23 changes: 0 additions & 23 deletions lib/python/django_browserid/tests/models.py
View file

This file was deleted.

3 changes: 0 additions & 3 deletions lib/python/django_browserid/tests/settings.py
View file
Expand Up @@ -5,8 +5,6 @@
"""
TEST_RUNNER = 'django_nose.runner.NoseTestSuiteRunner'

SECRET_KEY = 'asdf'

DATABASES = {
'default': {
'NAME': 'test.db',
Expand All @@ -17,7 +15,6 @@
INSTALLED_APPS = (
'django_nose',
'django_browserid',
'django_browserid.tests',

'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down

0 comments on commit 0b784af

Please sign in to comment.