jrrribeiro commited on
Commit
652c203
·
1 Parent(s): 6b16157

fix: add admin recovery and project deletion controls

Browse files
src/auth/auth_service.py CHANGED
@@ -507,3 +507,51 @@ class AuthService:
507
  self._pending_invites[str(username)] = user_invites
508
 
509
  self._prune_expired_invites()
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
507
  self._pending_invites[str(username)] = user_invites
508
 
509
  self._prune_expired_invites()
510
+
511
+ def revoke_all_invites_for_project(self, project_slug: str) -> int:
512
+ """Remove all pending invites for a project.
513
+
514
+ Returns:
515
+ Number of revoked invites
516
+ """
517
+ self._prune_expired_invites()
518
+ revoked = 0
519
+ empty_users: list[str] = []
520
+ for username, invites_by_project in self._pending_invites.items():
521
+ if project_slug in invites_by_project:
522
+ del invites_by_project[project_slug]
523
+ revoked += 1
524
+ if not invites_by_project:
525
+ empty_users.append(username)
526
+
527
+ for username in empty_users:
528
+ self._pending_invites.pop(username, None)
529
+
530
+ return revoked
531
+
532
+ def remove_project_from_all_users(self, project_slug: str) -> int:
533
+ """Remove a project assignment from all users and refresh active sessions.
534
+
535
+ Returns:
536
+ Number of user assignments removed
537
+ """
538
+ removed = 0
539
+ for access in self._user_access.values():
540
+ if project_slug in access.project_slugs:
541
+ del access.project_slugs[project_slug]
542
+ removed += 1
543
+
544
+ for session in self._sessions.values():
545
+ if project_slug in session.authorized_projects:
546
+ session.authorized_projects = [slug for slug in session.authorized_projects if slug != project_slug]
547
+
548
+ access = self._user_access.get(session.username)
549
+ if access is None or not access.is_active:
550
+ continue
551
+ session.role = (
552
+ Role.admin
553
+ if any(role == Role.admin for role in access.project_slugs.values())
554
+ else Role.validator
555
+ )
556
+
557
+ return removed
src/ui/admin_panel.py CHANGED
@@ -153,6 +153,22 @@ class AdminPanelManager:
153
  def revoke_invite(self, username: str, project_slug: str) -> Tuple[bool, str]:
154
  return self.auth_service.revoke_project_invite(username=username, project_slug=project_slug)
155
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
156
  def remove_user_from_project(self, username: str, project_slug: str) -> Tuple[bool, str]:
157
  """Remove a user's access to a project.
158
 
 
153
  def revoke_invite(self, username: str, project_slug: str) -> Tuple[bool, str]:
154
  return self.auth_service.revoke_project_invite(username=username, project_slug=project_slug)
155
 
156
+ def delete_project(self, project_slug: str) -> Tuple[bool, str]:
157
+ """Delete a project and remove all linked assignments/invites."""
158
+ slug = (project_slug or "").strip()
159
+ if not slug:
160
+ return False, "Project slug is required"
161
+ if slug not in self._projects:
162
+ return False, f"Project '{slug}' not found"
163
+
164
+ del self._projects[slug]
165
+ removed_assignments = self.auth_service.remove_project_from_all_users(slug)
166
+ revoked_invites = self.auth_service.revoke_all_invites_for_project(slug)
167
+ return (
168
+ True,
169
+ f"✅ Project '{slug}' deleted (removed assignments: {removed_assignments}, revoked invites: {revoked_invites})",
170
+ )
171
+
172
  def remove_user_from_project(self, username: str, project_slug: str) -> Tuple[bool, str]:
173
  """Remove a user's access to a project.
174
 
src/ui/app_factory.py CHANGED
@@ -872,11 +872,28 @@ def _bootstrap_auth_and_projects(
872
 
873
  auth_service.load_pending_invites_map(pending_invites)
874
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
875
  if used_demo_fallback:
876
- return (
877
  "⚠️ Demo bootstrap enabled via BIRDNET_ENABLE_DEMO_BOOTSTRAP. "
878
  "Use BIRDNET_PROJECTS_FILE and BIRDNET_USER_ACCESS_FILE for production auth/project setup."
879
  )
 
880
 
881
  if not projects:
882
  return (
@@ -884,7 +901,7 @@ def _bootstrap_auth_and_projects(
884
  "BIRDNET_PROJECTS_FILE and BIRDNET_USER_ACCESS_FILE (or enable demo bootstrap for local testing)."
885
  )
886
 
887
- return ""
888
 
889
 
890
  def _page_to_table(
@@ -2761,6 +2778,59 @@ def create_app() -> gr.Blocks:
2761
  outputs=[admin_message, admin_username, admin_project, admin_role],
2762
  )
2763
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2764
  gr.Markdown("#### Pending Invites")
2765
  with gr.Row():
2766
  pending_invites_filter_project = gr.Dropdown(
 
872
 
873
  auth_service.load_pending_invites_map(pending_invites)
874
 
875
+ emergency_admin_message = ""
876
+ has_admin = any(
877
+ role == "admin"
878
+ for roles in auth_service.export_user_access_map(include_inactive=True).values()
879
+ for role in roles.values()
880
+ )
881
+ if projects and not has_admin:
882
+ emergency_admin_username = "admin_user"
883
+ for project in projects:
884
+ auth_service.upsert_user_project_role(emergency_admin_username, project.project_slug, Role.admin)
885
+ auth_service.set_user_active(emergency_admin_username, True)
886
+ emergency_admin_message = (
887
+ "⚠️ No administrator was configured in bootstrap files. "
888
+ "Emergency admin access was granted to username 'admin_user'."
889
+ )
890
+
891
  if used_demo_fallback:
892
+ base_message = (
893
  "⚠️ Demo bootstrap enabled via BIRDNET_ENABLE_DEMO_BOOTSTRAP. "
894
  "Use BIRDNET_PROJECTS_FILE and BIRDNET_USER_ACCESS_FILE for production auth/project setup."
895
  )
896
+ return f"{base_message}\n\n{emergency_admin_message}" if emergency_admin_message else base_message
897
 
898
  if not projects:
899
  return (
 
901
  "BIRDNET_PROJECTS_FILE and BIRDNET_USER_ACCESS_FILE (or enable demo bootstrap for local testing)."
902
  )
903
 
904
+ return emergency_admin_message
905
 
906
 
907
  def _page_to_table(
 
2778
  outputs=[admin_message, admin_username, admin_project, admin_role],
2779
  )
2780
 
2781
+ gr.Markdown("#### Delete Project")
2782
+ with gr.Row():
2783
+ delete_project_slug = gr.Dropdown(
2784
+ choices=_project_slugs(),
2785
+ label="Project to delete",
2786
+ )
2787
+ delete_project_btn = gr.Button("🗑️ Delete Project", variant="stop")
2788
+
2789
+ def delete_project(session, project_slug: str):
2790
+ if session is None or session.role.value != "admin":
2791
+ return "❌ Access denied. Only admin can delete projects.", gr.update(), gr.update(), gr.update(), session, gr.update(), gr.update()
2792
+
2793
+ success, msg = admin_manager.delete_project(project_slug)
2794
+ if not success:
2795
+ return msg, _project_rows(), gr.update(choices=_project_slugs()), gr.update(choices=_project_slugs()), session, gr.update(), gr.update()
2796
+
2797
+ persisted, persist_error = _persist_admin_state()
2798
+ if not persisted:
2799
+ msg = f"{msg} | ⚠️ Persistence failed: {persist_error}"
2800
+
2801
+ refreshed_service, refreshed_warning = _build_detection_repository(
2802
+ _project_slugs(),
2803
+ seed_file_path=runtime_config.detection_seed_path,
2804
+ project_map=_project_map(),
2805
+ allow_demo_defaults=runtime_config.enable_demo_bootstrap,
2806
+ )
2807
+ service_ref["queue"] = refreshed_service
2808
+ refreshed_session = auth_service.refresh_session_authorizations(session.session_id) or session
2809
+
2810
+ return (
2811
+ msg,
2812
+ _project_rows(),
2813
+ gr.update(choices=_project_slugs(), value=None),
2814
+ gr.update(choices=_project_slugs(), value=None),
2815
+ refreshed_session,
2816
+ refreshed_warning,
2817
+ gr.update(value=""),
2818
+ )
2819
+
2820
+ delete_project_btn.click(
2821
+ fn=delete_project,
2822
+ inputs=[session_state, delete_project_slug],
2823
+ outputs=[
2824
+ admin_message,
2825
+ projects_table,
2826
+ admin_project,
2827
+ token_project_select,
2828
+ session_state,
2829
+ seed_warning_state,
2830
+ delete_project_slug,
2831
+ ],
2832
+ )
2833
+
2834
  gr.Markdown("#### Pending Invites")
2835
  with gr.Row():
2836
  pending_invites_filter_project = gr.Dropdown(
tests/unit/test_app_factory_audio_helpers.py CHANGED
@@ -808,9 +808,11 @@ def test_bootstrap_auth_and_projects_uses_config_files_without_demo_fallback(tmp
808
  admin_manager = AdminPanelManager(auth_service)
809
 
810
  warning = _bootstrap_auth_and_projects(auth_service, admin_manager, runtime_config)
 
811
 
812
- assert warning == ""
813
  assert auth_service.login("validator_a") is not None
 
814
  assert any(p["project_slug"] == "project-a" for p in admin_manager.list_projects())
815
 
816
 
@@ -833,6 +835,48 @@ def test_bootstrap_auth_and_projects_warns_when_not_configured(tmp_path: Path) -
833
  assert "Production bootstrap incomplete" in warning
834
 
835
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
836
  def test_load_dataset_detections_for_project_reads_jsonl(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
837
  from src.ui import app_factory as module
838
 
 
808
  admin_manager = AdminPanelManager(auth_service)
809
 
810
  warning = _bootstrap_auth_and_projects(auth_service, admin_manager, runtime_config)
811
+ emergency_admin_session = auth_service.login("admin_user")
812
 
813
+ assert "Emergency admin access" in warning
814
  assert auth_service.login("validator_a") is not None
815
+ assert emergency_admin_session is not None
816
  assert any(p["project_slug"] == "project-a" for p in admin_manager.list_projects())
817
 
818
 
 
835
  assert "Production bootstrap incomplete" in warning
836
 
837
 
838
+ def test_bootstrap_auth_and_projects_recovers_emergency_admin_when_missing(tmp_path: Path) -> None:
839
+ projects_file = tmp_path / "projects.json"
840
+ projects_file.write_text(
841
+ json.dumps(
842
+ [
843
+ {
844
+ "project_slug": "project-a",
845
+ "name": "Project A",
846
+ "dataset_repo_id": "org/project-a",
847
+ "active": True,
848
+ }
849
+ ]
850
+ ),
851
+ encoding="utf-8",
852
+ )
853
+ users_file = tmp_path / "users.json"
854
+ users_file.write_text(
855
+ json.dumps({"validator_only": {"project-a": "validator"}}),
856
+ encoding="utf-8",
857
+ )
858
+
859
+ runtime_config = RuntimeConfig(
860
+ detection_seed_path=None,
861
+ validation_base_dir=str(tmp_path / "validations"),
862
+ page_size=25,
863
+ projects_file_path=str(projects_file),
864
+ user_access_file_path=str(users_file),
865
+ invites_file_path=None,
866
+ invite_ttl_hours=72,
867
+ enable_demo_bootstrap=False,
868
+ )
869
+ auth_service = AuthService()
870
+ admin_manager = AdminPanelManager(auth_service)
871
+
872
+ warning = _bootstrap_auth_and_projects(auth_service, admin_manager, runtime_config)
873
+ emergency_session = auth_service.login("admin_user")
874
+
875
+ assert "Emergency admin access" in warning
876
+ assert emergency_session is not None
877
+ assert emergency_session.role.value == "admin"
878
+
879
+
880
  def test_load_dataset_detections_for_project_reads_jsonl(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
881
  from src.ui import app_factory as module
882
 
tests/unit/test_auth_service.py CHANGED
@@ -345,6 +345,39 @@ class TestAuthService:
345
 
346
  assert service.list_pending_invites("pending_user") == []
347
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
348
 
349
  class TestUserProjectAccess:
350
  """Test UserProjectAccess model."""
 
345
 
346
  assert service.list_pending_invites("pending_user") == []
347
 
348
+ def test_remove_project_from_all_users_updates_acl_and_session(self, auth_service):
349
+ auth_service.register_user_project_access(
350
+ "admin_user",
351
+ {"proj-a": Role.admin, "proj-b": Role.admin},
352
+ )
353
+ auth_service.register_user_project_access(
354
+ "validator_user",
355
+ {"proj-a": Role.validator},
356
+ )
357
+ admin_session = auth_service.login("admin_user")
358
+ validator_session = auth_service.login("validator_user")
359
+
360
+ removed = auth_service.remove_project_from_all_users("proj-a")
361
+
362
+ assert removed == 2
363
+ assert auth_service.get_user_role_for_project("admin_user", "proj-a") is None
364
+ assert auth_service.get_user_role_for_project("validator_user", "proj-a") is None
365
+ assert auth_service.get_user_role_for_project("admin_user", "proj-b") == Role.admin
366
+ assert admin_session is not None and "proj-a" not in admin_session.authorized_projects
367
+ assert validator_session is not None and "proj-a" not in validator_session.authorized_projects
368
+
369
+ def test_revoke_all_invites_for_project(self, auth_service):
370
+ auth_service.create_project_invite("u1", "proj-a", Role.validator, "owner")
371
+ auth_service.create_project_invite("u2", "proj-a", Role.validator, "owner")
372
+ auth_service.create_project_invite("u3", "proj-b", Role.validator, "owner")
373
+
374
+ revoked = auth_service.revoke_all_invites_for_project("proj-a")
375
+
376
+ assert revoked == 2
377
+ assert auth_service.list_pending_invites("u1") == []
378
+ assert auth_service.list_pending_invites("u2") == []
379
+ assert len(auth_service.list_pending_invites("u3")) == 1
380
+
381
 
382
  class TestUserProjectAccess:
383
  """Test UserProjectAccess model."""