添加contest ip限制api；

OI problem的AC，total count也算入profile了

contest/migrations/0008_contest_allowed_ip_ranges.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-11-10 06:57
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0007_contestannouncement_visible'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contest',
+            name='allowed_ip_ranges',
+            field=django.contrib.postgres.fields.jsonb.JSONField(default=list),
+        ),
+    ]

contest/models.py

@@ -4,7 +4,7 @@ from django.utils.timezone import now
 from utils.models import JSONField
 
 from utils.constants import ContestStatus, ContestType
-from account.models import User, AdminType
+from account.models import User
 from utils.models import RichTextField
 
 
@@ -23,6 +23,7 @@ class Contest(models.Model):
     created_by = models.ForeignKey(User)
     # 是否可见 false的话相当于删除
     visible = models.BooleanField(default=True)
+    allowed_ip_ranges = JSONField(default=list)
 
     @property
     def status(self):
@@ -42,14 +43,11 @@ class Contest(models.Model):
             return ContestType.PASSWORD_PROTECTED_CONTEST
         return ContestType.PUBLIC_CONTEST
 
-    def is_contest_admin(self, user):
-        return user.is_authenticated() and (self.created_by == user or user.admin_type == AdminType.SUPER_ADMIN)
-
     # 是否有权查看problem 的一些统计信息 诸如submission_number, accepted_number 等
     def problem_details_permission(self, user):
         return self.rule_type == ContestRuleType.ACM or \
                self.status == ContestStatus.CONTEST_ENDED or \
-               self.is_contest_admin(user) or \
+               user.is_authenticated() and user.is_contest_admin(self) or \
                self.real_time_rank
 
     class Meta:

contest/serializers.py

@@ -13,6 +13,7 @@ class CreateConetestSeriaizer(serializers.Serializer):
     password = serializers.CharField(allow_blank=True, max_length=32)
     visible = serializers.BooleanField()
     real_time_rank = serializers.BooleanField()
+    allowed_ip_ranges = serializers.ListField(child=serializers.CharField(max_length=32), allow_empty=True)
 
 
 class EditConetestSeriaizer(serializers.Serializer):
@@ -24,6 +25,7 @@ class EditConetestSeriaizer(serializers.Serializer):
     password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
     visible = serializers.BooleanField()
     real_time_rank = serializers.BooleanField()
+    allowed_ip_ranges = serializers.ListField(child=serializers.CharField(max_length=32))
 
 
 class ContestAdminSerializer(serializers.ModelSerializer):
@@ -42,7 +44,7 @@ class ContestAdminSerializer(serializers.ModelSerializer):
 class ContestSerializer(ContestAdminSerializer):
     class Meta:
         model = Contest
-        exclude = ("password", "visible")
+        exclude = ("password", "visible", "allowed_ip_ranges")
 
 
 class ContestAnnouncementSerializer(serializers.ModelSerializer):

contest/tests.py

@@ -13,6 +13,7 @@ DEFAULT_CONTEST_DATA = {"title": "test title", "description": "test description"
                         "end_time": timezone.localtime(timezone.now()) + timedelta(days=1),
                         "rule_type": ContestRuleType.ACM,
                         "password": "123",
+                        "allowed_ip_ranges": [],
                         "visible": True, "real_time_rank": True}
 
 

contest/views/admin.py

@@ -1,3 +1,4 @@
+from ipaddress import ip_network
 import dateutil.parser
 
 from utils.api import APIView, validate_serializer
@@ -21,6 +22,11 @@ class ContestAPI(APIView):
             return self.error("Start time must occur earlier than end time")
         if data.get("password") and data["password"] == "":
             data["password"] = None
+        for ip_range in data["allowed_ip_ranges"]:
+            try:
+                ip_network(ip_range, strict=False)
+            except ValueError:
+                return self.error(f"{ip_range} is not a valid cidr network")
         contest = Contest.objects.create(**data)
         return self.success(ContestAdminSerializer(contest).data)
 
@@ -39,6 +45,12 @@ class ContestAPI(APIView):
             return self.error("Start time must occur earlier than end time")
         if not data["password"]:
             data["password"] = None
+        for ip_range in data["allowed_ip_ranges"]:
+            try:
+                ip_network(ip_range, strict=False)
+            except ValueError as e:
+                return self.error(f"{ip_range} is not a valid cidr network")
+
         for k, v in data.items():
             setattr(contest, k, v)
         contest.save()