Upload 9 files

app.py

@@ -8,8 +8,7 @@ from fastapi.responses import HTMLResponse, FileResponse, JSONResponse, Redirect
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from pathlib import Path
-import logging
-from logging.handlers import RotatingFileHandler
+import logging # Standard logging
 import datetime # For admin logic timestamps
 import math # For admin logic format_bytes
 from typing import List, Optional # For admin logic type hinting
@@ -19,24 +18,19 @@ BASE_DIR = Path(__file__).resolve().parent
 FILES_DIR = BASE_DIR / "uploaded_files"
 STATIC_DIR = BASE_DIR / "static"
 TEMPLATES_DIR = BASE_DIR / "templates"
-LOG_FILE = BASE_DIR / "app.log"
+# LOG_FILE constant removed
 
 # Create directories if they don't exist
 FILES_DIR.mkdir(parents=True, exist_ok=True)
 STATIC_DIR.mkdir(parents=True, exist_ok=True)
 TEMPLATES_DIR.mkdir(parents=True, exist_ok=True)
 
-# --- Logging Configuration ---
+# --- Logging Configuration (Console Only) ---
 logger = logging.getLogger("file_app")
 logger.setLevel(logging.INFO)
-logger.propagate = False 
+# No file handler, no propagate=False. Logs will go to console via root logger.
 
-file_handler = RotatingFileHandler(LOG_FILE, maxBytes=1024*1024*5, backupCount=2, encoding='utf-8')
-file_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(module)s:%(lineno)d - %(message)s')
-file_handler.setFormatter(file_formatter)
-logger.addHandler(file_handler)
-
-logger.info("Application starting up...")
+logger.info("Application starting up... Logging to console.")
 
 app = FastAPI(title="File Uploader/Downloader")
 
@@ -44,19 +38,14 @@ app = FastAPI(title="File Uploader/Downloader")
 templates = Jinja2Templates(directory=str(TEMPLATES_DIR))
 
 # --- Admin Panel Configuration & Logic ---
-
-# INSECURE: Hardcoded credentials. Use environment variables or a secure auth system in production!
 ADMIN_EMAIL = "admin@example.com"
-ADMIN_PASSWORD = "adminpassword" # Store hashed passwords in a real application
-
+ADMIN_PASSWORD = "adminpassword"
 ADMIN_SESSION_COOKIE_NAME = "admin_session_id"
-# This should be a very random, long, and secret string in a real app
 ADMIN_SESSION_SECRET_VALUE = "my_super_secret_admin_session_value_for_demo_only_change_me"
 
 admin_router = APIRouter(
     prefix="/admin",
     tags=["Admin"],
-    # dependencies=[Depends(verify_admin_auth)] # Apply to all routes in this router, or per-route
 )
 
 # --- Admin Helper Functions ---
@@ -69,7 +58,7 @@ def get_file_info(file_path: Path):
                 "size_bytes": stat_info.st_size,
                 "size_human": format_bytes(stat_info.st_size),
                 "modified_at": datetime.datetime.fromtimestamp(stat_info.st_mtime).strftime('%Y-%m-%d %H:%M:%S UTC'),
-                "url": f"/download/{file_path.name}" # User-facing download URL
+                "url": f"/download/{file_path.name}"
             }
     except Exception as e:
         logger.error(f"Admin: Error getting file info for {file_path}: {e}")
@@ -84,20 +73,10 @@ def format_bytes(bytes_val, decimals=2):
     i = 0
     if bytes_val > 0:
         i = int(math.floor(math.log(bytes_val) / math.log(k)))
-    if i >= len(sizes): i = len(sizes) -1 # handle extremely large files gracefully
+    if i >= len(sizes): i = len(sizes) -1
     return f"{bytes_val / (k**i):.{dm}f} {sizes[i]}"
 
-def get_log_lines(num_lines: int = 200) -> List[str]:
-    if not LOG_FILE.exists():
-        logger.warning("Admin: Log file not found.")
-        return ["Log file not found or is empty."]
-    try:
-        with open(LOG_FILE, "r", encoding="utf-8") as f:
-            lines = f.readlines()
-            return list(reversed(lines[-num_lines:]))
-    except Exception as e:
-        logger.error(f"Admin: Error reading log file: {e}")
-        return [f"Error reading log file: {str(e)}"]
+# get_log_lines function removed as file logging is removed.
 
 # --- Admin Authentication Dependencies ---
 async def get_current_admin(request: Request):
@@ -106,7 +85,6 @@ async def get_current_admin(request: Request):
         return {"email": ADMIN_EMAIL} 
     
     current_path = request.url.path
-    # Allow access to login and auth paths without redirection loop
     if current_path not in [app.url_path_for("admin_login_page"), app.url_path_for("admin_authenticate")]:
         logger.info(f"Admin: Unauthorized access attempt to {current_path}, redirecting to login.")
         return RedirectResponse(url=app.url_path_for("admin_login_page"), status_code=status.HTTP_307_TEMPORARY_REDIRECT)
@@ -114,11 +92,7 @@ async def get_current_admin(request: Request):
 
 async def verify_admin_auth(request: Request):
     admin_user = await get_current_admin(request)
-    if isinstance(admin_user, RedirectResponse): # If get_current_admin decided to redirect
-        # This will interrupt the request flow and send the redirect response.
-        # It's a bit unusual to raise HTTPException for a redirect, but FastAPI handles it.
-        # A cleaner way might be to just return the RedirectResponse from the endpoint if the dependency returns it.
-        # However, for a dependency that *protects* a route, raising is common.
+    if isinstance(admin_user, RedirectResponse):
         raise HTTPException(
             status_code=status.HTTP_307_TEMPORARY_REDIRECT,
             detail="Redirecting to login.",
@@ -145,12 +119,8 @@ async def admin_authenticate(request: Request, email: str = Form(...), password:
         logger.info(f"Admin: Successful login for email {email}.")
         response = RedirectResponse(url=app.url_path_for("admin_dashboard"), status_code=status.HTTP_303_SEE_OTHER)
         response.set_cookie(
-            key=ADMIN_SESSION_COOKIE_NAME,
-            value=ADMIN_SESSION_SECRET_VALUE,
-            httponly=True, 
-            samesite="lax", 
-            # secure=True, # Uncomment if served over HTTPS
-            max_age=30 * 60 # 30 minutes
+            key=ADMIN_SESSION_COOKIE_NAME, value=ADMIN_SESSION_SECRET_VALUE,
+            httponly=True, samesite="lax", max_age=30 * 60
         )
         return response
     else:
@@ -166,7 +136,7 @@ async def admin_authenticate(request: Request, email: str = Form(...), password:
 async def admin_logout(request: Request):
     logger.info("Admin: Logout initiated.")
     response = RedirectResponse(url=app.url_path_for("admin_login_page"), status_code=status.HTTP_303_SEE_OTHER)
-    response.delete_cookie(ADMIN_SESSION_COOKIE_NAME, httponly=True, samesite="lax") #, secure=True)
+    response.delete_cookie(ADMIN_SESSION_COOKIE_NAME, httponly=True, samesite="lax")
     return response
 
 @admin_router.get("/dashboard", response_class=HTMLResponse, name="admin_dashboard")
@@ -181,19 +151,10 @@ async def admin_dashboard(request: Request, admin_user: dict = Depends(get_curre
     except Exception as e:
         logger.error(f"Admin: Error counting files for dashboard: {e}")
 
-    log_lines_count = 0
-    if LOG_FILE.exists():
-        try:
-            with open(LOG_FILE, "r", encoding="utf-8") as f:
-                log_lines_count = sum(1 for _ in f)
-        except Exception as e:
-            logger.error(f"Admin: Error counting log lines for dashboard: {e}")
-
-
+    # log_lines_count removed
     return templates.TemplateResponse("admin_dashboard.html", {
         "request": request,
         "num_files": num_files,
-        "log_lines_count": log_lines_count,
         "admin_user": admin_user,
         "url_for": app.url_path_for
     })
@@ -213,7 +174,6 @@ async def admin_files_page(request: Request, admin_user: dict = Depends(get_curr
                 uploaded_file_objects.append(info)
     except Exception as e:
         logger.error(f"Admin: Error listing files: {e}")
-        # Optionally, pass an error to the template
         
     return templates.TemplateResponse("admin_files.html", {
         "request": request,
@@ -224,10 +184,8 @@ async def admin_files_page(request: Request, admin_user: dict = Depends(get_curr
 
 @admin_router.post("/files/delete/{filename}", name="admin_delete_file")
 async def admin_delete_file(request: Request, filename: str, admin_user: dict = Depends(verify_admin_auth)):
-    # verify_admin_auth handles unauthorized access
-    
     logger.info(f"Admin: Attempting to delete file '{filename}' by {admin_user.get('email')}.")
-    safe_filename = sanitize_filename(filename) # Re-sanitize
+    safe_filename = sanitize_filename(filename)
     file_path = FILES_DIR / safe_filename
 
     if not file_path.resolve().is_relative_to(FILES_DIR.resolve()):
@@ -238,7 +196,6 @@ async def admin_delete_file(request: Request, filename: str, admin_user: dict =
         try:
             file_path.unlink()
             logger.info(f"Admin: File '{filename}' deleted successfully by {admin_user.get('email')}.")
-            # Add a success message via query param for display (optional)
             return RedirectResponse(url=app.url_path_for("admin_files_page") + "?message=File+deleted+successfully", status_code=status.HTTP_303_SEE_OTHER)
         except Exception as e:
             logger.error(f"Admin: Could not delete file '{filename}': {str(e)}")
@@ -247,36 +204,20 @@ async def admin_delete_file(request: Request, filename: str, admin_user: dict =
         logger.warning(f"Admin: File not found for deletion '{filename}'.")
         raise HTTPException(status_code=404, detail="File not found for deletion.")
 
-
-@admin_router.get("/logs", response_class=HTMLResponse, name="admin_logs_page")
-async def admin_logs_page(request: Request, admin_user: dict = Depends(get_current_admin)):
-    if isinstance(admin_user, RedirectResponse): return admin_user
-    if not admin_user: return RedirectResponse(url=app.url_path_for("admin_login_page"), status_code=status.HTTP_307_TEMPORARY_REDIRECT)
-    
-    logger.info(f"Admin: Logs page accessed by {admin_user.get('email')}.")
-    logs = get_log_lines(num_lines=500) 
-    return templates.TemplateResponse("admin_logs.html", {
-        "request": request,
-        "log_entries": logs,
-        "admin_user": admin_user,
-        "url_for": app.url_path_for
-    })
+# /admin/logs route and admin_logs_page function removed
 
 # --- Main Application Helper Functions (Original) ---
 def sanitize_filename(filename: str) -> str:
-    """Basic filename sanitization."""
     return os.path.basename(filename).strip()
 
 # --- Main Application Routes (Original functionality with added logging) ---
 @app.get("/", response_class=HTMLResponse, name="read_root")
 async def read_root(request: Request):
-    """Serves the main HTML page."""
     logger.info(f"Root page accessed by {request.client.host}")
     return templates.TemplateResponse("index.html", {"request": request, "url_for": app.url_path_for})
 
 @app.post("/upload/", name="upload_file")
 async def upload_file(request: Request, file: UploadFile = File(...)):
-    """Handles file uploads."""
     original_filename = file.filename
     logger.info(f"Upload attempt for '{original_filename}' from {request.client.host}")
 
@@ -297,9 +238,9 @@ async def upload_file(request: Request, file: UploadFile = File(...)):
 
     try:
         async with aiofiles.open(file_path, "wb") as buffer:
-            while content := await file.read(1024 * 1024):  # Read 1MB chunks
+            while content := await file.read(1024 * 1024):
                 await buffer.write(content)
-        file_size = file_path.stat().st_size # Get actual size after writing
+        file_size = file_path.stat().st_size
         logger.info(f"File '{filename}' uploaded successfully by {request.client.host}. Size: {file_size} bytes.")
     except Exception as e:
         logger.error(f"Could not save file '{filename}' from {request.client.host}: {str(e)}")
@@ -321,7 +262,6 @@ async def upload_file(request: Request, file: UploadFile = File(...)):
 
 @app.get("/download/{filename}", name="download_file")
 async def download_file(request: Request, filename: str):
-    """Handles file downloads."""
     clean_filename = sanitize_filename(filename)
     logger.info(f"Download attempt for '{clean_filename}' by {request.client.host}")
 
@@ -338,12 +278,10 @@ async def download_file(request: Request, filename: str):
     logger.info(f"File '{clean_filename}' downloaded by {request.client.host}")
     return FileResponse(path=file_path, filename=clean_filename, media_type='application/octet-stream')
 
-# Include the admin router
 app.include_router(admin_router)
-logger.info("Admin panel router included and configured.")
+logger.info("Admin panel router included. File-based logging is disabled.")
 
 if __name__ == "__main__":
     import uvicorn
     logger.info("Starting Uvicorn server for local development...")
-    # Use "app:app" to refer to the FastAPI instance named 'app' in the file 'app.py'
     uvicorn.run("app:app", host="0.0.0.0", port=7860, reload=True)

templates/admin_dashboard.html

@@ -16,12 +16,12 @@
         </div>
     </div>
     <div class="col-md-6">
-        <div class="card text-dark bg-warning mb-3"> <!-- Consider bg-info or another color for logs -->
-            <div class="card-header">Application Logs</div>
+        <div class="card text-dark bg-secondary mb-3"> <!-- Changed color for variety -->
+            <div class="card-header">Application Status</div>
             <div class="card-body">
-                <h5 class="card-title">{{ log_lines_count }}</h5>
-                <p class="card-text">Total lines in the current log file (app.log).</p>
-                <a href="{{ url_for('admin_logs_page') }}" class="btn btn-dark">View Logs <i class="bi bi-arrow-right-short"></i></a>
+                <h5 class="card-title text-success">Running</h5>
+                <p class="card-text">Application is operational. Logs are directed to the container console.</p>
+                 <a href="{{ url_for('read_root') }}" target="_blank" class="btn btn-light">View User Site <i class="bi bi-box-arrow-up-right"></i></a>
             </div>
         </div>
     </div>
@@ -30,6 +30,6 @@
 <div class="mt-4">
     <h4>Quick Info</h4>
     <p>Welcome, {{ admin_user.email }}!</p>
-    <!-- Add more quick actions or system info if needed -->
+    <p>Server logs are available through the container's standard output (e.g., `docker logs`).</p>
 </div>
 {% endblock %}

templates/admin_layout.html

@@ -50,11 +50,7 @@
                                 <i class="bi bi-file-earmark-arrow-up-fill"></i> Uploaded Files
                             </a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link {% if request.url.path == url_for('admin_logs_page') %}active{% endif %}" href="{{ url_for('admin_logs_page') }}">
-                                <i class="bi bi-card-list"></i> Application Logs
-                            </a>
-                        </li>
+                        <!-- Application Logs link removed -->
                          <li class="nav-item mt-auto mb-2 border-top pt-2">
                             <a class="nav-link" href="{{ url_for('read_root') }}" target="_blank">
                                 <i class="bi bi-box-arrow-up-right"></i> View Main Site