Accept Merge Request QingdaoU#331 dev -> master : (dev -> master)

Merge Request: dev -> master
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/331

account/migrations/0015_userprofile_student_id.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-08 06:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0014_auto_20151110_1037'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='student_id',
+            field=models.CharField(blank=True, max_length=15, null=True),
+        ),
+    ]

account/models.py

@@ -70,7 +70,7 @@ class UserProfile(models.Model):
     problems_status = JSONField(default={})
     phone_number = models.CharField(max_length=15, blank=True, null=True)
     school = models.CharField(max_length=200, blank=True, null=True)
-
+    student_id = models.CharField(max_length=15, blank=True, null=True)
 
     class Meta:
         db_table = "user_profile"

account/serializers.py

@@ -25,6 +25,7 @@ class UserRegisterSerializer(serializers.Serializer):
     password = serializers.CharField(max_length=30, min_length=6)
     email = serializers.EmailField(max_length=254)
     captcha = serializers.CharField(max_length=4, min_length=4)
+    student_id = serializers.CharField(max_length=15, required=False, default=None)
 
 
 class UserChangePasswordSerializer(serializers.Serializer):
@@ -74,11 +75,12 @@ class EditUserProfileSerializer(serializers.Serializer):
     codeforces_username = serializers.CharField(max_length=30, required=False, allow_blank=True, default='')
     school = serializers.CharField(max_length=200, required=False, allow_blank=True, default='')
     phone_number = serializers.CharField(max_length=15, required=False, allow_blank=True, default='')
+    student_id = serializers.CharField(max_length=15, required=False, default="")
 
 
 class UserProfileSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = UserProfile
         fields = ["avatar", "blog", "mood", "hduoj_username", "bestcoder_username", "codeforces_username",
-                  "rank", "accepted_number", "submissions_number", "problems_status", "phone_number", "school"]
+                  "rank", "accepted_number", "submissions_number", "problems_status", "phone_number", "school", "student_id"]

account/views.py

@@ -14,7 +14,7 @@
 from utils.shortcuts import (serializer_invalid_response, error_response,
                              success_response, error_page, paginate, rand_str)
 from utils.captcha import Captcha
-from mail.tasks import send_email
+from utils.mail import send_email
 
 from .decorators import login_required
 from .models import User, UserProfile
@@ -97,7 +97,7 @@ def post(self, request):
                                            email=data["email"])
                 user.set_password(data["password"])
                 user.save()
-                UserProfile.objects.create(user=user, school=data["school"])
+                UserProfile.objects.create(user=user, school=data["school"], student_id=data["student_id"])
                 return success_response(u"注册成功！")
         else:
             return serializer_invalid_response(serializer)
@@ -262,6 +262,7 @@ def put(self, request):
                 user_profile.codeforces_username = data["codeforces_username"]
                 user_profile.blog = data["blog"]
                 user_profile.school = data["school"]
+                user_profile.student_id = data["student_id"]
                 user_profile.phone_number = data["phone_number"]
             user_profile.save()
             return success_response(u"修改成功")

contest/decorators.py

@@ -8,8 +8,8 @@
 
 from utils.shortcuts import error_response, error_page
 
-from account.models import SUPER_ADMIN
-from .models import (Contest, PASSWORD_PROTECTED_CONTEST, PUBLIC_CONTEST, GROUP_CONTEST,
+from account.models import SUPER_ADMIN, ADMIN
+from .models import (Contest, PASSWORD_PROTECTED_CONTEST, PASSWORD_PROTECTED_GROUP_CONTEST, PUBLIC_CONTEST, GROUP_CONTEST,
                      CONTEST_ENDED, CONTEST_NOT_START, CONTEST_UNDERWAY)
 
 
@@ -57,7 +57,10 @@ def _check_user_contest_permission(*args, **kwargs):
 
         if request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by:
             return func(*args, **kwargs)
-
+        if request.user.admin_type == ADMIN:
+            contest_set = Contest.objects.filter(groups__in=request.user.managed_groups.all())
+            if contest in contest_set:
+                return func(*args, **kwargs)
         # 管理员可见隐藏的比赛，已经先判断了身份
         if not contest.visible:
             if request.is_ajax():
@@ -83,6 +86,15 @@ def _check_user_contest_permission(*args, **kwargs):
                 else:
                     return render(request, "oj/contest/no_contest_permission.html",
                                   {"reason": "group_limited", "show_tab": False, "contest": contest})
+
+        if contest.contest_type == PASSWORD_PROTECTED_GROUP_CONTEST:
+            if not contest.groups.filter(id__in=request.user.group_set.all()).exists():
+                if contest.id not in request.session.get("contests", []):
+                    if request.is_ajax():
+                        return error_response(u"请先输入密码")
+                    else:
+                        return render(request, "oj/contest/no_contest_permission.html",
+                                      {"reason": "password_protect", "show_tab": False, "contest": contest})
 
         # 比赛没有开始
         if contest.status == CONTEST_NOT_START:

contest/models.py

@@ -7,12 +7,13 @@
 from group.models import Group
 from utils.models import RichTextField
 from jsonfield import JSONField
-from judge.judger.result import result
+from judge.result import result
 
 
 GROUP_CONTEST = 0
 PUBLIC_CONTEST = 1
 PASSWORD_PROTECTED_CONTEST = 2
+PASSWORD_PROTECTED_GROUP_CONTEST = 3
 
 CONTEST_NOT_START = 1
 CONTEST_ENDED = -1

contest/views.py

@@ -17,13 +17,13 @@
                              success_response, paginate, error_page, paginate_data)
 from account.models import SUPER_ADMIN, User
 from account.decorators import login_required, super_admin_required
-from group.models import Group
+from group.models import Group, AdminGroupRelation, UserGroupRelation
 from utils.cache import get_cache_redis
 from submission.models import Submission
 from problem.models import Problem
 from .models import (Contest, ContestProblem, CONTEST_ENDED,
                      CONTEST_NOT_START, CONTEST_UNDERWAY, ContestRank)
-from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST
+from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST, PASSWORD_PROTECTED_GROUP_CONTEST
 from .decorators import check_user_contest_permission
 from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer,
                           CreateContestProblemSerializer, ContestProblemSerializer,
@@ -50,11 +50,11 @@ def post(self, request):
                 if request.user.admin_type != SUPER_ADMIN:
                     return error_response(u"只有超级管理员才可创建公开赛")
 
-            if data["contest_type"] == PASSWORD_PROTECTED_CONTEST:
+            if data["contest_type"] in [PASSWORD_PROTECTED_CONTEST, PASSWORD_PROTECTED_GROUP_CONTEST]:
                 if not data["password"]:
-                    return error_response(u"此比赛为有密码的公开赛，密码不可为空")
+                    return error_response(u"此比赛为有密码的比赛，密码不可为空")
             # 没有密码的公开赛 没有密码的小组赛
-            elif data["contest_type"] == GROUP_CONTEST:
+            if data["contest_type"] == GROUP_CONTEST or data["contest_type"] == PASSWORD_PROTECTED_GROUP_CONTEST:
                 if request.user.admin_type == SUPER_ADMIN:
                     groups = Group.objects.filter(id__in=data["groups"])
                 else:
@@ -91,8 +91,10 @@ def put(self, request):
             try:
                 # 超级管理员可以编辑所有的
                 contest = Contest.objects.get(id=data["id"])
-                if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user:
-                    return error_response(u"无权访问！")
+                if request.user.admin_type != SUPER_ADMIN:
+                    contest_set = Contest.objects.filter(groups__in=request.user.managed_groups.all())
+                    if contest not in contest_set:
+                        return error_response(u"无权访问！")
             except Contest.DoesNotExist:
                 return error_response(u"该比赛不存在！")
             try:
@@ -107,7 +109,7 @@ def put(self, request):
             if data["contest_type"] == PASSWORD_PROTECTED_CONTEST:
                 if not data["password"]:
                     return error_response(u"此比赛为有密码的公开赛，密码不可为空")
-            elif data["contest_type"] == GROUP_CONTEST:
+            elif data["contest_type"] in [GROUP_CONTEST, PASSWORD_PROTECTED_GROUP_CONTEST]:
                 if request.user.admin_type == SUPER_ADMIN:
                     groups = Group.objects.filter(id__in=data["groups"])
                 else:
@@ -151,16 +153,18 @@ def get(self, request):
                 # 普通管理员只能获取自己创建的题目
                 # 超级管理员可以获取全部的题目
                 contest = Contest.objects.get(id=contest_id)
-                if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user:
-                    return error_response(u"题目不存在")
+                if request.user.admin_type != SUPER_ADMIN:
+                    contest_set = Contest.objects.filter(groups__in=request.user.managed_groups.all())
+                    if contest not in contest_set:
+                        return error_response(u"比赛不存在")
                 return success_response(ContestSerializer(contest).data)
             except Contest.DoesNotExist:
-                return error_response(u"题目不存在")
+                return error_response(u"比赛不存在")
 
         if request.user.admin_type == SUPER_ADMIN:
             contest = Contest.objects.all().order_by("-create_time")
         else:
-            contest = Contest.objects.filter(created_by=request.user).order_by("-create_time")
+            contest = Contest.objects.filter(groups__in=request.user.managed_groups.all()).distinct().order_by("-create_time")
         visible = request.GET.get("visible", None)
         if visible:
             contest = contest.filter(visible=(visible == "true"))
@@ -184,8 +188,10 @@ def post(self, request):
             data = serializer.data
             try:
                 contest = Contest.objects.get(id=data["contest_id"])
-                if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user:
-                    return error_response(u"比赛不存在")
+                if request.user.admin_type != SUPER_ADMIN:
+                    contest_set = Contest.objects.filter(groups__in=request.user.managed_groups.all())
+                    if contest not in contest_set:
+                        return error_response(u"比赛不存在")
             except Contest.DoesNotExist:
                 return error_response(u"比赛不存在")
             contest_problem = ContestProblem.objects.create(title=data["title"],
@@ -362,7 +368,10 @@ def contest_problem_page(request, contest_id, contest_problem_id):
                     request.user.admin_type == SUPER_ADMIN or \
                     request.user == contest.created_by:
         show_submit_code_area = True
-
+    else:
+        contest_set = Contest.objects.filter(groups__in=request.user.managed_groups.all())
+        if contest in contest_set:
+            show_submit_code_area = True
     return render(request, "oj/problem/contest_problem.html", {"problem": problem,
                                                                "contest": contest,
                                                                "samples": json.loads(problem.samples),

dockerfiles/judger/Dockerfile

@@ -19,4 +19,5 @@ RUN cd lrun && make install
 RUN mkdir -p /var/judger/run/ && mkdir /var/judger/test_case/ && mkdir /var/judger/code/
 RUN chmod -R 777 /var/judger/run/
 COPY policy /var/judger/run/
-WORKDIR /var/judger/code/
+WORKDIR /var/judger/code/judge/
+CMD python server.py

dockerfiles/oj_web_server/requirements.txt

@@ -4,11 +4,11 @@ redis
 django-redis-sessions
 djangorestframework
 django-rest-swagger
-celery
 gunicorn
 coverage
 django-extensions
 supervisor
 pillow
 jsonfield
-Envelopes
+Envelopes
+huey

dockerfiles/oj_web_server/supervisord.conf

@@ -23,4 +23,4 @@ serverurl=unix:///tmp/supervisor.sock ; use unix:// schem for a unix sockets.
 
 [include]
 
-files=gunicorn.conf mq.conf
+files=gunicorn.conf task_queue.conf

dockerfiles/oj_web_server/mq.conf → dockerfiles/oj_web_server/task_queue.conf

@@ -1,12 +1,12 @@
 [program:mq]
 
-command=python manage.py runscript mq
+command=python manage.py run_huey
 
 directory=/code/
 user=root
 numprocs=1
-stdout_logfile=/code/log/mq.log
-stderr_logfile=/code/log/mq.log
+stdout_logfile=/code/log/task_queue.log
+stderr_logfile=/code/log/task_queue.log
 autostart=true
 autorestart=true
 startsecs=5

group/migrations/0006_auto_20151209_1834.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-09 10:34
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0005_joingrouprequest_accepted'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='group',
+            old_name='admin',
+            new_name='created_by',
+        ),
+    ]

group/migrations/0007_auto_20151209_1836.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-09 10:36
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('group', '0006_auto_20151209_1834'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AdminGroupRelation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='group.Group')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'admin_group_relation',
+            },
+        ),
+        migrations.AddField(
+            model_name='group',
+            name='admin',
+            field=models.ManyToManyField(related_name='managed_groups', through='group.AdminGroupRelation', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterUniqueTogether(
+            name='admingrouprelation',
+            unique_together=set([('user', 'group')]),
+        ),
+    ]

group/models.py

@@ -8,10 +8,11 @@ class Group(models.Model):
     name = models.CharField(max_length=30, unique=True)
     description = models.TextField()
     create_time = models.DateTimeField(auto_now_add=True)
-    admin = models.ForeignKey(User, related_name="my_groups")
+    created_by = models.ForeignKey(User, related_name="my_groups")
     # 0是公开 1是需要申请后加入 2是不允许任何人加入
     join_group_setting = models.IntegerField(default=1)
     members = models.ManyToManyField(User, through="UserGroupRelation")
+    admin = models.ManyToManyField(User, through="AdminGroupRelation", related_name="managed_groups")
     # 解散小组后，这一项改为False
     visible = models.BooleanField(default=True)
 
@@ -29,6 +30,16 @@ class Meta:
         unique_together = ("group", "user")
 
 
+
+class AdminGroupRelation(models.Model):
+    user = models.ForeignKey(User)
+    group = models.ForeignKey(Group)
+
+    class Meta:
+        db_table = "admin_group_relation"
+        unique_together = ("user", "group")
+
+
 class JoinGroupRequest(models.Model):
     group = models.ForeignKey(Group)
     user = models.ForeignKey(User, related_name="my_join_group_requests")

group/serializers.py

@@ -17,6 +17,7 @@ class EditGroupSerializer(serializers.Serializer):
     name = serializers.CharField(max_length=20)
     description = serializers.CharField(max_length=300)
     join_group_setting = serializers.IntegerField()
+    visible = serializers.BooleanField()
 
 
 class CreateJoinGroupRequestSerializer(serializers.Serializer):
@@ -73,4 +74,8 @@ class EditGroupMemberSerializer(serializers.Serializer):
 
 class PutJoinGroupRequestSerializer(serializers.Serializer):
     request_id = serializers.IntegerField()
-    status = serializers.BooleanField()
+    status = serializers.BooleanField()
+
+class GroupPromoteAdminSerializer(serializers.Serializer):
+    user_id = serializers.IntegerField()
+    group_id = serializers.IntegerField()