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,102 @@
|
||||
<?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\Request;
|
||||
use think\Response;
|
||||
|
||||
/**
|
||||
* CSRF 防护中间件(会话型应用:backend / member / frontend)。
|
||||
*
|
||||
* 两层防护(config/csrf.php):
|
||||
* 1. 同源校验(默认开启):POST/PUT/PATCH/DELETE 请求若携带 Origin 或 Referer,
|
||||
* 且与当前站点 Host 不一致 → 403。正常同源表单 / 同源 AJAX 完全不受影响,
|
||||
* 未携带来源头的老客户端放行(宽松模式,不破坏现有功能)。
|
||||
* 2. Token 校验(strict 模式,CSRF_STRICT=true 开启):校验 __token__ 参数
|
||||
* 或 X-CSRF-TOKEN 请求头与 Session 中令牌一致。启用后模板需注入
|
||||
* `{:token_field()}` 或 `{$Request.token}`,JS 需携带 X-CSRF-TOKEN 头。
|
||||
*
|
||||
* 注册位置:app/backend/middleware.php、app/member/middleware.php、
|
||||
* app/frontend/middleware.php。api 应用走 JWT 鉴权,不注册本中间件。
|
||||
*/
|
||||
class VerifyCsrfToken
|
||||
{
|
||||
/** 安全方法(无副作用,跳过校验) */
|
||||
protected array $safeMethods = ['GET', 'HEAD', 'OPTIONS'];
|
||||
|
||||
public function __construct(protected App $app)
|
||||
{
|
||||
}
|
||||
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
{
|
||||
if (in_array(strtoupper($request->method()), $this->safeMethods, true)) {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
$appName = $this->app->http->getName() ?: 'index';
|
||||
$apps = (array) $this->app->config->get('csrf.session_apps', ['backend', 'member', 'frontend', 'index']);
|
||||
if (!in_array($appName, $apps, true)) {
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
// 豁免路径(支付异步回调、第三方 webhook 等,匹配当前应用内 pathinfo)
|
||||
$path = $request->pathinfo();
|
||||
foreach ((array) $this->app->config->get('csrf.exempt', []) as $pattern) {
|
||||
if (is_string($pattern) && $pattern !== '' && preg_match($pattern, $path)) {
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
|
||||
// 第一层:同源校验
|
||||
if (!$this->sameOrigin($request)) {
|
||||
throw new HttpException(403, 'Cross-site request detected (CSRF protection)');
|
||||
}
|
||||
|
||||
// 第二层:strict 模式强校验令牌
|
||||
if ($this->app->config->get('csrf.strict', false)) {
|
||||
$token = (string) ($request->param('__token__', '') ?: $request->header('x-csrf-token', ''));
|
||||
$sessionToken = (string) $request->session()->get('__token__', '');
|
||||
if ($token === '' || $sessionToken === '' || !hash_equals($sessionToken, $token)) {
|
||||
throw new HttpException(403, 'CSRF token mismatch');
|
||||
}
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* 同源校验:Origin / Referer 任一存在且 Host 不匹配即拒绝。
|
||||
*/
|
||||
protected function sameOrigin(Request $request): bool
|
||||
{
|
||||
foreach (['origin', 'referer'] as $key) {
|
||||
$url = trim((string) $request->header($key, ''));
|
||||
if ($url === '' || stripos($url, '://') === false) {
|
||||
continue;
|
||||
}
|
||||
$host = (string) (parse_url($url, PHP_URL_HOST) ?: '');
|
||||
if ($host === '') {
|
||||
continue;
|
||||
}
|
||||
$port = parse_url($url, PHP_URL_PORT);
|
||||
$origin = strtolower($host . ($port ? ':' . $port : ''));
|
||||
if ($origin !== strtolower((string) $request->host(true))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user