Merge lp:~fmarier/django-openid-auth/django-openid-auth into lp:~django-openid-auth/django-openid-auth/trunk

[François Marier]

[Michael Hall (mhall119)]

Without commenting on the code change itself, this should at a minimum also contain a South migration for databases that have already been initialized.

review: Needs Fixing

[lp:~fmarier/django-openid-auth/django-openid-auth]

109. By François Marier on 2013-11-30

Add a South migration for the expanded salt field

Generated with "manage.py schemamigration django_openid_auth --auto" and
then hand-edited to match the style of the initial migration.

[François Marier (fmarier)]

> Without commenting on the code change itself, this should at a minimum also
> contain a South migration for databases that have already been initialized.

Good catch. South migration added.

review: Needs Resubmitting

Unmerged revisions

109. By François Marier on 2013-11-30

Add a South migration for the expanded salt field

Generated with "manage.py schemamigration django_openid_auth --auto" and
then hand-edited to match the style of the initial migration.

108. By François Marier on 2013-11-30

Expand the salt field for the nonce

This should fix the problem reported by someone using the id.koumbit.net
OpenID provider. The size of the salt needs to be larger to accomodate that
provider.

=== added file 'django_openid_auth/migrations/0002_auto__chg_field_nonce_salt.py'
--- django_openid_auth/migrations/0002_auto__chg_field_nonce_salt.py	1970-01-01 00:00:00 +0000
+++ django_openid_auth/migrations/0002_auto__chg_field_nonce_salt.py	2013-11-30 23:04:27 +0000
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Changing field 'Nonce.salt'
+        db.alter_column('django_openid_auth_nonce', 'salt', self.gf('django.db.models.fields.CharField')(max_length=128))
+
+
+    def backwards(self, orm):
+        # Changing field 'Nonce.salt'
+        db.alter_column('django_openid_auth_nonce', 'salt', self.gf('django.db.models.fields.CharField')(max_length=40))
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'django_openid_auth.association': {
+            'Meta': {'object_name': 'Association'},
+            'assoc_type': ('django.db.models.fields.TextField', [], {'max_length': '64'}),
+            'handle': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'issued': ('django.db.models.fields.IntegerField', [], {}),
+            'lifetime': ('django.db.models.fields.IntegerField', [], {}),
+            'secret': ('django.db.models.fields.TextField', [], {'max_length': '255'}),
+            'server_url': ('django.db.models.fields.TextField', [], {'max_length': '2047'})
+        },
+        u'django_openid_auth.nonce': {
+            'Meta': {'object_name': 'Nonce'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'salt': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'server_url': ('django.db.models.fields.CharField', [], {'max_length': '2047'}),
+            'timestamp': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'django_openid_auth.useropenid': {
+            'Meta': {'object_name': 'UserOpenID'},
+            'claimed_id': ('django.db.models.fields.TextField', [], {'unique': 'True', 'max_length': '2047'}),
+            'display_id': ('django.db.models.fields.TextField', [], {'max_length': '2047'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['django_openid_auth']

=== modified file 'django_openid_auth/models.py'
--- django_openid_auth/models.py	2013-06-21 17:48:28 +0000
+++ django_openid_auth/models.py	2013-11-30 23:04:27 +0000
@@ -37,7 +37,7 @@
 class Nonce(models.Model):
     server_url = models.CharField(max_length=2047)
     timestamp = models.IntegerField()
-    salt = models.CharField(max_length=40)
+    salt = models.CharField(max_length=128)
 
     def __unicode__(self):
         return u"Nonce: %s, %s" % (self.server_url, self.salt)