Add windows user SID as 'UID' in user resource. Fix #960

lib/resources/user.rb

@@ -438,7 +438,7 @@ def identity(username)
         ConvertTo-Json
       EOH
 
-      cmd = inspec.script(script)
+      cmd = inspec.powershell(script)
 
       # cannot rely on exit code for now, successful command returns exit code 1
       # return nil if cmd.exit_status != 0, try to parse json
@@ -448,18 +448,18 @@ def identity(username)
         return nil
       end
 
-      user = params['User']['Caption'] unless params['User'].nil?
-      groups = params['Groups']
+      user_hash = params['User'] || {}
+      group_hashes = params['Groups'] || []
       # if groups is no array, generate one
-      groups = [groups] if !groups.is_a?(Array)
-      groups = groups.map { |grp| grp['Caption'] } unless params['Groups'].nil?
+      group_hashes = [group_hashes] unless group_hashes.is_a?(Array)
+      group_names = group_hashes.map { |grp| grp['Caption'] }
 
       {
-        uid: nil,
-        user: user,
+        uid: user_hash['SID'],
+        user: user_hash['Caption'],
         gid: nil,
         group: nil,
-        groups: groups,
+        groups: group_names,
       }
     end
 

test/integration/default/user_spec.rb

@@ -76,6 +76,8 @@
 if os.windows?
   describe user(userinfo[:name]) do
     it { should exist }
+    # should return the SID of the user
+    its('uid') { should_not eq nil}
   end
 else
   describe user(userinfo[:name]) do

test/unit/resources/user_test.rb

@@ -100,6 +100,7 @@
 
   it 'read user on Windows' do
     resource = MockLoader.new(:windows).load_resource('user', 'example/Administrator')
+    _(resource.uid).wont_be_nil
     _(resource.exists?).must_equal true
     _(resource.group).must_equal nil
     _(resource.groups).must_equal ['WIN-K0AKLED332V\\Administrators', 'EXAMPLE\\Domain Admins']