+
+
+
diff --git a/template/src/oj/account/change_password.html b/template/src/oj/account/change_password.html
index 9fd1334..25faf1d 100644
--- a/template/src/oj/account/change_password.html
+++ b/template/src/oj/account/change_password.html
@@ -10,6 +10,7 @@
判题服务器管理
+| 编号 | +名字 | +最大实例数量 | +负载 | +创建时间 | +状态 | ++ |
|---|---|---|---|---|---|---|
| {{ el.id }} | +{{ el.name }} | +{{ el.max_instance_number }} | +{{ el.workload }} | +{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}} | ++ | + + | +
+
+
+
+
+
+
+
+
+ 编辑判题服务器
+ + +添加判题服务器
+ +
+ data-error="请填写用户名" placeholder="用户名" autofocus required autocomplete="off">
+ data-error="请填写密码" placeholder="密码" required autocomplete="off">
-
- 
-
-
+ '
+__homepage__ = 'https://github.com/lepture/otpauth'
+__version__ = '1.0.1'
+
+
+__all__ = ['OtpAuth', 'HOTP', 'TOTP', 'generate_hotp', 'generate_totp']
+
+
+HOTP = 'hotp'
+TOTP = 'totp'
+
+
+class OtpAuth(object):
+ """One Time Password Authentication.
+
+ :param secret: A secret token for the authentication.
+ """
+
+ def __init__(self, secret):
+ self.secret = secret
+
+ def hotp(self, counter=4):
+ """Generate a HOTP code.
+
+ :param counter: HOTP is a counter based algorithm.
+ """
+ return generate_hotp(self.secret, counter)
+
+ def totp(self, period=30, timestamp=None):
+ """Generate a TOTP code.
+
+ A TOTP code is an extension of HOTP algorithm.
+
+ :param period: A period that a TOTP code is valid in seconds
+ :param timestamp: Create TOTP at this given timestamp
+ """
+ return generate_totp(self.secret, period, timestamp)
+
+ def valid_hotp(self, code, last=0, trials=100):
+ """Valid a HOTP code.
+
+ :param code: A number that is less than 6 characters.
+ :param last: Guess HOTP code from last + 1 range.
+ :param trials: Guest HOTP code end at last + trials + 1.
+ """
+ if not valid_code(code):
+ return False
+
+ code = bytes(int(code))
+ for i in range(last + 1, last + trials + 1):
+ if compare_digest(bytes(self.hotp(counter=i)), code):
+ return i
+ return False
+
+ def valid_totp(self, code, period=30, timestamp=None):
+ """Valid a TOTP code.
+
+ :param code: A number that is less than 6 characters.
+ :param period: A period that a TOTP code is valid in seconds
+ :param timestamp: Validate TOTP at this given timestamp
+ """
+ if not valid_code(code):
+ return False
+ return compare_digest(
+ bytes(self.totp(period, timestamp)),
+ bytes(int(code))
+ )
+
+ @property
+ def encoded_secret(self):
+ secret = base64.b32encode(to_bytes(self.secret))
+ # bytes to string
+ secret = secret.decode('utf-8')
+ # remove pad string
+ return secret.strip('=')
+
+ def to_uri(self, type, label, issuer, counter=None):
+ """Generate the otpauth protocal string.
+
+ :param type: Algorithm type, hotp or totp.
+ :param label: Label of the identifier.
+ :param issuer: The company, the organization or something else.
+ :param counter: Counter of the HOTP algorithm.
+ """
+ type = type.lower()
+
+ if type not in ('hotp', 'totp'):
+ raise ValueError('type must be hotp or totp')
+
+ if type == 'hotp' and not counter:
+ raise ValueError('HOTP type authentication need counter')
+
+ # https://code.google.com/p/google-authenticator/wiki/KeyUriFormat
+ url = ('otpauth://%(type)s/%(label)s?secret=%(secret)s'
+ '&issuer=%(issuer)s')
+ dct = dict(
+ type=type, label=label, issuer=issuer,
+ secret=self.encoded_secret, counter=counter
+ )
+ ret = url % dct
+ if type == 'hotp':
+ ret = '%s&counter=%s' % (ret, counter)
+ return ret
+
+ def to_google(self, type, label, issuer, counter=None):
+ """Generate the otpauth protocal string for Google Authenticator.
+
+ .. deprecated:: 0.2.0
+ Use :func:`to_uri` instead.
+ """
+ warnings.warn('deprecated, use to_uri instead', DeprecationWarning)
+ return self.to_uri(type, label, issuer, counter)
+
+
+def generate_hotp(secret, counter=4):
+ """Generate a HOTP code.
+
+ :param secret: A secret token for the authentication.
+ :param counter: HOTP is a counter based algorithm.
+ """
+ # https://tools.ietf.org/html/rfc4226
+ msg = struct.pack('>Q', counter)
+ digest = hmac.new(to_bytes(secret), msg, hashlib.sha1).digest()
+
+ ob = digest[19]
+ if PY2:
+ ob = ord(ob)
+
+ pos = ob & 15
+ base = struct.unpack('>I', digest[pos:pos + 4])[0] & 0x7fffffff
+ token = base % 1000000
+ return token
+
+
+def generate_totp(secret, period=30, timestamp=None):
+ """Generate a TOTP code.
+
+ A TOTP code is an extension of HOTP algorithm.
+
+ :param secret: A secret token for the authentication.
+ :param period: A period that a TOTP code is valid in seconds
+ :param timestamp: Current time stamp.
+ """
+ if timestamp is None:
+ timestamp = time.time()
+ counter = int(timestamp) // period
+ return generate_hotp(secret, counter)
+
+
+def to_bytes(text):
+ if isinstance(text, string_type):
+ # Python3 str -> bytes
+ # Python2 unicode -> str
+ text = text.encode('utf-8')
+ return text
+
+
+def valid_code(code):
+ code = string_type(code)
+ return code.isdigit() and len(code) <= 6
+
+
+def compare_digest(a, b):
+ func = getattr(hmac, 'compare_digest', None)
+ if func:
+ return func(a, b)
+
+ # fallback
+ if len(a) != len(b):
+ return False
+
+ rv = 0
+ if PY2:
+ from itertools import izip
+ for x, y in izip(a, b):
+ rv |= ord(x) ^ ord(y)
+ else:
+ for x, y in zip(a, b):
+ rv |= x ^ y
+ return rv == 0
\ No newline at end of file
diff --git a/utils/shortcuts.py b/utils/shortcuts.py
index e3af916..2f0e1c6 100644
--- a/utils/shortcuts.py
+++ b/utils/shortcuts.py
@@ -2,6 +2,7 @@
import hashlib
import time
import random
+import logging
from django.shortcuts import render
from django.core.paginator import Paginator
@@ -9,6 +10,9 @@ from django.core.paginator import Paginator
from rest_framework.response import Response
+logger = logging.getLogger("app_info")
+
+
def error_page(request, error_reason):
return render(request, "utils/error.html", {"error": error_reason})
@@ -96,7 +100,8 @@ def paginate_data(request, query_set, object_serializer):
def paginate(request, query_set, object_serializer=None):
try:
data= paginate_data(request, query_set, object_serializer)
- except Exception:
+ except Exception as e:
+ logger.error(str(e))
return error_response(u"参数错误")
return success_response(data)
+
+
diff --git a/template/src/oj/account/settings.html b/template/src/oj/account/settings.html
index 5356024..e6436bb 100644
--- a/template/src/oj/account/settings.html
+++ b/template/src/oj/account/settings.html
@@ -10,6 +10,7 @@
通用设置
个人信息
更换头像
+ 两步验证
修改密码
diff --git a/template/src/oj/account/two_factor_auth.html b/template/src/oj/account/two_factor_auth.html
new file mode 100644
index 0000000..fe35d74
--- /dev/null
+++ b/template/src/oj/account/two_factor_auth.html
@@ -0,0 +1,41 @@
+{% extends "oj_base.html" %}
+{% block title %}
+ 两步验证
+{% endblock %}
+{% block body %}
+
+
+
+
+
+{% endblock %}
+
+{% block js_block %}
+
+{% endblock %}
diff --git a/utils/otp_auth.py b/utils/otp_auth.py
new file mode 100644
index 0000000..12773c4
--- /dev/null
+++ b/utils/otp_auth.py
@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+"""
+ otpauth
+ ~~~~~~~
+
+ Implements two-step verification of HOTP/TOTP.
+
+ :copyright: (c) 2013 - 2015 by Hsiaoming Yang.
+ :license: BSD, see LICENSE for more details.
+"""
+import sys
+import time
+import hmac
+import base64
+import struct
+import hashlib
+import warnings
+
+
+if sys.version_info[0] == 3:
+ PY2 = False
+ string_type = str
+else:
+ PY2 = True
+ string_type = unicode
+ range = xrange
+
+
+__author__ = 'Hsiaoming Yang
+ {% if not request.user.two_factor_auth %}
+ 
+
+
+ 扫描二维码开启两步验证
+
+
+
+ {% else %}
+
+
+
+
+
+ 两步验证已经开启
+ {% endif %}
+