make check

修复登录失败不跳转回去的问题

Author: Chise1

Makefile

@@ -27,8 +27,8 @@ style: deps
 check: deps
 	black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
 	flake8 $(checkfiles)
-	bandit -x test -r $(checkfiles)
-	mypy $(checkfiles)
+	bandit -x test -r $(checkfiles) -c pyproject.toml
+	mypy fast_tmp/
 
 
 test_sqlite:

README.md

@@ -1,4 +1,7 @@
+[![security: bandit](https://img.shields.io/badge/security-bandit-yellow.svg)](https://github.com/PyCQA/bandit)
+
 # fast-tmp
+
 项目模板
 
 ## 概述

fast_tmp/admin/creator.py

@@ -1,8 +1,7 @@
 from typing import Optional
 
-from fastapi import Cookie, Depends, Header, HTTPException
+from fastapi import Cookie, Depends, HTTPException
 from starlette.requests import Request
-from starlette.responses import RedirectResponse
 from starlette.status import HTTP_404_NOT_FOUND
 from tortoise import Tortoise
 
@@ -41,20 +40,24 @@ async def __get_user_or_none(access_token: Optional[str] = Cookie(None)) -> Opti
     """
     获取active为true的用户，否则返回none
     """
-    try:
-        payload = decode_access_token(access_token)
-        username: str = payload.get("sub")
-        if username is None:
+    if access_token is not None:
+        try:
+            payload = decode_access_token(access_token)
+            username: str = payload.get("sub")
+            if username is None:
+                return None
+        except Exception:
             return None
-    except Exception:
-        return None
-    user = await User.filter(username=username).first()
-    if user is not None and user.is_active:
-        return user
+        user = await User.filter(username=username).first()
+        if user is not None and user.is_active:
+            return user
     return None
 
 
 async def get_user(request: Request, user: Optional[User] = Depends(__get_user_or_none)):
+    """
+    found user and write to request
+    """
     if not user or not user.is_active:
-        raise NoAuthError
+        raise NoAuthError()
     request.scope["user"] = user

fast_tmp/admin/depends.py

@@ -1,15 +1,12 @@
-from typing import Any, List, Optional
+from typing import Optional
 
 from fastapi import APIRouter, Depends
-from pydantic import BaseModel
 from starlette.requests import Request
 
+from fast_tmp.admin.depends import get_user
+from fast_tmp.responses import BaseRes, ListDataWithPage
 from fast_tmp.site import ModelAdmin, get_model_site
 
-from ..models import User
-from ..responses import BaseRes, ListDataWithPage
-from .depends import get_user
-
 router = APIRouter()
 
 

fast_tmp/admin/endpoint.py

@@ -1,25 +1,19 @@
 from fastapi.responses import JSONResponse
+from starlette import status
 from starlette.requests import Request
-from starlette.responses import RedirectResponse
+from starlette.responses import RedirectResponse, Response
 from tortoise.exceptions import BaseORMException
 
 from fast_tmp.responses import BaseRes, FastTmpError, NoAuthError
 
 
 async def fasttmp_exception_handler(request: Request, exc: FastTmpError):
-    return JSONResponse(
-        status_code=200,
-        content=exc.detail,
+    if isinstance(exc, NoAuthError):
+        return RedirectResponse(request.url_for("admin:login"), status_code=status.HTTP_302_FOUND)
+    return Response(
+        status_code=200, content=exc.detail, headers={"Content-Type": "appliation/json"}
     )
 
 
 async def tortoise_exception_handler(request: Request, exc: BaseORMException):
     return JSONResponse(content=BaseRes(msg=str(exc), status=400).dict(), status_code=200)
-
-
-async def no_auth_middle(request: Request, call_next):
-    try:
-        response = await call_next(request)
-    except NoAuthError:
-        return RedirectResponse(request.url_for("admin:login"))
-    return response

fast_tmp/admin/exception_handlers.py

@@ -1,6 +1,3 @@
-from typing import Any
-
-from pydantic import BaseModel
 from starlette.requests import Request
 from starlette.responses import RedirectResponse
 from starlette.status import HTTP_303_SEE_OTHER