peter/Obtainium
1
0
Fork 0
mirror of https://github.com/ImranR98/Obtainium.git synced 2025-07-12 21:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

HTML bugfix: Incorrect URL resolution on redirected pages (#2315)

Browse Source
This commit is contained in:
Imran Remtulla
2025-06-13 16:49:59 -04:00
parent b539f0a926
commit 5f971dcddb
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/app_sources/html.dart
View File

@ -9,6 +9,13 @@ import 'package:obtainium/providers/apps_provider.dart';
import 'package:obtainium/providers/source_provider.dart'; import 'package:obtainium/providers/source_provider.dart';
String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) { String ensureAbsoluteUrl(String ambiguousUrl, Uri referenceAbsoluteUrl) {
try {
if (Uri.parse(ambiguousUrl).isAbsolute) {
return ambiguousUrl; // #2315
}
} catch (e) {
//
}
return referenceAbsoluteUrl.resolve(ambiguousUrl).toString(); return referenceAbsoluteUrl.resolve(ambiguousUrl).toString();
} }

4
lib/providers/apps_provider.dart
View File

@ -360,8 +360,8 @@ Future<File> downloadFile(String url, String fileName, bool fileNameHasExt,
} }
var responseWithClient = var responseWithClient =
await sourceRequestStreamResponse('GET', url, reqHeaders, {}); await sourceRequestStreamResponse('GET', url, reqHeaders, {});
HttpClient responseClient = responseWithClient.key; HttpClient responseClient = responseWithClient.value.key;
HttpClientResponse response = responseWithClient.value; HttpClientResponse response = responseWithClient.value.value;
sink ??= tempDownloadedFile.openWrite(mode: FileMode.writeOnly); sink ??= tempDownloadedFile.openWrite(mode: FileMode.writeOnly);
// Perform the download // Perform the download

12
lib/providers/source_provider.dart
View File

@ -511,7 +511,7 @@ HttpClient createHttpClient(bool insecure) {
return client; return client;
} }
Future<MapEntry<HttpClient, HttpClientResponse>> sourceRequestStreamResponse( Future<MapEntry<Uri, MapEntry<HttpClient, HttpClientResponse>>> sourceRequestStreamResponse(
String method, String method,
String url, String url,
Map<String, String>? requestHeaders, Map<String, String>? requestHeaders,
@ -551,7 +551,7 @@ Future<MapEntry<HttpClient, HttpClientResponse>> sourceRequestStreamResponse(
} }
} }
return MapEntry(httpClient, response); return MapEntry(currentUrl, MapEntry(httpClient, response));
} }
throw ObtainiumError('Too many redirects ($maxRedirects)'); throw ObtainiumError('Too many redirects ($maxRedirects)');
} }
@ -637,14 +637,14 @@ abstract class AppSource {
{bool followRedirects = true, Object? postBody}) async { {bool followRedirects = true, Object? postBody}) async {
var method = postBody == null ? 'GET' : 'POST'; var method = postBody == null ? 'GET' : 'POST';
var requestHeaders = await getRequestHeaders(additionalSettings); var requestHeaders = await getRequestHeaders(additionalSettings);
var streamedResponseAndClient = await sourceRequestStreamResponse( var streamedResponseUrlWithResponseAndClient = await sourceRequestStreamResponse(
method, url, requestHeaders, additionalSettings, method, url, requestHeaders, additionalSettings,
followRedirects: followRedirects, postBody: postBody); followRedirects: followRedirects, postBody: postBody);
return await httpClientResponseStreamToFinalResponse( return await httpClientResponseStreamToFinalResponse(
streamedResponseAndClient.key, streamedResponseUrlWithResponseAndClient.value.key,
method, method,
url, streamedResponseUrlWithResponseAndClient.key.toString(),
streamedResponseAndClient.value); streamedResponseUrlWithResponseAndClient.value.value);
} }
void runOnAddAppInputChange(String inputUrl) { void runOnAddAppInputChange(String inputUrl) {