Skip to content

Commit

Permalink
xdg-open filepath is escaped with quotation-marks correctly (#17682)
Browse files Browse the repository at this point in the history
  • Loading branch information
nickodei authored Dec 3, 2024
1 parent a42d874 commit ab1d77a
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/Avalonia.Base/Platform/Storage/FileIO/BclLauncher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Avalonia.Compatibility;
using Avalonia.Metadata;

namespace Avalonia.Platform.Storage.FileIO;

Expand Down Expand Up @@ -44,7 +43,8 @@ private static bool Exec(string urlOrFile)
{
// If no associated application/json MimeType is found xdg-open opens return error
// but it tries to open it anyway using the console editor (nano, vim, other..)
ShellExec($"xdg-open {urlOrFile}", waitForExit: false);
var args = EscapeForShell(urlOrFile);
ShellExecRaw($"xdg-open \\\"{args}\\\"", waitForExit: false);
return true;
}
else if (OperatingSystemEx.IsWindows() || OperatingSystemEx.IsMacOS())
Expand All @@ -63,17 +63,18 @@ private static bool Exec(string urlOrFile)
return false;
}
}

private static void ShellExec(string cmd, bool waitForExit = true)

private static string EscapeForShell(string input) => Regex
.Replace(input, "(?=[`~!#&*()|;'<>])", "\\")
.Replace("\"", "\\\\\\\"");

private static void ShellExecRaw(string cmd, bool waitForExit = true)
{
var escapedArgs = Regex.Replace(cmd, "(?=[`~!#&*()|;'<>])", "\\")
.Replace("\"", "\\\\\\\"");

using (var process = Process.Start(
new ProcessStartInfo
{
FileName = "/bin/sh",
Arguments = $"-c \"{escapedArgs}\"",
Arguments = $"-c \"{cmd}\"",
RedirectStandardOutput = true,
UseShellExecute = false,
CreateNoWindow = true,
Expand Down

0 comments on commit ab1d77a

Please sign in to comment.