fix(user): remove email from accounts
All checks were successful
CI/CD Pipeline / Code Quality Checks (pull_request) Successful in 2m11s
CI/CD Pipeline / Run Tests (pull_request) Successful in 4m32s
CI/CD Pipeline / Build and Push Dev Images (pull_request) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (pull_request) Has been skipped
CI/CD Pipeline / Code Quality Checks (push) Successful in 1m20s
CI/CD Pipeline / Run Tests (push) Successful in 3m21s
CI/CD Pipeline / Build and Push Dev Images (push) Has been skipped
CI/CD Pipeline / Deploy Dev via Compose (push) Has been skipped

This commit was merged in pull request #33.
This commit is contained in:
Aleksandr Meshchryakov
2026-10-01 10:20:01 +02:00
parent f3b731935e
commit e61f92200d
24 changed files with 239 additions and 295 deletions

View File

@@ -195,7 +195,7 @@ class SsoCallbackViewTest(APITestCase):
self.assertEqual(response["Location"], "/open-data")
user = User.objects.get(username="test30")
self.assertFalse(user.has_usable_password())
self.assertTrue(user.is_verified)
self.assertFalse(user.is_verified)
self.assertFalse(user.is_staff)
self.assertEqual(user.profile.first_name, "Иван")
self.assertEqual(user.profile.mid_name, "Иванович")
@@ -231,26 +231,17 @@ class SsoCallbackViewTest(APITestCase):
self.assertEqual(first_response.status_code, 303)
self.assertEqual(replay_response.status_code, 403)
def test_links_existing_user_only_when_username_and_email_both_match(self):
existing_user = UserFactory.create_user(
username="test30",
email="TEST30@example.com",
is_staff=True,
def test_username_match_cannot_claim_unlinked_local_admin(self):
existing = UserFactory.create_user(username="test30", is_staff=True)
self.assertEqual(self._post_callback(self._token()).status_code, 403)
self.assertFalse(
apps.get_model("user", "SsoIdentity").objects.filter(user=existing).exists()
)
response = self._post_callback(self._token())
self.assertEqual(response.status_code, 303)
self.assertEqual(User.objects.count(), 1)
existing_user.refresh_from_db()
self.assertTrue(existing_user.is_staff)
identity_model = apps.get_model("user", "SsoIdentity")
self.assertTrue(identity_model.objects.filter(user=existing_user).exists())
def test_rejects_partial_local_account_collision(self):
UserFactory.create_user(
username="test30",
email="another@example.com",
)
response = self._post_callback(self._token())
@@ -331,40 +322,31 @@ class SsoCallbackViewTest(APITestCase):
response = self._post_callback(self._encode_claims(claims))
self.assertEqual(response.status_code, 303)
user = User.objects.get(username=f"noemail{index}")
self.assertIsNone(user.email)
self.assertFalse(user.is_verified)
self.assertFalse(user.has_usable_password())
self.assertEqual(self.client.get("/api/v1/users/me/").status_code, 200)
self.assertEqual(User.objects.filter(email__isnull=True).count(), 4)
self.assertEqual(User.objects.count(), 4)
def test_email_less_identity_reuses_account_and_preserves_existing_email(self):
def test_identity_reuses_account_when_ignored_email_changes(self):
self.assertEqual(self._post_callback(self._token()).status_code, 303)
user = User.objects.get(username="test30")
response = self._post_callback(self._token(email=None, jti="without-email"))
self.assertEqual(response.status_code, 303)
user.refresh_from_db()
self.assertEqual(user.email, "test30@example.com")
self.assertTrue(user.is_verified)
self.assertEqual(User.objects.count(), 1)
self.assertEqual(self.client.session["_auth_user_id"], str(user.pk))
self.assertEqual(User.objects.get(username="test30").pk, user.pk)
def test_email_less_account_can_receive_email_on_later_login(self):
def test_email_claim_is_not_persisted(self):
self.assertEqual(self._post_callback(self._token(email=None)).status_code, 303)
response = self._post_callback(self._token(jti="email-added"))
self.assertEqual(response.status_code, 303)
user = User.objects.get(username="test30")
self.assertEqual(user.email, "test30@example.com")
self.assertTrue(user.is_verified)
self.assertEqual(User.objects.count(), 1)
self.assertEqual(
self._post_callback(self._token(jti="email-added")).status_code, 303
)
self.assertNotIn("email", self.client.get("/api/v1/users/me/").data)
def test_email_less_token_cannot_claim_existing_local_admin(self):
user = UserFactory.create_user(username="test30", is_staff=True)
original_email = user.email
response = self._post_callback(self._token(email=None))
self.assertEqual(response.status_code, 403)
self.assertNotIn("_auth_user_id", self.client.session)
user.refresh_from_db()
self.assertEqual(user.email, original_email)
self.assertTrue(user.is_staff)
self.assertFalse(apps.get_model("user", "SsoIdentity").objects.exists())
@@ -387,11 +369,15 @@ class SsoCallbackViewTest(APITestCase):
self.assertEqual(self._post_callback(token).status_code, 303)
self.assertEqual(self._post_callback(token).status_code, 403)
def test_invalid_provided_email_is_rejected(self):
for email in (123, [], "not-an-email", "x" * 250 + "@example.com"):
response = self._post_callback(self._token(email=email))
self.assertEqual(response.status_code, 403)
self.assertFalse(User.objects.exists())
def test_email_claim_is_ignored_regardless_of_format(self):
for index, email in enumerate(
(123, [], "not-an-email", "x" * 250 + "@example.com")
):
response = self._post_callback(
self._token(email=email, jti=f"ignored-{index}")
)
self.assertEqual(response.status_code, 303)
self.assertEqual(User.objects.count(), 1)
def _link(self, user, subject="2564", **options):
call_command(
@@ -407,7 +393,6 @@ class SsoCallbackViewTest(APITestCase):
user = UserFactory.create_user(
username="test30", is_staff=True, is_verified=False
)
original_email = user.email
self._link(user, dry_run=True)
identity_model = apps.get_model("user", "SsoIdentity")
self.assertFalse(identity_model.objects.exists())
@@ -417,7 +402,6 @@ class SsoCallbackViewTest(APITestCase):
response = self._post_callback(self._token(email=None))
self.assertEqual(response.status_code, 303)
user.refresh_from_db()
self.assertEqual(user.email, original_email)
self.assertFalse(user.is_verified)
self.assertTrue(user.is_staff)
self.assertIsNotNone(
@@ -459,13 +443,15 @@ class SsoCallbackViewTest(APITestCase):
self.assertEqual(User.objects.get(username="renamed").pk, original.pk)
self.assertEqual(User.objects.count(), 1)
def test_later_email_collision_does_not_modify_identity(self):
def test_email_claim_cannot_change_identity(self):
self.assertEqual(self._post_callback(self._token(email=None)).status_code, 303)
UserFactory.create_user(username="other", email="test30@example.com")
user = User.objects.get(username="test30")
other = UserFactory.create_user(username="other")
self.assertEqual(
self._post_callback(self._token(jti="email-conflict")).status_code, 403
self._post_callback(self._token(jti="ignored-email")).status_code, 303
)
self.assertIsNone(User.objects.get(username="test30").email)
self.assertEqual(self.client.session["_auth_user_id"], str(user.pk))
self.assertNotEqual(user.pk, other.pk)
def test_email_less_login_rejects_missing_security_claims(self):
for claim in (