mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
Merge pull request #855 from DanielMcAssey/bugfix-1
Update URL regex to match odd URLs
This commit is contained in:
commit
947a0ebd0d
1 changed files with 7 additions and 7 deletions
|
@ -184,10 +184,8 @@ public static bool IsValidURLRegex(string url)
|
|||
"(?:" +
|
||||
// IP address exclusion
|
||||
// private & local networks
|
||||
"(?!10(?:\\.\\d{1,3}){3})" +
|
||||
"(?!127(?:\\.\\d{1,3}){3})" +
|
||||
"(?!169\\.254(?:\\.\\d{1,3}){2})" +
|
||||
"(?!192\\.168(?:\\.\\d{1,3}){2})" +
|
||||
"(?!(?:10|127)(?:\\.\\d{1,3}){3})" +
|
||||
"(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})" +
|
||||
"(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})" +
|
||||
// IP address dotted notation octets
|
||||
// excludes loopback network 0.0.0.0
|
||||
|
@ -199,16 +197,18 @@ public static bool IsValidURLRegex(string url)
|
|||
"(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
|
||||
"|" +
|
||||
// host name
|
||||
"(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)" +
|
||||
"(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)" +
|
||||
// domain name
|
||||
"(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*" +
|
||||
"(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*" +
|
||||
// TLD identifier
|
||||
"(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" +
|
||||
// TLD may end with dot
|
||||
"\\.?" +
|
||||
")" +
|
||||
// port number
|
||||
"(?::\\d{2,5})?" +
|
||||
// resource path
|
||||
"(?:/[^\\s]*)?" +
|
||||
"(?:[/?#]\\S*)?" +
|
||||
"$";
|
||||
|
||||
return Regex.IsMatch(url.Trim(), pattern, RegexOptions.IgnoreCase);
|
||||
|
|
Loading…
Reference in a new issue