清理冗余路由代码,修复首页标题与模板安全
- 简化 http-api/http-tcp/web-toolkit 的 router.py,抽取重复代码 - 修复 ws-api middleware 中间件返回值传递问题 - 修复 web-toolkit template.py 安全漏洞 (eval → AST 验证) - 将首页标题从 "OSS Runtime" 改为 "Future OSS" - 更新 README.md 与 static/banner.svg - 新增 i18n 国际化插件 (骨架) - 新增 oss/shared/ 共享模块
This commit is contained in:
136
oss/shared/router.py
Normal file
136
oss/shared/router.py
Normal file
@@ -0,0 +1,136 @@
|
||||
"""共享路由工具函数"""
|
||||
from typing import Callable, Optional, Any
|
||||
|
||||
|
||||
class BaseRoute:
|
||||
"""路由定义基类"""
|
||||
def __init__(self, method: str, path: str, handler: Callable):
|
||||
self.method = method
|
||||
self.path = path
|
||||
self.handler = handler
|
||||
|
||||
|
||||
def match_path(pattern: str, path: str) -> bool:
|
||||
"""路径匹配
|
||||
|
||||
支持:
|
||||
- 精确匹配: /api/users == /api/users
|
||||
- 参数匹配: /api/users/:id 匹配 /api/users/123
|
||||
- 通配符匹配: /api/:path 匹配 /api/users/123/profile
|
||||
|
||||
Args:
|
||||
pattern: 路由模式 (如 /api/users/:id)
|
||||
path: 实际请求路径 (如 /api/users/123)
|
||||
|
||||
Returns:
|
||||
是否匹配成功
|
||||
"""
|
||||
if pattern == path:
|
||||
return True
|
||||
|
||||
if ":" not in pattern:
|
||||
return False
|
||||
|
||||
pattern_parts = pattern.strip("/").split("/")
|
||||
path_parts = path.strip("/").split("/")
|
||||
|
||||
# 如果最后一个 pattern 是 :path(通配符),允许更多路径段
|
||||
last_pattern = pattern_parts[-1]
|
||||
if last_pattern.startswith(":") and len(path_parts) >= len(pattern_parts):
|
||||
# 检查前面的段是否匹配
|
||||
for i, p in enumerate(pattern_parts[:-1]):
|
||||
if i >= len(path_parts):
|
||||
return False
|
||||
if not p.startswith(":") and p != path_parts[i]:
|
||||
return False
|
||||
return True
|
||||
|
||||
# 普通参数匹配,段数必须相同
|
||||
if len(pattern_parts) != len(path_parts):
|
||||
return False
|
||||
|
||||
for p, a in zip(pattern_parts, path_parts):
|
||||
if not p.startswith(":") and p != a:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
def extract_path_params(pattern: str, path: str) -> dict[str, str]:
|
||||
"""从路径中提取参数
|
||||
|
||||
Args:
|
||||
pattern: 路由模式 (如 /api/users/:id)
|
||||
path: 实际请求路径 (如 /api/users/123)
|
||||
|
||||
Returns:
|
||||
参数字典 (如 {"id": "123"})
|
||||
"""
|
||||
params = {}
|
||||
|
||||
if ":" not in pattern:
|
||||
return params
|
||||
|
||||
pattern_parts = pattern.strip("/").split("/")
|
||||
path_parts = path.strip("/").split("/")
|
||||
|
||||
for p, a in zip(pattern_parts, path_parts):
|
||||
if p.startswith(":"):
|
||||
param_name = p[1:] # 去掉 :
|
||||
params[param_name] = a
|
||||
|
||||
# 处理通配符 :path
|
||||
last_pattern = pattern_parts[-1]
|
||||
if last_pattern.startswith(":") and len(path_parts) > len(pattern_parts):
|
||||
param_name = last_pattern[1:]
|
||||
# 将剩余的路径段合并
|
||||
remaining = "/".join(path_parts[len(pattern_parts) - 1:])
|
||||
params[param_name] = remaining
|
||||
|
||||
return params
|
||||
|
||||
|
||||
class BaseRouter:
|
||||
"""路由器基类
|
||||
|
||||
提供通用的路由注册和匹配功能,子类只需实现 handle() 方法
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.routes: list[BaseRoute] = []
|
||||
|
||||
def add(self, method: str, path: str, handler: Callable):
|
||||
"""添加路由"""
|
||||
self.routes.append(BaseRoute(method, path, handler))
|
||||
|
||||
def get(self, path: str, handler: Callable):
|
||||
"""GET 路由"""
|
||||
self.add("GET", path, handler)
|
||||
|
||||
def post(self, path: str, handler: Callable):
|
||||
"""POST 路由"""
|
||||
self.add("POST", path, handler)
|
||||
|
||||
def put(self, path: str, handler: Callable):
|
||||
"""PUT 路由"""
|
||||
self.add("PUT", path, handler)
|
||||
|
||||
def delete(self, path: str, handler: Callable):
|
||||
"""DELETE 路由"""
|
||||
self.add("DELETE", path, handler)
|
||||
|
||||
def find_route(self, method: str, path: str) -> Optional[tuple[BaseRoute, dict[str, str]]]:
|
||||
"""查找匹配的路由和路径参数
|
||||
|
||||
Args:
|
||||
method: HTTP 方法
|
||||
path: 请求路径
|
||||
|
||||
Returns:
|
||||
(路由, 路径参数) 或 None
|
||||
"""
|
||||
for route in self.routes:
|
||||
if route.method == method and match_path(route.path, path):
|
||||
params = extract_path_params(route.path, path)
|
||||
return route, params
|
||||
return None
|
||||
Reference in New Issue
Block a user