fix: 清零 flutter analyze 问题并修复隐私红线正则缺陷(CI 门禁)
CI / flutter-gates (push) Successful in 50s

- 修复真实缺陷:隐私红线 RegExp 使用 Dart 不支持的 (?i) 内联标志,构造即抛异常
  导致带 props 的事件被静默丢弃;改为 caseSensitive: false
- 清理埋点模块未用 import/字段/变量(4 warning)
- 构造函数改用初始化形参(含 Dart 3.12 私有具名参数)
- E2E 手动脚本声明 ignore avoid_print + library 指令
- 门禁:format 0 changed / analyze No issues / flutter test 34 passed
This commit is contained in:
2026-09-04 19:44:46 +08:00
parent 45f94d2558
commit 3f8388e5d4
3 changed files with 61 additions and 45 deletions
+10 -17
View File
@@ -1,7 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
/// Simplified analytics client for M0 (report 13 + ticket 19): track events /// Simplified analytics client for M0 (report 13 + ticket 19): track events
@@ -10,21 +9,18 @@ import 'package:uuid/uuid.dart';
/// silently discarded (no retry as spec'd); privacy red-line enforced locally. /// silently discarded (no retry as spec'd); privacy red-line enforced locally.
class AnalyticsService { class AnalyticsService {
AnalyticsService({ AnalyticsService({
required String apiBaseUrl, required this.apiBaseUrl,
required this.getAccessToken, required this.getAccessToken,
String? anonymousId, String? anonymousId,
String? userId, this._userId,
}) : _apiBaseUrl = apiBaseUrl, }) : _anonymousId = anonymousId ?? const Uuid().v4();
_anonymousId = anonymousId ?? const Uuid().v4(),
_userId = userId;
static const _queueKey = 'patbond_analytics_queue'; // M0:内存队列,满 _flushThreshold 条上传一次;持久化队列留 M1(报告 19 §3)。
static const _queueMaxSize = 500;
static const _flushThreshold = 20; static const _flushThreshold = 20;
final String _apiBaseUrl; final String apiBaseUrl;
final String Function()? getAccessToken; final String Function()? getAccessToken;
String _anonymousId; final String _anonymousId;
String? _userId; String? _userId;
final List<Map<String, dynamic>> _pendingEvents = []; final List<Map<String, dynamic>> _pendingEvents = [];
@@ -90,13 +86,8 @@ class AnalyticsService {
Future<void> _upload(List<Map<String, dynamic>> events) async { Future<void> _upload(List<Map<String, dynamic>> events) async {
final token = getAccessToken?.call(); final token = getAccessToken?.call();
final headers = {
'Content-Type': 'application/json',
if (token != null) 'Authorization': 'Bearer $token',
};
final request = final request =
await HttpClient().postUrl(Uri.parse('$_apiBaseUrl/api/v1/events')) await HttpClient().postUrl(Uri.parse('$apiBaseUrl/api/v1/events'))
..headers.contentType = ContentType.json; ..headers.contentType = ContentType.json;
if (token != null) { if (token != null) {
request.headers.add('Authorization', 'Bearer $token'); request.headers.add('Authorization', 'Bearer $token');
@@ -110,8 +101,10 @@ class AnalyticsService {
} }
bool _containsForbiddenField(Map<String, dynamic> props) { bool _containsForbiddenField(Map<String, dynamic> props) {
// Dart RegExp 不支持 (?i) 内联标志(原写法构造即抛异常,事件被静默丢弃)。
final pattern = RegExp( final pattern = RegExp(
r'(?i).*(password|token|secret|phone|mobile|email|credential|idfa|gaid).*', r'password|token|secret|phone|mobile|email|credential|idfa|gaid',
caseSensitive: false,
); );
return props.keys.any((key) => pattern.hasMatch(key)); return props.keys.any((key) => pattern.hasMatch(key));
} }
+2 -2
View File
@@ -35,9 +35,9 @@ class ApiAuthRepository implements AuthRepository {
required this._api, required this._api,
required this._session, required this._session,
required this._refresher, required this._refresher,
AnalyticsService? analytics, this._analytics,
this._uuid = const Uuid(), this._uuid = const Uuid(),
}) : _analytics = analytics; });
final ApiClient _api; final ApiClient _api;
final SessionManager _session; final SessionManager _session;
+49 -26
View File
@@ -1,8 +1,12 @@
#!/usr/bin/env dart #!/usr/bin/env dart
// ignore_for_file: avoid_print — 手动 E2E 脚本,print 即输出。
/// E2E 手动测试脚本:对真实后端的完整登录纵切流程(独立脚本,无 Flutter 运行时)。 /// E2E 手动测试脚本:对真实后端的完整登录纵切流程(独立脚本,无 Flutter 运行时)。
/// ///
/// 前置条件:patbond-api 目录执行 `docker compose up -d` /// 前置条件:patbond-api 目录执行 `docker compose up -d`
/// 运行方式:dart run test_e2e_manual.dart /// 运行方式:dart run test_e2e_manual.dart
library;
/// ///
/// 本脚本直接通过 HTTP 客户端验证契约实现,不依赖 Flutter widget。 /// 本脚本直接通过 HTTP 客户端验证契约实现,不依赖 Flutter widget。
@@ -33,13 +37,13 @@ void main() async {
try { try {
// 1. 注册 // 1. 注册
print('[1/7] POST /api/v1/auth/register'); print('[1/7] POST /api/v1/auth/register');
final registerReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/register')); final registerReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/register'),
);
registerReq.headers.contentType = ContentType.json; registerReq.headers.contentType = ContentType.json;
registerReq.write(jsonEncode({ registerReq.write(
'username': username, jsonEncode({'username': username, 'phone': phone, 'password': password}),
'phone': phone, );
'password': password,
}));
final registerResp = await registerReq.close(); final registerResp = await registerReq.close();
final registerBody = await utf8.decodeStream(registerResp); final registerBody = await utf8.decodeStream(registerResp);
print(' Status: ${registerResp.statusCode}'); print(' Status: ${registerResp.statusCode}');
@@ -67,7 +71,9 @@ void main() async {
print(' accessToken: ${accessToken.substring(0, 20)}...<REDACTED>'); print(' accessToken: ${accessToken.substring(0, 20)}...<REDACTED>');
print(' refreshToken: ${refreshToken.substring(0, 20)}...<REDACTED>'); print(' refreshToken: ${refreshToken.substring(0, 20)}...<REDACTED>');
print(' accessTokenExpiresAt: ${registerData['accessTokenExpiresAt']}'); print(' accessTokenExpiresAt: ${registerData['accessTokenExpiresAt']}');
print(' refreshTokenExpiresAt: ${registerData['refreshTokenExpiresAt']}'); print(
' refreshTokenExpiresAt: ${registerData['refreshTokenExpiresAt']}',
);
print(''); print('');
// 2. 获取当前用户 (me) // 2. 获取当前用户 (me)
@@ -106,7 +112,9 @@ void main() async {
// 3. 刷新 token // 3. 刷新 token
print('[3/7] POST /api/v1/auth/refresh'); print('[3/7] POST /api/v1/auth/refresh');
final oldRefreshToken = refreshToken; final oldRefreshToken = refreshToken;
final refreshReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/refresh')); final refreshReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/refresh'),
);
refreshReq.headers.contentType = ContentType.json; refreshReq.headers.contentType = ContentType.json;
refreshReq.write(jsonEncode({'refreshToken': refreshToken})); refreshReq.write(jsonEncode({'refreshToken': refreshToken}));
final refreshResp = await refreshReq.close(); final refreshResp = await refreshReq.close();
@@ -131,7 +139,9 @@ void main() async {
print(' ✓ Token 刷新成功'); print(' ✓ Token 刷新成功');
print(' 新 accessToken: ${newAccessToken.substring(0, 20)}...<REDACTED>'); print(' 新 accessToken: ${newAccessToken.substring(0, 20)}...<REDACTED>');
print(' 新 refreshToken: ${newRefreshToken.substring(0, 20)}...<REDACTED>'); print(
' 新 refreshToken: ${newRefreshToken.substring(0, 20)}...<REDACTED>',
);
if (newAccessToken == accessToken) { if (newAccessToken == accessToken) {
print(' ✗ access token 未轮换'); print(' ✗ access token 未轮换');
@@ -148,7 +158,9 @@ void main() async {
// 4. 验证旧 refresh token 不可用(轮换生效) // 4. 验证旧 refresh token 不可用(轮换生效)
print('[4/7] POST /api/v1/auth/refresh(用已轮换的旧 token,应 401)'); print('[4/7] POST /api/v1/auth/refresh(用已轮换的旧 token,应 401)');
final oldRefreshReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/refresh')); final oldRefreshReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/refresh'),
);
oldRefreshReq.headers.contentType = ContentType.json; oldRefreshReq.headers.contentType = ContentType.json;
oldRefreshReq.write(jsonEncode({'refreshToken': oldRefreshToken})); oldRefreshReq.write(jsonEncode({'refreshToken': oldRefreshToken}));
final oldRefreshResp = await oldRefreshReq.close(); final oldRefreshResp = await oldRefreshReq.close();
@@ -168,7 +180,9 @@ void main() async {
// 5. 退出登录 // 5. 退出登录
print('[5/7] POST /api/v1/auth/logout'); print('[5/7] POST /api/v1/auth/logout');
final logoutReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/logout')); final logoutReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/logout'),
);
logoutReq.headers.contentType = ContentType.json; logoutReq.headers.contentType = ContentType.json;
logoutReq.headers.set('Authorization', 'Bearer $accessToken'); logoutReq.headers.set('Authorization', 'Bearer $accessToken');
logoutReq.write(jsonEncode({'refreshToken': refreshToken})); logoutReq.write(jsonEncode({'refreshToken': refreshToken}));
@@ -193,15 +207,20 @@ void main() async {
// 6. 验证退出后 refresh token 不可用 // 6. 验证退出后 refresh token 不可用
print('[6/7] POST /api/v1/auth/refresh(退出后,应 401'); print('[6/7] POST /api/v1/auth/refresh(退出后,应 401');
final postLogoutRefreshReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/refresh')); final postLogoutRefreshReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/refresh'),
);
postLogoutRefreshReq.headers.contentType = ContentType.json; postLogoutRefreshReq.headers.contentType = ContentType.json;
postLogoutRefreshReq.write(jsonEncode({'refreshToken': refreshToken})); postLogoutRefreshReq.write(jsonEncode({'refreshToken': refreshToken}));
final postLogoutRefreshResp = await postLogoutRefreshReq.close(); final postLogoutRefreshResp = await postLogoutRefreshReq.close();
final postLogoutRefreshBody = await utf8.decodeStream(postLogoutRefreshResp); final postLogoutRefreshBody = await utf8.decodeStream(
postLogoutRefreshResp,
);
print(' Status: ${postLogoutRefreshResp.statusCode}'); print(' Status: ${postLogoutRefreshResp.statusCode}');
if (postLogoutRefreshResp.statusCode == 401) { if (postLogoutRefreshResp.statusCode == 401) {
final postLogoutJson = jsonDecode(postLogoutRefreshBody) as Map<String, dynamic>; final postLogoutJson =
jsonDecode(postLogoutRefreshBody) as Map<String, dynamic>;
print(' ✓ 退出后 refresh token 已失效'); print(' ✓ 退出后 refresh token 已失效');
print(' code: ${postLogoutJson['code']}'); print(' code: ${postLogoutJson['code']}');
print(' message: ${postLogoutJson['message']}'); print(' message: ${postLogoutJson['message']}');
@@ -217,17 +236,20 @@ void main() async {
print('[7/7] POST /api/v1/auth/login5 次错误密码 → 第 6 次触发 423/42300'); print('[7/7] POST /api/v1/auth/login5 次错误密码 → 第 6 次触发 423/42300');
for (int i = 1; i <= 5; i++) { for (int i = 1; i <= 5; i++) {
print(' 错误密码尝试 $i/5...'); print(' 错误密码尝试 $i/5...');
final badLoginReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/login')); final badLoginReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/login'),
);
badLoginReq.headers.contentType = ContentType.json; badLoginReq.headers.contentType = ContentType.json;
badLoginReq.write(jsonEncode({ badLoginReq.write(
'username': username, jsonEncode({'username': username, 'password': 'WrongPassword$i'}),
'password': 'WrongPassword$i', );
}));
final badLoginResp = await badLoginReq.close(); final badLoginResp = await badLoginReq.close();
final badLoginBody = await utf8.decodeStream(badLoginResp); final badLoginBody = await utf8.decodeStream(badLoginResp);
final badLoginJson = jsonDecode(badLoginBody) as Map<String, dynamic>; final badLoginJson = jsonDecode(badLoginBody) as Map<String, dynamic>;
print(' → HTTP ${badLoginResp.statusCode} / code ${badLoginJson['code']}: ' print(
'${badLoginJson['message']}'); ' → HTTP ${badLoginResp.statusCode} / code ${badLoginJson['code']}: '
'${badLoginJson['message']}',
);
if (badLoginResp.statusCode == 423) { if (badLoginResp.statusCode == 423) {
// 之前的失败计数已触发锁定(本脚本重复运行时会出现),也算验证通过 // 之前的失败计数已触发锁定(本脚本重复运行时会出现),也算验证通过
print(' ✓ 账号已处于锁定状态(423/42300)'); print(' ✓ 账号已处于锁定状态(423/42300)');
@@ -238,12 +260,13 @@ void main() async {
// 第 6 次:用正确密码验证「锁定期间即使密码正确也返回 423/42300」 // 第 6 次:用正确密码验证「锁定期间即使密码正确也返回 423/42300」
print(' 第 6 次尝试(正确密码,应因锁定被拒绝)...'); print(' 第 6 次尝试(正确密码,应因锁定被拒绝)...');
final lockedLoginReq = await client.postUrl(Uri.parse('$baseUrl/api/v1/auth/login')); final lockedLoginReq = await client.postUrl(
Uri.parse('$baseUrl/api/v1/auth/login'),
);
lockedLoginReq.headers.contentType = ContentType.json; lockedLoginReq.headers.contentType = ContentType.json;
lockedLoginReq.write(jsonEncode({ lockedLoginReq.write(
'username': username, jsonEncode({'username': username, 'password': password}),
'password': password, );
}));
final lockedLoginResp = await lockedLoginReq.close(); final lockedLoginResp = await lockedLoginReq.close();
final lockedLoginBody = await utf8.decodeStream(lockedLoginResp); final lockedLoginBody = await utf8.decodeStream(lockedLoginResp);
print(' Status: ${lockedLoginResp.statusCode}'); print(' Status: ${lockedLoginResp.statusCode}');