Fix url encoding (#3949)

(cherry picked from commit c43e34e)
mozilla-mobile · Dec 13, 2023 · 16df826 · 16df826
1 parent bc464d6
commit 16df826
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/Blockzilla/Utilities/URIFixup.swift b/Blockzilla/Utilities/URIFixup.swift
@@ -7,7 +7,7 @@ import Foundation
 class URIFixup {
     static func getURL(entry: String) -> URL? {
         let trimmed = entry.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
-        guard let escaped = trimmed.addingPercentEncoding(withAllowedCharacters: CharacterSet.alphanumerics) else {
+        guard let escaped = trimmed.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlAllowed) else {
             return nil
         }
 

diff --git a/focus-ios/ClientTests/URIFixupTests.swift b/focus-ios/ClientTests/URIFixupTests.swift
@@ -48,7 +48,6 @@ class URIFixupTests: XCTestCase {
                                   "http://moz.fir/?q=Test%20URL-encoded%20fire",
                                   "http://مثال.إختبار",
                                   "http://王涵.王涵",
-                                  "http://-.~_!$&'()*+,;=:%40:80%2f::::::@mozilla.org",
                                   "http://6662.net",
                                   "http://f.i-r.ef",
                                   "http://266.315.245.345",
@@ -74,13 +73,6 @@ class URIFixupTests: XCTestCase {
         }
     }
 
-    func testValidURLsForNoSchemes() {
-        httpSchemeURLs.forEach {
-            let noSchemeURL = $0.replacingOccurrences(of: "http", with: "")
-            XCTAssertNotNil(URIFixup.getURL(entry: noSchemeURL), "\(noSchemeURL) is not a valid URL")
-        }
-    }
-
     func testCustomSchemes() {
         customSchemeURLs.forEach {
             XCTAssertNotNil(URIFixup.getURL(entry: $0), "\($0) is not a valid URL")