perf: 修改随机使用secrets

pull/11743/head
ibuler 2023-09-28 11:24:34 +08:00 committed by Bryan
parent 27c505853b
commit 28196573bb
1 changed files with 18 additions and 24 deletions

View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
import random import random
import secrets
import socket import socket
import string import string
import struct import struct
@ -18,31 +19,24 @@ def random_ip():
def random_string(length: int, lower=True, upper=True, digit=True, special_char=False, symbols=string_punctuation): def random_string(length: int, lower=True, upper=True, digit=True, special_char=False, symbols=string_punctuation):
random.seed() if not any([lower, upper, digit]):
args_names = ['lower', 'upper', 'digit'] raise ValueError('At least one of `lower`, `upper`, `digit` must be `True`')
args_values = [lower, upper, digit] if length < 4:
args_string = [string.ascii_lowercase, string.ascii_uppercase, string.digits] raise ValueError('The length of the string must be greater than 3')
args_string_map = dict(zip(args_names, args_string))
kwargs = dict(zip(args_names, args_values))
kwargs_keys = list(kwargs.keys())
kwargs_values = list(kwargs.values())
args_true_count = len([i for i in kwargs_values if i])
assert any(kwargs_values), f'Parameters {kwargs_keys} must have at least one `True`' chars_map = (
assert length >= args_true_count, f'Expected length >= {args_true_count}, bug got {length}' (lower, string.ascii_lowercase),
(upper, string.ascii_uppercase),
chars = ''.join([args_string_map[k] for k, v in kwargs.items() if v]) (digit, string.digits),
password = list(random.choice(chars) for i in range(length)) )
chars = ''.join([i[1] for i in chars_map if i[0]])
texts = list(secrets.choice(chars) for __ in range(length))
if special_char: if special_char:
special_num = length // 16 + 1 symbol_num = length // 16 + 1
special_index = [] symbol_index = random.choices(list(range(1, length - 1)), k=symbol_num)
for i in range(special_num): for i in symbol_index:
index = random.randint(1, length - 1) texts[i] = secrets.choice(symbols)
if index not in special_index:
special_index.append(index)
for i in special_index:
password[i] = random.choice(symbols)
password = ''.join(password) text = ''.join(texts)
return password return text