Merge remote-tracking branch 'origin/3.0-dev' into 3.0-dev

src/module/api/auth.py

@@ -0,0 +1,53 @@
+from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi.security import OAuth2PasswordRequestForm
+
+from module.database.user import AuthDB
+from module.security.jwt import decode_token, oauth2_scheme
+
+from .api import router
+
+
+async def get_current_user(token: str = Depends(oauth2_scheme)):
+    if not token:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token")
+    payload = decode_token(token)
+    if not payload:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token")
+    username = payload.get("sub")
+    user = user_db.get_user(username)
+    if not user:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid username")
+    return user
+
+
+async def get_token_data(token: str = Depends(oauth2_scheme)):
+    payload = decode_token(token)
+    if not payload:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token")
+    return payload
+
+
+@router.get("/api/v1/auth/login", response_model=dict, tags=["login"])
+async def login(form_data: OAuth2PasswordRequestForm = Depends()):
+    username = form_data.username
+    password = form_data.password
+    with AuthDB() as db:
+        if not db.authenticate(username, password):
+            raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid username or password")
+        token = db.create_access_token(username)
+        return {"access_token": token, "token_type": "bearer"}
+
+
+@router.get("/api/v1/auth/logout", response_model=dict, tags=["login"])
+async def logout(token_data: dict = Depends(get_token_data)):
+    pass
+
+@router.get("/api/v1/auth/refresh", response_model=dict, tags=["login"])
+async def refresh(
+        current_user: User = Depends(get_token_data),
+):
+    if not current_user:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="invalid token")
+    token = create_access_token(current_user)
+    return {"access_token": token, "token_type": "bearer"}
+

src/module/database/user.py

@@ -0,0 +1,42 @@
+from fastapi import HTTPException
+
+from .connector import DataConnector
+
+from module.security.jwt import get_password_hash, verify_password
+from module.models import UserLogin
+
+
+class AuthDB(DataConnector):
+    def update_table(self):
+        pass
+
+    def auth_user(self, user: UserLogin) -> bool:
+        username = user.username
+        password = user.password
+        self._cursor.execute(f"SELECT * FROM user WHERE username='{username}'")
+        result = self._cursor.fetchone()
+        if not result:
+            raise HTTPException(status_code=404, detail="User not found")
+        if not verify_password(password, result[2]):
+            raise HTTPException(status_code=401, detail="Password error")
+        return True
+
+    def update_user(self, user: UserUpdate):
+        # Update username and password
+        username = user.username
+        new_username = user.new_username
+        password = user.password
+        new_password = user.new_password
+        self._cursor.execute(f"SELECT * FROM user WHERE username='{username}'")
+        result = self._cursor.fetchone()
+        if not result:
+            raise HTTPException(status_code=404, detail="User not found")
+        if not verify_password(password, result[2]):
+            raise HTTPException(status_code=401, detail="Password error")
+        self._cursor.execute("""
+            UPDATE user
+            SET username=%s, password=%s
+            WHERE username=%s
+            """, (new_username, get_password_hash(new_password), username))
+        self._conn.commit()
+        return True

src/module/downloader/client/qb_downloader.py

@@ -2,7 +2,7 @@ import logging
 import time
 
 from qbittorrentapi import Client, LoginFailed
-from qbittorrentapi.exceptions import Conflict409Error, Forbidden403Error
+from qbittorrentapi.exceptions import Conflict409Error, Forbidden403Error, APIConnectionError
 
 from module.ab_decorator import qb_connect_failed_wait
 from module.downloader.exceptions import ConflictError
@@ -38,6 +38,13 @@ class QbDownloader:
                 logger.error(f"Login refused by qBittorrent Server")
                 logger.info(f"Please release the IP in qBittorrent Server")
                 break
+            except APIConnectionError:
+                logger.error(f"Cannot connect to qBittorrent Server")
+                logger.info(f"Please check the IP and port in qBittorrent Server")
+                time.sleep(30)
+            except Exception as e:
+                logger.error(f"Unknown error: {e}")
+                break
         return False
 
     def logout(self):

src/module/models/__init__.py

@@ -1,3 +1,4 @@
 from .bangumi import *
 from .config import Config
 from .torrent import EpisodeFile, SubtitleFile
+from .user import UserLogin

src/module/models/user.py

@@ -0,0 +1,39 @@
+from typing import Optional
+from pydantic import BaseModel, Field
+from datetime import datetime
+
+
+class UserBase(BaseModel):
+    username: str = Field(..., min_length=4, max_length=20, regex=r"^[a-zA-Z0-9_]+$")
+
+
+class UserCreate(UserBase):
+    password: str = Field(..., min_length=8)
+
+
+class UserUpdate(UserBase):
+    password: str = Field(..., min_length=8)
+
+
+class User(UserBase):
+    user_id: int
+    password: str = Field(..., min_length=8)
+    id: str = Field(..., alias="_id")
+
+
+class UserInDB(UserBase):
+    password: str = Field(..., min_length=8)
+
+
+class UserLogin(BaseModel):
+    username: str
+    password: str = Field(..., min_length=8)
+
+
+class Token(BaseModel):
+    token: str
+    token_type: str
+
+
+class TokenData(BaseModel):
+    username: str | None = None

src/module/parser/title_parser.py

@@ -57,7 +57,7 @@ class TitleParser:
                 title_raw=title_raw,
                 season=_season,
                 season_raw=episode.season_raw,
-                group=episode.group,
+                group_name=episode.group,
                 dpi=episode.resolution,
                 source=episode.source,
                 subtitle=episode.sub,

src/module/security/jwt.py

@@ -0,0 +1,54 @@
+from datetime import datetime, timedelta
+from typing import Optional
+from passlib.context import CryptContext
+from jose import jwt, JWTError
+
+
+# app_pwd_key = settings.KEY
+# app_pwd_algorithm = settings.ALGORITHM
+
+# Hashing 密码
+app_pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
+
+
+# 创建 JWT Token
+def create_access_token(data: dict, expires_delta: timedelta | None = None):
+    to_encode = data.copy()
+    if expires_delta:
+        expire = datetime.utcnow() + expires_delta
+    else:
+        expire = datetime.utcnow() + timedelta(minutes=120)
+    to_encode.update({"exp": expire})
+    encoded_jwt = jwt.encode(to_encode, app_pwd_key, algorithm=app_pwd_algorithm)
+    return encoded_jwt
+
+
+# 解码 Token
+def decode_token(token: str):
+    try:
+        payload = jwt.decode(token, app_pwd_key, algorithms=[app_pwd_algorithm])
+        username = payload.get("sub")
+        if username is None:
+            return None
+        return payload
+    except JWTError as e:
+        raise e
+
+
+def verify_token(token: str):
+    token_data = decode_token(token)
+    if token_data is None:
+        return None
+    expires = token_data.get("exp")
+    if datetime.utcnow() >= datetime.fromtimestamp(expires):
+        raise JWTError("Token expired")
+    return create_access_token(data={"sub": token_data.get("sub")})
+
+
+# 密码加密&验证
+def verify_password(plain_password, hashed_password):
+    return app_pwd_context.verify(plain_password, hashed_password)
+
+
+def get_password_hash(password):
+    return app_pwd_context.hash(password)