external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: suspend check should check Suspended...

Browse source 
This was causing some false negative errors in the update process,
and it clearly not correct -- oops :(

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2022-02-19 16:12:15 -08:00
parent 4a4fd01563
commit 80622cc966
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aurweb/users/validate.py
View file

@ -15,6 +15,7 @@ from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_to
from aurweb.exceptions import ValidationError
from aurweb.models.account_type import ACCOUNT_TYPE_NAME
from aurweb.models.ssh_pub_key import get_fingerprint
from aurweb.util import strtobool
logger = logging.get_logger(__name__)
@ -26,9 +27,9 @@ def invalid_fields(E: str = str(), U: str = str(), **kwargs) -> None:
def invalid_suspend_permission(request: Request = None,
user: models.User = None,
J: bool = False,
S: str = "False",
**kwargs) -> None:
if not request.user.is_elevated() and J != bool(user.InactivityTS):
if not request.user.is_elevated() and strtobool(S) != bool(user.Suspended):
raise ValidationError([
"You do not have permission to suspend accounts."])

4
test/test_accounts_routes.py
View file

@ -916,13 +916,13 @@ def test_post_account_edit_error_invalid_password(client: TestClient,
assert "Invalid password." in content
def test_post_account_edit_inactivity_unauthorized(client: TestClient,
def test_post_account_edit_suspend_unauthorized(client: TestClient,
user: User):
cookies = {"AURSID": user.login(Request(), "testPassword")}
post_data = {
"U": "test",
"E": "test@example.org",
"J": True,
"S": True,
"passwd": "testPassword"
}
with client as request: