win_acl/Certificates: Low hanging fruit refactoring part 2

ansible-collections · Sep 6, 2023 · 0778ddd · 0778ddd
1 parent 520398e
commit 0778ddd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/plugins/module_utils/CertACLHelper.cs → plugins/module_utils/_CertACLHelper.cs b/plugins/module_utils/CertACLHelper.cs → plugins/module_utils/_CertACLHelper.cs
@@ -1,3 +1,7 @@
+// Note: The contents of this file are for internal use only! Do not depend on these classes
+//       or their methods and properties. The API can change without any warning or respect to
+//       semantic versioning.
+
 using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
@@ -18,12 +22,6 @@ public CryptHandle()
         {
         }
 
-        public CryptHandle(IntPtr handle)
-            : base(true)
-        {
-            this.SetHandle(handle);
-        }
-
         [DllImport("advapi32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool CryptReleaseContext(IntPtr safeProvHandle, uint dwFlags);

diff --git a/plugins/modules/win_acl.ps1 b/plugins/modules/win_acl.ps1
@@ -95,7 +95,7 @@ $inherit = Get-AnsibleParam -obj $params -name "inherit" -type "str"
 $propagation = Get-AnsibleParam -obj $params -name "propagation" -type "str" -default "None" -validateset "InheritOnly", "None", "NoPropagateInherit"
 $follow = Get-AnsibleParam -obj $params -name "follow" -type "bool" -default "false"
 
-# We mount the HKCR, HKU, and HKCC registry hives and the certificate stores so PS can access them.
+# We mount the HKCR, HKU, and HKCC registry hives so PS can access them.
 # Network paths have no qualifiers so we use -EA SilentlyContinue to ignore that
 $path_qualifier = Split-Path -Path $path -Qualifier -ErrorAction SilentlyContinue
 if ($path_qualifier -eq "HKCR:" -and (-not (Test-Path -LiteralPath HKCR:\))) {

diff --git a/tests/integration/targets/win_acl/tasks/tests.yml b/tests/integration/targets/win_acl/tasks/tests.yml
@@ -22,13 +22,13 @@
           "FileSystemRights"
       }
       $ace_list = (Get-Acl -LiteralPath $path).Access | Where-Object { $_.IsInherited -eq $false } | ForEach-Object {
-        @{
-            rights = $_."$rights_key".ToString()
-            type = $_.AccessControlType.ToString()
-            identity = $_.IdentityReference.Value.ToString()
-            inheritance_flags = $_.InheritanceFlags.ToString()
-            propagation_flags = $_.PropagationFlags.ToString()
-        }
+          @{
+              rights = $_."$rights_key".ToString()
+              type = $_.AccessControlType.ToString()
+              identity = $_.IdentityReference.Value.ToString()
+              inheritance_flags = $_.InheritanceFlags.ToString()
+              propagation_flags = $_.PropagationFlags.ToString()
+          }
       }
       Pop-Location
       ConvertTo-Json -InputObject @($ace_list)