bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-10 21:33:20 +00:00
Code Issues Releases Wiki Activity

added gsuite type and secret config

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-18 15:28:24 -04:00
parent 53c5fce24c
commit 643cdf6e16
6 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Console/Program.cs
View File

@@ -315,6 +315,15 @@ namespace Bit.Console
config.Azure.Tenant = parameters["t"];
}
}
else if(config.Type == Core.Enums.DirectoryType.GSuite)
{
config.GSuite = new GSuiteConfiguration();
if(parameters.ContainsKey("f"))
{
config.GSuite.SecretFile = parameters["f"];
}
}
else
{
config.Ldap = config.Ldap ?? new LdapConfiguration();
@@ -358,7 +367,8 @@ namespace Bit.Console
Con.WriteLine("1. Active Directory");
Con.WriteLine("2. Azure Active Directory ");
Con.WriteLine("3. Other LDAP Directory");
Con.WriteLine("3. GSuite Directory");
Con.WriteLine("4. Other LDAP Directory");
string currentType;
switch(config.Type)
@@ -369,9 +379,12 @@ namespace Bit.Console
case Core.Enums.DirectoryType.AzureActiveDirectory:
currentType = "2";
break;
default:
case Core.Enums.DirectoryType.GSuite:
currentType = "3";
break;
default:
currentType = "4";
break;
}
Con.WriteLine();
Con.Write("Type [{0}]: ", currentType);
@@ -386,6 +399,9 @@ namespace Bit.Console
case "2":
config.Type = Core.Enums.DirectoryType.AzureActiveDirectory;
break;
case "3":
config.Type = Core.Enums.DirectoryType.GSuite;
break;
default:
config.Type = Core.Enums.DirectoryType.Other;
break;
@@ -416,6 +432,17 @@ namespace Bit.Console
input = null;
}
}
else if(config.Type == Core.Enums.DirectoryType.GSuite)
{
config.GSuite = config.GSuite ?? new GSuiteConfiguration();
Con.Write("Secret file [{0}]: ", config.GSuite.SecretFile);
input = Con.ReadLine();
if(!string.IsNullOrEmpty(input))
{
config.GSuite.SecretFile = input.Trim();
}
}
else
{
config.Ldap = config.Ldap ?? new LdapConfiguration();
@@ -523,7 +550,8 @@ namespace Bit.Console
config.RemoveDisabledUsers = parameters.ContainsKey("rd");
if(SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
if(SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.ActiveDirectory ||
SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.Other)
{
if(parameters.ContainsKey("go"))
{
@@ -593,8 +621,8 @@ namespace Bit.Console
{
config.SyncGroups = input == "y" || input == "yes";
}
if(config.SyncGroups &&
SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
if(config.SyncGroups && (SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.ActiveDirectory ||
SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.Other))
{
Con.Write("Group path [{0}]: ", config.Ldap.GroupPath);
input = Con.ReadLine();
@@ -628,8 +656,8 @@ namespace Bit.Console
{
config.SyncUsers = input == "y" || input == "yes";
}
if(config.SyncUsers &&
SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
if(config.SyncUsers && (SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.ActiveDirectory ||
SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.Other))
{
Con.Write("User path [{0}]: ", config.Ldap.UserPath);
input = Con.ReadLine();
@@ -680,7 +708,8 @@ namespace Bit.Console
config.UserFilter = input;
}
if(SettingsService.Instance.Server.Type != Core.Enums.DirectoryType.AzureActiveDirectory)
if(SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.ActiveDirectory ||
SettingsService.Instance.Server.Type == Core.Enums.DirectoryType.Other)
{
Con.Write("Member Attribute [{0}]: ", config.Ldap.MemberAttribute);
input = Con.ReadLine();
@@ -753,7 +782,7 @@ namespace Bit.Console
if(result.Success)
{
WriteSuccessLine(string.Format("Syncing complete ({0} users, {1} groups).",
WriteSuccessLine(string.Format("Syncing complete ({0} users, {1} groups).",
result.Users.Count, result.Groups.Count));
}
else

1
src/Core/Core.csproj
View File

@@ -90,6 +90,7 @@
<Compile Include="Models\ApiError.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\Entry.cs" />
<Compile Include="Models\GSuiteConfiguration.cs" />
<Compile Include="Models\ImportRequest.cs" />
<Compile Include="Models\AzureConfiguration.cs" />
<Compile Include="Models\ServerConfiguration.cs" />

3
src/Core/Enums/DirectoryType.cs
View File

@@ -10,6 +10,7 @@ namespace Bit.Core.Enums
{
ActiveDirectory = 0,
AzureActiveDirectory = 1,
Other = 2
Other = 2,
GSuite = 3
}
}

7
src/Core/Models/GSuiteConfiguration.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Bit.Core.Models
{
public class GSuiteConfiguration
{
public string SecretFile { get; set; } = "client_secret.json";
}
}

1
src/Core/Models/ServerConfiguration.cs
View File

@@ -13,5 +13,6 @@ namespace Bit.Core.Models
public Enums.DirectoryType Type { get; set; } = Enums.DirectoryType.ActiveDirectory;
public LdapConfiguration Ldap { get; set; }
public AzureConfiguration Azure { get; set; }
public GSuiteConfiguration GSuite { get; set; }
}
}

2
src/Core/Models/SyncConfiguration.cs
View File

@@ -22,8 +22,6 @@ namespace Bit.Core.Models
case DirectoryType.ActiveDirectory:
break;
case DirectoryType.AzureActiveDirectory:
GroupFilter = null;
UserFilter = null;
break;
case DirectoryType.Other:
IntervalMinutes = 60;