Sync dev changes into release-1.0
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
from typing import Any, Dict, List
|
||||
from datetime import datetime, timedelta, timezone
|
||||
import secrets
|
||||
import os
|
||||
|
||||
from fastapi import APIRouter, HTTPException, Depends, UploadFile, File
|
||||
@@ -8,7 +10,17 @@ from ..config import settings as env_settings
|
||||
from ..db import (
|
||||
delete_setting,
|
||||
get_all_users,
|
||||
get_invite_profile,
|
||||
list_invite_profiles,
|
||||
create_invite_profile,
|
||||
create_invite,
|
||||
list_invites,
|
||||
disable_invite,
|
||||
delete_invite,
|
||||
delete_user,
|
||||
get_all_contacts,
|
||||
get_request_cache_overview,
|
||||
save_announcement,
|
||||
get_settings_overrides,
|
||||
get_user_by_username,
|
||||
set_setting,
|
||||
@@ -27,10 +39,12 @@ from ..clients.radarr import RadarrClient
|
||||
from ..clients.jellyfin import JellyfinClient
|
||||
from ..clients.jellyseerr import JellyseerrClient
|
||||
from ..services.jellyfin_sync import sync_jellyfin_users
|
||||
from ..services.jellyseerr_sync import sync_jellyseerr_users
|
||||
import logging
|
||||
from ..logging_config import configure_logging
|
||||
from ..routers import requests as requests_router
|
||||
from ..routers.branding import save_branding_image
|
||||
from ..services.notifications import send_notification
|
||||
|
||||
router = APIRouter(prefix="/admin", tags=["admin"], dependencies=[Depends(require_admin)])
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -42,6 +56,17 @@ SENSITIVE_KEYS = {
|
||||
"radarr_api_key",
|
||||
"prowlarr_api_key",
|
||||
"qbittorrent_password",
|
||||
"smtp_password",
|
||||
"hcaptcha_secret_key",
|
||||
"recaptcha_secret_key",
|
||||
"turnstile_secret_key",
|
||||
"telegram_bot_token",
|
||||
"matrix_password",
|
||||
"matrix_access_token",
|
||||
"pushover_token",
|
||||
"pushover_user_key",
|
||||
"pushbullet_token",
|
||||
"gotify_token",
|
||||
}
|
||||
|
||||
SETTING_KEYS: List[str] = [
|
||||
@@ -74,6 +99,59 @@ SETTING_KEYS: List[str] = [
|
||||
"requests_cleanup_time",
|
||||
"requests_cleanup_days",
|
||||
"requests_data_source",
|
||||
"invites_enabled",
|
||||
"invites_require_captcha",
|
||||
"invite_default_profile_id",
|
||||
"signup_allow_referrals",
|
||||
"referral_default_uses",
|
||||
"password_min_length",
|
||||
"password_require_upper",
|
||||
"password_require_lower",
|
||||
"password_require_number",
|
||||
"password_require_symbol",
|
||||
"password_reset_enabled",
|
||||
"captcha_provider",
|
||||
"hcaptcha_site_key",
|
||||
"hcaptcha_secret_key",
|
||||
"recaptcha_site_key",
|
||||
"recaptcha_secret_key",
|
||||
"turnstile_site_key",
|
||||
"turnstile_secret_key",
|
||||
"smtp_host",
|
||||
"smtp_port",
|
||||
"smtp_user",
|
||||
"smtp_password",
|
||||
"smtp_from",
|
||||
"smtp_tls",
|
||||
"smtp_starttls",
|
||||
"notify_email_enabled",
|
||||
"notify_discord_enabled",
|
||||
"notify_telegram_enabled",
|
||||
"notify_matrix_enabled",
|
||||
"notify_pushover_enabled",
|
||||
"notify_pushbullet_enabled",
|
||||
"notify_gotify_enabled",
|
||||
"notify_ntfy_enabled",
|
||||
"telegram_bot_token",
|
||||
"telegram_chat_id",
|
||||
"matrix_homeserver",
|
||||
"matrix_user",
|
||||
"matrix_password",
|
||||
"matrix_access_token",
|
||||
"matrix_room_id",
|
||||
"pushover_token",
|
||||
"pushover_user_key",
|
||||
"pushbullet_token",
|
||||
"gotify_url",
|
||||
"gotify_token",
|
||||
"ntfy_url",
|
||||
"ntfy_topic",
|
||||
"expiry_default_days",
|
||||
"expiry_default_action",
|
||||
"expiry_warning_days",
|
||||
"expiry_check_interval_minutes",
|
||||
"jellyseerr_sync_users",
|
||||
"jellyseerr_sync_interval_minutes",
|
||||
]
|
||||
|
||||
def _normalize_root_folders(folders: Any) -> List[Dict[str, Any]]:
|
||||
@@ -208,6 +286,12 @@ async def jellyfin_users_sync() -> Dict[str, Any]:
|
||||
return {"status": "ok", "imported": imported}
|
||||
|
||||
|
||||
@router.post("/jellyseerr/users/sync")
|
||||
async def jellyseerr_users_sync() -> Dict[str, Any]:
|
||||
imported = await sync_jellyseerr_users()
|
||||
return {"status": "ok", "imported": imported}
|
||||
|
||||
|
||||
@router.post("/requests/sync")
|
||||
async def requests_sync() -> Dict[str, Any]:
|
||||
runtime = get_runtime_settings()
|
||||
@@ -365,3 +449,157 @@ async def update_user_password(username: str, payload: Dict[str, Any]) -> Dict[s
|
||||
)
|
||||
set_user_password(username, new_password.strip())
|
||||
return {"status": "ok", "username": username}
|
||||
|
||||
|
||||
@router.post("/users/bulk")
|
||||
async def bulk_user_action(payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||
action = str(payload.get("action") or "").strip().lower()
|
||||
usernames = payload.get("usernames")
|
||||
if not isinstance(usernames, list) or not usernames:
|
||||
raise HTTPException(status_code=400, detail="User list required")
|
||||
if action not in {"block", "unblock", "delete", "role"}:
|
||||
raise HTTPException(status_code=400, detail="Invalid action")
|
||||
updated = 0
|
||||
for username in usernames:
|
||||
if not isinstance(username, str) or not username.strip():
|
||||
continue
|
||||
name = username.strip()
|
||||
if action == "block":
|
||||
set_user_blocked(name, True)
|
||||
elif action == "unblock":
|
||||
set_user_blocked(name, False)
|
||||
elif action == "delete":
|
||||
delete_user(name)
|
||||
elif action == "role":
|
||||
role = str(payload.get("role") or "").strip().lower()
|
||||
if role not in {"admin", "user"}:
|
||||
raise HTTPException(status_code=400, detail="Invalid role")
|
||||
set_user_role(name, role)
|
||||
updated += 1
|
||||
return {"status": "ok", "updated": updated}
|
||||
|
||||
|
||||
@router.get("/invite-profiles")
|
||||
async def invite_profiles() -> Dict[str, Any]:
|
||||
return {"profiles": list_invite_profiles()}
|
||||
|
||||
|
||||
@router.post("/invite-profiles")
|
||||
async def create_profile(
|
||||
payload: Dict[str, Any], user: Dict[str, Any] = Depends(require_admin)
|
||||
) -> Dict[str, Any]:
|
||||
name = str(payload.get("name") or "").strip()
|
||||
if not name:
|
||||
raise HTTPException(status_code=400, detail="Profile name required")
|
||||
profile_id = create_invite_profile(
|
||||
name=name,
|
||||
description=str(payload.get("description") or "").strip() or None,
|
||||
max_uses=payload.get("max_uses"),
|
||||
expires_in_days=payload.get("expires_in_days"),
|
||||
require_captcha=bool(payload.get("require_captcha")),
|
||||
password_rules=payload.get("password_rules") if isinstance(payload.get("password_rules"), dict) else None,
|
||||
allow_referrals=bool(payload.get("allow_referrals")),
|
||||
referral_uses=payload.get("referral_uses"),
|
||||
user_expiry_days=payload.get("user_expiry_days"),
|
||||
user_expiry_action=str(payload.get("user_expiry_action") or "").strip() or None,
|
||||
)
|
||||
return {"status": "ok", "id": profile_id}
|
||||
|
||||
|
||||
@router.get("/invites")
|
||||
async def list_invites_endpoint(limit: int = 200) -> Dict[str, Any]:
|
||||
return {"invites": list_invites(limit)}
|
||||
|
||||
|
||||
@router.post("/invites")
|
||||
async def create_invite_endpoint(
|
||||
payload: Dict[str, Any], user: Dict[str, Any] = Depends(require_admin)
|
||||
) -> Dict[str, Any]:
|
||||
runtime = get_runtime_settings()
|
||||
profile_id = payload.get("profile_id")
|
||||
profile = None
|
||||
if profile_id is not None:
|
||||
try:
|
||||
profile = get_invite_profile(int(profile_id))
|
||||
except (TypeError, ValueError):
|
||||
profile = None
|
||||
expires_in_days = payload.get("expires_in_days") or (profile.get("expires_in_days") if profile else None)
|
||||
expires_at = None
|
||||
if expires_in_days:
|
||||
try:
|
||||
expires_at = (
|
||||
datetime.now(timezone.utc) + timedelta(days=float(expires_in_days))
|
||||
).isoformat()
|
||||
except (TypeError, ValueError):
|
||||
expires_at = None
|
||||
require_captcha = bool(payload.get("require_captcha"))
|
||||
if not require_captcha and profile:
|
||||
require_captcha = bool(profile.get("require_captcha"))
|
||||
if not require_captcha:
|
||||
require_captcha = runtime.invites_require_captcha
|
||||
password_rules = payload.get("password_rules")
|
||||
if not isinstance(password_rules, dict):
|
||||
password_rules = profile.get("password_rules") if profile else None
|
||||
allow_referrals = bool(payload.get("allow_referrals"))
|
||||
if not allow_referrals and profile:
|
||||
allow_referrals = bool(profile.get("allow_referrals"))
|
||||
user_expiry_days = payload.get("user_expiry_days") or (profile.get("user_expiry_days") if profile else None)
|
||||
user_expiry_action = payload.get("user_expiry_action") or (profile.get("user_expiry_action") if profile else None)
|
||||
code = secrets.token_urlsafe(8)
|
||||
create_invite(
|
||||
code=code,
|
||||
created_by=user.get("username"),
|
||||
profile_id=int(profile_id) if profile_id is not None else None,
|
||||
expires_at=expires_at,
|
||||
max_uses=payload.get("max_uses") or (profile.get("max_uses") if profile else None),
|
||||
require_captcha=require_captcha,
|
||||
password_rules=password_rules if isinstance(password_rules, dict) else None,
|
||||
allow_referrals=allow_referrals,
|
||||
referral_uses=payload.get("referral_uses") or (profile.get("referral_uses") if profile else None),
|
||||
user_expiry_days=user_expiry_days,
|
||||
user_expiry_action=str(user_expiry_action) if user_expiry_action else None,
|
||||
is_referral=bool(payload.get("is_referral")),
|
||||
)
|
||||
return {"status": "ok", "code": code}
|
||||
|
||||
|
||||
@router.post("/invites/{code}/disable")
|
||||
async def disable_invite_endpoint(code: str) -> Dict[str, Any]:
|
||||
disable_invite(code)
|
||||
return {"status": "ok", "code": code, "disabled": True}
|
||||
|
||||
|
||||
@router.delete("/invites/{code}")
|
||||
async def delete_invite_endpoint(code: str) -> Dict[str, Any]:
|
||||
delete_invite(code)
|
||||
return {"status": "ok", "code": code, "deleted": True}
|
||||
|
||||
|
||||
@router.post("/announcements")
|
||||
async def send_announcement(
|
||||
payload: Dict[str, Any], user: Dict[str, Any] = Depends(require_admin)
|
||||
) -> Dict[str, Any]:
|
||||
subject = str(payload.get("subject") or "").strip()
|
||||
body = str(payload.get("body") or "").strip()
|
||||
channels = payload.get("channels") if isinstance(payload.get("channels"), list) else []
|
||||
if not subject or not body:
|
||||
raise HTTPException(status_code=400, detail="Subject and message required")
|
||||
results: Dict[str, Any] = {}
|
||||
email_count = 0
|
||||
email_failed = 0
|
||||
if "email" in [str(c).lower() for c in channels]:
|
||||
for contact in get_all_contacts():
|
||||
email = contact.get("email")
|
||||
if not email:
|
||||
continue
|
||||
outcome = await send_notification(subject, body, channels=["email"], email=email)
|
||||
if outcome.get("email") == "sent":
|
||||
email_count += 1
|
||||
else:
|
||||
email_failed += 1
|
||||
results["email"] = {"sent": email_count, "failed": email_failed}
|
||||
other_channels = [c for c in channels if str(c).lower() != "email"]
|
||||
if other_channels:
|
||||
results.update(await send_notification(subject, body, channels=other_channels))
|
||||
save_announcement(user.get("username"), subject, body, ",".join(channels))
|
||||
return {"status": "ok", "results": results}
|
||||
|
||||
Reference in New Issue
Block a user