|
@@ -1197,6 +1197,7 @@ class v3registerView(TemplateView):
|
|
|
lang = request_dict.get('lang', None)
|
|
|
unique = request_dict.get('unique', None)
|
|
|
number = request_dict.get('number', None)
|
|
|
+ salt = request_dict.get('salt', None)
|
|
|
region_status = request_dict.get('region_status', None)
|
|
|
|
|
|
if unique:
|
|
@@ -1248,14 +1249,14 @@ class v3registerView(TemplateView):
|
|
|
|
|
|
if phone is not None:
|
|
|
return self.do_phone_register(phone, password, authcode, number, region_status, response,
|
|
|
- password_version)
|
|
|
+ password_version, salt)
|
|
|
elif email is not None:
|
|
|
return self.do_email_register(email, password, authcode, number, region_status, response,
|
|
|
- password_version)
|
|
|
+ password_version, salt)
|
|
|
else:
|
|
|
return response.json(444, 'phone or email')
|
|
|
|
|
|
- def do_phone_register(self, phone, password, authcode, number, region_status, response, password_version):
|
|
|
+ def do_phone_register(self, phone, password, authcode, number, region_status, response, password_version, salt):
|
|
|
data_valid = DataValid()
|
|
|
if data_valid.mobile_validate(phone) is not True:
|
|
|
return response.json(100)
|
|
@@ -1264,6 +1265,7 @@ class v3registerView(TemplateView):
|
|
|
password = make_password(password)
|
|
|
else:
|
|
|
re_flag = True
|
|
|
+ password = "%s$%d$%s$%s" % ("pbkdf2_sha256", 260000, salt, password)
|
|
|
if re_flag is not True:
|
|
|
return response.json(109)
|
|
|
reds = RedisObject()
|
|
@@ -1330,7 +1332,7 @@ class v3registerView(TemplateView):
|
|
|
res['phone'] = user_list[0]["phone"] if user_list[0]["phone"] is not None else ''
|
|
|
return response.json(0, res)
|
|
|
|
|
|
- def do_email_register(self, email, password, authcode, number, region_status, response, password_version):
|
|
|
+ def do_email_register(self, email, password, authcode, number, region_status, response, password_version, salt):
|
|
|
data_valid = DataValid()
|
|
|
if data_valid.email_validate(email) is not True:
|
|
|
return response.json(105)
|
|
@@ -1339,6 +1341,7 @@ class v3registerView(TemplateView):
|
|
|
password = make_password(password)
|
|
|
else:
|
|
|
re_flag = True
|
|
|
+ password = "%s$%d$%s$%s" % ("pbkdf2_sha256", 260000, salt, password)
|
|
|
if re_flag is not True:
|
|
|
return response.json(109)
|
|
|
reds = RedisObject()
|