sha/scatcher
1
0
Fork 0
mirror of https://github.com/shadoll/scatcher.git synced 2025-12-20 03:26:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor namespace checking in app.py

Browse Source
This commit is contained in:
sHa
2024-03-13 11:35:52 +02:00
parent 66ca19902c
commit c8f02f8526
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app.py
View File

@@ -61,8 +61,17 @@ def store_last_request(request_data, namespace="requests"):
with open(filename, "w") as f: with open(filename, "w") as f:
json.dump(data, f, indent=4) json.dump(data, f, indent=4)
def check_namespace(namespace): def check_namespace(namespace):
if namespace == "__history" or namespace == "__last_request" or namespace == "__clear" or namespace == "__help" or namespace == "docs" or namespace == "redoc" or namespace == "api": if (
namespace == "__history"
or namespace == "__last_request"
or namespace == "__clear"
or namespace == "__help"
or namespace == "docs"
or namespace == "redoc"
or namespace == "api"
):
return False return False
return True return True
@@ -82,7 +91,9 @@ def check_namespace(namespace):
@app.options("/{namespace}", status_code=status.HTTP_200_OK) @app.options("/{namespace}", status_code=status.HTTP_200_OK)
@app.head("/{namespace}", status_code=status.HTTP_200_OK) @app.head("/{namespace}", status_code=status.HTTP_200_OK)
async def catch( async def catch(
request: Request, response: Response, namespace: str = "requests", request: Request,
response: Response,
namespace: str = "requests",
) -> Answer: ) -> Answer:
if not check_namespace(namespace): if not check_namespace(namespace):
response.status_code = status.HTTP_400_BAD_REQUEST response.status_code = status.HTTP_400_BAD_REQUEST
@@ -129,7 +140,10 @@ def help():
@app.get("/api/__last_request", status_code=status.HTTP_200_OK) @app.get("/api/__last_request", status_code=status.HTTP_200_OK)
@app.get("/api/__last_request/{namespace}", status_code=status.HTTP_200_OK) @app.get("/api/__last_request/{namespace}", status_code=status.HTTP_200_OK)
async def last_requests(response: Response, namespace: str = "requests",) -> Answer | RequestData: async def last_requests(
response: Response,
namespace: str = "requests",
) -> Answer | RequestData:
if not check_namespace(namespace): if not check_namespace(namespace):
response.status_code = status.HTTP_400_BAD_REQUEST response.status_code = status.HTTP_400_BAD_REQUEST
return Answer(status="error", message="Invalid namespace name provided.") return Answer(status="error", message="Invalid namespace name provided.")
@@ -152,7 +166,8 @@ async def last_requests(response: Response, namespace: str = "requests",) -> Ans
@app.get("/api/__history/{namespace}", status_code=status.HTTP_200_OK) @app.get("/api/__history/{namespace}", status_code=status.HTTP_200_OK)
async def history( async def history(
response: Response, response: Response,
id: int = 0, namespace: str = "requests", id: int = 0,
namespace: str = "requests",
) -> Answer | RequestData | list[RequestData]: ) -> Answer | RequestData | list[RequestData]:
if not check_namespace(namespace): if not check_namespace(namespace):
response.status_code = status.HTTP_400_BAD_REQUEST response.status_code = status.HTTP_400_BAD_REQUEST
@@ -173,8 +188,10 @@ async def history(
@app.get("/api/__clear", status_code=status.HTTP_200_OK) @app.get("/api/__clear", status_code=status.HTTP_200_OK)
@app.get("/api/__clear/{namespace}", status_code=status.HTTP_200_OK) @app.get("/api/__clear/{namespace}", status_code=status.HTTP_200_OK)
async def clear_history(response: Response, async def clear_history(
namespace: str = "requests",) -> Answer: response: Response,
namespace: str = "requests",
) -> Answer:
if not check_namespace(namespace): if not check_namespace(namespace):
response.status_code = status.HTTP_400_BAD_REQUEST response.status_code = status.HTTP_400_BAD_REQUEST
return Answer(status="error", message="Invalid namespace name provided.") return Answer(status="error", message="Invalid namespace name provided.")