reinit
This commit is contained in:
virusdefender
@@ -1,4 +1,3 @@
|
||||
# coding=utf-8
|
||||
from django.core.management.base import BaseCommand
|
||||
from account.models import User, UserProfile, AdminType
|
||||
from utils.shortcuts import rand_str
|
||||
@@ -12,9 +11,10 @@ class Command(BaseCommand):
|
||||
self.stdout.write(self.style.WARNING("Super admin user 'root' already exists, "
|
||||
"would you like to reset it's password?\n"
|
||||
"Input yes to confirm: "))
|
||||
if raw_input() == "yes":
|
||||
if input() == "yes":
|
||||
rand_password = rand_str(length=6)
|
||||
admin.set_password(rand_password)
|
||||
# admin.set_password(rand_password)
|
||||
admin.set_password("rootroot")
|
||||
admin.save()
|
||||
self.stdout.write(self.style.SUCCESS("Successfully created super admin user password.\n"
|
||||
"Username: root\nPassword: %s\n"
|
||||
@@ -27,7 +27,9 @@ class Command(BaseCommand):
|
||||
except User.DoesNotExist:
|
||||
user = User.objects.create(username="root", email="root@oj.com", admin_type=AdminType.SUPER_ADMIN)
|
||||
rand_password = rand_str(length=6)
|
||||
user.set_password(rand_password)
|
||||
# user.set_password(rand_password)
|
||||
# for dev
|
||||
user.set_password("rootroot")
|
||||
user.save()
|
||||
UserProfile.objects.create(user=user)
|
||||
self.stdout.write(self.style.SUCCESS("Successfully created super admin user.\n"
|
||||
|
||||
@@ -1,208 +0,0 @@
|
||||
# -*- 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 <me@lepture.com>'
|
||||
__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
|
||||
@@ -1,4 +1,3 @@
|
||||
# coding=utf-8
|
||||
import logging
|
||||
import random
|
||||
|
||||
@@ -22,4 +21,4 @@ def rand_str(length=32, type="lower_hex"):
|
||||
elif type == "lower_hex":
|
||||
return random.choice("123456789abcdef") + get_random_string(length - 1, allowed_chars="0123456789abcdef")
|
||||
else:
|
||||
return random.choice("123456789") + get_random_string(length - 1, allowed_chars="0123456789")
|
||||
return random.choice("123456789") + get_random_string(length - 1, allowed_chars="0123456789")
|
||||
|
||||
Reference in New Issue
Block a user