fix: properly escape shell commands

123FLO321 · Apr 27, 2022 · fd9619c · fd9619c
1 parent 914d968
commit fd9619c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Sources/SwiftTileserverCache/Controller/DatasetsController.swift b/Sources/SwiftTileserverCache/Controller/DatasetsController.swift
@@ -6,7 +6,6 @@
 //
 
 import Vapor
-import ShellOut
 
 internal class DatasetsController {
 
@@ -99,15 +98,15 @@ internal class DatasetsController {
         if datasets.count == 1 {
             try? FileManager.default.removeItem(atPath: self.folder + "/Combined.mbtiles")
             do {
-                try shellOut(to: "/bin/ln", arguments: ["-s", "List/\(datasets[0]).mbtiles".bashEncoded, "Combined.mbtiles"], at: self.folder)
+                try escapedShellOut(to: "/bin/ln", arguments: ["-s", "List/\(datasets[0]).mbtiles", "Combined.mbtiles"], at: self.folder)
             } catch {
                 return request.eventLoop.makeFailedFuture("Failed to link mbtiles: \(error.localizedDescription)")
             }
             return request.eventLoop.future()
         } else {
             return request.application.threadPool.runIfActive(eventLoop: request.eventLoop) {
                 do {
-                    try shellOut(to: DatasetsController.tileJoinCommand, arguments: ["--force", "-o", "Combined.mbtiles", "List/*.mbtiles".bashEncoded], at: self.folder)
+                    try escapedShellOut(to: DatasetsController.tileJoinCommand, arguments: ["--force", "-o", "Combined.mbtiles", "List/*.mbtiles"], at: self.folder)
                 } catch {
                     throw Abort(.internalServerError, reason: "Failed to get mbtiles: \(error.localizedDescription)")
                 }

diff --git a/Sources/SwiftTileserverCache/Controller/FontsController.swift b/Sources/SwiftTileserverCache/Controller/FontsController.swift
@@ -6,7 +6,6 @@
 //
 
 import Vapor
-import ShellOut
 
 internal class FontsController {
 
@@ -63,7 +62,7 @@ internal class FontsController {
             try? FileManager.default.removeItem(atPath: path)
             do {
                 try FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: false)
-                try shellOut(to: FontsController.buildGlyphsCommand, arguments: [file.bashEncoded, path.bashEncoded])
+                try escapedShellOut(to: FontsController.buildGlyphsCommand, arguments: [file, path])
             } catch {
                 try? FileManager.default.removeItem(atPath: path)
                 throw Abort(.internalServerError, reason: "Failed to create glyphs: \(error.localizedDescription)")

diff --git a/Sources/SwiftTileserverCache/Misc/String+BashEncode.swift b/Sources/SwiftTileserverCache/Misc/String+BashEncode.swift