feat: 上线前安全加固与发布工程化;appmall 由插件迁移为独立应用
安全(P0) - 发布包签名:新增 scripts/package_keygen.php、scripts/package_verify.php、 ywxapp\service\PackageVerifier;FrameworkService::apply() 解压前强制验签 (ywxapp.framework_package_verify,默认开启) - JWT 收紧:config/jwt.php 移除公开默认密钥,JwtService::assertStrongSecret() 校验非空 / 长度≥32 / 已知弱值;.env.production.example 键名由 JWT_SECRET_KEY 修正为 JWT_SECRET - /api/v1/Article:免登录白名单收窄为只读接口,写操作字段白名单 + assertOwner() 越权校验 - 开发者令牌:查找接口不再回显明文、统一失败文案 + 限流 - TemplateInstaller:文件名白名单 + realpath 归一化 + 目录内断言,修复 Zip Slip;补 use ZipArchive - 后台登录:接入验证码、失败锁定与登录限流(config/ratelimit.php) - 缓存 / Session 驱动可由 .env 覆盖(CACHE_DRIVER / SESSION_TYPE),集群部署改 redis - paycenter 支付日志开关改为 PAY_LOG,不再跟随 APP_DEBUG 工程化 / 交付 - 新增 CHANGELOG.md 与 .env.production.example;composer.lock 入库锁定依赖版本 - 插件离线安装 CLI 增加 --uid,后台上传安装透传 uid,付费插件授权校验可通过 - 授权拒绝文案区分「未携带 uid」与「未找到有效授权」,便于排障 - .gitignore 放行 .env.production.example / .env.addon.example / .gitattributes / public/.htaccess 结构 - appmall 由 addon/appmall 迁移为独立应用 app/appmall(市场 / 开发者中心 / 审核 / 分润)
This commit is contained in:
1 parent
1d49e6f5ee
commit
18101cf11a
636 files changed
+58517
-9519
No files matched your search
@@ -0,0 +1,93 @@
|
||||
<?php
|
||||
// +----------------------------------------------------------------------
|
||||
// | YwxApp [ WE CAN DO IT JUST THINK ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2026-2036 http://ywxapp.cn All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: ywxapp<admin@ywxapp.cn>
|
||||
// +----------------------------------------------------------------------
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace ywxapp\middleware;
|
||||
|
||||
use Closure;
|
||||
use think\App;
|
||||
use think\exception\HttpException;
|
||||
use think\facade\Cache;
|
||||
use think\Request;
|
||||
use think\Response;
|
||||
|
||||
/**
|
||||
* API 限流中间件(固定窗口计数,按 IP 维度)。
|
||||
*
|
||||
* - 规则读取 config/ratelimit.php:rules 为「正则 => {limit, window}」,
|
||||
* 按声明顺序匹配 pathinfo,命中即用;未命中走 default 兜底。
|
||||
* - 存储驱动跟随 config/cache.php:配了 Redis 自动分布式生效,
|
||||
* File 驱动单机生效。
|
||||
* - 注册位置:app/api/middleware.php(放在 CrossDomain 之后,
|
||||
* 预检 OPTIONS 由 CrossDomain 提前返回,不计入配额)。
|
||||
*/
|
||||
class RateLimit
|
||||
{
|
||||
public function __construct(protected App $app)
|
||||
{
|
||||
}
|
||||
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
{
|
||||
$default = (array) $this->app->config->get('ratelimit.default', ['limit' => 120, 'window' => 60]);
|
||||
$bucket = 'default';
|
||||
$limit = (int) ($default['limit'] ?? 120);
|
||||
$window = max(1, (int) ($default['window'] ?? 60));
|
||||
|
||||
$path = strtolower($request->pathinfo());
|
||||
foreach ((array) $this->app->config->get('ratelimit.rules', []) as $pattern => $rule) {
|
||||
if (!is_string($pattern) || !is_array($rule)) {
|
||||
continue;
|
||||
}
|
||||
if (preg_match($pattern, $path)) {
|
||||
$bucket = $pattern;
|
||||
$limit = (int) ($rule['limit'] ?? 0);
|
||||
$window = max(1, (int) ($rule['window'] ?? 60));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ($limit <= 0) {
|
||||
return $next($request); // 0 = 该桶不限流
|
||||
}
|
||||
|
||||
$key = 'ratelimit:' . ($this->app->http->getName() ?: 'index') . ':' . md5($bucket) . ':' . $request->ip();
|
||||
$hit = (int) Cache::get($key, 0);
|
||||
if ($hit >= $limit) {
|
||||
return $this->deny($request, $window, $hit);
|
||||
}
|
||||
Cache::set($key, $hit + 1, $window);
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* 超限响应:api 应用或 Ajax 统一 JSON(结构与 Result 一致),其余抛 HttpException。
|
||||
*/
|
||||
protected function deny(Request $request, int $window, int $hit): Response
|
||||
{
|
||||
$appName = $this->app->http->getName() ?: '';
|
||||
$isApi = $appName === 'api' || $request->isAjax();
|
||||
|
||||
if (!$isApi) {
|
||||
throw new HttpException(429, '请求过于频繁,请稍后再试');
|
||||
}
|
||||
|
||||
$payload = [
|
||||
'code' => 429,
|
||||
'message' => '请求过于频繁,请稍后再试',
|
||||
'timestamp' => time(),
|
||||
];
|
||||
|
||||
return Response::create($payload, 'json', 429)->header([
|
||||
'Retry-After' => (string) $window,
|
||||
'X-RateLimit-Limit' => (string) $hit,
|
||||
]);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user