Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

feat(auth): admit "teacher" and "student" role values in the single role whitelist

polaris-smart85c6cad6b21c
diff --git a/deeptutor/multi_user/models.py b/deeptutor/multi_user/models.py
index a8d43f2da..057d07e80 100644
--- a/deeptutor/multi_user/models.py
+++ b/deeptutor/multi_user/models.py
@@ -6,14 +6,14 @@ from dataclasses import dataclass, field
from pathlib import Path
from typing import Any, Literal
-Role = Literal["admin", "user"]
+Role = Literal["admin", "teacher", "student", "user"]
AccountPreset = Literal["standard", "learner", "custom"]
ScopeKind = Literal["admin", "user"]
#: The single source of truth for valid role values. Every role-bearing
#: store/validator must accept exactly this set; authorization itself stays
#: least-privilege — only "admin" elevates.
-VALID_ROLES: frozenset[str] = frozenset({"admin", "user"})
+VALID_ROLES: frozenset[str] = frozenset({"admin", "teacher", "student", "user"})
def normalize_role(value: str, default: str = "user") -> str:
diff --git a/tests/multi_user/test_role_normalization.py b/tests/multi_user/test_role_normalization.py
index 930abe3f8..6ebb66d94 100644
--- a/tests/multi_user/test_role_normalization.py
+++ b/tests/multi_user/test_role_normalization.py
@@ -21,16 +21,18 @@ from deeptutor.multi_user.models import VALID_ROLES, normalize_role
# ---------------------------------------------------------------- models
-def test_valid_roles_contains_exactly_the_two_documented_roles():
- assert VALID_ROLES == frozenset({"admin", "user"})
+def test_valid_roles_contains_exactly_the_documented_roles():
+ assert VALID_ROLES == frozenset({"admin", "teacher", "student", "user"})
-def test_normalize_role_passes_legal_roles_through():
- assert normalize_role("admin") == "admin"
- assert normalize_role("user") == "user"
[email protected]("legal", ["admin", "teacher", "student", "user"])
+def test_normalize_role_passes_legal_roles_through(legal):
+ assert normalize_role(legal) == legal
[email protected]("bogus", ["", "superadmin", "Admin", "teacher", "student", "root"])
+ "bogus", ["", "superadmin", "Admin", "instructor", "parent", "root"]
+)
def test_normalize_role_degrades_unknown_values_to_user(bogus):
assert normalize_role(bogus) == "user"
@@ -66,6 +68,18 @@ def test_set_role_rejects_unknown_roles(mu_isolated_root):
assert load_users() == {}
[email protected]("role", ["teacher", "student"])
+def test_set_role_accepts_new_roles_and_round_trips(seed_user, role):
+ from deeptutor.multi_user.identity import load_users
+ from deeptutor.services.auth import set_role
+
+ seed_user("carol", "password1234")
+ assert set_role("carol", role) is True
+ # Round-trip through the canonicalization path: the new values persist.
+ roles = {username: record["role"] for username, record in load_users().items()}
+ assert roles["carol"] == role
+
+
def test_corrupted_stored_role_degrades_to_user_on_load(mu_isolated_root):
from deeptutor.multi_user import identity
@@ -101,14 +115,34 @@ def test_token_payload_degrades_unknown_roles_to_user():
assert current.is_admin is False
[email protected]("role", ["teacher", "student"])
+def test_new_roles_do_not_elevate(role):
+ # Only "admin" elevates: the new roles carry strictly user-level
+ # capabilities until a deployment explicitly grants more.
+ current = user_from_token_payload(
+ SimpleNamespace(user_id="u_n", username="n", role=role)
+ )
+ assert current.role == role
+ assert current.is_admin is False
+
+
# ------------------------------------------------------- API validator
def test_set_role_request_accepts_legal_roles():
assert SetRoleRequest(role="admin").role == "admin"
+ assert SetRoleRequest(role="teacher").role == "teacher"
+ assert SetRoleRequest(role="student").role == "student"
assert SetRoleRequest(role="user").role == "user"
def test_set_role_request_rejects_unknown_roles():
with pytest.raises(ValidationError):
SetRoleRequest(role="superadmin")
+
+
+def test_set_role_request_still_rejects_parent():
+ # Negative control: "parent" is not admitted yet — the whitelist, not
+ # string truthiness, decides.
+ with pytest.raises(ValidationError):
+ SetRoleRequest(role="parent")