mirror of
https://github.com/QingdaoU/OnlineJudge.git
synced 2024-09-21 08:23:20 +00:00
Merge branch 'virusdefender-dev' of https://git.coding.net/virusdefender/qduoj
This commit is contained in:
commit
68201a0dc7
24
account/middleware.py
Normal file
24
account/middleware.py
Normal file
@ -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()
|
@ -4,6 +4,7 @@ from functools import wraps
|
|||||||
|
|
||||||
from django.http import HttpResponse, HttpResponseRedirect
|
from django.http import HttpResponse, HttpResponseRedirect
|
||||||
from django.shortcuts import render
|
from django.shortcuts import render
|
||||||
|
from django.core.urlresolvers import reverse
|
||||||
|
|
||||||
from utils.shortcuts import error_response, error_page
|
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})
|
{"reason": "contest_not_start", "show_tab": False, "contest": contest})
|
||||||
|
|
||||||
# 比赛已经结束了,只拦截 ajax 的答案提交
|
# 比赛已经结束了,只拦截 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 error_response(u"比赛已经结束")
|
||||||
|
|
||||||
return func(*args, **kwargs)
|
return func(*args, **kwargs)
|
||||||
|
@ -264,7 +264,7 @@ class ContestProblemAdminAPIView(APIView):
|
|||||||
keyword = request.GET.get("keyword", None)
|
keyword = request.GET.get("keyword", None)
|
||||||
if keyword:
|
if keyword:
|
||||||
contest_problems = contest_problems.filter(Q(title__contains=keyword) |
|
contest_problems = contest_problems.filter(Q(title__contains=keyword) |
|
||||||
Q(description__contains=keyword))
|
Q(description__contains=keyword))
|
||||||
contest_id = request.GET.get("contest_id", None)
|
contest_id = request.GET.get("contest_id", None)
|
||||||
if contest_id:
|
if contest_id:
|
||||||
contest_problems = contest_problems.filter(contest__id=contest_id).order_by("sort_index")
|
contest_problems = contest_problems.filter(contest__id=contest_id).order_by("sort_index")
|
||||||
@ -291,7 +291,6 @@ class MakeContestProblemPublicAPIView(APIView):
|
|||||||
return success_response(u"创建成功")
|
return success_response(u"创建成功")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class ContestPasswordVerifyAPIView(APIView):
|
class ContestPasswordVerifyAPIView(APIView):
|
||||||
@login_required
|
@login_required
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
@ -374,7 +373,7 @@ def contest_problems_list_page(request, contest_id):
|
|||||||
比赛所有题目的列表页
|
比赛所有题目的列表页
|
||||||
"""
|
"""
|
||||||
contest = Contest.objects.get(id=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,
|
return render(request, "oj/contest/contest_problems_list.html", {"contest_problems": contest_problems,
|
||||||
"contest": {"id": contest_id}})
|
"contest": {"id": contest_id}})
|
||||||
|
|
||||||
@ -430,9 +429,9 @@ def contest_rank_page(request, contest_id):
|
|||||||
rank = r.get(cache_key)
|
rank = r.get(cache_key)
|
||||||
|
|
||||||
if not rank:
|
if not rank:
|
||||||
rank = ContestRank.objects.filter(contest_id=contest_id).\
|
rank = ContestRank.objects.filter(contest_id=contest_id). \
|
||||||
select_related("user").\
|
select_related("user"). \
|
||||||
order_by("-total_ac_number", "total_time").\
|
order_by("-total_ac_number", "total_time"). \
|
||||||
values("id", "user__id", "user__username", "user__real_name", "contest_id", "submission_info",
|
values("id", "user__id", "user__username", "user__real_name", "contest_id", "submission_info",
|
||||||
"total_submission_number", "total_ac_number", "total_time")
|
"total_submission_number", "total_ac_number", "total_time")
|
||||||
r.set(cache_key, json.dumps([dict(item) for item in rank]))
|
r.set(cache_key, json.dumps([dict(item) for item in rank]))
|
||||||
@ -459,13 +458,14 @@ def contest_rank_page(request, contest_id):
|
|||||||
"contest_problems": contest_problems,
|
"contest_problems": contest_problems,
|
||||||
"paging_info": paging_info,
|
"paging_info": paging_info,
|
||||||
"auto_refresh": request.GET.get("auto_refresh", None) == "true",
|
"auto_refresh": request.GET.get("auto_refresh", None) == "true",
|
||||||
"show_real_name": request.GET.get("show_real_name", None) == "true",})
|
"show_real_name": request.GET.get("show_real_name", None) == "true", })
|
||||||
|
|
||||||
|
|
||||||
class ContestTimeAPIView(APIView):
|
class ContestTimeAPIView(APIView):
|
||||||
"""
|
"""
|
||||||
获取比赛开始或者结束的倒计时,返回毫秒数字
|
获取比赛开始或者结束的倒计时,返回毫秒数字
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
contest_id = request.GET.get("contest_id", -1)
|
contest_id = request.GET.get("contest_id", -1)
|
||||||
try:
|
try:
|
||||||
@ -490,8 +490,8 @@ def contest_problem_my_submissions_list_page(request, contest_id, contest_proble
|
|||||||
contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
|
contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
|
||||||
except ContestProblem.DoesNotExist:
|
except ContestProblem.DoesNotExist:
|
||||||
return error_page(request, u"比赛问题不存在")
|
return error_page(request, u"比赛问题不存在")
|
||||||
submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).\
|
submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id). \
|
||||||
order_by("-create_time").\
|
order_by("-create_time"). \
|
||||||
values("id", "result", "create_time", "accepted_answer_time", "language")
|
values("id", "result", "create_time", "accepted_answer_time", "language")
|
||||||
return render(request, "oj/submission/problem_my_submissions_list.html",
|
return render(request, "oj/submission/problem_my_submissions_list.html",
|
||||||
{"submissions": submissions, "problem": contest_problem})
|
{"submissions": submissions, "problem": contest_problem})
|
||||||
@ -507,7 +507,7 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
|
|||||||
except Contest.DoesNotExist:
|
except Contest.DoesNotExist:
|
||||||
return error_page(request, u"比赛不存在")
|
return error_page(request, u"比赛不存在")
|
||||||
|
|
||||||
submissions = Submission.objects.filter(contest_id=contest_id).\
|
submissions = Submission.objects.filter(contest_id=contest_id). \
|
||||||
values("id", "contest_id", "problem_id", "result", "create_time",
|
values("id", "contest_id", "problem_id", "result", "create_time",
|
||||||
"accepted_answer_time", "language", "user_id").order_by("-create_time")
|
"accepted_answer_time", "language", "user_id").order_by("-create_time")
|
||||||
|
|
||||||
@ -568,4 +568,4 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
|
|||||||
return render(request, "oj/contest/submissions_list.html",
|
return render(request, "oj/contest/submissions_list.html",
|
||||||
{"submissions": current_page, "page": int(page),
|
{"submissions": current_page, "page": int(page),
|
||||||
"previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
|
"previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
|
||||||
"contest": contest, "filter": filter, "user_id": user_id, "problem_id": problem_id})
|
"contest": contest, "filter": filter, "user_id": user_id, "problem_id": problem_id})
|
||||||
|
@ -71,7 +71,8 @@ MIDDLEWARE_CLASSES = (
|
|||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'django.middleware.security.SecurityMiddleware',
|
'django.middleware.security.SecurityMiddleware',
|
||||||
'admin.middleware.AdminRequiredMiddleware'
|
'admin.middleware.AdminRequiredMiddleware',
|
||||||
|
'account.middleware.SessionSecurityMiddleware'
|
||||||
)
|
)
|
||||||
|
|
||||||
ROOT_URLCONF = 'oj.urls'
|
ROOT_URLCONF = 'oj.urls'
|
||||||
|
108
problem/views.py
108
problem/views.py
@ -40,6 +40,7 @@ class ProblemTagAdminAPIView(APIView):
|
|||||||
"""
|
"""
|
||||||
获取所有标签的列表
|
获取所有标签的列表
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
return success_response(ProblemTagSerializer(ProblemTag.objects.all(), many=True).data)
|
return success_response(ProblemTagSerializer(ProblemTag.objects.all(), many=True).data)
|
||||||
|
|
||||||
@ -189,75 +190,61 @@ class TestCaseUploadAPIView(APIView):
|
|||||||
return error_response(u"解压失败")
|
return error_response(u"解压失败")
|
||||||
name_list = test_case_file.namelist()
|
name_list = test_case_file.namelist()
|
||||||
|
|
||||||
l = []
|
|
||||||
|
|
||||||
# 如果文件是直接打包的,那么name_list 就是["1.in", "1.out"]这样的
|
# 如果文件是直接打包的,那么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(".")
|
|
||||||
# 有了.in 判断对应的.out 在不在
|
|
||||||
if name[1] == "in":
|
|
||||||
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()
|
for index in range(1, len(name_list) / 2 + 1):
|
||||||
test_case_dir = settings.TEST_CASE_DIR + problem_test_dir + "/"
|
if not (str(index) + ".in" in name_list and str(index) + ".out" in name_list):
|
||||||
|
return error_response(u"测试用例文件格式错误,缺少" + str(index) + u".in/.out文件")
|
||||||
|
|
||||||
# 得到了合法的测试用例文件列表 然后去解压缩
|
problem_test_dir = rand_str()
|
||||||
os.mkdir(test_case_dir)
|
test_case_dir = settings.TEST_CASE_DIR + problem_test_dir + "/"
|
||||||
for name in l:
|
|
||||||
f = open(test_case_dir + name, "wb")
|
|
||||||
try:
|
|
||||||
f.write(test_case_file.read(name).replace("\r\n", "\n"))
|
|
||||||
except MemoryError:
|
|
||||||
return error_response(u"单个测试数据体积过大!")
|
|
||||||
finally:
|
|
||||||
f.close()
|
|
||||||
l.sort()
|
|
||||||
|
|
||||||
file_info = {"test_case_number": len(l) / 2, "test_cases": {}}
|
# 得到了合法的测试用例文件列表 然后去解压缩
|
||||||
|
os.mkdir(test_case_dir)
|
||||||
|
for name in name_list:
|
||||||
|
f = open(test_case_dir + name, "wb")
|
||||||
|
try:
|
||||||
|
f.write(test_case_file.read(name).replace("\r\n", "\n"))
|
||||||
|
except MemoryError:
|
||||||
|
return error_response(u"单个测试数据体积过大!")
|
||||||
|
finally:
|
||||||
|
f.close()
|
||||||
|
name_list.sort()
|
||||||
|
|
||||||
# 计算输出文件的md5
|
file_info = {"test_case_number": len(name_list) / 2, "test_cases": {}}
|
||||||
for i in range(len(l) / 2):
|
|
||||||
md5 = hashlib.md5()
|
|
||||||
striped_md5 = hashlib.md5()
|
|
||||||
f = open(test_case_dir + str(i + 1) + ".out", "r")
|
|
||||||
# 完整文件的md5
|
|
||||||
while True:
|
|
||||||
data = f.read(2 ** 8)
|
|
||||||
if not data:
|
|
||||||
break
|
|
||||||
md5.update(data)
|
|
||||||
|
|
||||||
# 删除标准输出最后的空格和换行
|
# 计算输出文件的md5
|
||||||
# 这时只能一次全部读入了,分块读的话,没办法确定文件结尾
|
for i in range(1, len(name_list) / 2 + 1):
|
||||||
f.seek(0)
|
md5 = hashlib.md5()
|
||||||
striped_md5.update(f.read().rstrip())
|
striped_md5 = hashlib.md5()
|
||||||
|
f = open(test_case_dir + str(i) + ".out", "r")
|
||||||
|
# 完整文件的md5
|
||||||
|
while True:
|
||||||
|
data = f.read(2 ** 8)
|
||||||
|
if not data:
|
||||||
|
break
|
||||||
|
md5.update(data)
|
||||||
|
|
||||||
file_info["test_cases"][str(i + 1)] = {"input_name": str(i + 1) + ".in",
|
# 删除标准输出最后的空格和换行
|
||||||
"output_name": str(i + 1) + ".out",
|
# 这时只能一次全部读入了,分块读的话,没办法确定文件结尾
|
||||||
"output_md5": md5.hexdigest(),
|
f.seek(0)
|
||||||
"striped_output_md5": striped_md5.hexdigest(),
|
striped_md5.update(f.read().rstrip())
|
||||||
"input_size": os.path.getsize(test_case_dir + str(i + 1) + ".in"),
|
|
||||||
"output_size": os.path.getsize(test_case_dir + str(i + 1) + ".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_info["test_cases"][str(i)] = {"input_name": str(i) + ".in",
|
||||||
"file_list": file_info["test_cases"]})
|
"output_name": str(i) + ".out",
|
||||||
else:
|
"output_md5": md5.hexdigest(),
|
||||||
return error_response(u"测试用例压缩文件格式错误,请保证测试用例文件在根目录下直接压缩")
|
"striped_output_md5": striped_md5.hexdigest(),
|
||||||
|
"input_size": os.path.getsize(test_case_dir + str(i) + ".in"),
|
||||||
|
"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"]})
|
||||||
|
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
test_case_id = request.GET.get("test_case_id", None)
|
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"]})
|
return success_response({"file_list": config["test_cases"]})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def problem_list_page(request, page=1):
|
def problem_list_page(request, page=1):
|
||||||
"""
|
"""
|
||||||
前台的问题列表
|
前台的问题列表
|
||||||
|
Loading…
Reference in New Issue
Block a user