Merge lp:~canonical-isd-hackers/canonical-identity-provider/remove-oauth-backend into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

Removed oauth_backend code from the project.

Removed oauth_backend code from the project. This branch also updates debian package dependencies for SSO.

[Ricardo Kirkner (ricardokirkner)]

Also needs to add django-oauth-backend to the requirements.txt file.

review: Needs Fixing

[Michael Nelson (michael.nelson)]

Assuming there wasn't anything else that Ricardo thought needs fixing (other than the requirements.txt which you updated)... thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2010-09-13 15:45:15 +0000
+++ debian/control	2011-01-12 08:53:59 +0000
@@ -26,6 +26,7 @@
  python-restrictedpython,
  python-schemaconfig (>= 0.1.3.dev1),
  python-simplejson,
- python-lazr.uri
+ python-lazr.uri,
+ python-django-oauth-backend
 Conflicts: python-lazr.restful (>= 0.9.22)
 Description: Canonical OpenID provider

=== removed directory 'oauth_backend'
=== removed file 'oauth_backend/__init__.py'
=== removed file 'oauth_backend/models.py'
--- oauth_backend/models.py	2011-01-10 15:02:53 +0000
+++ oauth_backend/models.py	1970-01-01 00:00:00 +0000
@@ -1,181 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-import random
-import struct
-import string
-import os.path
-
-from oauth.oauth import OAuthToken, OAuthDataStore, OAuthConsumer
-
-from functools import partial
-from django.db import models
-from django.conf import settings
-from django.contrib.auth.models import User
-
-
-__all__ = [
-    'Token',
-    'Consumer',
-    'Nonce',
-    'DataStore',
-]
-
-
-TOKEN_LENGTH = getattr(settings, 'OAUTH_TOKEN_LENGTH', 50)
-TOKEN_SECRET_LENGTH = getattr(settings, 'OAUTH_TOKEN_SECRET_LENGTH', 50)
-CONSUMER_SECRET_LENGTH = getattr(settings, 'OAUTH_CONSUMER_SECRET_LENGTH', 30)
-
-
-def _set_seed():
-    if (not hasattr(_set_seed, 'seed') and
-        os.path.exists("/dev/random")):
-
-        data = open("/dev/random").read(struct.calcsize('Q'))
-        random.seed(struct.unpack('Q', data))
-        _set_seed.seed = True
-
-
-def generate_random_string(length):
-    _set_seed()
-    return ''.join(random.choice(string.ascii_letters)
-                   for x in range(length))
-
-
-class Token(models.Model):
-    consumer = models.ForeignKey('Consumer')
-
-    token = models.CharField(
-        max_length=TOKEN_LENGTH,
-        default=partial(generate_random_string, TOKEN_LENGTH),
-        primary_key=True)
-
-    token_secret = models.CharField(
-        max_length=TOKEN_SECRET_LENGTH,
-        default=partial(generate_random_string, TOKEN_SECRET_LENGTH))
-
-    name = models.CharField(max_length=255, blank=True)
-
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    def oauth_token(self):
-        """Return OAuthToken with information contained in this model"""
-        return OAuthToken(self.token, self.token_secret)
-
-    def serialize(self):
-        return {
-            'consumer_key': self.consumer.key,
-            'consumer_secret': self.consumer.secret,
-            'token': self.token,
-            'token_secret': self.token_secret,
-            'name': self.name
-        }
-
-    def __unicode__(self):
-        return self.token
-
-    class Meta:
-        db_table = 'oauth_token'
-
-
-class Consumer(models.Model):
-    user = models.OneToOneField(User, related_name='oauth_consumer')
-
-    @property
-    def key(self):
-        return self.user.username
-
-    secret = models.CharField(
-        max_length=255,
-        blank=True,
-        null=False,
-        default=partial(generate_random_string, CONSUMER_SECRET_LENGTH)
-    )
-
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    def __unicode__(self):
-        return self.key
-
-    def oauth_consumer(self):
-        """Return OAuthConsumer based on information contained in this model"""
-        return OAuthConsumer(self.key, self.secret)
-
-    class Meta:
-        db_table = 'oauth_consumer'
-
-
-class Nonce(models.Model):
-    token = models.ForeignKey(Token)
-    consumer = models.ForeignKey(Consumer)
-
-    nonce = models.CharField(max_length=255,
-                             unique=True, editable=False)
-    created_at = models.DateTimeField(auto_now_add=True)
-
-    @classmethod
-    def create(cls, consumer_key, token_value, nonce):
-        """
-        Create new nonce object linked to given consumer and token
-        """
-        consumer = Consumer.objects.get(
-            user__username=consumer_key)
-        token = consumer.token_set.get(token=token_value)
-        return consumer.nonce_set.create(token=token, nonce=nonce)
-
-    class Meta:
-        db_table = 'oauth_nonce'
-
-
-class DataStore(OAuthDataStore):
-
-    def lookup_token(self, token_type, token_field):
-        """
-        :param token_type: type of token to lookup
-        :param token_field: token to look up
-
-        :note: token_type should always be 'access' as only such tokens are
-               stored in database
-
-        :returns: OAuthToken object
-        """
-        assert token_type == 'access'
-
-        try:
-            token = Token.objects.get(token=token_field)
-            return OAuthToken(token.token, token.token_secret)
-        except Token.DoesNotExist:
-            return None
-
-    def lookup_consumer(self, consumer_key):
-        """
-        :param consumer_key: consumer key to lookup
-
-        :returns: OAuthConsumer object
-        """
-        try:
-            consumer = Consumer.objects.get(
-                user__username=consumer_key)
-            return consumer.oauth_consumer()
-        except Consumer.DoesNotExist:
-            return None
-
-    def lookup_nonce(self, consumer, token, nonce):
-        """
-        :param consumer: OAuthConsumer object
-        :param token: OAuthToken object
-        :param nonce: nonce to check
-
-        """
-        count = Nonce.objects.filter(
-            consumer__user__username=consumer.key,
-            token__token=token.key,
-            nonce=nonce).count()
-        if count > 0:
-            return True
-        else:
-            Nonce.create(consumer.key, token.key, nonce)
-            return False
-

=== removed file 'oauth_backend/tests.py'
--- oauth_backend/tests.py	2011-01-10 12:30:22 +0000
+++ oauth_backend/tests.py	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from django.test import TestCase
-from django.contrib.auth.models import User
-
-from .models import Consumer, DataStore, Nonce, Token, OAuthToken
-
-
-class BaseTestCase(TestCase):
-
-    @property
-    def user(self):
-        if not hasattr(self, '_user'):
-            self._user = User.objects.create_user(
-                'test_username', '[e-mail]', 'password'
-            )
-        return self._user
-
-
-class TokenTestCase(BaseTestCase):
-
-    def setUp(self):
-        self.consumer, _ = Consumer.objects.get_or_create(user=self.user)
-        self.token = Token(consumer=self.consumer, token='token',
-                           token_secret='secret', name='name')
-    def test_unicode(self):
-        self.assertEqual(unicode(self.token), u'token')
-
-    def test_serialize(self):
-        expected = {'consumer_key': self.consumer.key,
-                    'consumer_secret': self.consumer.secret,
-                    'token': 'token',
-                    'token_secret': 'secret',
-                    'name': 'name'}
-        self.assertEqual(self.token.serialize(), expected)
-
-
-class ConsumerTestCase(BaseTestCase):
-
-    def test_unicode(self):
-        consumer, _ = Consumer.objects.get_or_create(user=self.user)
-        self.assertEqual(unicode(consumer),
-                         unicode(self.user.username))
-
-    def test_one_to_one_relationship_with_user(self):
-        consumer, _ = Consumer.objects.get_or_create(user=self.user)
-
-        self.assertEquals(self.user.id, consumer.user.id)
-        self.assertEquals(consumer.id, self.user.oauth_consumer.id)
-
-
-class DataStoreTestCase(BaseTestCase):
-
-    def setUp(self):
-        self.ds = DataStore()
-        self.consumer, _ = Consumer.objects.get_or_create(user=self.user)
-        self.token, _ = Token.objects.get_or_create(consumer=self.consumer,
-            token='token', token_secret='secret', name='name')
-        self.nonce, _ = Nonce.objects.get_or_create(consumer=self.consumer,
-            token=self.token, nonce='nonce')
-
-    def test_lookup_token_wrong_type(self):
-        self.assertRaises(AssertionError, self.ds.lookup_token, 'value',
-                          'token')
-
-    def test_lookup_token_exists(self):
-        # create a token
-        token = self.ds.lookup_token('access', 'token')
-        self.assertEqual(token.key, 'token')
-        self.assertEqual(token.secret, 'secret')
-
-    def test_lookup_token_not_exists(self):
-        self.token.delete()
-        token = self.ds.lookup_token('access', 'token')
-        self.assertEqual(token, None)
-
-    def test_lookup_consumer_exists(self):
-        consumer_key = self.consumer.key
-        result = self.ds.lookup_consumer(consumer_key)
-        self.assertEqual(result.key, self.consumer.key)
-        self.assertEqual(result.secret, self.consumer.secret)
-
-    def test_lookup_consumer_not_exists(self):
-        consumer_key = 'foo'
-        consumer = self.ds.lookup_consumer(consumer_key)
-        self.assertEqual(consumer, None)
-
-    def test_lookup_nonce_exists(self):
-        otoken = OAuthToken(self.token.token, self.token.token_secret)
-        r = self.ds.lookup_nonce(self.consumer, otoken, 'nonce')
-        self.assertTrue(r)
-
-    def test_lookup_nonce_not_exists(self):
-        self.nonce.delete()
-        otoken = OAuthToken(self.token.token, self.token.token_secret)
-        r = self.ds.lookup_nonce(self.consumer, otoken, 'nonce')
-        self.assertFalse(r)

=== modified file 'requirements.txt'
--- requirements.txt	2010-11-03 16:44:21 +0000
+++ requirements.txt	2011-01-12 08:53:59 +0000
@@ -75,6 +75,7 @@
 wsgi-intercept==0.4
 zc.lockfile==1.0.0
 zdaemon==2.0.4
+django-oauth-backend
 zope.app.pagetemplate==3.10.1
 zope.authentication==3.7.0
 zope.browser==1.2