Skip to content

解决了被防火墙等注入Cookies时丢cookies的问题 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taskmemz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

解决了被防火墙等注入Cookies时丢cookies的问题 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions lib/models/search_result.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,9 @@ class SearchStartEvent extends SearchEvent {
SearchStartEvent({
required this.query,
required this.totalSources,
required int timestamp,
required super.timestamp,
}) : super(
type: SearchEventType.start,
timestamp: timestamp,
);

factory SearchStartEvent.fromJson(Map<String, dynamic> json) {
Expand All @@ -175,10 +174,9 @@ class SearchSourceResultEvent extends SearchEvent {
required this.source,
required this.sourceName,
required this.results,
required int timestamp,
required super.timestamp,
}) : super(
type: SearchEventType.sourceResult,
timestamp: timestamp,
);

factory SearchSourceResultEvent.fromJson(Map<String, dynamic> json) {
Expand Down Expand Up @@ -206,10 +204,9 @@ class SearchSourceErrorEvent extends SearchEvent {
required this.source,
required this.sourceName,
required this.error,
required int timestamp,
required super.timestamp,
}) : super(
type: SearchEventType.sourceError,
timestamp: timestamp,
);

factory SearchSourceErrorEvent.fromJson(Map<String, dynamic> json) {
Expand All @@ -230,10 +227,9 @@ class SearchCompleteEvent extends SearchEvent {
SearchCompleteEvent({
required this.totalResults,
required this.completedSources,
required int timestamp,
required super.timestamp,
}) : super(
type: SearchEventType.complete,
timestamp: timestamp,
);

factory SearchCompleteEvent.fromJson(Map<String, dynamic> json) {
Expand Down
1 change: 0 additions & 1 deletion lib/screens/anime_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:provider/provider.dart';
import '../services/theme_service.dart';
import '../widgets/capsule_tab_switcher.dart';
Expand Down
12 changes: 7 additions & 5 deletions lib/screens/live_player_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,12 @@ class _LivePlayerScreenState extends State<LivePlayerScreen>
children: [
Column(
children: [
// Windows 自定义标题栏
// Windows 自定义标题栏（跟随主题）
if (Platform.isWindows)
const WindowsTitleBar(
customBackgroundColor: Color(0xFF000000),
WindowsTitleBar(
customBackgroundColor: isDarkMode
? const Color(0xFF121212)
: const Color(0xFFf5f5f5),
),
// 主要内容
Expanded(
Expand Down Expand Up @@ -1798,8 +1800,8 @@ class _LivePlayerScreenState extends State<LivePlayerScreen>
Container(
width: 4,
height: 4,
decoration: BoxDecoration(
color: const Color(0xFF27ae60),
decoration: const BoxDecoration(
color: Color(0xFF27ae60),
shape: BoxShape.circle,
),
),
Expand Down
249 changes: 235 additions & 14 deletions lib/screens/login_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ class _LoginScreenState extends State<LoginScreen> {
bool _isLoading = false;
bool _isFormValid = false;
bool _isLocalMode = false;
bool _showAdvancedSettings = false;
bool _enableBrowserHeaders = false;
final _userAgentController = TextEditingController();
final _customHeaderNameController = TextEditingController();
final _customHeaderValueController = TextEditingController();

// 点击计数器相关
int _logoTapCount = 0;
Expand All @@ -41,6 +46,23 @@ class _LoginScreenState extends State<LoginScreen> {
_passwordController.addListener(_validateForm);
_subscriptionUrlController.addListener(_validateForm);
_loadSavedUserData();
_loadAdvancedSettings();
}

void _loadAdvancedSettings() async {
final ua = await UserDataService.getCustomUserAgent();
final enabled = await UserDataService.getEnableBrowserHeaders();
final header = await UserDataService.getCustomHeader();
if (mounted) {
setState(() {
_userAgentController.text = ua;
_enableBrowserHeaders = enabled;
if (header.isNotEmpty) {
_customHeaderNameController.text = header.keys.first;
_customHeaderValueController.text = header.values.first;
}
});
}
}

void _loadSavedUserData() async {
Expand Down Expand Up @@ -82,6 +104,9 @@ class _LoginScreenState extends State<LoginScreen> {
_usernameController.dispose();
_passwordController.dispose();
_subscriptionUrlController.dispose();
_userAgentController.dispose();
_customHeaderNameController.dispose();
_customHeaderValueController.dispose();
_tapTimer?.cancel();
super.dispose();
}
Expand Down Expand Up @@ -257,16 +282,23 @@ class _LoginScreenState extends State<LoginScreen> {
}

String _parseCookies(http.Response response) {
// 解析 Set-Cookie 头部
List<String> cookies = [];

// 获取所有 Set-Cookie 头部
final setCookieHeaders = response.headers['set-cookie'];
if (setCookieHeaders != null) {
// HTTP 头部通常是 String 类型
final cookieParts = setCookieHeaders.split(';');
if (cookieParts.isNotEmpty) {
cookies.add(cookieParts[0].trim());
final allCookies = response.headers['set-cookie'];
if (allCookies == null || allCookies.isEmpty) return '';

final lines = allCookies
.split('\n')
.expand((line) => line.split(','))
.where((s) => s.trim().isNotEmpty)
.toList();

final cookies = <String>[];
for (final line in lines) {
final semicolonIdx = line.indexOf(';');
final nameValue = semicolonIdx > 0
? line.substring(0, semicolonIdx).trim()
: line.trim();
if (nameValue.contains('=')) {
cookies.add(nameValue);
}
}

Expand Down Expand Up @@ -301,16 +333,37 @@ class _LoginScreenState extends State<LoginScreen> {
});

try {
// 保存高级设置
await UserDataService.saveCustomUserAgent(_userAgentController.text);
await UserDataService.saveEnableBrowserHeaders(_enableBrowserHeaders);
await UserDataService.saveCustomHeader(
_customHeaderNameController.text,
_customHeaderValueController.text);

// 处理 URL
String baseUrl = _processUrl(_urlController.text);
String loginUrl = '$baseUrl/api/login';

final loginHeaders = <String, String>{
'Content-Type': 'application/json',
};
loginHeaders['User-Agent'] = _userAgentController.text;
if (_enableBrowserHeaders) {
loginHeaders['Accept-Language'] = 'zh-CN,zh;q=0.9,en;q=0.8';
loginHeaders['Sec-Fetch-Site'] = 'same-origin';
loginHeaders['Sec-Fetch-Mode'] = 'cors';
loginHeaders['Sec-Fetch-Dest'] = 'empty';
}
if (_customHeaderNameController.text.isNotEmpty &&
_customHeaderValueController.text.isNotEmpty) {
loginHeaders[_customHeaderNameController.text.trim()] =
_customHeaderValueController.text.trim();
}

// 发送登录请求
final response = await http.post(
Uri.parse(loginUrl),
headers: {
'Content-Type': 'application/json',
},
headers: loginHeaders,
body: json.encode({
'username': _usernameController.text,
'password': _passwordController.text,
Expand Down Expand Up @@ -502,6 +555,168 @@ class _LoginScreenState extends State<LoginScreen> {
}
}

Widget _buildAdvancedSettingsToggle() {
return Padding(
padding: const EdgeInsets.only(top: 12),
child: GestureDetector(
onTap: () {
setState(() {
_showAdvancedSettings = !_showAdvancedSettings;
});
},
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
_showAdvancedSettings
? Icons.expand_less
: Icons.expand_more,
color: const Color(0xFF7f8c8d),
size: 18,
),
const SizedBox(width: 4),
Text(
'高级设置',
style: FontUtils.poppins(
fontSize: 13,
color: const Color(0xFF7f8c8d),
),
),
],
),
),
);
}

Widget _buildAdvancedSettingsPanel() {
return Padding(
padding: const EdgeInsets.only(top: 12),
child: Container(
decoration: BoxDecoration(
color: Colors.white.withValues(alpha: 0.4),
borderRadius: BorderRadius.circular(12),
),
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
'User-Agent',
style: FontUtils.poppins(
fontSize: 12,
fontWeight: FontWeight.w600,
color: const Color(0xFF2c3e50),
),
),
const Spacer(),
SizedBox(
height: 20,
child: Switch.adaptive(
value: _enableBrowserHeaders,
onChanged: (v) {
setState(() {
_enableBrowserHeaders = v;
});
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
),
Text(
'浏览器头',
style: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFF7f8c8d),
),
),
],
),
const SizedBox(height: 8),
TextFormField(
controller: _userAgentController,
maxLines: 2,
minLines: 1,
style: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFF2c3e50),
),
decoration: InputDecoration(
hintText: '自定义 User-Agent',
hintStyle: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFFbdc3c7),
),
filled: true,
fillColor: Colors.white.withValues(alpha: 0.5),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 10),
),
),
const SizedBox(height: 12),
Row(
children: [
Expanded(
child: TextFormField(
controller: _customHeaderNameController,
style: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFF2c3e50),
),
decoration: InputDecoration(
hintText: '自定义头名称',
hintStyle: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFFbdc3c7),
),
filled: true,
fillColor: Colors.white.withValues(alpha: 0.5),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 10),
),
),
),
const SizedBox(width: 8),
Expanded(
child: TextFormField(
controller: _customHeaderValueController,
style: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFF2c3e50),
),
decoration: InputDecoration(
hintText: '自定义头值',
hintStyle: FontUtils.poppins(
fontSize: 12,
color: const Color(0xFFbdc3c7),
),
filled: true,
fillColor: Colors.white.withValues(alpha: 0.5),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 10),
),
),
),
],
),
],
),
),
);
}

@override
Widget build(BuildContext context) {
final isTablet = DeviceUtils.isTablet(context);
Expand Down Expand Up @@ -775,7 +990,7 @@ class _LoginScreenState extends State<LoginScreen> {
? Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
const SizedBox(
height: 18,
width: 18,
child: CircularProgressIndicator(
Expand Down Expand Up @@ -805,6 +1020,9 @@ class _LoginScreenState extends State<LoginScreen> {
),
),
),
// 高级设置折叠面板
_buildAdvancedSettingsToggle(),
if (_showAdvancedSettings) _buildAdvancedSettingsPanel(),
],
),
),
Expand Down Expand Up @@ -1072,6 +1290,9 @@ class _LoginScreenState extends State<LoginScreen> {
),
),
),
// 高级设置折叠面板
_buildAdvancedSettingsToggle(),
if (_showAdvancedSettings) _buildAdvancedSettingsPanel(),
],
),
),
Expand Down
Loading