From f6858cdd4d84c26d69c0adaffd868fedf64510bd Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Wed, 13 Sep 2017 06:00:28 +1000 Subject: [PATCH] windows facts: better way to get machine SID (#29821) * windows facts: better way to get machine SID * remove the substring and just get the property that contains the value we need --- lib/ansible/modules/windows/setup.ps1 | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/windows/setup.ps1 b/lib/ansible/modules/windows/setup.ps1 index 3b32fb5b406..b079489bd0a 100644 --- a/lib/ansible/modules/windows/setup.ps1 +++ b/lib/ansible/modules/windows/setup.ps1 @@ -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()