init
This commit is contained in:
+35
-3
@@ -1,6 +1,8 @@
|
||||
"""
|
||||
JWT 认证工具
|
||||
JWT 认证工具 + 密码哈希
|
||||
"""
|
||||
import hashlib
|
||||
import secrets
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Optional
|
||||
|
||||
@@ -17,12 +19,42 @@ from .models import User
|
||||
bearer_scheme = HTTPBearer(auto_error=False)
|
||||
|
||||
|
||||
def create_access_token(user_id: int, client_code: str) -> str:
|
||||
# ------------------------------------------------------------------
|
||||
# 密码哈希(PBKDF2-SHA256,标准库实现,无需额外依赖)
|
||||
# ------------------------------------------------------------------
|
||||
_PBKDF2_ITERATIONS = 120_000
|
||||
|
||||
|
||||
def hash_password(password: str) -> str:
|
||||
"""生成 '盐$哈希' 格式的密码摘要"""
|
||||
salt = secrets.token_hex(16)
|
||||
digest = hashlib.pbkdf2_hmac(
|
||||
"sha256", password.encode("utf-8"), salt.encode("utf-8"), _PBKDF2_ITERATIONS
|
||||
).hex()
|
||||
return f"{salt}${digest}"
|
||||
|
||||
|
||||
def verify_password(password: str, stored: str) -> bool:
|
||||
"""校验明文密码与存储摘要是否匹配"""
|
||||
try:
|
||||
salt, digest = stored.split("$", 1)
|
||||
except ValueError:
|
||||
return False
|
||||
candidate = hashlib.pbkdf2_hmac(
|
||||
"sha256", password.encode("utf-8"), salt.encode("utf-8"), _PBKDF2_ITERATIONS
|
||||
).hex()
|
||||
return secrets.compare_digest(candidate, digest)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# JWT
|
||||
# ------------------------------------------------------------------
|
||||
def create_access_token(user_id: int, username: str) -> str:
|
||||
"""生成 JWT token"""
|
||||
expire = datetime.utcnow() + timedelta(days=settings.ACCESS_TOKEN_EXPIRE_DAYS)
|
||||
payload = {
|
||||
"sub": str(user_id),
|
||||
"client_code": client_code,
|
||||
"username": username,
|
||||
"exp": expire,
|
||||
}
|
||||
return jwt.encode(payload, settings.SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
|
||||
|
||||
+9
-5
@@ -18,17 +18,21 @@ def utcnow() -> datetime:
|
||||
|
||||
class User(Base):
|
||||
"""
|
||||
客户端用户
|
||||
以机器硬件指纹(client_code)作为唯一标识
|
||||
系统用户
|
||||
以用户名(username)+ 密码哈希作为身份,与机器/指纹浏览器解耦
|
||||
"""
|
||||
__tablename__ = "users"
|
||||
|
||||
id = Column(Integer, primary_key=True, autoincrement=True)
|
||||
# 机器硬件指纹哈希(唯一)
|
||||
client_code = Column(String(128), unique=True, nullable=False, index=True)
|
||||
# 登录用户名(唯一)
|
||||
username = Column(String(64), unique=True, nullable=False, index=True)
|
||||
# 密码加盐哈希(PBKDF2,格式:盐$摘要),不存明文
|
||||
password_hash = Column(String(255), nullable=False)
|
||||
# 客户端显示昵称(可选)
|
||||
nickname = Column(String(64), nullable=True)
|
||||
# JWT token 存储(服务端无状态校验,这里仅做记录)
|
||||
# 最近一次登录的客户端设备指纹(仅作审计/展示,非身份标识)
|
||||
client_code = Column(String(128), nullable=True)
|
||||
# 账号是否启用
|
||||
is_active = Column(Boolean, default=True, nullable=False)
|
||||
# Boss直聘 账号标识(登录成功后回填,用于区分同一 Boss 账号)
|
||||
boss_account = Column(String(128), nullable=True)
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
"""
|
||||
RPA 在线状态服务(业务底层收敛)
|
||||
====================================
|
||||
所有与"客户端在线"相关的判定与刷新必须经由本模块,禁止在路由里各自实现:
|
||||
|
||||
- is_online(user) 纯判定:last_seen_at 距今是否在在线窗口内
|
||||
- touch(user, db) 刷新活跃时间(心跳 / 任何业务请求)
|
||||
- require_online_user 前置校验依赖:认证 + 刷新活跃 + 在线校验
|
||||
|
||||
使用约定:
|
||||
- 心跳接口 → touch()
|
||||
- 需要 RPA 存活的写操作(开始/结束投递、登录状态变更、简历上传、
|
||||
投递上报等)→ require_online_user 前置校验
|
||||
- 只读查询接口 → 仍用 get_current_user,不做在线强制
|
||||
"""
|
||||
from datetime import datetime
|
||||
|
||||
from fastapi import Depends, HTTPException, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from .auth import get_current_user
|
||||
from .database import get_db
|
||||
from .models import User
|
||||
|
||||
# 客户端心跳间隔 30s;连续 3 个周期(90s)无心跳即判定离线
|
||||
ONLINE_WINDOW_SECONDS = 90
|
||||
|
||||
|
||||
def is_online(user: User) -> bool:
|
||||
"""判定客户端是否在线(纯函数,不产生任何写操作)"""
|
||||
if not user.last_seen_at:
|
||||
return False
|
||||
return (datetime.utcnow() - user.last_seen_at).total_seconds() <= ONLINE_WINDOW_SECONDS
|
||||
|
||||
|
||||
def touch(user: User, db: Session) -> None:
|
||||
"""刷新活跃时间并提交(请求本身即在线信号)"""
|
||||
user.last_seen_at = datetime.utcnow()
|
||||
db.commit()
|
||||
|
||||
|
||||
def require_online_user(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
) -> User:
|
||||
"""
|
||||
业务操作前置校验依赖(开始/结束投递、登录等必须走这里):
|
||||
1. 认证(复用 get_current_user)
|
||||
2. 先校验在线:若客户端已离线(心跳中断),直接拒绝操作
|
||||
3. 再刷新活跃时间,让业务请求本身也成为在线信号
|
||||
|
||||
注意顺序:先校验后刷新。若先刷新,离线校验将永远通过,失去拦截意义。
|
||||
"""
|
||||
if not is_online(current_user):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_409_CONFLICT,
|
||||
detail="RPA 客户端已离线,请确认客户端正在运行后重试",
|
||||
)
|
||||
touch(current_user, db)
|
||||
return current_user
|
||||
@@ -10,6 +10,7 @@ from sqlalchemy import func
|
||||
from ..auth import get_current_user
|
||||
from ..database import get_db
|
||||
from ..models import User, JobApplication
|
||||
from ..online import require_online_user
|
||||
from ..schemas import ApplicationIn, ApplicationOut, Message, StatsOut
|
||||
|
||||
router = APIRouter(prefix="/api/jobs", tags=["投递记录"])
|
||||
@@ -19,11 +20,11 @@ router = APIRouter(prefix="/api/jobs", tags=["投递记录"])
|
||||
def report_application(
|
||||
req: ApplicationIn,
|
||||
session_id: Optional[int] = Query(None, description="所属会话 ID"),
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_user: User = Depends(require_online_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
客户端上报一条投递/跳过记录。
|
||||
客户端上报一条投递/跳过记录(前置校验:RPA 必须在线)。
|
||||
同一用户 + 同一职位 ID 去重,已存在则更新。
|
||||
"""
|
||||
existing = db.query(JobApplication).filter(
|
||||
|
||||
+62
-30
@@ -1,59 +1,91 @@
|
||||
"""
|
||||
客户端注册 / 登录状态 / 用户信息路由
|
||||
账号注册 / 登录 / 用户状态路由
|
||||
"""
|
||||
from datetime import datetime
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from ..auth import create_access_token, get_current_user
|
||||
from ..auth import (
|
||||
create_access_token, get_current_user, hash_password, verify_password,
|
||||
)
|
||||
from ..database import get_db
|
||||
from ..models import User
|
||||
from ..online import is_online, touch, require_online_user
|
||||
from ..schemas import (
|
||||
RegisterRequest, RegisterResponse, UserInfo, LoginStatusUpdate, Message,
|
||||
RegisterRequest, LoginRequest, AuthResponse,
|
||||
UserInfo, LoginStatusUpdate, Message,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/api/auth", tags=["认证与用户"])
|
||||
|
||||
|
||||
@router.post("/register", response_model=RegisterResponse)
|
||||
@router.post("/register", response_model=AuthResponse)
|
||||
def register(req: RegisterRequest, db: Session = Depends(get_db)):
|
||||
"""
|
||||
客户端注册/登录。
|
||||
以机器硬件指纹 client_code 作为唯一标识:
|
||||
- 已存在 → 直接返回 token(视为登录)
|
||||
- 不存在 → 创建新用户
|
||||
"""
|
||||
user = db.query(User).filter(User.client_code == req.client_code).first()
|
||||
is_new = user is None
|
||||
"""注册新账号(用户名 + 密码)"""
|
||||
exists = db.query(User).filter(User.username == req.username).first()
|
||||
if exists:
|
||||
raise HTTPException(status_code=409, detail="用户名已存在")
|
||||
|
||||
if is_new:
|
||||
user = User(client_code=req.client_code, nickname=req.nickname)
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
user = User(
|
||||
username=req.username,
|
||||
password_hash=hash_password(req.password),
|
||||
nickname=req.nickname,
|
||||
)
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
# 更新最后活跃时间
|
||||
token = create_access_token(user.id, user.username)
|
||||
return AuthResponse(user_id=user.id, username=user.username, token=token)
|
||||
|
||||
|
||||
@router.post("/login", response_model=AuthResponse)
|
||||
def login(req: LoginRequest, db: Session = Depends(get_db)):
|
||||
"""账号密码登录,返回 JWT token"""
|
||||
user = db.query(User).filter(User.username == req.username).first()
|
||||
if user is None or not verify_password(req.password, user.password_hash):
|
||||
raise HTTPException(status_code=401, detail="用户名或密码错误")
|
||||
if not user.is_active:
|
||||
raise HTTPException(status_code=403, detail="账号已被禁用")
|
||||
|
||||
# 记录登录设备与活跃时间(client_code 仅作审计)
|
||||
if req.client_code:
|
||||
user.client_code = req.client_code
|
||||
user.last_seen_at = datetime.utcnow()
|
||||
db.commit()
|
||||
|
||||
token = create_access_token(user.id, user.client_code)
|
||||
return RegisterResponse(
|
||||
user_id=user.id,
|
||||
token=token,
|
||||
client_code=user.client_code,
|
||||
is_new=is_new,
|
||||
)
|
||||
token = create_access_token(user.id, user.username)
|
||||
return AuthResponse(user_id=user.id, username=user.username, token=token)
|
||||
|
||||
|
||||
@router.post("/heartbeat", response_model=Message)
|
||||
def heartbeat(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""客户端心跳:刷新 last_seen_at,用于在线判定(统一走 online.touch)"""
|
||||
touch(current_user, db)
|
||||
return Message(msg="ok")
|
||||
|
||||
|
||||
@router.get("/me", response_model=UserInfo)
|
||||
def get_me(current_user: User = Depends(get_current_user)):
|
||||
"""获取当前用户信息"""
|
||||
def get_me(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""获取当前用户信息(含 RPA 在线状态)"""
|
||||
online = is_online(current_user)
|
||||
# 懒清理:客户端已离线却仍停留在“登录中”,说明登录轮询已中断,重置为未登录
|
||||
if not online and current_user.login_status == "logging_in":
|
||||
current_user.login_status = "not_login"
|
||||
db.commit()
|
||||
return UserInfo(
|
||||
id=current_user.id,
|
||||
client_code=current_user.client_code,
|
||||
username=current_user.username,
|
||||
nickname=current_user.nickname,
|
||||
boss_account=current_user.boss_account,
|
||||
login_status=current_user.login_status,
|
||||
is_online=online,
|
||||
created_at=current_user.created_at,
|
||||
)
|
||||
|
||||
@@ -61,10 +93,10 @@ def get_me(current_user: User = Depends(get_current_user)):
|
||||
@router.put("/login-status", response_model=Message)
|
||||
def update_login_status(
|
||||
req: LoginStatusUpdate,
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_user: User = Depends(require_online_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""更新 Boss直聘 登录状态"""
|
||||
"""更新 Boss直聘 登录状态(前置校验:RPA 必须在线)"""
|
||||
valid_status = {"not_login", "logging_in", "logged_in"}
|
||||
if req.login_status not in valid_status:
|
||||
raise HTTPException(status_code=400, detail=f"登录状态必须是 {valid_status} 之一")
|
||||
|
||||
@@ -7,6 +7,7 @@ from sqlalchemy.orm import Session
|
||||
from ..auth import get_current_user
|
||||
from ..database import get_db
|
||||
from ..models import User, Resume
|
||||
from ..online import require_online_user
|
||||
from ..schemas import ResumeIn, ResumeOut, ResumeBatchIn, Message
|
||||
|
||||
router = APIRouter(prefix="/api/resumes", tags=["简历管理"])
|
||||
@@ -40,11 +41,11 @@ def get_primary_resume(
|
||||
@router.post("/batch", response_model=list[ResumeOut])
|
||||
def upload_resumes_batch(
|
||||
req: ResumeBatchIn,
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_user: User = Depends(require_online_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
批量上传抓取到的简历。
|
||||
批量上传抓取到的简历(前置校验:RPA 必须在线)。
|
||||
以 boss_resume_id 去重:存在则更新,不存在则新增。
|
||||
第一份简历自动设为主简历(若当前没有主简历)。
|
||||
"""
|
||||
|
||||
@@ -8,6 +8,7 @@ from sqlalchemy.orm import Session
|
||||
from ..auth import get_current_user
|
||||
from ..database import get_db
|
||||
from ..models import User, ApplySession
|
||||
from ..online import require_online_user
|
||||
from ..schemas import SessionStartIn, SessionOut, SessionStatsIn, Message
|
||||
|
||||
router = APIRouter(prefix="/api/sessions", tags=["投递会话"])
|
||||
@@ -16,10 +17,10 @@ router = APIRouter(prefix="/api/sessions", tags=["投递会话"])
|
||||
@router.post("/start", response_model=SessionOut)
|
||||
def start_session(
|
||||
req: SessionStartIn,
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_user: User = Depends(require_online_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""开始一次投递会话"""
|
||||
"""开始一次投递会话(前置校验:RPA 必须在线)"""
|
||||
# 若已有进行中的会话,先结束它
|
||||
running = db.query(ApplySession).filter(
|
||||
ApplySession.user_id == current_user.id,
|
||||
@@ -64,7 +65,11 @@ def stop_session(
|
||||
current_user: User = Depends(get_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""结束指定会话"""
|
||||
"""
|
||||
结束指定会话。
|
||||
特例:start 需在线前置校验,但 stop 是安全清理操作,故意豁免在线拦截——
|
||||
否则离线前遗留的 running 僵尸会话将永远无法关闭。
|
||||
"""
|
||||
session = db.query(ApplySession).filter(
|
||||
ApplySession.id == session_id,
|
||||
ApplySession.user_id == current_user.id,
|
||||
@@ -82,10 +87,10 @@ def stop_session(
|
||||
def update_session_stats(
|
||||
session_id: int,
|
||||
req: SessionStatsIn,
|
||||
current_user: User = Depends(get_current_user),
|
||||
current_user: User = Depends(require_online_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""增量上报投递/跳过数量"""
|
||||
"""增量上报投递/跳过数量(前置校验:RPA 必须在线)"""
|
||||
session = db.query(ApplySession).filter(
|
||||
ApplySession.id == session_id,
|
||||
ApplySession.user_id == current_user.id,
|
||||
|
||||
+15
-7
@@ -7,23 +7,30 @@ from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
# =======================================================
|
||||
# 认证相关
|
||||
# 认证相关(账号密码体系)
|
||||
# =======================================================
|
||||
class RegisterRequest(BaseModel):
|
||||
client_code: str = Field(..., min_length=8, max_length=128, description="机器硬件指纹哈希")
|
||||
username: str = Field(..., min_length=3, max_length=64, description="登录用户名")
|
||||
password: str = Field(..., min_length=6, max_length=128, description="登录密码")
|
||||
nickname: Optional[str] = Field(None, max_length=64)
|
||||
|
||||
|
||||
class RegisterResponse(BaseModel):
|
||||
class LoginRequest(BaseModel):
|
||||
username: str = Field(..., min_length=1, max_length=64)
|
||||
password: str = Field(..., min_length=1, max_length=128)
|
||||
# 可选:客户端设备指纹(仅作审计记录)
|
||||
client_code: Optional[str] = Field(None, max_length=128)
|
||||
|
||||
|
||||
class AuthResponse(BaseModel):
|
||||
user_id: int
|
||||
username: str
|
||||
token: str
|
||||
client_code: str
|
||||
is_new: bool # 是否为新注册用户
|
||||
|
||||
|
||||
class TokenPayload(BaseModel):
|
||||
sub: int # user_id
|
||||
client_code: str
|
||||
username: str
|
||||
|
||||
|
||||
# =======================================================
|
||||
@@ -31,10 +38,11 @@ class TokenPayload(BaseModel):
|
||||
# =======================================================
|
||||
class UserInfo(BaseModel):
|
||||
id: int
|
||||
client_code: str
|
||||
username: str
|
||||
nickname: Optional[str]
|
||||
boss_account: Optional[str]
|
||||
login_status: str
|
||||
is_online: bool # RPA 客户端是否在线(心跳判定)
|
||||
created_at: datetime
|
||||
|
||||
class Config:
|
||||
|
||||
Reference in New Issue
Block a user