EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add email authentication

pull/1/head
eric 2013-10-10 22:31:31 -04:00
parent a4321ff6fc
commit eb9cc878ce
6 changed files with 145 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin.py
View File

@ -41,8 +41,8 @@ from regluit.core.lookups import (
OwnerLookup,
EditionLookup
)
from regluit.libraryauth.models import Library, Block, CardPattern
from regluit.libraryauth.admin import LibraryAdmin, BlockAdmin, CardPatternAdmin
from regluit.libraryauth.models import Library, Block, CardPattern, EmailPattern
from regluit.libraryauth.admin import LibraryAdmin, BlockAdmin, CardPatternAdmin, EmailPatternAdmin
class RegluitAdmin(AdminSite):
login_template = 'registration/login.html'
@ -216,6 +216,7 @@ admin_site.register(User, UserAdmin)
admin_site.register(Library, LibraryAdmin)
admin_site.register(Block, BlockAdmin)
admin_site.register(CardPattern, CardPatternAdmin)
admin_site.register(EmailPattern, EmailPatternAdmin)
admin_site.register(models.Work, WorkAdmin)
admin_site.register(models.Claim, ClaimAdmin)
admin_site.register(models.RightsHolder, RightsHolderAdmin)

4
libraryauth/admin.py
View File

@ -38,3 +38,7 @@ class BlockAdmin(ModelAdmin):
class CardPatternAdmin(ModelAdmin):
list_display = ('library', 'pattern', 'checksum',)
search_fields = ('library__user__username', )
class EmailPatternAdmin(ModelAdmin):
list_display = ('library', 'pattern', )
search_fields = ('library__user__username',)

17
libraryauth/backends.py
View File

@ -82,4 +82,19 @@ class cardnum_form(forms.ModelForm):
class Meta:
model = LibraryUser
widgets = { 'library': forms.HiddenInput, 'user': forms.HiddenInput }
widgets = { 'library': forms.HiddenInput, 'user': forms.HiddenInput }
def email_authenticate(request, library):
if request.user.is_anonymous():
return False
email = request.user.email
for email_pattern in library.email_patterns.all():
if email_pattern.is_valid(email):
logger.info('%s authenticated for %s from %s'%(request.user, library, email))
library.credential=email
return True
return False
class email_authenticator():
def process(authenticator, success_url, deny_url):
return HttpResponseRedirect(deny_url)

99
libraryauth/migrations/0002_auto__add_emailpattern.py Normal file
View File

@ -0,0 +1,99 @@
# -*- 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):
# Adding model 'EmailPattern'
db.create_table('libraryauth_emailpattern', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('library', self.gf('django.db.models.fields.related.ForeignKey')(related_name='email_patterns', to=orm['libraryauth.Library'])),
('pattern', self.gf('django.db.models.fields.CharField')(max_length=20)),
))
db.send_create_signal('libraryauth', ['EmailPattern'])
def backwards(self, orm):
# Deleting model 'EmailPattern'
db.delete_table('libraryauth_emailpattern')
models = {
'auth.group': {
'Meta': {'object_name': 'Group'},
'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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
'auth.permission': {
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'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': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
'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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
'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'}),
'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'})
},
'libraryauth.block': {
'Meta': {'ordering': "['lower']", 'object_name': 'Block'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'library': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': "orm['libraryauth.Library']"}),
'lower': ('regluit.libraryauth.models.IPAddressModelField', [], {'unique': 'True', 'db_index': 'True'}),
'upper': ('regluit.libraryauth.models.IPAddressModelField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'})
},
'libraryauth.cardpattern': {
'Meta': {'object_name': 'CardPattern'},
'checksum': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'library': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'card_patterns'", 'to': "orm['libraryauth.Library']"}),
'pattern': ('django.db.models.fields.CharField', [], {'max_length': '20'})
},
'libraryauth.emailpattern': {
'Meta': {'object_name': 'EmailPattern'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'library': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'email_patterns'", 'to': "orm['libraryauth.Library']"}),
'pattern': ('django.db.models.fields.CharField', [], {'max_length': '20'})
},
'libraryauth.library': {
'Meta': {'object_name': 'Library'},
'backend': ('django.db.models.fields.CharField', [], {'default': "'ip'", 'max_length': '10'}),
'group': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'library'", 'unique': 'True', 'null': 'True', 'to': "orm['auth.Group']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'library'", 'unique': 'True', 'to': "orm['auth.User']"})
},
'libraryauth.libraryuser': {
'Meta': {'object_name': 'LibraryUser'},
'credential': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'library': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'library_users'", 'to': "orm['libraryauth.Library']"}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_libraries'", 'to': "orm['auth.User']"})
}
}
complete_apps = ['libraryauth']

18
libraryauth/models.py
View File

@ -16,7 +16,11 @@ class Library(models.Model):
'''
user = models.OneToOneField(User, related_name='library')
group = models.OneToOneField(Group, related_name='library', null = True)
backend = models.CharField(max_length=10, choices=(('ip','IP authentication'),('cardnum', 'Library Card Number check')),default='ip')
backend = models.CharField(max_length=10, choices=(
('ip','IP authentication'),
('cardnum', 'Library Card Number check'),
('email', 'e-mail pattern check'),
),default='ip')
credential = None
def __unicode__(self):
@ -267,3 +271,15 @@ class LibraryUser(models.Model):
user = models.ForeignKey(User, related_name='user_libraries')
credential = models.CharField(max_length=30, null=True)
date_modified = models.DateTimeField(auto_now=True)
class EmailPattern(models.Model):
library = models.ForeignKey(Library, related_name='email_patterns')
# email endswith string
pattern = models.CharField(max_length=20)
def is_valid(self, email):
if email.lower().endswith(self.pattern.lower()):
return True
else:
return False

6
libraryauth/templates/libraryauth/email_join.html Normal file
View File

@ -0,0 +1,6 @@
<br />
{% if authenticator.allowed %}
<a href="{% url join_library authenticator.library %}?next={% url join_library authenticator.library %}" class="fakeinput">Make this my Library</a>
{% else %}
Based on your account's email address, you can't join {{ authenticator.library }}. You can < a href="{% url email_change %}"> change your email address</a> if you need to.
{% endif %}