[iOS] Don't percent encode file paths passed into path based file i/o

brave · Aug 19, 2024 · 517c849 · 517c849
1 parent 7d20b69
commit 517c849
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/ios/brave-ios/Sources/Brave/Extensions/AsyncFileManagerExtensions.swift b/ios/brave-ios/Sources/Brave/Extensions/AsyncFileManagerExtensions.swift
@@ -28,13 +28,16 @@ extension AsyncFileManager {
     lock: Bool
   ) async throws {
     let url = try url(for: .libraryDirectory, in: .userDomainMask).appending(path: path.value)
-    try await setAttributes([.posixPermissions: lock ? 0 : 0o755], ofItemAtPath: url.path())
+    try await setAttributes(
+      [.posixPermissions: lock ? 0 : 0o755],
+      ofItemAtPath: url.path(percentEncoded: false)
+    )
   }
 
   /// Returns whether or a given WebDataPath is currently locked
   func isWebDataLocked(atPath path: WebDataPath) async throws -> Bool {
     let url = try url(for: .libraryDirectory, in: .userDomainMask).appending(path: path.value)
-    let attributes = try await attributesOfItem(atPath: url.path())
+    let attributes = try await attributesOfItem(atPath: url.path(percentEncoded: false))
     if let posixPermissions = attributes[.posixPermissions] as? NSNumber {
       return posixPermissions == 0o755
     }

diff --git a/ios/brave-ios/Sources/Brave/Frontend/Browser/TemporaryDocument.swift b/ios/brave-ios/Sources/Brave/Frontend/Browser/TemporaryDocument.swift
@@ -99,7 +99,10 @@ class TemporaryDocument: NSObject {
           try await AsyncFileManager.default.removeItem(at: url)
         }
 
-        await AsyncFileManager.default.createFile(atPath: url.path(), contents: data)
+        await AsyncFileManager.default.createFile(
+          atPath: url.path(percentEncoded: false),
+          contents: data
+        )
 
         localFileURL = url
         pendingContinuation?.resume(returning: url)

diff --git a/ios/brave-ios/Sources/BraveNews/Composer/FeedDataSource.swift b/ios/brave-ios/Sources/BraveNews/Composer/FeedDataSource.swift
@@ -272,7 +272,7 @@ public class FeedDataSource: ObservableObject {
     assert(!resource.isLocalized || localeIdentifier != nil)
     let fileManager = FileManager.default
     let filename = resourceFilename(for: resource, localeIdentifier: localeIdentifier)
-    let cachedPath = cacheDirectoryURL?.appending(path: filename).path()
+    let cachedPath = cacheDirectoryURL?.appending(path: filename).path(percentEncoded: false)
     if let cachedPath = cachedPath,
       let attributes = try? fileManager.attributesOfItem(atPath: cachedPath),
       let date = attributes[.modificationDate] as? Date
@@ -337,7 +337,7 @@ public class FeedDataSource: ObservableObject {
       for: .applicationSupportDirectory,
       appending: Self.cacheFolderName,
       create: true
-    ).appending(path: name).path()
+    ).appending(path: name).path(percentEncoded: false)
     if loadExpiredData || !isResourceExpired(resource, localeIdentifier: localeIdentifier),
       let cachedPath = cachedPath,
       await fileManager.fileExists(atPath: cachedPath)
@@ -391,7 +391,7 @@ public class FeedDataSource: ObservableObject {
         create: true
       )
       let createdFile = await AsyncFileManager.default.createFile(
-        atPath: cachePath.appending(path: filename).path(),
+        atPath: cachePath.appending(path: filename).path(percentEncoded: false),
         contents: data
       )
       if !createdFile {

diff --git a/ios/brave-ios/Sources/BraveNews/Customize/OPMLImporterViewModifier.swift b/ios/brave-ios/Sources/BraveNews/Customize/OPMLImporterViewModifier.swift
@@ -96,7 +96,8 @@ struct OPMLImporterViewModifier: ViewModifier {
   }
 
   nonisolated private func importOPML(from url: URL) async {
-    guard url.isFileURL, let data = await AsyncFileManager.default.contents(atPath: url.path())
+    guard url.isFileURL,
+      let data = await AsyncFileManager.default.contents(atPath: url.path(percentEncoded: false))
     else {
       isPresented = false
       importError = .noFeedsFound

diff --git a/ios/brave-ios/Sources/BraveShared/AsyncFileManager.swift b/ios/brave-ios/Sources/BraveShared/AsyncFileManager.swift
@@ -268,7 +268,7 @@ extension AsyncFileManager {
       create: false
     )
     var directory = searchPathDirectory.appending(path: pathComponent)
-    let exists = await fileExists(atPath: directory.path())
+    let exists = await fileExists(atPath: directory.path(percentEncoded: false))
     if !exists && create {
       try await createDirectory(at: directory, withIntermediateDirectories: true)
       if excludeFromBackups {
@@ -318,7 +318,7 @@ extension AsyncFileManager {
   public func utf8Contents(
     at url: URL
   ) async -> String? {
-    guard let data = fileManager.contents(atPath: url.path()) else {
+    guard let data = fileManager.contents(atPath: url.path(percentEncoded: false)) else {
       return nil
     }
     return String(decoding: data, as: UTF8.self)