feat: support custom http request headers (#868)

This commit is contained in:
Levi authored and GitHub committed 2025-01-16 00:19:50 +08:00
1 parent acc7ed8f6b
commit 0919936050
9 files changed
+160 -67

No files matched your search

+4
View File
@@ -427,6 +427,10 @@ func (f *Fetcher) buildRequest(ctx context.Context, req *base.Request) (httpReq
return return
} }
httpReq.Header = headers httpReq.Header = headers
// Override Host header
if host := headers.Get(base.HttpHeaderHost); host != "" {
httpReq.Host = host
}
return httpReq, nil return httpReq, nil
} }
+16
View File
@@ -11,6 +11,7 @@ import (
"net" "net"
gohttp "net/http" gohttp "net/http"
"net/url" "net/url"
"strings"
"testing" "testing"
"time" "time"
) )
@@ -59,6 +60,21 @@ func TestFetcher_Resolve(t *testing.T) {
} }
} }
func TestFetcher_ResolveWithHostHeader(t *testing.T) {
fetcher := buildFetcher()
err := fetcher.Resolve(&base.Request{
URL: "https://bing.com",
Extra: &http.ReqExtra{
Header: map[string]string{
"Host": "test",
},
},
})
if err == nil || !strings.Contains(err.Error(), "400") {
t.Errorf("Resolve() got = %v, want %v", err, "400")
}
}
func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) { func testResolve(startTestServer func() net.Listener, path string, want *base.Resource, t *testing.T) {
listener := startTestServer() listener := startTestServer()
defer listener.Close() defer listener.Close()
+1
View File
@@ -15,6 +15,7 @@ const (
HttpCodeOK = 200 HttpCodeOK = 200
HttpCodePartialContent = 206 HttpCodePartialContent = 206
HttpHeaderHost = "Host"
HttpHeaderRange = "Range" HttpHeaderRange = "Range"
HttpHeaderAcceptRanges = "Accept-Ranges" HttpHeaderAcceptRanges = "Accept-Ranges"
HttpHeaderContentLength = "Content-Length" HttpHeaderContentLength = "Content-Length"
@@ -1,4 +1,4 @@
import 'package:autoscale_tabbarview/autoscale_tabbarview.dart'; import 'package:contentsize_tabbarview/contentsize_tabbarview.dart';
import 'package:desktop_drop/desktop_drop.dart'; import 'package:desktop_drop/desktop_drop.dart';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -36,9 +36,20 @@ class CreateView extends GetView<CreateController> {
final _proxyPortController = TextEditingController(); final _proxyPortController = TextEditingController();
final _proxyUsrController = TextEditingController(); final _proxyUsrController = TextEditingController();
final _proxyPwdController = TextEditingController(); final _proxyPwdController = TextEditingController();
final _httpUaController = TextEditingController(); final _httpHeaderControllers = [
final _httpCookieController = TextEditingController(); (
final _httpRefererController = TextEditingController(); name: TextEditingController(text: "User-Agent"),
value: TextEditingController()
),
(
name: TextEditingController(text: "Cookie"),
value: TextEditingController()
),
(
name: TextEditingController(text: "Referer"),
value: TextEditingController()
),
];
final _btTrackerController = TextEditingController(); final _btTrackerController = TextEditingController();
final _availableSchemes = ["http:", "https:", "magnet:"]; final _availableSchemes = ["http:", "https:", "magnet:"];
@@ -434,56 +445,105 @@ class CreateView extends GetView<CreateController> {
) )
], ],
), ),
AutoScaleTabBarView( DefaultTabController(
controller: controller.advancedTabController, length: 2,
children: [ child: ContentSizeTabBarView(
Column( controller:
children: [ controller.advancedTabController,
TextFormField( children: [
controller: _httpUaController, Column(
decoration: const InputDecoration( children: [
labelText: 'User-Agent', ..._httpHeaderControllers.map((e) {
)), return Row(
TextFormField( children: [
controller: _httpCookieController, Flexible(
decoration: const InputDecoration( child: TextFormField(
labelText: 'Cookie', controller: e.name,
)), decoration: InputDecoration(
TextFormField( hintText:
controller: _httpRefererController, 'httpHeaderName'.tr,
decoration: const InputDecoration( ),
labelText: 'Referer', ),
)), ),
Padding( const Padding(
padding: padding: EdgeInsets.only(
const EdgeInsets.only(top: 10), left: 10)),
child: CompactCheckbox( Flexible(
label: 'skipVerifyCert'.tr, child: TextFormField(
value: controller: e.value,
_skipVerifyCertController.value, decoration: InputDecoration(
onChanged: (bool? value) { hintText:
_skipVerifyCertController.value = 'httpHeaderValue'.tr,
value ?? false; ),
}, ),
textStyle: const TextStyle( ),
color: Colors.grey, const Padding(
padding: EdgeInsets.only(
left: 10)),
IconButton(
icon: const Icon(Icons.add),
onPressed: () {
_httpHeaderControllers.add(
(
name:
TextEditingController(),
value:
TextEditingController(),
),
);
controller.showAdvanced
.update((val) => val);
},
),
IconButton(
icon:
const Icon(Icons.remove),
onPressed: () {
if (_httpHeaderControllers
.length <=
1) {
return;
}
_httpHeaderControllers
.remove(e);
controller.showAdvanced
.update((val) => val);
},
),
],
);
}),
Padding(
padding:
const EdgeInsets.only(top: 10),
child: CompactCheckbox(
label: 'skipVerifyCert'.tr,
value: _skipVerifyCertController
.value,
onChanged: (bool? value) {
_skipVerifyCertController
.value = value ?? false;
},
textStyle: const TextStyle(
color: Colors.grey,
),
), ),
), ),
), ],
], ),
), Column(
Column( children: [
children: [ TextFormField(
TextFormField( controller: _btTrackerController,
controller: _btTrackerController, maxLines: 5,
maxLines: 5, decoration: InputDecoration(
decoration: InputDecoration( labelText: 'Trackers',
labelText: 'Trackers', hintText: 'addTrackerHit'.tr,
hintText: 'addTrackerHit'.tr, )),
)), ],
], )
) ],
], ),
) )
], ],
).paddingOnly(top: 16), ).paddingOnly(top: 16),
@@ -642,12 +702,10 @@ class CreateView extends GetView<CreateController> {
if (controller.showAdvanced.value) { if (controller.showAdvanced.value) {
switch (controller.advancedTabController.index) { switch (controller.advancedTabController.index) {
case 0: case 0:
final header = { final header = Map<String, String>.fromEntries(_httpHeaderControllers
"User-Agent": _httpUaController.text, .map((e) => MapEntry(e.name.text, e.value.text)));
"Cookie": _httpCookieController.text, header.removeWhere(
"Referer": _httpRefererController.text, (key, value) => key.trim().isEmpty || value.trim().isEmpty);
};
header.removeWhere((key, value) => value.trim().isEmpty);
if (header.isNotEmpty) { if (header.isNotEmpty) {
reqExtra = ReqExtraHttp()..header = header; reqExtra = ReqExtraHttp()..header = header;
} }
+2
View File
@@ -116,5 +116,7 @@ const enUS = {
'unknown': 'Unknown', 'unknown': 'Unknown',
'fileSelectedCount': 'Files: ', 'fileSelectedCount': 'Files: ',
'fileSelectedSize': 'Size: ', 'fileSelectedSize': 'Size: ',
'httpHeaderName': 'Header Name',
'httpHeaderValue': 'Header Value',
}, },
}; };
+2
View File
@@ -114,5 +114,7 @@ const zhCN = {
'unknown': '未知', 'unknown': '未知',
'fileSelectedCount': '文件数:', 'fileSelectedCount': '文件数:',
'fileSelectedSize': '大小:', 'fileSelectedSize': '大小:',
'httpHeaderName': '请求头名称',
'httpHeaderValue': '请求头值',
} }
}; };
+2
View File
@@ -114,5 +114,7 @@ const zhTW = {
'unknown': '未知', 'unknown': '未知',
'fileSelectedCount': '文件數:', 'fileSelectedCount': '文件數:',
'fileSelectedSize': '大小:', 'fileSelectedSize': '大小:',
'httpHeaderName': '標頭名稱',
'httpHeaderValue': '標頭值',
} }
}; };
+16 -8
View File
@@ -94,14 +94,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.11.0" version: "2.11.0"
autoscale_tabbarview:
dependency: "direct main"
description:
name: autoscale_tabbarview
sha256: "29449e8876185acc4763cc6cf26ffcc3f842f42f1502d5964c6d85f489ee1bc4"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
badges: badges:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -238,6 +230,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.18.0" version: "1.18.0"
contentsize_tabbarview:
dependency: "direct main"
description:
name: contentsize_tabbarview
sha256: "4a3cf5e3a17bb5ebe5ee56d55c518f4dde7db639334b79f874f03ecea4755b22"
url: "https://pub.dev"
source: hosted
version: "0.0.2"
context_menus: context_menus:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -334,6 +334,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.0.0" version: "2.0.0"
expandable_page_view:
dependency: transitive
description:
name: expandable_page_view
sha256: "210dc6961cfc29f7ed42867824eb699c9a4b9b198a7c04b8bdc1c05844969dc6"
url: "https://pub.dev"
source: hosted
version: "1.0.17"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
+1 -1
View File
@@ -54,7 +54,6 @@ dependencies:
app_links: ^6.3.3 app_links: ^6.3.3
uri_to_file: ^1.0.0 uri_to_file: ^1.0.0
window_manager: ^0.4.2 window_manager: ^0.4.2
autoscale_tabbarview: ^1.0.2
share_plus: ^10.1.0 share_plus: ^10.1.0
flutter_form_builder: ^9.5.0 flutter_form_builder: ^9.5.0
form_builder_validators: ^11.0.0 form_builder_validators: ^11.0.0
@@ -70,6 +69,7 @@ dependencies:
device_info_plus: ^11.1.0 device_info_plus: ^11.1.0
checkable_treeview: ^1.3.1 checkable_treeview: ^1.3.1
contextmenu_plus: ^1.0.1 contextmenu_plus: ^1.0.1
contentsize_tabbarview: ^0.0.2
win32_registry: ^1.1.5 win32_registry: ^1.1.5
dependency_overrides: dependency_overrides:
permission_handler_windows: permission_handler_windows: