Skip to content

Commit 3a362f7

Browse files
authored
Revert "Harden Linux manager executable resolution for elevation (#4621)"
This reverts commit 335578e.
1 parent 335578e commit 3a362f7

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

  • src
    • UniGetUI.PackageEngine.Managers.Apt
    • UniGetUI.PackageEngine.Managers.Dnf
    • UniGetUI.PackageEngine.Managers.Pacman

src/UniGetUI.PackageEngine.Managers.Apt/Apt.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public Apt()
5252

5353
public override IReadOnlyList<string> FindCandidateExecutableFiles()
5454
{
55-
var candidates = new List<string>();
56-
foreach (var path in new[] { "/usr/bin/apt", "/bin/apt" })
55+
var candidates = new List<string>(CoreTools.WhichMultiple("apt"));
56+
foreach (var path in new[] { "/usr/bin/apt", "/usr/local/bin/apt" })
5757
{
5858
if (File.Exists(path) && !candidates.Contains(path))
5959
candidates.Add(path);

src/UniGetUI.PackageEngine.Managers.Dnf/Dnf.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,13 @@ public Dnf()
5555

5656
public override IReadOnlyList<string> FindCandidateExecutableFiles()
5757
{
58-
var candidates = new List<string>();
59-
foreach (var path in new[] { "/usr/bin/dnf5", "/usr/bin/dnf", "/bin/dnf5", "/bin/dnf" })
58+
var candidates = new List<string>(CoreTools.WhichMultiple("dnf5"));
59+
foreach (var path in CoreTools.WhichMultiple("dnf"))
60+
{
61+
if (!candidates.Contains(path))
62+
candidates.Add(path);
63+
}
64+
foreach (var path in new[] { "/usr/bin/dnf5", "/usr/bin/dnf", "/usr/local/bin/dnf" })
6065
{
6166
if (File.Exists(path) && !candidates.Contains(path))
6267
candidates.Add(path);

src/UniGetUI.PackageEngine.Managers.Pacman/Pacman.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public Pacman()
5151

5252
public override IReadOnlyList<string> FindCandidateExecutableFiles()
5353
{
54-
var candidates = new List<string>();
55-
foreach (var path in new[] { "/usr/bin/pacman", "/bin/pacman" })
54+
var candidates = new List<string>(CoreTools.WhichMultiple("pacman"));
55+
foreach (var path in new[] { "/usr/bin/pacman", "/usr/local/bin/pacman" })
5656
{
5757
if (File.Exists(path) && !candidates.Contains(path))
5858
candidates.Add(path);

0 commit comments

Comments
 (0)