beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

keys: Start ssh-agent when there isn't one running

Browse source
This commit is contained in:
Hylke Bons 2016-03-05 12:24:30 +00:00
parent 66485af890
commit 013a9b45fd
1 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
SparkleShare/SparkleKeys.cs
View file

@ -46,41 +46,32 @@ namespace SparkleShare {
"-C \"" + computer_name + " (SparkleShare)\" " + // key comment "-C \"" + computer_name + " (SparkleShare)\" " + // key comment
"-f \"" + key_name + "\""; // file name "-f \"" + key_name + "\""; // file name
SparkleKeyProcess process = new SparkleKeyProcess ("ssh-keygen", arguments); SparkleProcess process = new SparkleProcess ("ssh-keygen", arguments);
process.StartInfo.WorkingDirectory = output_path; process.StartInfo.WorkingDirectory = output_path;
process.Start (); process.Start ();
process.WaitForExit (); process.WaitForExit ();
if (process.ExitCode == 0)
SparkleLogger.LogInfo ("Auth", "Created keypair '" + key_file_path + "'");
else
SparkleLogger.LogInfo ("Auth", "Could not create key pair '" + key_file_path + "'");
return new string [] { key_file_path, key_file_path + ".pub" }; return new string [] { key_file_path, key_file_path + ".pub" };
} }
public static void ImportPrivateKey (string key_file_path) public static void ImportPrivateKey (string key_file_path)
{ {
StartKeyAgent ();
// Use forward slashes when dealing with Windows domain accounts // Use forward slashes when dealing with Windows domain accounts
if (key_file_path.StartsWith ("\\\\")) if (key_file_path.StartsWith ("\\\\"))
key_file_path = key_file_path.Replace ("\\", "/"); key_file_path = key_file_path.Replace ("\\", "/");
SparkleKeyProcess process = new SparkleKeyProcess ("ssh-add", "\"" + key_file_path + "\""); SparkleProcess process = new SparkleProcess ("ssh-add", "\"" + key_file_path + "\"");
process.Start (); process.Start ();
process.WaitForExit (); process.WaitForExit ();
if (process.ExitCode == 0)
SparkleLogger.LogInfo ("Auth", "Imported key '" + key_file_path + "'");
else
SparkleLogger.LogInfo ("Auth", "Could not import key '" + key_file_path + "', " +
process.StandardError.ReadToEnd ());
} }
public static void ListPrivateKeys () public static void ListPrivateKeys ()
{ {
SparkleKeyProcess process = new SparkleKeyProcess ("ssh-add", "-l"); SparkleProcess process = new SparkleProcess ("ssh-add", "-l");
process.Start (); process.Start ();
string keys_in_use = process.StandardOutput.ReadToEnd (); string keys_in_use = process.StandardOutput.ReadToEnd ();
process.WaitForExit (); process.WaitForExit ();
@ -89,16 +80,16 @@ namespace SparkleShare {
} }
private class SparkleKeyProcess : Process { private static void StartKeyAgent ()
{
Process [] processes = Process.GetProcessesByName ("ssh-agent");
public SparkleKeyProcess (string command, string arguments) : base () if (processes.Length == 0) {
{ SparkleLogger.LogInfo ("Auth", "No key agent running, starting one...");
StartInfo.FileName = command;
StartInfo.Arguments = arguments; SparkleProcess process = new SparkleProcess ("ssh-agent", "");
StartInfo.UseShellExecute = false; process.Start ();
StartInfo.RedirectStandardOutput = true; process.WaitForExit ();
StartInfo.RedirectStandardError = true;
StartInfo.CreateNoWindow = true;
} }
} }
} }