xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some tests

Browse Source
This commit is contained in:
virusdefender
2016-10-30 02:17:35 +08:00
parent 078de956e5
commit 39857d1b56
118 changed files with 326 additions and 19131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
account/decorators.py
View File

@@ -1,12 +1,13 @@
# coding=utf-8
from __future__ import unicode_literals
import urllib
import json
import functools
from django.http import HttpResponseRedirect
from django.http import HttpResponse
from django.utils.translation import ugettext as _
from utils.shortcuts import error_response, error_page, redirect_to_login
from utils.shortcuts import JSONResponse
from .models import AdminType
@@ -17,24 +18,18 @@ class BasePermissionDecorator(object):
def __get__(self, obj, obj_type):
return functools.partial(self.__call__, obj)
def error(self, data):
return JSONResponse({"error": "permission-denied", "data": data})
def __call__(self, *args, **kwargs):
if len(args) == 2:
self.request = args[1]
else:
self.request = args[0]
self.request = args[1]
if self.check_permission():
if self.request.user.is_disabled:
if self.request.is_ajax():
return error_response(_("Your account is disabled"))
else:
return error_page(self.request, _("Your account is disabled"))
return self.error(_("Your account is disabled"))
return self.func(*args, **kwargs)
else:
if self.request.is_ajax():
return error_response(_("Please login in first"))
else:
return redirect_to_login(self.request)
return self.error(_("Please login in first"))
def check_permission(self):
raise NotImplementedError()

15
account/middleware.py
View File

@@ -6,7 +6,7 @@ from django.http import HttpResponse
from django.utils.translation import ugettext as _
from django.contrib import auth
from utils.shortcuts import redirect_to_login
from utils.shortcuts import JSONResponse
from .models import AdminType
@@ -17,11 +17,7 @@ class SessionSecurityMiddleware(object):
# 24 hours passed since last visit
if time.time() - request.session["last_activity"] >= 24 * 60 * 60:
auth.logout(request)
if request.is_ajax():
return HttpResponse(json.dumps({"code": 1, "data": _("Please login in first")}),
content_type="application/json")
else:
return redirect_to_login(request)
return JSONResponse({"error": "login-required", "data": _("Please login in first")})
# update last active time
request.session["last_activity"] = time.time()
@@ -31,9 +27,4 @@ class AdminRequiredMiddleware(object):
path = request.path_info
if path.startswith("/admin/") or path.startswith("/api/admin/"):
if not(request.user.is_authenticated() and request.user.is_admin()):
if request.is_ajax():
return HttpResponse(json.dumps({"code": 1, "data": _("Please login in first")}),
content_type="application/json")
else:
return HttpResponse(json.dumps({"code": 1, "data": _("Admin required")}),
content_type="application/json")
return JSONResponse({"error": "login-required", "data": _("Please login in first")})

39
account/migrations/0005_auto_20161029_2255.py Normal file
View File

@@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.5 on 2016-10-29 14:55
from __future__ import unicode_literals
from django.db import migrations, models
import jsonfield.fields
class Migration(migrations.Migration):
dependencies = [
('account', '0004_auto_20160925_1649'),
]
operations = [
migrations.RenameField(
model_name='user',
old_name='reset_password_token_create_time',
new_name='reset_password_token_expire_time',
),
migrations.RemoveField(
model_name='user',
name='admin_extra_permission',
),
migrations.RemoveField(
model_name='user',
name='problems_status',
),
migrations.AddField(
model_name='userprofile',
name='problems_status',
field=jsonfield.fields.JSONField(default={}),
),
migrations.AlterField(
model_name='user',
name='admin_type',
field=models.CharField(default='regular_user', max_length=24),
),
]

29
account/models.py
View File

@@ -6,9 +6,9 @@ from jsonfield import JSONField
class AdminType(object):
REGULAR_USER = 0
ADMIN = 1
SUPER_ADMIN = 2
REGULAR_USER = "regular_user"
ADMIN = "admin"
SUPER_ADMIN = "super_admin"
class ProblemSolutionStatus(object):
@@ -16,15 +16,6 @@ class ProblemSolutionStatus(object):
PENDING = 2
class AdminExtraPermission(object):
CREATE_PUBLIC_CONTEST = 1
MANAGE_ALL_CONTEST = 2
# 3 and 4 are mutually exclusive
MANAGE_ALL_PROBLEM = 3
# Manage public problem user created
MANAGE_OWN_PROBLEM = 4
class UserManager(models.Manager):
use_in_migrations = True
@@ -38,14 +29,9 @@ class User(AbstractBaseUser):
email = models.EmailField(max_length=254, null=True)
create_time = models.DateTimeField(auto_now_add=True, null=True)
# One of UserType
admin_type = models.IntegerField(default=0)
# List of items in AdminExtraPermission
admin_extra_permission = JSONField(default=[])
# Store user problem solution status with json string format
# {"problems": {1: ProblemSolutionStatus.ACCEPTED}, "contest_problems": {20: ProblemSolutionStatus.PENDING)}
problems_status = JSONField(default={})
admin_type = models.CharField(max_length=24, default=AdminType.REGULAR_USER)
reset_password_token = models.CharField(max_length=40, null=True)
reset_password_token_create_time = models.DateTimeField(null=True)
reset_password_token_expire_time = models.DateTimeField(null=True)
# SSO auth token
auth_token = models.CharField(max_length=40, null=True)
two_factor_auth = models.BooleanField(default=False)
@@ -61,7 +47,7 @@ class User(AbstractBaseUser):
objects = UserManager()
def is_admin(self):
return self.admin_type > AdminType.REGULAR_USER
return self.admin_type in [AdminType.ADMIN, AdminType.SUPER_ADMIN]
class Meta:
db_table = "user"
@@ -74,6 +60,9 @@ def _random_avatar():
class UserProfile(models.Model):
user = models.OneToOneField(User)
# Store user problem solution status with json string format
# {"problems": {1: ProblemSolutionStatus.ACCEPTED}, "contest_problems": {20: ProblemSolutionStatus.PENDING)}
problems_status = JSONField(default={})
avatar = models.CharField(max_length=50, default=_random_avatar)
blog = models.URLField(blank=True, null=True)
mood = models.CharField(max_length=200, blank=True, null=True)

11
account/serializers.py
View File

@@ -2,13 +2,13 @@
from rest_framework import serializers
from utils.serializers import DateTimeTZField
from .models import User
from .models import User, AdminType
class UserLoginSerializer(serializers.Serializer):
username = serializers.CharField(max_length=30)
password = serializers.CharField(max_length=30)
tfa_code = serializers.CharField(min_length=6, max_length=6, required=False)
tfa_code = serializers.CharField(min_length=6, max_length=6, required=False, allow_null=True)
class UserRegisterSerializer(serializers.Serializer):
@@ -27,11 +27,10 @@ class UserChangePasswordSerializer(serializers.Serializer):
class UserSerializer(serializers.ModelSerializer):
create_time = DateTimeTZField()
last_login = DateTimeTZField()
admin_extra_permission = serializers.ListField()
class Meta:
model = User
fields = ["id", "username", "real_name", "email", "admin_type", "admin_extra_permission",
fields = ["id", "username", "real_name", "email", "admin_type",
"create_time", "last_login", "two_factor_auth", "open_api", "is_disabled"]
@@ -41,9 +40,7 @@ class EditUserSerializer(serializers.Serializer):
real_name = serializers.CharField(max_length=30)
password = serializers.CharField(max_length=30, min_length=6, required=False, default=None)
email = serializers.EmailField(max_length=254)
admin_type = serializers.IntegerField(default=0)
admin_type = serializers.ChoiceField(choices=(AdminType.REGULAR_USER, AdminType.ADMIN, AdminType.SUPER_ADMIN))
open_api = serializers.BooleanField()
two_factor_auth = serializers.BooleanField()
is_disabled = serializers.BooleanField()
admin_extra_permission = serializers.ListField(required=False, default=[],
child=serializers.IntegerField())

138
account/tests.py
View File

@@ -1,17 +1,18 @@
# coding=utf-8
from __future__ import unicode_literals
import time
import mock
import time
import mock
from django.contrib import auth
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
from rest_framework.test import APIClient
from rest_framework.test import APIClient, APITestCase
from utils.shortcuts import rand_str
from utils.otp_auth import OtpAuth
from .models import User
from utils.shortcuts import rand_str
from utils.tests import APITestCase
from .models import User, AdminType
class PermissionDecoratorTest(APITestCase):
@@ -34,12 +35,8 @@ class PermissionDecoratorTest(APITestCase):
class UserLoginAPITest(APITestCase):
def setUp(self):
self.username = "testuser"
self.password = "testuserpassword"
self.user = User.objects.create(username=self.username)
self.user.set_password(self.password)
self.user.save()
self.username = self.password = "test"
self.user = self.create_user(username=self.username, password=self.password)
self.login_url = reverse("user_login_api")
def _set_tfa(self):
@@ -52,7 +49,7 @@ class UserLoginAPITest(APITestCase):
def test_login_with_correct_info(self):
response = self.client.post(self.login_url,
data={"username": self.username, "password": self.password})
self.assertDictEqual(response.data, {"code": 0, "data": _("Succeeded")})
self.assertDictEqual(response.data, {"error": None, "data": _("Succeeded")})
user = auth.get_user(self.client)
self.assertTrue(user.is_authenticated())
@@ -60,8 +57,7 @@ class UserLoginAPITest(APITestCase):
def test_login_with_wrong_info(self):
response = self.client.post(self.login_url,
data={"username": self.username, "password": "invalid_password"})
self.assertDictEqual(response.data, {"code": 1, "data": _("Invalid username or password")})
self.assertDictEqual(response.data, {"error": "error", "data": _("Invalid username or password")})
user = auth.get_user(self.client)
self.assertFalse(user.is_authenticated())
@@ -75,7 +71,7 @@ class UserLoginAPITest(APITestCase):
data={"username": self.username,
"password": self.password,
"tfa_code": code})
self.assertDictEqual(response.data, {"code": 0, "data": _("Succeeded")})
self.assertDictEqual(response.data, {"error": None, "data": _("Succeeded")})
user = auth.get_user(self.client)
self.assertTrue(user.is_authenticated())
@@ -86,7 +82,7 @@ class UserLoginAPITest(APITestCase):
data={"username": self.username,
"password": self.password,
"tfa_code": "qqqqqq"})
self.assertDictEqual(response.data, {"code": 1, "data": _("Invalid two factor verification code")})
self.assertDictEqual(response.data, {"error": "error", "data": _("Invalid two factor verification code")})
user = auth.get_user(self.client)
self.assertFalse(user.is_authenticated())
@@ -96,7 +92,7 @@ class UserLoginAPITest(APITestCase):
response = self.client.post(self.login_url,
data={"username": self.username,
"password": self.password})
self.assertDictEqual(response.data, {"code": 0, "data": "tfa_required"})
self.assertDictEqual(response.data, {"error": None, "data": "tfa_required"})
user = auth.get_user(self.client)
self.assertFalse(user.is_authenticated())
@@ -124,15 +120,15 @@ class UserRegisterAPITest(CaptchaTest):
def test_invalid_captcha(self):
self.data["captcha"] = "****"
response = self.client.post(self.register_url, data=self.data)
self.assertDictEqual(response.data, {"code": 1, "data": _("Invalid captcha")})
self.assertDictEqual(response.data, {"error": "error", "data": _("Invalid captcha")})
self.data.pop("captcha")
response = self.client.post(self.register_url, data=self.data)
self.assertEqual(response.data["code"], 1)
self.assertTrue(response.data["error"] is not None)
def test_register_with_correct_info(self):
response = self.client.post(self.register_url, data=self.data)
self.assertDictEqual(response.data, {"code": 0, "data": _("Succeeded")})
self.assertDictEqual(response.data, {"error": None, "data": _("Succeeded")})
def test_username_already_exists(self):
self.test_register_with_correct_info()
@@ -140,7 +136,7 @@ class UserRegisterAPITest(CaptchaTest):
self.data["captcha"] = self._set_captcha(self.client.session)
self.data["email"] = "test1@qduoj.com"
response = self.client.post(self.register_url, data=self.data)
self.assertDictEqual(response.data, {"code": 1, "data": _("Username already exists")})
self.assertDictEqual(response.data, {"error": "error", "data": _("Username already exists")})
def test_email_already_exists(self):
self.test_register_with_correct_info()
@@ -148,7 +144,7 @@ class UserRegisterAPITest(CaptchaTest):
self.data["captcha"] = self._set_captcha(self.client.session)
self.data["username"] = "test_user1"
response = self.client.post(self.register_url, data=self.data)
self.assertDictEqual(response.data, {"code": 1, "data": _("Email already exists")})
self.assertDictEqual(response.data, {"error": "error", "data": _("Email already exists")})
class UserChangePasswordAPITest(CaptchaTest):
@@ -160,45 +156,99 @@ class UserChangePasswordAPITest(CaptchaTest):
self.username = "test_user"
self.old_password = "testuserpassword"
self.new_password = "new_password"
register_data = {"username": self.username, "password": self.old_password,
"real_name": "real_name", "email": "test@qduoj.com",
"captcha": self._set_captcha(self.client.session)}
response = self.client.post(reverse("user_register_api"), data=register_data)
self.assertDictEqual(response.data, {"code": 0, "data": _("Succeeded")})
self.create_user(username=self.username, password=self.old_password)
self.data = {"old_password": self.old_password, "new_password": self.new_password,
"captcha": self._set_captcha(self.client.session)}
def test_login_required(self):
response = self.client.post(self.url, data=self.data, HTTP_X_REQUESTED_WITH="XMLHttpRequest")
self.assertEqual(response.data, {"code": 1, "data": _("Please login in first")})
response = self.client.post(self.url, data=self.data)
self.assertEqual(response.data, {"error": "permission-denied", "data": _("Please login in first")})
def test_valid_ola_password(self):
self.assertTrue(self.client.login(username=self.username, password=self.old_password))
response = self.client.post(self.url, data=self.data, HTTP_X_REQUESTED_WITH="XMLHttpRequest")
self.assertEqual(response.data, {"code": 0, "data": _("Succeeded")})
response = self.client.post(self.url, data=self.data)
self.assertEqual(response.data, {"error": None, "data": _("Succeeded")})
self.assertTrue(self.client.login(username=self.username, password=self.new_password))
def test_invalid_old_password(self):
self.assertTrue(self.client.login(username=self.username, password=self.old_password))
self.data["old_password"] = "invalid"
response = self.client.post(self.url, data=self.data, HTTP_X_REQUESTED_WITH="XMLHttpRequest")
self.assertEqual(response.data, {"code": 1, "data": _("Invalid old password")})
response = self.client.post(self.url, data=self.data)
self.assertEqual(response.data, {"error": "error", "data": _("Invalid old password")})
class AdminEditUserTest(APITestCase):
class AdminUserTest(APITestCase):
def setUp(self):
pass
self.user = self.create_super_admin(login=True)
self.username = self.password = "test"
self.regular_user = self.create_user(username=self.username, password=self.password)
self.url = reverse("user_admin_api")
self.data = {"id": self.regular_user.id, "username": self.username, "real_name": "test_name",
"email": "test@qq.com", "admin_type": AdminType.REGULAR_USER,
"open_api": True, "two_factor_auth": False, "is_disabled": False}
def test_user_list(self):
response = self.client.get(self.url)
self.assertSuccess(response)
def test_edit_user_successfully(self):
pass
response = self.client.put(self.url, data=self.data)
self.assertSuccess(response)
resp_data = response.data["data"]
self.assertEqual(resp_data["username"], self.username)
self.assertEqual(resp_data["email"], "test@qq.com")
self.assertEqual(resp_data["real_name"], "test_name")
self.assertEqual(resp_data["open_api"], True)
self.assertEqual(resp_data["two_factor_auth"], False)
self.assertEqual(resp_data["is_disabled"], False)
def test_change_user_admin_type(self):
pass
self.assertTrue(self.regular_user.check_password("test"))
def test_change_user_permission(self):
pass
def test_edit_user_password(self):
data = self.data
new_password = "testpassword"
data["password"] = new_password
response = self.client.put(self.url, data=data)
self.assertSuccess(response)
user = User.objects.get(id=self.regular_user.id)
self.assertFalse(user.check_password(self.password))
self.assertTrue(user.check_password(new_password))
def test_change_user_password(self):
pass
def test_edit_user_tfa(self):
data = self.data
self.assertIsNone(self.regular_user.tfa_token)
data["two_factor_auth"] = True
response = self.client.put(self.url, data=data)
self.assertSuccess(response)
resp_data = response.data["data"]
# if `tfa_token` is None, a new value will be generated
self.assertTrue(resp_data["two_factor_auth"])
token = User.objects.get(id=self.regular_user.id).tfa_token
self.assertIsNotNone(token)
response = self.client.put(self.url, data=data)
self.assertSuccess(response)
resp_data = response.data["data"]
# if `tfa_token` is not None, the value is not changed
self.assertTrue(resp_data["two_factor_auth"])
self.assertEqual(User.objects.get(id=self.regular_user.id).tfa_token, token)
def test_edit_user_openapi(self):
data = self.data
self.assertIsNone(self.regular_user.open_api_appkey)
data["open_api"] = True
response = self.client.put(self.url, data=data)
self.assertSuccess(response)
resp_data = response.data["data"]
# if `open_api_appkey` is None, a new value will be generated
self.assertTrue(resp_data["open_api"])
key = User.objects.get(id=self.regular_user.id).open_api_appkey
self.assertIsNotNone(key)
response = self.client.put(self.url, data=data)
self.assertSuccess(response)
resp_data = response.data["data"]
# if `openapi_app_key` is not None, the value is not changed
self.assertTrue(resp_data["open_api"])
self.assertEqual(User.objects.get(id=self.regular_user.id).open_api_appkey, key)

29
account/views/admin.py
View File

@@ -4,10 +4,8 @@ from __future__ import unicode_literals
from django.core.exceptions import MultipleObjectsReturned
from django.db.models import Q
from django.utils.translation import ugettext as _
from rest_framework.views import APIView
from utils.shortcuts import (serializer_invalid_response, error_response,
success_response, paginate, rand_str)
from utils.shortcuts import (APIView, paginate_data, rand_str)
from ..decorators import super_admin_required
from ..models import User, AdminType
from ..serializers import (UserSerializer, EditUserSerializer)
@@ -25,21 +23,21 @@ class UserAdminAPIView(APIView):
try:
user = User.objects.get(id=data["id"])
except User.DoesNotExist:
return error_response(_("User does not exist"))
return self.error(_("User does not exist"))
try:
user = User.objects.get(username=data["username"])
if user.id != data["id"]:
return error_response(_("Username already exists"))
return self.error(_("Username already exists"))
except User.DoesNotExist:
pass
try:
user = User.objects.get(email=data["email"])
if user.id != data["id"]:
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
# Some old data has duplicate email
except MultipleObjectsReturned:
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
except User.DoesNotExist:
pass
@@ -68,15 +66,10 @@ class UserAdminAPIView(APIView):
user.tfa_token = None
user.two_factor_auth = data["two_factor_auth"]
if data["admin_type"] == AdminType.ADMIN:
user.admin_extra_permission = list(set(data["admin_extra_permission"]))
else:
user.admin_extra_permission = []
user.save()
return success_response(UserSerializer(user).data)
return self.success(UserSerializer(user).data)
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)
@super_admin_required
def get(self, request):
@@ -88,8 +81,8 @@ class UserAdminAPIView(APIView):
try:
user = User.objects.get(id=user_id)
except User.DoesNotExist:
return error_response(_("User does not exist"))
return success_response(UserSerializer(user).data)
return self.error(_("User does not exist"))
return self.success(UserSerializer(user).data)
user = User.objects.all().order_by("-create_time")
@@ -98,10 +91,10 @@ class UserAdminAPIView(APIView):
try:
user = user.filter(admin_type__gte=int(admin_type))
except ValueError:
return error_response(_("Invalid parameter"))
return self.error(_("Invalid parameter"))
keyword = request.GET.get("keyword", None)
if keyword:
user = user.filter(Q(username__contains=keyword) |
Q(real_name__contains=keyword) |
Q(email__contains=keyword))
return paginate(request, user, UserSerializer)
return self.success(paginate_data(request, user, UserSerializer))

38
account/views/oj.py
View File

@@ -4,12 +4,10 @@ from __future__ import unicode_literals
from django.contrib import auth
from django.core.exceptions import MultipleObjectsReturned
from django.utils.translation import ugettext as _
from rest_framework.views import APIView
from utils.captcha import Captcha
from utils.otp_auth import OtpAuth
from utils.shortcuts import (serializer_invalid_response, error_response,
success_response)
from utils.shortcuts import (APIView, )
from ..decorators import login_required
from ..models import User, UserProfile
from ..serializers import (UserLoginSerializer, UserRegisterSerializer,
@@ -29,26 +27,26 @@ class UserLoginAPIView(APIView):
if user:
if not user.two_factor_auth:
auth.login(request, user)
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
# `tfa_code` not in post data
if user.two_factor_auth and "tfa_code" not in data:
return success_response("tfa_required")
return self.success("tfa_required")
if OtpAuth(user.tfa_token).valid_totp(data["tfa_code"]):
auth.login(request, user)
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
else:
return error_response(_("Invalid two factor verification code"))
return self.error(_("Invalid two factor verification code"))
else:
return error_response(_("Invalid username or password"))
return self.error(_("Invalid username or password"))
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)
# todo remove this, only for debug use
def get(self, request):
auth.login(request, auth.authenticate(username=request.GET["username"], password=request.GET["password"]))
return success_response({})
return self.success({})
class UserRegisterAPIView(APIView):
@@ -61,26 +59,26 @@ class UserRegisterAPIView(APIView):
data = serializer.data
captcha = Captcha(request)
if not captcha.check(data["captcha"]):
return error_response(_("Invalid captcha"))
return self.error(_("Invalid captcha"))
try:
User.objects.get(username=data["username"])
return error_response(_("Username already exists"))
return self.error(_("Username already exists"))
except User.DoesNotExist:
pass
try:
User.objects.get(email=data["email"])
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
# Some old data has duplicate email
except MultipleObjectsReturned:
return error_response(_("Email already exists"))
return self.error(_("Email already exists"))
except User.DoesNotExist:
user = User.objects.create(username=data["username"], email=data["email"])
user.set_password(data["password"])
user.save()
UserProfile.objects.create(user=user)
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)
class UserChangePasswordAPIView(APIView):
@@ -94,14 +92,14 @@ class UserChangePasswordAPIView(APIView):
data = serializer.data
captcha = Captcha(request)
if not captcha.check(data["captcha"]):
return error_response(_("Invalid captcha"))
return self.error(_("Invalid captcha"))
username = request.user.username
user = auth.authenticate(username=username, password=data["old_password"])
if user:
user.set_password(data["new_password"])
user.save()
return success_response(_("Succeeded"))
return self.success(_("Succeeded"))
else:
return error_response(_("Invalid old password"))
return self.error(_("Invalid old password"))
else:
return serializer_invalid_response(serializer)
return self.invalid_serializer(serializer)