Implement bans

api/handlers.py

@@ -17,6 +17,8 @@ class WhitelistHandler(AnonymousBaseHandler):
         except IndexError, e:
             return {'valid': False, 'error': 'User not found', 'permissions': []}
         if profile.user.is_active:
+            if profile.isBanned():
+                return {'valid': False, 'error': 'Your account is banned.', 'permissions': []}
             return {'valid': True, 'error': '', 'permissions': profile.serverPermissions()}
         else:
             return {'valid': False, 'error': 'Your account is inactive.', 'permissions': []}

minecraft/admin.py

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

minecraft/migrations/0008_auto__add_ban.py

@@ -0,0 +1,113 @@
+# 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 'Ban'
+        db.create_table('minecraft_ban', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('player', self.gf('django.db.models.fields.related.ForeignKey')(related_name='bans', to=orm['minecraft.MinecraftProfile'])),
+            ('banner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('start', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('expiration', self.gf('django.db.models.fields.DateTimeField')(blank=True)),
+            ('reason', self.gf('django.db.models.fields.TextField')()),
+        ))
+        db.send_create_signal('minecraft', ['Ban'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'Ban'
+        db.delete_table('minecraft_ban')
+
+
+    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.ban': {
+            'Meta': {'object_name': 'Ban'},
+            'banner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'expiration': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'player': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bans'", 'to': "orm['minecraft.MinecraftProfile']"}),
+            'reason': ('django.db.models.fields.TextField', [], {}),
+            'start': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+        },
+        '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', [], {'blank': 'True'})
+        },
+        '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']

minecraft/models.py

@@ -5,11 +5,19 @@ import pyspy
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist
 import socket
+import datetime
 
 class MinecraftProfile(models.Model):
     user = models.OneToOneField(User)
     mc_username = models.CharField(max_length=30, verbose_name="Minecraft.net Username", unique=True)
 
+    def isBanned(self):
+        if self.bans.filter(expiration__gt=datetime.datetime.today()):
+            return True
+        if self.bans.filter(expiration__isnull=True):
+            return True
+        return False
+
     def serverPermissions(self):
         perms = []
         for group in self.user.groups.all():
@@ -87,3 +95,13 @@ def create_group(sender, instance, created, **kwargs):
         MinecraftGroup.objects.create(authGroup = instance)
 
 post_save.connect(create_group, sender=Group)
+
+class Ban(models.Model):
+    player = models.ForeignKey(MinecraftProfile, related_name='bans')
+    banner = models.ForeignKey(User)
+    start = models.DateTimeField(auto_now_add=True)
+    expiration = models.DateTimeField(blank=True)
+    reason = models.TextField()
+
+    def __unicode__(self):
+        return "%s: %s"%(self.player, self.reason)