voltron/PowerCLI-Example-Scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug fixes (#499)

Browse Source 
* Add Certificates to External Identity Source

Signed-off-by: Dimitar Milov <dmilov@vmware.com>

* Add Credential parameter to Connect-SsoAdminServer

Signed-off-by: Dimitar Milov <dmilov@vmware.com>
This commit is contained in:
dmilov
2021-11-25 14:18:53 +02:00
committed by GitHub
parent 9d82c04d72
commit 8830d3ec2d
12 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/ActiveDirectoryIdentitySource.cs
View File

@@ -24,5 +24,7 @@ namespace VMware.vSphere.SsoAdminClient.DataTypes
public string FailoverUrl { get; set; }
public string UserBaseDN { get; set; }
public string GroupBaseDN { get; set; }
public System.Security.Cryptography.X509Certificates.X509Certificate2[] Certificates {get ;set;}
}
}

34
Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
View File

@@ -1232,32 +1232,34 @@ namespace VMware.vSphere.SsoAdminClient
var authorizedInvocationContext =
CreateAuthorizedInvocationContext();
var domains = authorizedInvocationContext.
var identitySources = authorizedInvocationContext.
InvokeOperation(() =>
_ssoAdminBindingClient.GetDomainsAsync(
_ssoAdminBindingClient.GetAsync(
new ManagedObjectReference
{
type = "SsoAdminDomainManagementService",
Value = "domainManagementService"
type = "SsoAdminIdentitySourceManagementService",
Value = "identitySourceManagementService"
})).Result;
if (domains != null)
if (identitySources != null)
{
var localos = new LocalOSIdentitySource();
localos.Name = domains.localOSDomainName;
localos.Name = identitySources.localOS.name;
yield return localos;
var system = new SystemIdentitySource();
system.Name = domains.systemDomainName;
yield return system;
foreach (var systemDomain in identitySources.system.domains) {
var system = new SystemIdentitySource();
system.Name = systemDomain.name;
yield return system;
}
if (domains.externalDomains != null && domains.externalDomains.Length > 0)
if (identitySources.ldaps != null && identitySources.ldaps.Length > 0)
{
foreach (var externalDomain in domains.externalDomains)
foreach (var externalDomain in identitySources.ldaps)
{
var extIdentitySource = new ActiveDirectoryIdentitySource();
extIdentitySource.Name = externalDomain.name;
extIdentitySource.Alias = externalDomain.alias;
extIdentitySource.Type = externalDomain.type;
extIdentitySource.AuthenticationType = externalDomain.authenticationDetails?.authenticationType;
extIdentitySource.AuthenticationUsername = externalDomain.authenticationDetails?.username;
@@ -1266,6 +1268,14 @@ namespace VMware.vSphere.SsoAdminClient
extIdentitySource.FailoverUrl = externalDomain.details?.failoverUrl;
extIdentitySource.GroupBaseDN = externalDomain.details?.groupBaseDn;
extIdentitySource.UserBaseDN = externalDomain.details?.userBaseDn;
if (externalDomain.details?.certificates != null && externalDomain.details?.certificates.Length > 0) {
var certificatesList = new List<X509Certificate2>();
foreach (var cert in externalDomain.details?.certificates) {
certificatesList.Add(new X509Certificate2(Encoding.ASCII.GetBytes(cert)));
}
extIdentitySource.Certificates = certificatesList.ToArray();
}
yield return extIdentitySource;
}
}

20
Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
View File

@@ -45,6 +45,26 @@ Describe "Connect-SsoAdminServer and Disconnect-SsoAdminServer Tests" {
$global:DefaultSsoAdminServers | Should -Contain $actual
}
It 'Connect-SsoAdminServer connects the server with PSCredential object' {
# Act
$securePassword = ConvertTo-SecureString -AsPlainText -Force -String $Password
$credential = New-Object `
-TypeName System.Management.Automation.PSCredential `
-ArgumentList $User, $securePassword
$actual = Connect-SsoAdminServer `
-Server $VcAddress `
-Credential $credential `
-SkipCertificateCheck
# Assert
$actual | Should -Not -Be $null
$actual.GetType().FullName | Should -Be 'VMware.vSphere.SsoAdminClient.DataTypes.SsoAdminServer'
$actual.IsConnected | Should -Be $true
$actual.Name | Should -Be $VcAddress
$global:DefaultSsoAdminServers | Should -Contain $actual
}
It 'Connect-SsoAdminServer throws error on invalid password' {
# Act
# Assert