From a566218de19350f545acab4ff603505625886175 Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Thu, 26 Oct 2023 08:25:34 +0300 Subject: [PATCH] Add `itms-apps`, `itms-appss` and `itmss` the to supported schemes --- Sources/Shared/Extensions/URLExtensions.swift | 2 +- Tests/ClientTests/URLFormatTests.swift | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Sources/Shared/Extensions/URLExtensions.swift b/Sources/Shared/Extensions/URLExtensions.swift index 5a817fbde94..cc4213f2fe0 100644 --- a/Sources/Shared/Extensions/URLExtensions.swift +++ b/Sources/Shared/Extensions/URLExtensions.swift @@ -69,7 +69,7 @@ extension URL { } // The list of permanent URI schemes has been taken from http://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml -private let permanentURISchemes = ["aaa", "aaas", "about", "acap", "acct", "cap", "cid", "coap", "coaps", "crid", "data", "dav", "dict", "dns", "example", "file", "ftp", "geo", "go", "gopher", "h323", "http", "https", "iax", "icap", "im", "imap", "info", "ipp", "ipps", "iris", "iris.beep", "iris.lwz", "iris.xpc", "iris.xpcs", "jabber", "javascript", "ldap", "mailto", "mid", "msrp", "msrps", "mtqp", "mupdate", "news", "nfs", "ni", "nih", "nntp", "opaquelocktoken", "pkcs11", "pop", "pres", "reload", "rtsp", "rtsps", "rtspu", "service", "session", "shttp", "sieve", "sip", "sips", "sms", "snmp", "soap.beep", "soap.beeps", "stun", "stuns", "tag", "tel", "telnet", "tftp", "thismessage", "tip", "tn3270", "turn", "turns", "tv", "urn", "vemmi", "vnc", "ws", "wss", "xcon", "xcon-userid", "xmlrpc.beep", "xmlrpc.beeps", "xmpp", "z39.50r", "z39.50s"] +private let permanentURISchemes = ["aaa", "aaas", "about", "acap", "acct", "cap", "cid", "coap", "coaps", "crid", "data", "dav", "dict", "dns", "example", "file", "ftp", "geo", "go", "gopher", "h323", "http", "https", "iax", "icap", "im", "imap", "info", "ipp", "ipps", "iris", "iris.beep", "iris.lwz", "iris.xpc", "iris.xpcs", "itms-apps", "itms-appss", "itmss", "jabber", "javascript", "ldap", "mailto", "mid", "msrp", "msrps", "mtqp", "mupdate", "news", "nfs", "ni", "nih", "nntp", "opaquelocktoken", "pkcs11", "pop", "pres", "reload", "rtsp", "rtsps", "rtspu", "service", "session", "shttp", "sieve", "sip", "sips", "sms", "snmp", "soap.beep", "soap.beeps", "stun", "stuns", "tag", "tel", "telnet", "tftp", "thismessage", "tip", "tn3270", "turn", "turns", "tv", "urn", "vemmi", "vnc", "ws", "wss", "xcon", "xcon-userid", "xmlrpc.beep", "xmlrpc.beeps", "xmpp", "z39.50r", "z39.50s"] private let ignoredSchemes = ["data"] private let supportedSchemes = permanentURISchemes.filter { !ignoredSchemes.contains($0) } diff --git a/Tests/ClientTests/URLFormatTests.swift b/Tests/ClientTests/URLFormatTests.swift index d1309030556..37f43210e00 100644 --- a/Tests/ClientTests/URLFormatTests.swift +++ b/Tests/ClientTests/URLFormatTests.swift @@ -24,12 +24,15 @@ import XCTest checkValidURL("about:", afterFixup: "about:") checkValidURL("about:config", afterFixup: "about:config") checkValidURL("about: config", afterFixup: "about:%20config") - + checkValidURL("file:///f/o/o", afterFixup: "file:///f/o/o") checkValidURL("ftp://ftp.mozilla.org", afterFixup: "ftp://ftp.mozilla.org/") checkValidURL("foo.bar", afterFixup: "http://foo.bar/") checkValidURL(" foo.bar ", afterFixup: "http://foo.bar/") - + checkValidURL("itms-apps://apps.apple.com/app/pulse-secure/id945832041", afterFixup: "itms-apps://apps.apple.com/app/pulse-secure/id945832041") + checkValidURL("itms-appss://apps.apple.com/app/pulse-secure/id945832041", afterFixup: "itms-appss://apps.apple.com/app/pulse-secure/id945832041") + checkValidURL("itmss://apps.apple.com/app/pulse-secure/id945832041", afterFixup: "itmss://apps.apple.com/app/pulse-secure/id945832041") + checkValidURL("[::1]:80", afterFixup: "http://[::1]/") checkValidURL("[2a04:4e42:400::288]", afterFixup: "http://[2a04:4e42:400::288]/") checkValidURL("[2a04:4e42:600::288]:80", afterFixup: "http://[2a04:4e42:600::288]/")