Always follow redirects and store cookies between redirects, including for downloads —useful for https://xeiaso.net/blog/2025/anubis (#2264)

This commit is contained in:
Imran Remtulla
2025-04-26 23:48:15 -04:00
parent 98182d9873
commit ecf4326b47
2 changed files with 93 additions and 90 deletions

View File

@@ -510,6 +510,75 @@ HttpClient createHttpClient(bool insecure) {
return client;
}
Future<MapEntry<HttpClient, HttpClientResponse>> sourceRequestStreamResponse(
String method,
String url,
Map<String, String>? requestHeaders,
Map<String, dynamic> additionalSettings,
{bool followRedirects = true,
Object? postBody}) async {
var currentUrl = Uri.parse(url);
var redirectCount = 0;
const maxRedirects = 10;
List<Cookie> cookies = [];
while (redirectCount < maxRedirects) {
var httpClient =
createHttpClient(additionalSettings['allowInsecure'] == true);
var request = await httpClient.openUrl(method, currentUrl);
if (requestHeaders != null) {
requestHeaders.forEach((key, value) {
request.headers.set(key, value);
});
}
request.cookies.addAll(cookies);
request.followRedirects = false;
if (postBody != null) {
request.headers.contentType = ContentType.json;
request.write(jsonEncode(postBody));
}
final response = await request.close();
if (followRedirects &&
(response.statusCode >= 300 && response.statusCode <= 399)) {
final location = response.headers.value(HttpHeaders.locationHeader);
if (location != null) {
currentUrl = Uri.parse(ensureAbsoluteUrl(location, currentUrl));
redirectCount++;
cookies = response.cookies;
httpClient.close();
continue;
}
}
return MapEntry(httpClient, response);
}
throw ObtainiumError('Too many redirects ($maxRedirects)');
}
Future<Response> httpClientResponseStreamToFinalResponse(
HttpClient httpClient,
String method,
String url,
HttpClientResponse response) async {
final bytes =
(await response.fold<BytesBuilder>(BytesBuilder(), (b, d) => b..add(d)))
.toBytes();
final headers = <String, String>{};
response.headers.forEach((name, values) {
headers[name] = values.join(', ');
});
httpClient.close();
return http.Response.bytes(
bytes,
response.statusCode,
headers: headers,
request: http.Request(method, Uri.parse(url)),
);
}
abstract class AppSource {
List<String> hosts = [];
bool hostChanged = false;
@@ -567,64 +636,15 @@ abstract class AppSource {
Future<Response> sourceRequest(
String url, Map<String, dynamic> additionalSettings,
{bool followRedirects = true, Object? postBody}) async {
var method = postBody == null ? 'GET' : 'POST';
var requestHeaders = await getRequestHeaders(additionalSettings);
if (requestHeaders != null || followRedirects == false) {
var method = postBody == null ? 'GET' : 'POST';
var currentUrl = url;
var redirectCount = 0;
const maxRedirects = 10;
while (redirectCount < maxRedirects) {
var httpClient =
createHttpClient(additionalSettings['allowInsecure'] == true);
var request = await httpClient.openUrl(method, Uri.parse(currentUrl));
if (requestHeaders != null) {
requestHeaders.forEach((key, value) {
request.headers.set(key, value);
});
}
request.followRedirects = false;
if (postBody != null) {
request.headers.contentType = ContentType.json;
request.write(jsonEncode(postBody));
}
final response = await request.close();
if (followRedirects &&
(response.statusCode == 301 || response.statusCode == 302)) {
final location = response.headers.value(HttpHeaders.locationHeader);
if (location != null) {
currentUrl = location;
redirectCount++;
httpClient.close();
continue;
}
}
final bytes = (await response.fold<BytesBuilder>(
BytesBuilder(), (b, d) => b..add(d)))
.toBytes();
final headers = <String, String>{};
response.headers.forEach((name, values) {
headers[name] = values.join(', ');
});
httpClient.close();
return http.Response.bytes(
bytes,
response.statusCode,
headers: headers,
request: http.Request(method, Uri.parse(url)),
);
}
throw ObtainiumError('Too many redirects ($maxRedirects)');
} else {
return postBody == null
? http.get(Uri.parse(url))
: http.post(Uri.parse(url), body: jsonEncode(postBody));
}
var streamedResponseAndClient = await sourceRequestStreamResponse(
method, url, requestHeaders, additionalSettings);
return await httpClientResponseStreamToFinalResponse(
streamedResponseAndClient.key,
method,
url,
streamedResponseAndClient.value);
}
void runOnAddAppInputChange(String inputUrl) {