michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: SSH_ASKPASS can NOT use parameter

Browse source
This commit is contained in:
leo 2024-07-10 10:47:43 +08:00
parent 7febac5843
commit ca461d1926
No known key found for this signature in database
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -604,3 +604,4 @@ build/*.zip
build/*.tar.gz build/*.tar.gz
build/*.deb build/*.deb
build/*.rpm build/*.rpm
build/*.AppImage

4
src/App.axaml.cs
View file

@ -456,10 +456,10 @@ namespace SourceGit
private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime desktop) private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
{ {
var args = desktop.Args; var args = desktop.Args;
if (args.Length <= 1 || !args[0].Equals("--askpass", StringComparison.Ordinal)) if (args.Length != 1 || !args[0].StartsWith("Enter passphrase", StringComparison.Ordinal))
return false; return false;
desktop.MainWindow = new Views.Askpass(args[1]); desktop.MainWindow = new Views.Askpass(args[0]);
return true; return true;
} }

2
src/Commands/Command.cs
View file

@ -53,7 +53,7 @@ namespace SourceGit.Commands
// Force using this app as SSH askpass program // Force using this app as SSH askpass program
var selfExecFile = Process.GetCurrentProcess().MainModule.FileName; var selfExecFile = Process.GetCurrentProcess().MainModule.FileName;
start.Environment.Add("DISPLAY", "required"); start.Environment.Add("DISPLAY", "required");
start.Environment.Add("SSH_ASKPASS", $"\"{selfExecFile}\" --askpass"); start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec`
start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer"); start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer");
// If an SSH private key was provided, sets the environment. // If an SSH private key was provided, sets the environment.