Spaces:
Sleeping
Sleeping
Sync app from GitHub Actions (feature/project-state-security-privacy-review)
Browse files
docs/TEMP_HF_ADMIN_OWNED_PRIVATE_STORAGE_DELIVERY_PLAN.md
CHANGED
|
@@ -52,7 +52,8 @@ For public distribution to independent administrators, this model is not suffici
|
|
| 52 |
7. Dataset metadata and audio fetches route through the backend credential only after server-side authorization of the session and project role.
|
| 53 |
8. At startup the app automatically discovers the administrator's private companion `*_state` datasets for rebuild recovery; a manual repo list remains an optional fallback.
|
| 54 |
9. This mode takes precedence over configured Supabase persistence so durable project state does not remain dependent on the app operator's Supabase database.
|
| 55 |
-
10.
|
|
|
|
| 56 |
|
| 57 |
## Space Configuration
|
| 58 |
|
|
|
|
| 52 |
7. Dataset metadata and audio fetches route through the backend credential only after server-side authorization of the session and project role.
|
| 53 |
8. At startup the app automatically discovers the administrator's private companion `*_state` datasets for rebuild recovery; a manual repo list remains an optional fallback.
|
| 54 |
9. This mode takes precedence over configured Supabase persistence so durable project state does not remain dependent on the app operator's Supabase database.
|
| 55 |
+
10. Empty `*_state` repositories left by interrupted setup attempts are ignored during discovery until they contain a `project.json` manifest.
|
| 56 |
+
11. The administrator can run a backend storage health check; validators do not test or receive direct Bucket permissions.
|
| 57 |
|
| 58 |
## Space Configuration
|
| 59 |
|
src/ui/app_factory.py
CHANGED
|
@@ -1367,6 +1367,7 @@ def _load_hf_project_state_repos(
|
|
| 1367 |
state_repo_ids: tuple[str, ...],
|
| 1368 |
token: str | None,
|
| 1369 |
loader: HfProjectStateStoreLoader | None = None,
|
|
|
|
| 1370 |
) -> tuple[list[HfProjectStateStoreLoadedProject], list[str]]:
|
| 1371 |
repo_ids = tuple(repo.strip() for repo in (state_repo_ids or ()) if repo and repo.strip())
|
| 1372 |
if not repo_ids:
|
|
@@ -1384,6 +1385,13 @@ def _load_hf_project_state_repos(
|
|
| 1384 |
if state is not None:
|
| 1385 |
loaded.append(state)
|
| 1386 |
except Exception as exc:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1387 |
errors.append(f"{repo_id}: {exc}")
|
| 1388 |
return loaded, errors
|
| 1389 |
|
|
@@ -1512,6 +1520,7 @@ def _bootstrap_auth_and_projects(
|
|
| 1512 |
state_repo_ids=state_repo_ids,
|
| 1513 |
token=hf_project_state_token,
|
| 1514 |
loader=hf_project_state_loader,
|
|
|
|
| 1515 |
)
|
| 1516 |
if hf_loaded_state:
|
| 1517 |
projects, user_access, pending_invites = _overlay_hf_project_state(
|
|
|
|
| 1367 |
state_repo_ids: tuple[str, ...],
|
| 1368 |
token: str | None,
|
| 1369 |
loader: HfProjectStateStoreLoader | None = None,
|
| 1370 |
+
skip_incomplete_repos: bool = False,
|
| 1371 |
) -> tuple[list[HfProjectStateStoreLoadedProject], list[str]]:
|
| 1372 |
repo_ids = tuple(repo.strip() for repo in (state_repo_ids or ()) if repo and repo.strip())
|
| 1373 |
if not repo_ids:
|
|
|
|
| 1385 |
if state is not None:
|
| 1386 |
loaded.append(state)
|
| 1387 |
except Exception as exc:
|
| 1388 |
+
message = str(exc).lower()
|
| 1389 |
+
is_missing_manifest = (
|
| 1390 |
+
"could not read project.json" in message
|
| 1391 |
+
and any(marker in message for marker in ("entry not found", "404", "not found"))
|
| 1392 |
+
)
|
| 1393 |
+
if skip_incomplete_repos and is_missing_manifest:
|
| 1394 |
+
continue
|
| 1395 |
errors.append(f"{repo_id}: {exc}")
|
| 1396 |
return loaded, errors
|
| 1397 |
|
|
|
|
| 1520 |
state_repo_ids=state_repo_ids,
|
| 1521 |
token=hf_project_state_token,
|
| 1522 |
loader=hf_project_state_loader,
|
| 1523 |
+
skip_incomplete_repos=runtime_config.hf_admin_storage_mode_enabled,
|
| 1524 |
)
|
| 1525 |
if hf_loaded_state:
|
| 1526 |
projects, user_access, pending_invites = _overlay_hf_project_state(
|
tests/unit/test_app_factory_audio_helpers.py
CHANGED
|
@@ -45,7 +45,7 @@ from src.config.runtime_config import RuntimeConfig
|
|
| 45 |
from src.domain.models import Detection, Project, Role
|
| 46 |
from src.repositories.hf_bucket_validation_repository import HfBucketValidationError, HfBucketValidationInitResult
|
| 47 |
from src.repositories.state_safety import StateSafetyError
|
| 48 |
-
from src.services.hf_project_state_store import HfProjectStateStoreLoadedProject
|
| 49 |
from src.ui.admin_panel import AdminPanelManager
|
| 50 |
|
| 51 |
|
|
@@ -1483,6 +1483,46 @@ def test_bootstrap_auth_and_projects_reports_hf_project_state_load_errors(tmp_pa
|
|
| 1483 |
assert "no HF token" in warning
|
| 1484 |
|
| 1485 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1486 |
def test_bootstrap_auth_and_projects_recovers_emergency_admin_when_missing(tmp_path: Path) -> None:
|
| 1487 |
projects_file = tmp_path / "projects.json"
|
| 1488 |
projects_file.write_text(
|
|
|
|
| 45 |
from src.domain.models import Detection, Project, Role
|
| 46 |
from src.repositories.hf_bucket_validation_repository import HfBucketValidationError, HfBucketValidationInitResult
|
| 47 |
from src.repositories.state_safety import StateSafetyError
|
| 48 |
+
from src.services.hf_project_state_store import HfProjectStateStoreError, HfProjectStateStoreLoadedProject
|
| 49 |
from src.ui.admin_panel import AdminPanelManager
|
| 50 |
|
| 51 |
|
|
|
|
| 1483 |
assert "no HF token" in warning
|
| 1484 |
|
| 1485 |
|
| 1486 |
+
def test_bootstrap_admin_storage_ignores_discovered_state_repo_without_manifest(tmp_path: Path) -> None:
|
| 1487 |
+
class MissingManifestLoader:
|
| 1488 |
+
def load_project_state(self, *, state_repo_id: str, token: str): # noqa: ANN001
|
| 1489 |
+
_ = (state_repo_id, token)
|
| 1490 |
+
raise HfProjectStateStoreError(
|
| 1491 |
+
"Could not read project.json from jrrribeiro/upload_test1_state: "
|
| 1492 |
+
"404 Client Error. Entry Not Found"
|
| 1493 |
+
)
|
| 1494 |
+
|
| 1495 |
+
runtime_config = RuntimeConfig(
|
| 1496 |
+
detection_seed_path=None,
|
| 1497 |
+
validation_base_dir=str(tmp_path / "validations"),
|
| 1498 |
+
bootstrap_base_dir=str(tmp_path / "bootstrap"),
|
| 1499 |
+
page_size=25,
|
| 1500 |
+
projects_file_path=None,
|
| 1501 |
+
user_access_file_path=None,
|
| 1502 |
+
invites_file_path=None,
|
| 1503 |
+
invite_ttl_hours=72,
|
| 1504 |
+
enable_demo_bootstrap=False,
|
| 1505 |
+
invite_email_enabled=False,
|
| 1506 |
+
invite_email_sender="",
|
| 1507 |
+
invite_email_login_url="",
|
| 1508 |
+
hf_admin_storage_mode_enabled=True,
|
| 1509 |
+
hf_project_state_repos=("jrrribeiro/upload_test1_state",),
|
| 1510 |
+
)
|
| 1511 |
+
auth_service = AuthService()
|
| 1512 |
+
admin_manager = AdminPanelManager(auth_service, invite_notifier=NoopInviteNotifier())
|
| 1513 |
+
|
| 1514 |
+
warning = _bootstrap_auth_and_projects(
|
| 1515 |
+
auth_service,
|
| 1516 |
+
admin_manager,
|
| 1517 |
+
runtime_config,
|
| 1518 |
+
hf_project_state_token="hf_storage",
|
| 1519 |
+
hf_project_state_loader=MissingManifestLoader(), # type: ignore[arg-type]
|
| 1520 |
+
)
|
| 1521 |
+
|
| 1522 |
+
assert "upload_test1_state" not in warning
|
| 1523 |
+
assert "project.json" not in warning
|
| 1524 |
+
|
| 1525 |
+
|
| 1526 |
def test_bootstrap_auth_and_projects_recovers_emergency_admin_when_missing(tmp_path: Path) -> None:
|
| 1527 |
projects_file = tmp_path / "projects.json"
|
| 1528 |
projects_file.write_text(
|