improved uri parsing
This commit is contained in:
@@ -18,49 +18,13 @@
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:weblibre/extensions/uri.dart';
|
||||
|
||||
final _domainRegex = RegExp(r'\.[a-zA-Z]{2,}$');
|
||||
import 'package:weblibre/utils/uri_input_parser.dart';
|
||||
import 'package:weblibre/utils/uri_policy.dart';
|
||||
|
||||
Uri? tryParseUrl(String? input, {bool eagerParsing = false}) {
|
||||
if (input != null) {
|
||||
var uri = Uri.tryParse(input);
|
||||
if (uri != null) {
|
||||
if (uri.authority.isEmpty && eagerParsing) {
|
||||
if (uri.pathSegments.isNotEmpty) {
|
||||
int? port;
|
||||
var firstSegment = uri.pathSegments.first;
|
||||
|
||||
//When there is no scheme while aprsing, the port becomse the first segment because : is treated as delimeter
|
||||
if (int.tryParse(firstSegment) case final int segmentPort) {
|
||||
port = segmentPort;
|
||||
firstSegment = uri.scheme;
|
||||
}
|
||||
|
||||
if (_domainRegex.hasMatch(firstSegment)) {
|
||||
uri = Uri.tryParse('https://$input')?.replace(port: port);
|
||||
} else if (firstSegment == 'localhost') {
|
||||
uri = Uri.tryParse('http://$input')?.replace(port: port);
|
||||
} else if (InternetAddress.tryParse(firstSegment) != null) {
|
||||
uri = Uri.tryParse('https://$input')?.replace(port: port);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (uri != null) {
|
||||
if (uri.isScheme('about')) {
|
||||
return uri;
|
||||
}
|
||||
|
||||
if (uri.authority.isNotEmpty) {
|
||||
if (uri.hasSupportedScheme || !uri.hasScheme) {
|
||||
return uri;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
return parseUserInputUrl(
|
||||
input,
|
||||
policy: SchemePolicy.internalIntent,
|
||||
allowSchemelessHosts: eagerParsing,
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user