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

auth: Allow Windows domain account paths

Browse source
This commit is contained in:
Hylke Bons 2016-03-27 22:09:57 +01:00
parent e9aa3240e7
commit 93785776a6
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SparkleLib/SSHAuthenticationInfo.cs
View file

@ -41,7 +41,9 @@ namespace SparkleLib {
public SSHAuthenticationInfo ()
{
Path = IO.Path.Combine (IO.Path.GetDirectoryName (SparkleConfig.DefaultConfig.FullPath), "ssh");
KnownHostsFilePath = IO.Path.Combine (Path, "known_hosts");
KnownHostsFilePath = MakeWindowsDomainAccountSafe (KnownHostsFilePath);
if (IO.Directory.Exists (Path)) {
ImportKeys ();
@ -68,6 +70,9 @@ namespace SparkleLib {
}
if (key_found) {
PrivateKeyFilePath = MakeWindowsDomainAccountSafe (PrivateKeyFilePath);
PublicKeyFilePath = MakeWindowsDomainAccountSafe (PublicKeyFilePath);
PrivateKey = IO.File.ReadAllText (PrivateKeyFilePath);
PublicKey = IO.File.ReadAllText (PublicKeyFilePath);
@ -108,5 +113,15 @@ namespace SparkleLib {
SparkleLogger.LogInfo ("Auth", "Could not create key pair");
return false;
}
// Use forward slashes in paths when dealing with Windows domain accounts
string MakeWindowsDomainAccountSafe (string path)
{
if (path.StartsWith ("\\\\"))
return path.Replace ("\\", "/");
return path;
}
}
}