Bugzilla 1649160: RTL char bug in downloaded file name

Client/Frontend/Browser/DownloadQueue.swift

@@ -68,14 +68,20 @@ class HTTPDownload: Download {
 
     private var resumeData: Data?
 
+    // Used to avoid name spoofing using Unicode RTL char to change file extension
+    public static func stripUnicode(fromFilename string: String) -> String {
+        let allowed = CharacterSet.alphanumerics.union(CharacterSet.punctuationCharacters)
+        return string.components(separatedBy: allowed.inverted).joined()
+     }
+
     init(preflightResponse: URLResponse, request: URLRequest) {
         self.preflightResponse = preflightResponse
         self.request = request
 
         super.init()
 
         if let filename = preflightResponse.suggestedFilename {
-            self.filename = filename
+            self.filename = HTTPDownload.stripUnicode(fromFilename: filename)
         }
 
         if let mimeType = preflightResponse.mimeType {

ClientTests/StringExtensionsTests.swift

@@ -4,6 +4,7 @@
 
 import Foundation
 import XCTest
+@testable import Client
 
 class StringExtensionsTests: XCTestCase {
 
@@ -51,4 +52,11 @@ class StringExtensionsTests: XCTestCase {
         roundtripTest("http://mozilla.com/?a=foo&b=bar", "http://mozilla.com/%3Fa%3Dfoo%26b%3Dbar")
     }
 
+    func testRemoveUnicodeFromFilename() {
+        let file = "foo-\u{200F}cod.jpg" // Unicode RTL-switch code, becomes "foo-gpj.doc"
+        let nounicode = "foo-cod.jpg"
+        XCTAssert(file != nounicode)
+        let strip = HTTPDownload.stripUnicode(fromFilename: file)
+        XCTAssert(strip == nounicode)
+    }
 }