mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Update UrlPattern to include private addresses and update test cases
This commit is contained in:
VictoriousRaptor
parent
8092a440f4
commit
be630f1ab5
2 changed files with 60 additions and 32 deletions
|
|
@ -14,20 +14,47 @@ namespace Flow.Launcher.Test.Plugins
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("http://www.google.com"));
|
ClassicAssert.IsTrue(plugin.IsURL("http://www.google.com"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("https://www.google.com"));
|
ClassicAssert.IsTrue(plugin.IsURL("https://www.google.com"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("http://google.com"));
|
ClassicAssert.IsTrue(plugin.IsURL("http://google.com"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("ftp://google.com"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("www.google.com"));
|
ClassicAssert.IsTrue(plugin.IsURL("www.google.com"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("google.com"));
|
ClassicAssert.IsTrue(plugin.IsURL("google.com"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("http://localhost"));
|
ClassicAssert.IsTrue(plugin.IsURL("http://localhost"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("https://localhost"));
|
ClassicAssert.IsTrue(plugin.IsURL("https://localhost"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("http://localhost:80"));
|
ClassicAssert.IsTrue(plugin.IsURL("http://localhost:80"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("https://localhost:80"));
|
ClassicAssert.IsTrue(plugin.IsURL("https://localhost:80"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("localhost"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("localhost:8080"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("http://110.10.10.10"));
|
ClassicAssert.IsTrue(plugin.IsURL("http://110.10.10.10"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("110.10.10.10"));
|
ClassicAssert.IsTrue(plugin.IsURL("110.10.10.10"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("110.10.10.10:8080"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("192.168.1.1"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("192.168.1.1:3000"));
|
||||||
ClassicAssert.IsTrue(plugin.IsURL("ftp://110.10.10.10"));
|
ClassicAssert.IsTrue(plugin.IsURL("ftp://110.10.10.10"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("[2001:db8::1]"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("[2001:db8::1]:8080"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("http://[2001:db8::1]"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("https://[2001:db8::1]:8080"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("[::1]"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("[::1]:8080"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("2001:db8::1"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("::1"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("HTTP://EXAMPLE.COM"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("HTTPS://EXAMPLE.COM"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("EXAMPLE.COM"));
|
||||||
|
ClassicAssert.IsTrue(plugin.IsURL("LOCALHOST"));
|
||||||
|
|
||||||
|
|
||||||
ClassicAssert.IsFalse(plugin.IsURL("wwww"));
|
ClassicAssert.IsFalse(plugin.IsURL("wwww"));
|
||||||
ClassicAssert.IsFalse(plugin.IsURL("wwww.c"));
|
ClassicAssert.IsFalse(plugin.IsURL("wwww.c"));
|
||||||
ClassicAssert.IsFalse(plugin.IsURL("wwww.c"));
|
ClassicAssert.IsFalse(plugin.IsURL("wwww.c"));
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("not a url"));
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("just text"));
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("http://"));
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("://example.com"));
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("0.0.0.0")); // Pattern excludes 0.0.0.0
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("256.1.1.1")); // Invalid IPv4
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("example")); // No TLD
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL(".com"));
|
||||||
|
ClassicAssert.IsFalse(plugin.IsURL("http://.com"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using Flow.Launcher.Plugin.SharedCommands;
|
using Flow.Launcher.Plugin.SharedCommands;
|
||||||
|
|
@ -15,19 +16,26 @@ namespace Flow.Launcher.Plugin.Url
|
||||||
// user:pass authentication
|
// user:pass authentication
|
||||||
"(?:\\S+(?::\\S*)?@)?" +
|
"(?:\\S+(?::\\S*)?@)?" +
|
||||||
"(?:" +
|
"(?:" +
|
||||||
// IP address exclusion
|
// IPv6 address with optional brackets (brackets required if followed by port)
|
||||||
// private & local networks
|
// IPv6 with brackets
|
||||||
"(?!(?:10|127)(?:\\.\\d{1,3}){3})" +
|
"(?:\\[(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\]|" + // standard IPv6
|
||||||
"(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})" +
|
"\\[(?:[0-9a-fA-F]{1,4}:){1,7}:\\]|" + // IPv6 with trailing ::
|
||||||
"(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})" +
|
"\\[(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}\\]|" + // IPv6 compressed
|
||||||
// IP address dotted notation octets
|
"\\[::(?:[0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}\\]|" + // IPv6 with leading ::
|
||||||
// excludes loopback network 0.0.0.0
|
"\\[::1\\])" + // IPv6 loopback
|
||||||
// excludes reserved space >= 224.0.0.0
|
"|" +
|
||||||
// excludes network & broacast addresses
|
// IPv6 without brackets (only when no port follows)
|
||||||
// (first & last IP address of each class)
|
"(?:(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|" + // standard IPv6
|
||||||
"(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
|
"(?:[0-9a-fA-F]{1,4}:){1,7}:|" + // IPv6 with trailing ::
|
||||||
"(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
|
"(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|" + // IPv6 compressed
|
||||||
"(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
|
"::(?:[0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}|" + // IPv6 with leading ::
|
||||||
|
"::1)(?!:[0-9])" + // IPv6 loopback (not followed by port)
|
||||||
|
"|" +
|
||||||
|
// IPv4 address - all valid addresses including private networks (excluding 0.0.0.0)
|
||||||
|
"(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|[1-9])\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d))" +
|
||||||
|
"|" +
|
||||||
|
// localhost
|
||||||
|
"localhost" +
|
||||||
"|" +
|
"|" +
|
||||||
// host name
|
// host name
|
||||||
"(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)" +
|
"(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)" +
|
||||||
|
|
@ -37,7 +45,7 @@ namespace Flow.Launcher.Plugin.Url
|
||||||
"(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" +
|
"(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" +
|
||||||
")" +
|
")" +
|
||||||
// port number
|
// port number
|
||||||
"(?::\\d{2,5})?" +
|
"(?::\\d{1,5})?" +
|
||||||
// resource path
|
// resource path
|
||||||
"(?:/\\S*)?" +
|
"(?:/\\S*)?" +
|
||||||
"$";
|
"$";
|
||||||
|
|
@ -45,12 +53,17 @@ namespace Flow.Launcher.Plugin.Url
|
||||||
internal static PluginInitContext Context { get; private set; }
|
internal static PluginInitContext Context { get; private set; }
|
||||||
internal static Settings Settings { get; private set; }
|
internal static Settings Settings { get; private set; }
|
||||||
|
|
||||||
|
private static readonly string[] UrlSchemes = ["http://", "https://", "ftp://"];
|
||||||
|
|
||||||
public List<Result> Query(Query query)
|
public List<Result> Query(Query query)
|
||||||
{
|
{
|
||||||
var raw = query.Search;
|
var raw = query.Search;
|
||||||
if (IsURL(raw))
|
if (!IsURL(raw))
|
||||||
{
|
{
|
||||||
return
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
[
|
[
|
||||||
new()
|
new()
|
||||||
{
|
{
|
||||||
|
|
@ -60,7 +73,8 @@ namespace Flow.Launcher.Plugin.Url
|
||||||
Score = 8,
|
Score = 8,
|
||||||
Action = _ =>
|
Action = _ =>
|
||||||
{
|
{
|
||||||
if (!raw.StartsWith("http://", StringComparison.OrdinalIgnoreCase) && !raw.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
|
// not a recognized scheme, add preferred http scheme
|
||||||
|
if (!UrlSchemes.Any(scheme => raw.StartsWith(scheme, StringComparison.OrdinalIgnoreCase)))
|
||||||
{
|
{
|
||||||
raw = GetHttpPreference() + "://" + raw;
|
raw = GetHttpPreference() + "://" + raw;
|
||||||
}
|
}
|
||||||
|
|
@ -92,9 +106,6 @@ namespace Flow.Launcher.Plugin.Url
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetHttpPreference()
|
private static string GetHttpPreference()
|
||||||
|
|
@ -104,17 +115,7 @@ namespace Flow.Launcher.Plugin.Url
|
||||||
|
|
||||||
public bool IsURL(string raw)
|
public bool IsURL(string raw)
|
||||||
{
|
{
|
||||||
raw = raw.ToLower();
|
if (UrlRegex.Match(raw.ToLower()).Value == raw) return true;
|
||||||
|
|
||||||
if (UrlRegex.Match(raw).Value == raw) return true;
|
|
||||||
|
|
||||||
if (raw == "localhost" || raw.StartsWith("localhost:") ||
|
|
||||||
raw == "http://localhost" || raw.StartsWith("http://localhost:") ||
|
|
||||||
raw == "https://localhost" || raw.StartsWith("https://localhost:")
|
|
||||||
)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue