Merge branch 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj

account/middleware.py

@@ -0,0 +1,24 @@
+# coding=utf-8
+import time
+import json
+import urllib
+from django.http import HttpResponseRedirect, HttpResponse
+from django.contrib import auth
+from utils.shortcuts import error_response, error_page
+from .models import ADMIN
+
+
+class SessionSecurityMiddleware(object):
+    def process_request(self, request):
+        if request.user.is_authenticated() and request.user.admin_type >= ADMIN:
+            if "last_activity" in request.session:
+                # 24个小时没有活动
+                if time.time() - request.session["last_activity"] >= 24 * 60 * 60:
+                    auth.logout(request)
+                    if request.is_ajax():
+                        return HttpResponse(json.dumps({"code": 1, "data": u"请先登录"}),
+                                            content_type="application/json")
+                    else:
+                        return HttpResponseRedirect("/login/?__from=" + urllib.quote(request.build_absolute_uri()))
+            # 更新最后活动日期
+            request.session["last_activity"] = time.time()

contest/decorators.py

@@ -4,6 +4,7 @@ from functools import wraps
 
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
+from django.core.urlresolvers import reverse
 
 from utils.shortcuts import error_response, error_page
 
@@ -92,7 +93,7 @@ def check_user_contest_permission(func):
                               {"reason": "contest_not_start", "show_tab": False, "contest": contest})
 
         # 比赛已经结束了，只拦截 ajax 的答案提交
-        if contest.status == CONTEST_ENDED and request.is_ajax():
+        if contest.status == CONTEST_ENDED and request.path == reverse("contest_submission_api") and request.is_ajax():
             return error_response(u"比赛已经结束")
 
         return func(*args, **kwargs)

contest/views.py

@@ -291,7 +291,6 @@ class MakeContestProblemPublicAPIView(APIView):
         return success_response(u"创建成功")
 
 
-
 class ContestPasswordVerifyAPIView(APIView):
     @login_required
     def post(self, request):
@@ -374,7 +373,7 @@ def contest_problems_list_page(request, contest_id):
     比赛所有题目的列表页
     """
     contest = Contest.objects.get(id=contest_id)
-    contest_problems = ContestProblem.objects.filter(contest=contest).select_related("contest").order_by("sort_index")
+    contest_problems = ContestProblem.objects.filter(contest=contest, visible=True).select_related("contest").order_by("sort_index")
     return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems,
                                                                      "contest": {"id": contest_id}})
 
@@ -466,6 +465,7 @@ class ContestTimeAPIView(APIView):
     """
     获取比赛开始或者结束的倒计时，返回毫秒数字
     """
+
     def get(self, request):
         contest_id = request.GET.get("contest_id", -1)
         try:

oj/settings.py

@@ -71,7 +71,8 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
-    'admin.middleware.AdminRequiredMiddleware'
+    'admin.middleware.AdminRequiredMiddleware',
+    'account.middleware.SessionSecurityMiddleware'
 )
 
 ROOT_URLCONF = 'oj.urls'

problem/views.py

@@ -40,6 +40,7 @@ class ProblemTagAdminAPIView(APIView):
     """
     获取所有标签的列表
     """
+
     def get(self, request):
         return success_response(ProblemTagSerializer(ProblemTag.objects.all(), many=True).data)
 
@@ -189,33 +190,21 @@ class TestCaseUploadAPIView(APIView):
             return error_response(u"解压失败")
         name_list = test_case_file.namelist()
 
-        l = []
-
         # 如果文件是直接打包的，那么name_list 就是["1.in", "1.out"]这样的
 
-        if "1.in" in name_list and "1.out" in name_list:
+        if len(name_list) % 2 == 1:
-            for file_name in name_list:
+            return error_response(u"测试用例文件格式错误，文件数目为奇数")
-                if self._is_legal_test_case_file_name(file_name):
+
-                    name = file_name.split(".")
+        for index in range(1, len(name_list) / 2 + 1):
-                    # 有了.in 判断对应的.out 在不在
+            if not (str(index) + ".in" in name_list and str(index) + ".out" in name_list):
-                    if name[1] == "in":
+                return error_response(u"测试用例文件格式错误，缺少" + str(index) + u".in/.out文件")
-                        if (name[0] + ".out") in name_list:
-                            l.append(file_name)
-                        else:
-                            return error_response(u"测试用例文件不完整，缺少" + name[0] + ".out")
-                    else:
-                        # 有了.out 判断对应的 .in 在不在
-                        if (name[0] + ".in") in name_list:
-                            l.append(file_name)
-                        else:
-                            return error_response(u"测试用例文件不完整，缺少" + name[0] + ".in")
 
         problem_test_dir = rand_str()
         test_case_dir = settings.TEST_CASE_DIR + problem_test_dir + "/"
 
         # 得到了合法的测试用例文件列表 然后去解压缩
         os.mkdir(test_case_dir)
-            for name in l:
+        for name in name_list:
             f = open(test_case_dir + name, "wb")
             try:
                 f.write(test_case_file.read(name).replace("\r\n", "\n"))
@@ -223,15 +212,15 @@ class TestCaseUploadAPIView(APIView):
                 return error_response(u"单个测试数据体积过大!")
             finally:
                 f.close()
-            l.sort()
+        name_list.sort()
 
-            file_info = {"test_case_number": len(l) / 2, "test_cases": {}}
+        file_info = {"test_case_number": len(name_list) / 2, "test_cases": {}}
 
         # 计算输出文件的md5
-            for i in range(len(l) / 2):
+        for i in range(1, len(name_list) / 2 + 1):
             md5 = hashlib.md5()
             striped_md5 = hashlib.md5()
-                f = open(test_case_dir + str(i + 1) + ".out", "r")
+            f = open(test_case_dir + str(i) + ".out", "r")
             # 完整文件的md5
             while True:
                 data = f.read(2 ** 8)
@@ -244,20 +233,18 @@ class TestCaseUploadAPIView(APIView):
             f.seek(0)
             striped_md5.update(f.read().rstrip())
 
-                file_info["test_cases"][str(i + 1)] = {"input_name": str(i + 1) + ".in",
+            file_info["test_cases"][str(i)] = {"input_name": str(i) + ".in",
-                                                       "output_name": str(i + 1) + ".out",
+                                               "output_name": str(i) + ".out",
                                                "output_md5": md5.hexdigest(),
                                                "striped_output_md5": striped_md5.hexdigest(),
-                                                       "input_size": os.path.getsize(test_case_dir + str(i + 1) + ".in"),
+                                               "input_size": os.path.getsize(test_case_dir + str(i) + ".in"),
-                                                       "output_size": os.path.getsize(test_case_dir + str(i + 1) + ".out")}
+                                               "output_size": os.path.getsize(test_case_dir + str(i) + ".out")}
             # 写入配置文件
             with open(test_case_dir + "info", "w") as f:
                 f.write(json.dumps(file_info))
 
         return success_response({"test_case_id": problem_test_dir,
                                  "file_list": file_info["test_cases"]})
-        else:
-            return error_response(u"测试用例压缩文件格式错误，请保证测试用例文件在根目录下直接压缩")
 
     def get(self, request):
         test_case_id = request.GET.get("test_case_id", None)
@@ -273,7 +260,6 @@ class TestCaseUploadAPIView(APIView):
         return success_response({"file_list": config["test_cases"]})
 
 
-
 def problem_list_page(request, page=1):
     """
     前台的问题列表