bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2026-01-06 10:33:46 +00:00
Code Issues Releases Wiki Activity

tweaks for ldap

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-17 16:35:24 -04:00
parent 203876a527
commit 4b6b2884cb
4 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Console/Program.cs
View File

@@ -342,14 +342,22 @@ namespace Bit.Console
config.Ldap.Path = parameters["path"];
}
if(parameters.ContainsKey("u"))
if(parameters.ContainsKey("cu"))
{
config.Ldap.Username = parameters["u"];
config.Ldap.Username = null;
config.Ldap.Password = null;
}
if(parameters.ContainsKey("p"))
else
{
config.Ldap.Password = new EncryptedData(parameters["p"]);
if(parameters.ContainsKey("u"))
{
config.Ldap.Username = parameters["u"];
}
if(parameters.ContainsKey("p"))
{
config.Ldap.Password = new EncryptedData(parameters["p"]);
}
}
}
}
@@ -419,7 +427,7 @@ namespace Bit.Console
}
else
{
config.Ldap = new LdapConfiguration();
config.Ldap = config.Ldap ?? new LdapConfiguration();
Con.Write("Address [{0}]: ", config.Ldap.Address);
input = Con.ReadLine();
@@ -439,18 +447,36 @@ namespace Bit.Console
{
config.Ldap.Path = input.Trim();
}
Con.Write("Username [{0}]: ", config.Ldap.Username);
input = Con.ReadLine();
var currentUser = string.IsNullOrWhiteSpace(config.Ldap.Username) &&
config.Ldap.Password == null;
Con.Write("Authenticate as current user? [{0}]: ", currentUser ? "y" : "n");
input = Con.ReadLine().ToLower();
if(!string.IsNullOrEmpty(input))
{
config.Ldap.Username = input.Trim();
currentUser = input == "y" || input == "yes";
}
Con.Write("Password: ");
input = ReadSecureLine();
if(!string.IsNullOrEmpty(input))
if(currentUser)
{
config.Ldap.Password = new EncryptedData(input);
input = null;
config.Ldap.Username = null;
config.Ldap.Password = null;
}
else
{
Con.Write("Username [{0}]: ", config.Ldap.Username);
input = Con.ReadLine();
if(!string.IsNullOrEmpty(input))
{
config.Ldap.Username = input.Trim();
}
Con.Write("Password: ");
input = ReadSecureLine();
if(!string.IsNullOrEmpty(input))
{
config.Ldap.Password = new EncryptedData(input);
input = null;
}
}
}