caminus/caminus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement permission assignment via groups

Browse Source
This commit is contained in:
Trever Fischer
2012-04-03 21:06:45 -04:00
parent 9bfe62dc92
commit 6496eef466
4 changed files with 119 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/handlers.py
View File

@@ -20,6 +20,9 @@ class WhitelistHandler(AnonymousBaseHandler):
perms = []
if profile.user.is_staff:
perms.append('bukkit.command.op.give')
for group in profile.user.groups.all():
for perm in group.minecraftgroup.permissionList.split("\n"):
perms.append(perm.strip())
return {'valid': True, 'error': '', 'permissions': perms}
else:
return {'valid': False, 'error': 'Your account is inactive.', 'permissions': []}

1
minecraft/admin.py
View File

@@ -5,3 +5,4 @@ admin.site.register(models.MinecraftProfile)
admin.site.register(models.Server)
admin.site.register(models.MOTD)
admin.site.register(models.PlayerSession)
admin.site.register(models.MinecraftGroup)

101
minecraft/migrations/0007_auto__add_minecraftgroup.py Normal file
View File

@@ -0,0 +1,101 @@
# encoding: 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 'MinecraftGroup'
db.create_table('minecraft_minecraftgroup', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('authGroup', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.Group'], unique=True)),
('permissionList', self.gf('django.db.models.fields.TextField')()),
))
db.send_create_signal('minecraft', ['MinecraftGroup'])
def backwards(self, orm):
# Deleting model 'MinecraftGroup'
db.delete_table('minecraft_minecraftgroup')
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'})
},
'minecraft.minecraftgroup': {
'Meta': {'object_name': 'MinecraftGroup'},
'authGroup': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.Group']", 'unique': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'permissionList': ('django.db.models.fields.TextField', [], {})
},
'minecraft.minecraftprofile': {
'Meta': {'object_name': 'MinecraftProfile'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'mc_username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
},
'minecraft.motd': {
'Meta': {'object_name': 'MOTD'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['minecraft.Server']"}),
'text': ('django.db.models.fields.TextField', [], {})
},
'minecraft.playersession': {
'Meta': {'object_name': 'PlayerSession'},
'end': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
'player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['minecraft.MinecraftProfile']"}),
'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['minecraft.Server']"}),
'start': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
},
'minecraft.server': {
'Meta': {'object_name': 'Server'},
'hostname': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'port': ('django.db.models.fields.IntegerField', [], {'default': '25565'}),
'query_port': ('django.db.models.fields.IntegerField', [], {'default': '25565'}),
'ruleset': ('django.db.models.fields.TextField', [], {'default': "''"}),
'secret': ('django.db.models.fields.CharField', [], {'max_length': '100'})
}
}
complete_apps = ['minecraft']

15
minecraft/models.py
View File

@@ -1,5 +1,5 @@
from django.db import models
from django.contrib.auth.models import User
from django.contrib.auth.models import User, Group
from django.db.models.signals import post_save
import pyspy
from django.core.cache import cache
@@ -67,3 +67,16 @@ def create_profile(sender, instance, created, **kwargs):
MinecraftProfile.objects.create(user=instance, mc_username=instance.username)
post_save.connect(create_profile, sender=User)
class MinecraftGroup(models.Model):
authGroup = models.OneToOneField(Group)
permissionList = models.TextField()
def __unicode__(self):
return self.authGroup.__unicode__()
def create_group(sender, instance, created, **kwargs):
if created:
MinecraftGroup.objects.create(authGroup = instance)
post_save.connect(create_group, sender=Group)