Implement application setup and flow middleware
- Add SetupService for detecting application setup completion - Create ApplicationFlowMiddleware to enforce setup auth main flow - Add setup processing endpoints (/api/auth/setup, /api/auth/setup/status) - Add Pydantic models for setup requests and responses - Integrate middleware into FastAPI application - Fix logging paths to use ./logs consistently - All existing templates (setup.html, login.html) already working
This commit is contained in:
@@ -34,6 +34,10 @@ from fastapi.templating import Jinja2Templates
|
||||
from pydantic import BaseModel, Field
|
||||
from pydantic_settings import BaseSettings
|
||||
|
||||
# Import application flow services
|
||||
from src.server.middleware.application_flow_middleware import ApplicationFlowMiddleware
|
||||
from src.server.services.setup_service import SetupService
|
||||
|
||||
# Import our custom middleware - temporarily disabled due to file corruption
|
||||
# from src.server.web.middleware.fastapi_auth_middleware import AuthMiddleware
|
||||
# from src.server.web.middleware.fastapi_logging_middleware import (
|
||||
@@ -46,7 +50,7 @@ logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
|
||||
handlers=[
|
||||
logging.FileHandler('./logs/aniworld.log'),
|
||||
logging.FileHandler('./logs/aniworld.log'),
|
||||
logging.StreamHandler()
|
||||
]
|
||||
)
|
||||
@@ -138,6 +142,23 @@ class ErrorResponse(BaseModel):
|
||||
code: Optional[str] = None
|
||||
details: Optional[Dict[str, Any]] = None
|
||||
|
||||
class SetupRequest(BaseModel):
|
||||
"""Setup request model."""
|
||||
password: str = Field(..., min_length=8, description="Master password (min 8 characters)")
|
||||
directory: str = Field(..., min_length=1, description="Anime directory path")
|
||||
|
||||
class SetupResponse(BaseModel):
|
||||
"""Setup response model."""
|
||||
status: str
|
||||
message: str
|
||||
redirect_url: Optional[str] = None
|
||||
|
||||
class SetupStatusResponse(BaseModel):
|
||||
"""Setup status response model."""
|
||||
setup_complete: bool
|
||||
requirements: Dict[str, bool]
|
||||
missing_requirements: List[str]
|
||||
|
||||
# Authentication utilities
|
||||
def hash_password(password: str) -> str:
|
||||
"""Hash password with salt using SHA-256."""
|
||||
@@ -311,6 +332,10 @@ app.add_middleware(
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
# Add application flow middleware
|
||||
setup_service = SetupService()
|
||||
app.add_middleware(ApplicationFlowMiddleware, setup_service=setup_service)
|
||||
|
||||
# Add custom middleware - temporarily disabled
|
||||
# app.add_middleware(EnhancedLoggingMiddleware)
|
||||
# app.add_middleware(AuthMiddleware)
|
||||
@@ -360,6 +385,144 @@ async def legacy_download(
|
||||
except Exception as e:
|
||||
return {"status": "error", "message": f"Failed to start download: {str(e)}"}
|
||||
|
||||
# Setup endpoints
|
||||
@app.get("/api/auth/setup/status", response_model=SetupStatusResponse, tags=["Setup"])
|
||||
async def get_setup_status() -> SetupStatusResponse:
|
||||
"""
|
||||
Check the current setup status of the application.
|
||||
|
||||
Returns information about what setup requirements are met and which are missing.
|
||||
"""
|
||||
try:
|
||||
setup_service = SetupService()
|
||||
requirements = setup_service.get_setup_requirements()
|
||||
missing = setup_service.get_missing_requirements()
|
||||
|
||||
return SetupStatusResponse(
|
||||
setup_complete=setup_service.is_setup_complete(),
|
||||
requirements=requirements,
|
||||
missing_requirements=missing
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"Error checking setup status: {e}")
|
||||
return SetupStatusResponse(
|
||||
setup_complete=False,
|
||||
requirements={},
|
||||
missing_requirements=["Error checking setup status"]
|
||||
)
|
||||
|
||||
@app.post("/api/auth/setup", response_model=SetupResponse, tags=["Setup"])
|
||||
async def process_setup(request_data: SetupRequest) -> SetupResponse:
|
||||
"""
|
||||
Process the initial application setup.
|
||||
|
||||
- **password**: Master password (minimum 8 characters)
|
||||
- **directory**: Anime directory path
|
||||
"""
|
||||
try:
|
||||
setup_service = SetupService()
|
||||
|
||||
# Check if setup is already complete
|
||||
if setup_service.is_setup_complete():
|
||||
return SetupResponse(
|
||||
status="error",
|
||||
message="Setup has already been completed"
|
||||
)
|
||||
|
||||
# Validate directory path
|
||||
from pathlib import Path
|
||||
directory_path = Path(request_data.directory)
|
||||
if not directory_path.is_absolute():
|
||||
return SetupResponse(
|
||||
status="error",
|
||||
message="Please provide an absolute directory path"
|
||||
)
|
||||
|
||||
# Create directory if it doesn't exist
|
||||
try:
|
||||
directory_path.mkdir(parents=True, exist_ok=True)
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to create directory: {e}")
|
||||
return SetupResponse(
|
||||
status="error",
|
||||
message=f"Failed to create directory: {str(e)}"
|
||||
)
|
||||
|
||||
# Hash the password
|
||||
password_hash = hash_password(request_data.password)
|
||||
|
||||
# Prepare configuration updates
|
||||
config_updates = {
|
||||
"security": {
|
||||
"master_password_hash": password_hash,
|
||||
"salt": settings.password_salt,
|
||||
"session_timeout_hours": settings.token_expiry_hours,
|
||||
"max_failed_attempts": 5,
|
||||
"lockout_duration_minutes": 30
|
||||
},
|
||||
"anime": {
|
||||
"directory": str(directory_path),
|
||||
"download_threads": 3,
|
||||
"download_speed_limit": None,
|
||||
"auto_rescan_time": "03:00",
|
||||
"auto_download_after_rescan": False
|
||||
},
|
||||
"logging": {
|
||||
"level": "INFO",
|
||||
"enable_console_logging": True,
|
||||
"enable_console_progress": False,
|
||||
"enable_fail2ban_logging": True,
|
||||
"log_file": "aniworld.log",
|
||||
"max_log_size_mb": 10,
|
||||
"log_backup_count": 5
|
||||
},
|
||||
"providers": {
|
||||
"default_provider": "aniworld.to",
|
||||
"preferred_language": "German Dub",
|
||||
"fallback_providers": ["aniworld.to"],
|
||||
"provider_timeout": 30,
|
||||
"retry_attempts": 3,
|
||||
"provider_settings": {
|
||||
"aniworld.to": {
|
||||
"enabled": True,
|
||||
"priority": 1,
|
||||
"quality_preference": "720p"
|
||||
}
|
||||
}
|
||||
},
|
||||
"advanced": {
|
||||
"max_concurrent_downloads": 3,
|
||||
"download_buffer_size": 8192,
|
||||
"connection_timeout": 30,
|
||||
"read_timeout": 300,
|
||||
"enable_debug_mode": False,
|
||||
"cache_duration_minutes": 60
|
||||
}
|
||||
}
|
||||
|
||||
# Mark setup as complete and save configuration
|
||||
success = setup_service.mark_setup_complete(config_updates)
|
||||
|
||||
if success:
|
||||
logger.info("Application setup completed successfully")
|
||||
return SetupResponse(
|
||||
status="success",
|
||||
message="Setup completed successfully",
|
||||
redirect_url="/login"
|
||||
)
|
||||
else:
|
||||
return SetupResponse(
|
||||
status="error",
|
||||
message="Failed to save configuration"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Setup processing error: {e}")
|
||||
return SetupResponse(
|
||||
status="error",
|
||||
message="Setup failed due to internal error"
|
||||
)
|
||||
|
||||
# Authentication endpoints
|
||||
@app.post("/auth/login", response_model=LoginResponse, tags=["Authentication"])
|
||||
async def login(request_data: LoginRequest, request: Request) -> LoginResponse:
|
||||
|
||||
Reference in New Issue
Block a user