Skip to content

Fixed password strength logic with details #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericbsd merged 1 commit into from
Dec 13, 2025
Merged

Fixed password strength logic with details #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions setup_station/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ def is_same_type(text: str) -> bool:
Returns:
bool: True if password is all lowercase, all uppercase, or all digits
"""
# ^[a-z]+$ - only lowercase letters from start to end
# ^[A-Z]+$ - only uppercase letters from start to end
# ^[0-9]+$ - only digits from start to end
return bool(re.match(r'^[a-z]+$|^[A-Z]+$|^[0-9]+$', text))


Expand All @@ -29,7 +32,15 @@ def mix_character(text: str) -> bool:
Returns:
bool: True if password contains lower+number, upper+number, or lower+upper
"""
return bool(re.match(r'^[a-z0-9]+$|^[A-Z0-9]+$|^[a-zA-Z]+$', text))
# ^(?=.*[a-z])(?=.*[0-9])[a-z0-9]+$ - must have at least one lowercase AND one digit, only lowercase/digits allowed
# ^(?=.*[A-Z])(?=.*[0-9])[A-Z0-9]+$ - must have at least one uppercase AND one digit, only uppercase/digits allowed
# ^(?=.*[a-z])(?=.*[A-Z])[a-zA-Z]+$ - must have at least one lowercase AND one uppercase, only letters allowed
return bool(
re.match(
r'^(?=.*[a-z])(?=.*[0-9])[a-z0-9]+$|^(?=.*[A-Z])(?=.*[0-9])[A-Z0-9]+$|^(?=.*[a-z])(?=.*[A-Z])[a-zA-Z]+$',
text
)
)


def lower_upper_number(text: str) -> bool:
Expand All @@ -40,9 +51,11 @@ def lower_upper_number(text: str) -> bool:
text: Password string to validate

Returns:
bool: True if password contains only letters (a-z, A-Z) and digits (0-9)
bool: True if password contains lowercase, uppercase, and digits
"""
return bool(re.match(r'^[a-zA-Z0-9]+$', text))
# ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]+$ - must have lowercase AND uppercase AND digit,
# only letters/digits allowed
return bool(re.match(r'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])[a-zA-Z0-9]+$', text))


def all_character(text: str) -> bool:
Expand All @@ -53,9 +66,16 @@ def all_character(text: str) -> bool:
text: Password string to validate

Returns:
bool: True if password contains allowed characters (a-z, A-Z, 0-9, and ~!@#$%^&*_+":;'-)
bool: True if password contains lowercase, uppercase, digits, and special characters
"""
return bool(re.match(r'^[a-zA-Z0-9~!@#$%^&*_+":;\'-]+$', text))
# ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[~!@#$%^&*_+":;\'-])[a-zA-Z0-9~!@#$%^&*_+":;\'-]+$
# must have lowercase AND uppercase AND digit AND special char, only those characters allowed
return bool(
re.match(
r'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[~!@#$%^&*_+":;\'-])[a-zA-Z0-9~!@#$%^&*_+":;\'-]+$',
text
)
)


def _get_complexity_tier(password: str) -> int:
Expand Down