cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

windows facts: better way to get machine SID (#29821)

Browse source 
* windows facts: better way to get machine SID

* remove the substring and just get the property that contains the value we need
This commit is contained in:
Jordan Borean 2017-09-13 06:00:28 +10:00 committed by Matt Davis
parent 984af98b1e
commit f6858cdd4d
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/windows/setup.ps1
View file

@ -36,6 +36,24 @@ Function Get-CustomFacts {
}
}
Function Get-MachineSid {
# The Machine SID is stored in HKLM:\SECURITY\SAM\Domains\Account and is
# only accessible by the Local System account. This method get's the local
# admin account (ends with -500) and lops it off to get the machine sid.
Add-Type -AssemblyName System.DirectoryServices.AccountManagement
$principal_context = New-Object -TypeName System.DirectoryServices.AccountManagement.PrincipalContext([System.DirectoryServices.AccountManagement.ContextType]::Machine)
$user_principal = New-Object -TypeName System.DirectoryServices.AccountManagement.UserPrincipal($principal_context)
$searcher = New-Object -TypeName System.DirectoryServices.AccountManagement.PrincipalSearcher($user_principal)
$users = $searcher.FindAll() | Where-Object { $_.Sid -like "*-500" }
$machine_sid = $null
if ($users -ne $null) {
$machine_sid = $users.Sid.AccountDomainSid.Value
}
return $machine_sid
}
$result = @{
ansible_facts = @{ }
changed = $false
@ -147,7 +165,7 @@ $ansible_facts = @{
ansible_ip_addresses = $ips
ansible_kernel = $osversion.Version.ToString()
ansible_lastboot = $win32_os.lastbootuptime.ToString("u")
ansible_machine_id = $user.User.AccountDomainSid.Value
ansible_machine_id = Get-MachineSid
ansible_nodename = ($ip_props.HostName + "." + $ip_props.DomainName)
ansible_os_family = "Windows"
ansible_os_name = ($win32_os.Name.Split('|')[0]).Trim()