Browse Source

xdg-open filepath is escaped with quotation-marks correctly (#17682)

pull/16577/merge
nickodei 1 year ago
committed by GitHub
parent
commit
ab1d77a30d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 17
      src/Avalonia.Base/Platform/Storage/FileIO/BclLauncher.cs

17
src/Avalonia.Base/Platform/Storage/FileIO/BclLauncher.cs

@ -3,7 +3,6 @@ using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using Avalonia.Compatibility;
using Avalonia.Metadata;
namespace Avalonia.Platform.Storage.FileIO;
@ -44,7 +43,8 @@ internal class BclLauncher : ILauncher
{
// 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())
@ -63,17 +63,18 @@ internal class BclLauncher : ILauncher
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,

Loading…
Cancel
Save