indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Snake case

merge-requests/30/head
Bob Mottram 2021-12-26 18:05:54 +00:00
parent 1129862acb
commit cd5a897184
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon.py
View File

@ -252,7 +252,7 @@ from utils import isDM
from utils import replace_users_with_at from utils import replace_users_with_at
from utils import local_actor_url from utils import local_actor_url
from utils import is_float from utils import is_float
from utils import validPassword from utils import valid_password
from utils import removeLineEndings from utils import removeLineEndings
from utils import get_base_content_from_post from utils import get_base_content_from_post
from utils import acct_dir from utils import acct_dir
@ -1687,7 +1687,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
self.server.last_login_time = int(time.time()) self.server.last_login_time = int(time.time())
if register: if register:
if not validPassword(loginPassword): if not valid_password(loginPassword):
self.server.POSTbusy = False self.server.POSTbusy = False
if callingDomain.endswith('.onion') and onion_domain: if callingDomain.endswith('.onion') and onion_domain:
self._redirect_headers('http://' + onion_domain + self._redirect_headers('http://' + onion_domain +
@ -4971,7 +4971,7 @@ class PubServer(BaseHTTPRequestHandler):
removeLineEndings(fields['password']) removeLineEndings(fields['password'])
fields['passwordconfirm'] = \ fields['passwordconfirm'] = \
removeLineEndings(fields['passwordconfirm']) removeLineEndings(fields['passwordconfirm'])
if validPassword(fields['password']) and \ if valid_password(fields['password']) and \
fields['password'] == fields['passwordconfirm']: fields['password'] == fields['passwordconfirm']:
# set password # set password
storeBasicCredentials(base_dir, nickname, storeBasicCredentials(base_dir, nickname,

12
tests.py
View File

@ -65,7 +65,7 @@ from utils import setConfigParam
from utils import is_group_actor from utils import is_group_actor
from utils import date_string_to_seconds from utils import date_string_to_seconds
from utils import date_seconds_to_string from utils import date_seconds_to_string
from utils import validPassword from utils import valid_password
from utils import userAgentDomain from utils import userAgentDomain
from utils import camelCaseSplit from utils import camelCaseSplit
from utils import decoded_host from utils import decoded_host
@ -5681,11 +5681,11 @@ def _testDateConversions() -> None:
def _testValidPassword(): def _testValidPassword():
print('testValidPassword') print('testValidPassword')
assert not validPassword('123') assert not valid_password('123')
assert not validPassword('') assert not valid_password('')
assert validPassword('パスワード12345') assert valid_password('パスワード12345')
assert validPassword('测试密码12345') assert valid_password('测试密码12345')
assert validPassword('A!bc:defg1/234?56') assert valid_password('A!bc:defg1/234?56')
def _testGetPriceFromString() -> None: def _testGetPriceFromString() -> None:

2
utils.py
View File

@ -2953,7 +2953,7 @@ def removeLineEndings(text: str) -> str:
return text.strip() return text.strip()
def validPassword(password: str) -> bool: def valid_password(password: str) -> bool:
"""Returns true if the given password is valid """Returns true if the given password is valid
""" """
if len(password) < 8: if len(password) < 8: