RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use staticmethod for PasswordStrength methods (#4461) 

The methods don't need access to the class, so they don't need to
be classmethods. This change reduces the number of 'bad return'
warnings seen when running Pyright, Pyrefly, and ty.
This commit is contained in:
correctmost 2026-04-22 07:31:06 -04:00 committed by GitHub
parent 094798b496
commit d1765323d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
archinstall/lib/models/users.py
View File

@ -36,67 +36,66 @@ class PasswordStrength(Enum):
case PasswordStrength.STRONG:
return 'green'
@classmethod
def strength(cls, password: str) -> Self:
@staticmethod
def strength(password: str) -> PasswordStrength:
digit = any(character.isdigit() for character in password)
upper = any(character.isupper() for character in password)
lower = any(character.islower() for character in password)
symbol = any(not character.isalnum() for character in password)
return cls._check_password_strength(digit, upper, lower, symbol, len(password))
return PasswordStrength._check_password_strength(digit, upper, lower, symbol, len(password))
@classmethod
@staticmethod
def _check_password_strength(
cls,
digit: bool,
upper: bool,
lower: bool,
symbol: bool,
length: int,
) -> Self:
) -> PasswordStrength:
# suggested evaluation
# https://github.com/archlinux/archinstall/issues/1304#issuecomment-1146768163
if digit and upper and lower and symbol:
match length:
case num if 13 <= num:
return cls.STRONG
return PasswordStrength.STRONG
case num if 11 <= num <= 12:
return cls.MODERATE
return PasswordStrength.MODERATE
case num if 7 <= num <= 10:
return cls.WEAK
return PasswordStrength.WEAK
case num if num <= 6:
return cls.VERY_WEAK
return PasswordStrength.VERY_WEAK
elif digit and upper and lower:
match length:
case num if 14 <= num:
return cls.STRONG
return PasswordStrength.STRONG
case num if 11 <= num <= 13:
return cls.MODERATE
return PasswordStrength.MODERATE
case num if 7 <= num <= 10:
return cls.WEAK
return PasswordStrength.WEAK
case num if num <= 6:
return cls.VERY_WEAK
return PasswordStrength.VERY_WEAK
elif upper and lower:
match length:
case num if 15 <= num:
return cls.STRONG
return PasswordStrength.STRONG
case num if 12 <= num <= 14:
return cls.MODERATE
return PasswordStrength.MODERATE
case num if 7 <= num <= 11:
return cls.WEAK
return PasswordStrength.WEAK
case num if num <= 6:
return cls.VERY_WEAK
return PasswordStrength.VERY_WEAK
elif lower or upper:
match length:
case num if 18 <= num:
return cls.STRONG
return PasswordStrength.STRONG
case num if 14 <= num <= 17:
return cls.MODERATE
return PasswordStrength.MODERATE
case num if 9 <= num <= 13:
return cls.WEAK
return PasswordStrength.WEAK
case num if num <= 8:
return cls.VERY_WEAK
return PasswordStrength.VERY_WEAK
return cls.VERY_WEAK
return PasswordStrength.VERY_WEAK
UserSerialization = TypedDict(