Update

Examples/Example-01-BackupGPOs.ps1

@@ -1,8 +1,7 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
 # Backup GPOs
-$BackupPath = "$Env:UserProfile\Desktop\GPO"
-$GPOSummary = Backup-GPOZaurr -BackupPath $BackupPath -Verbose -Type All #-BackupDated #-LimitProcessing 1
+$GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All -IncludeDomains 'ad.evotec.pl' #-BackupDated #-LimitProcessing 1
 $GPOSummary | Format-Table -AutoSize
 
 ## Confirm GPOs are backed up properly

Examples/Example-04-GPOInformation02.ps1

@@ -0,0 +1,7 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+#$GPOS = Get-GPOZaurr -GPOName 'TEST | Office Configuration'
+#$GPOS | Format-Table -AutoSize *
+
+$GPOS = Get-GPOZaurr -GPOName 'New Group Policy Object3'
+$GPOS | Format-Table -AutoSize *

Examples/Example-08-ListingPermissionIssues.ps1

@@ -0,0 +1,4 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+$Issues = Get-GPOZaurrPermissionIssue
+$Issues | Format-Table

Examples/Example-11-ReplaceGPOOwnerAutomated.ps1

@@ -4,14 +4,18 @@
 # And also can fix at the same time NotAdministrative - this basically looks for users/groups that are not Domain Admins or Enterprise Admins
 # regardless if current user is still Domain Admin or not
 
-$GPOs = Get-GPOZaurrOwner -IncludeSysvol #-GPOName
+$GPOs = Get-GPOZaurrOwner -IncludeSysvol
 $GPOs | Format-Table DisplayName, Owner, OwnerSID, OwnerType, SysvolOwner, SysvolSID, SysvolType
 
-#Set-GPOZaurrOwner -Type Unknown -Verbose  #-LimitProcessing 2 -WhatIf
-Set-GPOZaurrOwner -Type NotAdministrative -Verbose -LimitProcessing 2 -WhatIf
-#Set-GPOZaurrOwner -Type NotMatching -Verbose -LimitProcessing 2 -WhatIf
+Set-GPOZaurrOwner -Type Unknown -Verbose -WhatIf  #-LimitProcessing 2
+Set-GPOZaurrOwner -Type All -Verbose -LimitProcessing 2 -WhatIf -IncludeDomains 'ad.evotec.pl'
+Set-GPOZaurrOwner -Type NotMatching -Verbose -LimitProcessing 2 -WhatIf
 
-#Set-GPOZaurrOwner -GPOName 'COMPUTERS | Enable Sets' -Verbose -Principal 'przemyslaw.klys' -WhatIf #-SkipSysvol
-#Set-GPOZaurrOwner -GPOName 'New Group Policy Object' -Verbose #-WhatIf #-SkipSysvol
-#$GPOs = Get-GPOZaurrOwner -IncludeSysvol #-GPOName 'New Group Policy Object'
-#$GPOs | Format-Table DisplayName, Owner, OwnerSID
+# This will only set it to przemyslaw klys if the owner is not Domain Admins / Enterprise Admins
+# it's not working currently for any other object
+# You can enforce -Force to set it to any other principal
+Set-GPOZaurrOwner -GPOName 'COMPUTERS | Enable Sets' -Verbose -Principal 'przemyslaw.klys' -WhatIf:$false -Force #-SkipSysvol
+Set-GPOZaurrOwner -GPOName 'New Group Policy Object' -Verbose -WhatIf #-SkipSysvol
+
+$GPOs = Get-GPOZaurrOwner -IncludeSysvol #-GPOName 'New Group Policy Object'
+$GPOs | Format-Table DisplayName, Owner, OwnerSID

Examples/Example-11-ReplaceGPOOwnerPerGPO.ps1

@@ -9,7 +9,7 @@ $GPOs | Format-Table DisplayName, Owner, OwnerSID, OwnerType
 Set-GPOZaurrOwner -GPOName 'ALL | Enable RDP' -WhatIf
 
 # If principal is given it is set (of course if it exits). Otherwise warning is returned.
-Set-GPOZaurrOwner -GPOName 'ALL | Enable RDP' -Principal 'przemyslaw.klys' #-WhatIf
+Set-GPOZaurrOwner -GPOName 'ALL | Enable RDP' -Principal 'przemyslaw.klys' -WhatIf
 
 $GPOs = Get-GPOZaurr #-GPOName 'New Group Policy Object'
 $GPOs | Format-Table DisplayName, Owner, OwnerSID, OwnerType

Examples/Example-15-AddPermission01.ps1

@@ -0,0 +1,5 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+Add-GPOZaurrPermission -Type AuthenticatedUsers -PermissionType GpoRead -LimitProcessing 3 -All -WhatIf -Verbose #-IncludeDomains 'ad.evotec.pl'
+
+Add-GPOZaurrPermission -Type Administrative -PermissionType GpoEditDeleteModifySecurity -LimitProcessing 100 -All -WhatIf -Verbose #-IncludeDomains 'ad.evotec.pl'

Examples/Example-15-AddPermission02.ps1

@@ -0,0 +1,3 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+Add-GPOZaurrPermission -GPOName 'New Group Policy Object' -Type AuthenticatedUsers -PermissionType GpoRead -Verbose -WhatIf

Examples/Example-15-GetPermissions.ps1

@@ -0,0 +1,3 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+Get-GPOZaurrPermission -IncludePermissionType GpoRead -Type AuthenticatedUsers -ReturnSecurityWhenNoData | Format-Table

Examples/Example-16-AddRemoveGPOPermission01.ps1

@@ -1,17 +1,23 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-Clear-Host
-
 $T = Get-GPOZaurrPermission -GPOName 'ALL | Enable RDP' #-IncludeGPOObject #-ExcludePermissionType GpoApply,GpoRead -IncludeGPOObject
 $T | Format-Table -AutoSize *
 
-Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -Verbose
+#Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'CN=Przemysław Kłys,OU=Users,OU=Accounts,OU=Production,DC=ad,DC=evotec,DC=xyz' -PrincipalType DistinguishedName -Verbose #-WhatIf
+#Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'CN=Administrator,OU=Special,OU=Accounts,OU=Production,DC=ad,DC=evotec,DC=xyz' -PrincipalType DistinguishedName -Verbose #-WhatIf
+
+Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name -Verbose #-WhatIf
+Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'S-1-5-21-853615985-2870445339-3163598659-1105' -PrincipalType Sid -Verbose #-WhatIf
 
 $T = Get-GPOZaurrPermission -GPOName 'ALL | Enable RDP' #-ExcludePermissionType GpoApply,GpoRead -IncludeGPOObject
 $T | Format-Table -AutoSize *
 
-Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEditDeleteModifySecurity -Principal 'Domain Admins' -Verbose
-Remove-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name -Verbose
+Add-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEditDeleteModifySecurity -Principal 'Domain Admins' -PrincipalType Name -Verbose #-WhatIf
+Remove-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name -Verbose #-WhatIf
+Remove-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'EVOTEC\przemyslaw.klys' -PrincipalType NetbiosName -Verbose #-WhatIf
+Remove-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Principal 'CN=Przemysław Kłys,OU=Users,OU=Accounts,OU=Production,DC=ad,DC=evotec,DC=xyz' -PrincipalType DistinguishedName -Verbose #-WhatIf
+Remove-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEdit -Type NotAdministrative -Verbose
 
+Remove-GPOZaurrPermission -GPOName 'ALL | Enable RDP' -PermissionType GpoEditDeleteModifySecurity -PrincipalType DistinguishedName -Principal 'CN=Domain Admins,CN=Users,DC=ad,DC=evotec,DC=pl' -Verbose
 $T = Get-GPOZaurrPermission -GPOName 'ALL | Enable RDP' #-ExcludePermissionType GpoApply,GpoRead -IncludeGPOObject
 $T | Format-Table -AutoSize *

Examples/Example-20-RemoveOrphanedFoldersSysvol.ps1

@@ -1,7 +1,10 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
+# Find broken GPOs
+Get-GPOZaurrBroken -Verbose -IncludeDomains 'ad.evotec.pl' | Format-Table
+
 # this allows you to process X amount of orphaned folders/files (good for testing)
-Remove-GPOZaurrOrphaned -Verbose -WhatIf -IncludeDomains 'ad.evotec.xyz' #-LimitProcessing 2
+Remove-GPOZaurrBroken -Verbose -WhatIf -IncludeDomains 'ad.evotec.pl' #-LimitProcessing 2
 
 # this runs for whole SYSVOL and checks things against GPOS
-Remove-GPOZaurrOrphaned -Verbose -IncludeDomains 'ad.evotec.xyz' -BackupPath $Env:UserProfile\Desktop\MyBackup1 -WhatIf
+Remove-GPOZaurrBroken -Verbose -IncludeDomains 'ad.evotec.xyz' -BackupPath $Env:UserProfile\Desktop\MyBackup1 -WhatIf

Examples/Example-40-ShowGPO01.ps1

@@ -1,7 +1,7 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-$Output = Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Type GPOList -PassThru
+$Output = Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Type GPOOrphans -PassThru
 $Output
 
 Write-Color -Text 'Output of nested report' -Color DarkYellow -LinesBefore 1 -LinesAfter 1
-$Output.GPOList
+$Output.GPOOrphans

GPOZaurr.Tests.ps1

@@ -0,0 +1,59 @@
+$ModuleName = (Get-ChildItem $PSScriptRoot\*.psd1).BaseName
+$PrimaryModule = Get-ChildItem -Path $PSScriptRoot -Filter '*.psd1' -Recurse -ErrorAction SilentlyContinue -Depth 1
+if (-not $PrimaryModule) {
+    throw "Path $PSScriptRoot doesn't contain PSD1 files. Failing tests."
+}
+if ($PrimaryModule.Count -ne 1) {
+    throw 'More than one PSD1 files detected. Failing tests.'
+}
+$PSDInformation = Import-PowerShellDataFile -Path $PrimaryModule.FullName
+$RequiredModules = @(
+    'Pester'
+    'PSWriteColor'
+    'PSParseHTML'
+    if ($PSDInformation.RequiredModules) {
+        $PSDInformation.RequiredModules
+    }
+)
+foreach ($Module in $RequiredModules) {
+    if ($Module -is [System.Collections.IDictionary]) {
+        $Exists = Get-Module -ListAvailable -Name $Module.ModuleName
+        if (-not $Exists) {
+            Write-Warning "$ModuleName - Downloading $($Module.ModuleName) from PSGallery"
+            Install-Module -Name $Module.ModuleName -Force -SkipPublisherCheck
+        }
+    } else {
+        $Exists = Get-Module -ListAvailable $Module -ErrorAction SilentlyContinue
+        if (-not $Exists) {
+            Install-Module -Name $Module -Force -SkipPublisherCheck
+        }
+    }
+}
+
+Write-Color 'ModuleName: ', $ModuleName, ' Version: ', $PSDInformation.ModuleVersion -Color Yellow, Green, Yellow, Green -LinesBefore 2
+Write-Color 'PowerShell Version: ', $PSVersionTable.PSVersion -Color Yellow, Green
+Write-Color 'PowerShell Edition: ', $PSVersionTable.PSEdition -Color Yellow, Green
+Write-Color 'Required modules: ' -Color Yellow
+foreach ($Module in $PSDInformation.RequiredModules) {
+    if ($Module -is [System.Collections.IDictionary]) {
+        Write-Color '   [>] ', $Module.ModuleName, ' Version: ', $Module.ModuleVersion -Color Yellow, Green, Yellow, Green
+    } else {
+        Write-Color '   [>] ', $Module -Color Yellow, Green
+    }
+}
+Write-Color
+
+Import-Module $PSScriptRoot\*.psd1 -Force
+Import-Module Pester -Force
+$Configuration = [PesterConfiguration]::Default
+$Configuration.Run.Path = "$PSScriptRoot\Tests"
+$Configuration.Run.Exit = $true
+$Configuration.Should.ErrorAction = 'Continue'
+$Configuration.CodeCoverage.Enabled = $false
+$Configuration.Output.Verbosity = 'Detailed'
+$Result = Invoke-Pester -Configuration $Configuration
+#$result = Invoke-Pester -Script $PSScriptRoot\Tests -Verbose -Output Detailed #-EnableExit
+
+if ($Result.FailedCount -gt 0) {
+    throw "$($Result.FailedCount) tests failed."
+}

GPOZaurr.psd1

@@ -6,9 +6,9 @@
     CompatiblePSEditions = @('Desktop')
     Copyright            = '(c) 2011 - 2020 Przemyslaw Klys @ Evotec. All rights reserved.'
     Description          = 'Group Policy Eater is a PowerShell module that aims to gather information about Group Policies but also allows fixing issues that you may find in them.'
-    FunctionsToExport    = @('Add-GPOPermission', 'Add-GPOZaurrPermission', 'Backup-GPOZaurr', 'Clear-GPOZaurrSysvolDFSR', 'ConvertFrom-CSExtension', 'Find-CSExtension', 'Get-GPOZaurr', 'Get-GPOZaurrAD', 'Get-GPOZaurrBackupInformation', 'Get-GPOZaurrBroken', 'Get-GPOZaurrDictionary', 'Get-GPOZaurrDuplicateObject', 'Get-GPOZaurrFiles', 'Get-GPOZaurrFilesPolicyDefinition', 'Get-GPOZaurrFolders', 'Get-GPOZaurrInheritance', 'Get-GPOZaurrLegacyFiles', 'Get-GPOZaurrLink', 'Get-GPOZaurrLinkSummary', 'Get-GPOZaurrNetLogon', 'Get-GPOZaurrOwner', 'Get-GPOZaurrPassword', 'Get-GPOZaurrPermission', 'Get-GPOZaurrPermissionConsistency', 'Get-GPOZaurrPermissionRoot', 'Get-GPOZaurrPermissionSummary', 'Get-GPOZaurrSysvolDFSR', 'Get-GPOZaurrWMI', 'Invoke-GPOZaurr', 'Invoke-GPOZaurrContent', 'Invoke-GPOZaurrPermission', 'Invoke-GPOZaurrSupport', 'New-GPOZaurrWMI', 'Optimize-GPOZaurr', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrBroken', 'Remove-GPOZaurrDuplicateObject', 'Remove-GPOZaurrFolders', 'Remove-GPOZaurrLegacyFiles', 'Remove-GPOZaurrPermission', 'Remove-GPOZaurrWMI', 'Repair-GPOZaurrNetLogonOwner', 'Repair-GPOZaurrPermissionConsistency', 'Restore-GPOZaurr', 'Save-GPOZaurrFiles', 'Set-GPOOwner', 'Set-GPOZaurrOwner')
+    FunctionsToExport    = @('Add-GPOPermission', 'Add-GPOZaurrPermission', 'Backup-GPOZaurr', 'Clear-GPOZaurrSysvolDFSR', 'ConvertFrom-CSExtension', 'Find-CSExtension', 'Get-GPOZaurr', 'Get-GPOZaurrAD', 'Get-GPOZaurrBackupInformation', 'Get-GPOZaurrBroken', 'Get-GPOZaurrDictionary', 'Get-GPOZaurrDuplicateObject', 'Get-GPOZaurrFiles', 'Get-GPOZaurrFilesPolicyDefinition', 'Get-GPOZaurrFolders', 'Get-GPOZaurrInheritance', 'Get-GPOZaurrLegacyFiles', 'Get-GPOZaurrLink', 'Get-GPOZaurrLinkSummary', 'Get-GPOZaurrNetLogon', 'Get-GPOZaurrOwner', 'Get-GPOZaurrPassword', 'Get-GPOZaurrPermission', 'Get-GPOZaurrPermissionConsistency', 'Get-GPOZaurrPermissionIssue', 'Get-GPOZaurrPermissionRoot', 'Get-GPOZaurrPermissionSummary', 'Get-GPOZaurrSysvolDFSR', 'Get-GPOZaurrWMI', 'Invoke-GPOZaurr', 'Invoke-GPOZaurrContent', 'Invoke-GPOZaurrPermission', 'Invoke-GPOZaurrSupport', 'New-GPOZaurrWMI', 'Optimize-GPOZaurr', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrBroken', 'Remove-GPOZaurrDuplicateObject', 'Remove-GPOZaurrFolders', 'Remove-GPOZaurrLegacyFiles', 'Remove-GPOZaurrPermission', 'Remove-GPOZaurrWMI', 'Repair-GPOZaurrNetLogonOwner', 'Repair-GPOZaurrPermissionConsistency', 'Restore-GPOZaurr', 'Save-GPOZaurrFiles', 'Set-GPOOwner', 'Set-GPOZaurrOwner')
     GUID                 = 'f7d4c9e4-0298-4f51-ad77-e8e3febebbde'
-    ModuleVersion        = '0.0.78'
+    ModuleVersion        = '0.0.83'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{
@@ -18,7 +18,7 @@
         }
     }
     RequiredModules      = @(@{
-            ModuleVersion = '0.0.187'
+            ModuleVersion = '0.0.188'
             ModuleName    = 'PSSharedGoods'
             Guid          = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe'
         }, @{

Private/Get-PrivPermission.ps1

@@ -166,7 +166,7 @@
             #>
 
             # I don't trust the returned data, some stuff like 'alias' shows up for groups. To unify it with everything else... using my own function
-            $PermissionAccount = Get-WinADObject -Identity $GPOPermission.Trustee.Sid.Value -AddType -Cache
+            $PermissionAccount = Get-WinADObject -Identity $GPOPermission.Trustee.Sid.Value -AddType -Cache -Verbose:$false
             if ($PermissionAccount) {
                 $UserNameDomain = $PermissionAccount.DomainName
                 $UserName = $PermissionAccount.Name
@@ -214,7 +214,7 @@
         if ($IncludeOwner) {
             if ($GPO.Owner) {
                 # I don't trust the returned data, some stuff like 'alias' shows up for groups. To unify it with everything else... using my own function
-                $OwnerAccount = Get-WinADObject -Identity $GPO.Owner -AddType -Cache
+                $OwnerAccount = Get-WinADObject -Identity $GPO.Owner -AddType -Cache -Verbose:$false
                 if ($OwnerAccount) {
                     $UserNameDomain = $OwnerAccount.DomainName
                     $UserName = $OwnerAccount.Name

Private/Get-XMLGPO.ps1

@@ -27,13 +27,11 @@
         $LinksDisabledCount = 0
         $LinksTotalCount = 0
     }
-    if ($null -eq $XMLContent.GPO.Computer.ExtensionData -and $null -eq $XMLContent.GPO.User.ExtensionData) {
-        $Empty = $true
-    } else {
-        $Empty = $false
-    }
-
-
+    #if ($null -eq $XMLContent.GPO.Computer.ExtensionData -and $null -eq $XMLContent.GPO.User.ExtensionData) {
+    #    $Empty = $true
+    #} else {
+    #    $Empty = $false
+    #}
     # Find proper values for enabled/disabled user/computer settings
     if ($XMLContent.GPO.Computer.Enabled -eq 'False') {
         $ComputerEnabled = $false
@@ -59,12 +57,55 @@
     $ComputerSettingsAvailable = if ($null -eq $XMLContent.GPO.Computer.ExtensionData) { $false } else { $true }
     $UserSettingsAvailable = if ($null -eq $XMLContent.GPO.User.ExtensionData) { $false } else { $true }
 
+    if ($ComputerSettingsAvailable -eq $false -and $UserSettingsAvailable -eq $false) {
+        $Empty = $true
+    } else {
+        $Empty = $false
+    }
+
+    # $OutputUser = $XMLContent.GPO.User.ExtensionData.Extension | Where-Object { $_.PSObject.Properties.TypeNameOfValue -in 'System.Xml.XmlElement', 'System.Object[]' }
+    # $OutputComputer = $XMLContent.GPO.Computer.ExtensionData.Extension | Where-Object { $_.PSObject.Properties.TypeNameOfValue -in 'System.Xml.XmlElement', 'System.Object[]' }
+
+    $OutputUser = foreach ($ExtensionType in $XMLContent.GPO.User.ExtensionData.Extension) {
+        if ($ExtensionType) {
+            $GPOSettingTypeSplit = ($ExtensionType.type -split ':')
+            try {
+                $KeysToLoop = $ExtensionType | Get-Member -MemberType Properties -ErrorAction Stop | Where-Object { $_.Name -notin 'type', $GPOSettingTypeSplit[0] -and $_.Name -notin @('Blocked') }
+            } catch {
+                Write-Warning "Get-XMLStandard - things went sideways $($_.Exception.Message)"
+                continue
+            }
+        }
+        $KeysToLoop
+    }
+    $OutputComputer = foreach ($ExtensionType in $XMLContent.GPO.Computer.ExtensionData.Extension) {
+        if ($ExtensionType) {
+            $GPOSettingTypeSplit = ($ExtensionType.type -split ':')
+            try {
+                $KeysToLoop = $ExtensionType | Get-Member -MemberType Properties -ErrorAction Stop | Where-Object { $_.Name -notin 'type', $GPOSettingTypeSplit[0] -and $_.Name -notin @('Blocked') }
+            } catch {
+                Write-Warning "Get-XMLStandard - things went sideways $($_.Exception.Message)"
+                continue
+            }
+        }
+        $KeysToLoop
+    }
+
+    $ComputerSettingsAvailableReal = if ($OutputComputer) { $true } else { $false }
+    $UserSettingsAvailableReal = if ($OutputUser) { $true } else { $false }
+
+    if (-not $ComputerSettingsAvailableReal -and -not $UserSettingsAvailableReal) {
+        $EmptyMaybe = $true
+    } else {
+        $EmptyMaybe = $false
+    }
+
     $ComputerProblem = $false
-    if ($ComputerEnabled -eq $true -and $ComputerSettingsAvailable -eq $true) {
+    if ($ComputerEnabled -eq $true -and $ComputerSettingsAvailableReal -eq $true) {
         $ComputerOptimized = $true
-    } elseif ($ComputerEnabled -eq $true -and $ComputerSettingsAvailable -eq $false) {
+    } elseif ($ComputerEnabled -eq $true -and $ComputerSettingsAvailableReal -eq $false) {
         $ComputerOptimized = $false
-    } elseif ($ComputerEnabled -eq $false -and $ComputerSettingsAvailable -eq $false) {
+    } elseif ($ComputerEnabled -eq $false -and $ComputerSettingsAvailableReal -eq $false) {
         $ComputerOptimized = $true
     } else {
         # Enabled $false, but ComputerData is there.
@@ -73,11 +114,11 @@
     }
 
     $UserProblem = $false
-    if ($UserEnabled -eq $true -and $UserSettingsAvailable -eq $true) {
+    if ($UserEnabled -eq $true -and $UserSettingsAvailableReal -eq $true) {
         $UserOptimized = $true
-    } elseif ($UserEnabled -eq $true -and $UserSettingsAvailable -eq $false) {
+    } elseif ($UserEnabled -eq $true -and $UserSettingsAvailableReal -eq $false) {
         $UserOptimized = $false
-    } elseif ($UserEnabled -eq $false -and $UserSettingsAvailable -eq $false) {
+    } elseif ($UserEnabled -eq $false -and $UserSettingsAvailableReal -eq $false) {
         $UserOptimized = $true
     } else {
         # Enabled $false, but UserData is there.
@@ -148,6 +189,7 @@
             'DomainName'                        = $XMLContent.GPO.Identifier.Domain.'#text'
             'GUID'                              = $XMLContent.GPO.Identifier.Identifier.InnerText -replace '{' -replace '}'
             'Empty'                             = $Empty
+            'EmptyMaybe'                        = $EmptyMaybe
             'Linked'                            = $Linked
             'LinksCount'                        = $LinksTotalCount
             'LinksEnabledCount'                 = $LinksEnabledCount
@@ -161,6 +203,10 @@
             'UserProblem'                       = $UserProblem
             'ComputerSettingsAvailable'         = $ComputerSettingsAvailable
             'UserSettingsAvailable'             = $UserSettingsAvailable
+            'ComputerSettingsAvailableReal'     = $ComputerSettingsAvailableReal
+            'UserSettingsAvailableReal'         = $UserSettingsAvailableReal
+            'ComputerSettingsTypes'             = $OutputComputer.Name
+            'UserSettingsTypes'                 = $OutputUser.Name
             'ComputerSettingsStatus'            = if ($XMLContent.GPO.Computer.VersionDirectory -eq 0 -and $XMLContent.GPO.Computer.VersionSysvol -eq 0) { "NeverModified" } else { "Modified" }
             'ComputerSetttingsVersionIdentical' = if ($XMLContent.GPO.Computer.VersionDirectory -eq $XMLContent.GPO.Computer.VersionSysvol) { $true } else { $false }
             'ComputerSettings'                  = $XMLContent.GPO.Computer.ExtensionData.Extension

Private/Invoke.GPOZaurrConsistency.ps1

@@ -17,7 +17,7 @@
                 $Script:Reporting['GPOConsistency']['Variables']['InconsistentInside']++
             }
         }
-        if ($Script:Reporting['GPOConsistency']['Variables']['Inconsistent'].Count -gt 0 -or $Script:Reporting['GPOConsistency']['Variables']['InconsistentInside'].Count -gt 0 ) {
+        if ($Script:Reporting['GPOConsistency']['Variables']['Inconsistent'] -gt 0 -or $Script:Reporting['GPOConsistency']['Variables']['InconsistentInside'] -gt 0 ) {
             $Script:Reporting['GPOConsistency']['ActionRequired'] = $true
         } else {
             $Script:Reporting['GPOConsistency']['ActionRequired'] = $false

Private/Invoke.GPOZaurrList.ps1

@@ -65,7 +65,7 @@
             }
         }
         $Script:Reporting['GPOList']['Variables']['GPOTotal'] = $Script:Reporting['GPOList']['Data'].Count
-        if ($Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked'].Count -gt 0) {
+        if ($Script:Reporting['GPOList']['Variables']['GPOEmptyOrUnlinked'] -gt 0) {
             $Script:Reporting['GPOList']['ActionRequired'] = $true
         } else {
             $Script:Reporting['GPOList']['ActionRequired'] = $false

Private/Invoke.GPOZaurrNetLogonPermissions.ps1

@@ -30,7 +30,7 @@
                 $Script:Reporting['NetLogonPermissions']['Variables']['NonOwner'].Add($File)
             }
         }
-        if ($Script:Reporting['NetLogonPermissions']['Variables']['NetLogonOwnersToFix'].Count -gt 0) {
+        if ($Script:Reporting['NetLogonPermissions']['Variables']['NetLogonOwnersToFix'] -gt 0) {
             $Script:Reporting['NetLogonPermissions']['ActionRequired'] = $true
         } else {
             $Script:Reporting['NetLogonPermissions']['ActionRequired'] = $false

Private/Invoke.GPOZaurrOrphans.ps1

@@ -7,30 +7,44 @@
         Get-GPOZaurrBroken
     }
     Processing     = {
+        $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'] = @{}
+        $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssuePerDomain'] = @{}
         foreach ($GPO in $Script:Reporting['GPOOrphans']['Data']) {
+            if (-not $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'][$GPO.DomainName] = 0
+            }
+            if (-not $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssuePerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssuePerDomain'][$GPO.DomainName] = 0
+            }
             if ($GPO.Status -eq 'Not available in AD') {
                 $Script:Reporting['GPOOrphans']['Variables']['NotAvailableInAD']++
                 $Script:Reporting['GPOOrphans']['Variables']['ToBeDeleted']++
+                $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'][$GPO.DomainName]++
             } elseif ($GPO.Status -eq 'Not available on SYSVOL') {
                 $Script:Reporting['GPOOrphans']['Variables']['NotAvailableOnSysvol']++
                 $Script:Reporting['GPOOrphans']['Variables']['ToBeDeleted']++
+                $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'][$GPO.DomainName]++
             } elseif ($GPO.Status -eq 'Permissions issue') {
                 $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssue']++
+                $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssuePerDomain'][$GPO.DomainName]++
             }
         }
-        if ($Script:Reporting['GPOOrphans']['Variables']['ToBeDeleted'].Count -gt 0) {
+        if ($Script:Reporting['GPOOrphans']['Variables']['ToBeDeleted'] -gt 0) {
             $Script:Reporting['GPOOrphans']['ActionRequired'] = $true
         } else {
             $Script:Reporting['GPOOrphans']['ActionRequired'] = $false
         }
     }
     Variables      = @{
-        NotAvailableInAD            = 0
-        NotAvailableOnSysvol        = 0
-        NotAvailablePermissionIssue = 0
-        ToBeDeleted                 = 0
+        NotAvailableInAD                     = 0
+        NotAvailableOnSysvol                 = 0
+        NotAvailablePermissionIssue          = 0
+        NotAvailablePermissionIssuePerDomain = $null
+        ToBeDeleted                          = 0
+        ToBeDeletedPerDomain                 = $null
     }
     Overview       = {
+        <#
         New-HTMLPanel {
             New-HTMLText -TextBlock {
                 "Group Policies are stored in two places - Active Directory (metadata) and SYSVOL (content)."
@@ -55,12 +69,13 @@
                 New-ChartBar -Name 'Orphans' -Value $Script:Reporting['GPOOrphans']['Variables']['NotAvailableInAD'], $Script:Reporting['GPOOrphans']['Variables']['NotAvailableOnSysvol'], $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssue']
             } -Title 'Broken / Orphaned Group Policies' -TitleAlignment center
         }
+        #>
     }
     Summary        = {
         New-HTMLText -TextBlock {
             "Group Policies are stored in two places - Active Directory (metadata) and SYSVOL (content)."
             "Since those are managed in different ways, replicated in different ways it's possible because of different issues they get out of sync."
-        } -FontSize 10pt
+        } -FontSize 10pt -LineBreak
         New-HTMLText -Text "For example:" -FontSize 10pt -FontWeight bold
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'USN Rollback in AD could cause already deleted Group Policies to reapper in Active Directory, yet SYSVOL data would be unavailable'
@@ -74,6 +89,12 @@
             New-HTMLListItem -Text 'Group Policies in AD, but no content on SYSVOL: ', $Script:Reporting['GPOOrphans']['Variables']['NotAvailableOnSysvol'] -FontWeight normal, bold
             New-HTMLListItem -Text "Group Policies which couldn't be assed due to permissions issue: ", $Script:Reporting['GPOOrphans']['Variables']['NotAvailablePermissionIssue'] -FontWeight normal, bold
         } -FontSize 10pt
+        New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
+        New-HTMLList -Type Unordered {
+            foreach ($Domain in $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'].Keys) {
+                New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOOrphans']['Variables']['ToBeDeletedPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
+            }
+        } -FontSize 10pt
         New-HTMLText -Text "Please review output in table and follow the steps below table to get Active Directory Group Policies in healthy state." -FontSize 10pt
     }
     Solution       = {
@@ -124,6 +145,22 @@
                             }
                             New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
                         }
+                        New-HTMLWizardStep -Name 'Make a backup (optional)' {
+                            New-HTMLText -TextBlock {
+                                "The process fixing broken GPOs will delete AD or SYSVOL content depending on type of a problem. "
+                                "While it's always useful to have a backup, this backup won't actually backup those broken group policies"
+                                " for a simple reason that those are not backupable. You can't back up GPO if there is no SYSVOL content"
+                                " and you can't backup GPO if there's only SYSVOL content. "
+                                "However, since the script does make changes to GPOs it's advised to have a backup anyways! "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                $GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All
+                                $GPOSummary | Format-Table # only if you want to display output of backup
+                            }
+                            New-HTMLText -TextBlock {
+                                "Above command when executed will make a backup to Desktop, create GPO folder and within it it will put all those GPOs. "
+                            }
+                        }
                         New-HTMLWizardStep -Name 'Fix GPOs not available in AD' {
                             New-HTMLText -Text @(
                                 "Following command when executed runs cleanup procedure that removes all broken GPOs on SYSVOL side. ",

Private/Invoke.GPOZaurrOwners.ps1

@@ -5,7 +5,18 @@
     Data           = $null
     Execute        = { Get-GPOZaurrOwner -IncludeSysvol }
     Processing     = {
+        # Create Per Domain Variables
+        $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'] = @{}
+        $Script:Reporting['GPOOwners']['Variables']['WillFixPerDomain'] = @{}
         foreach ($GPO in $Script:Reporting['GPOOwners']['Data']) {
+            # Create Per Domain Variables
+            if (-not $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'][$GPO.DomainName] = 0
+            }
+            if (-not $Script:Reporting['GPOOwners']['Variables']['WillFixPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOOwners']['Variables']['WillFixPerDomain'][$GPO.DomainName] = 0
+            }
+            # Checks
             if ($GPO.IsOwnerConsistent) {
                 $Script:Reporting['GPOOwners']['Variables']['IsConsistent']++
             } else {
@@ -18,28 +29,33 @@
             }
             if (($GPO.IsOwnerAdministrative -eq $false -or $GPO.IsOwnerConsistent -eq $false) -and $GPO.SysvolExists -eq $true) {
                 $Script:Reporting['GPOOwners']['Variables']['WillFix']++
+                $Script:Reporting['GPOOwners']['Variables']['WillFixPerDomain'][$GPO.DomainName]++
             } elseif ($GPO.SysvolExists -eq $false) {
                 $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFix']++
+                $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'][$GPO.DomainName]++
             } else {
                 $Script:Reporting['GPOOwners']['Variables']['WillNotTouch']++
             }
         }
-        if ($Script:Reporting['GPOOwners']['Variables']['WillFix'].Count -gt 0) {
+        if ($Script:Reporting['GPOOwners']['Variables']['WillFix'] -gt 0) {
             $Script:Reporting['GPOOwners']['ActionRequired'] = $true
         } else {
             $Script:Reporting['GPOOwners']['ActionRequired'] = $false
         }
     }
     Variables      = @{
-        IsAdministrative    = 0
-        IsNotAdministrative = 0
-        IsConsistent        = 0
-        IsNotConsistent     = 0
-        WillFix             = 0
-        RequiresDiffFix     = 0
-        WillNotTouch        = 0
+        IsAdministrative         = 0
+        IsNotAdministrative      = 0
+        IsConsistent             = 0
+        IsNotConsistent          = 0
+        WillFix                  = 0
+        RequiresDiffFix          = 0
+        WillNotTouch             = 0
+        RequiresDiffFixPerDomain = $null
+        WillFixPerDomain         = $null
     }
     Overview       = {
+        <#
         New-HTMLPanel {
             New-HTMLText -Text 'Following chart presents Group Policy owners and whether they are administrative and consistent. By design an owner of Group Policy should be Domain Admins or Enterprise Admins group only to prevent malicious takeover. ', `
                 "It's also important that owner in Active Directory matches owner on SYSVOL (file system)." -FontSize 10pt
@@ -56,6 +72,7 @@
                 New-ChartBar -Name 'Is consistent' -Value $Script:Reporting['GPOOwners']['Variables']['IsConsistent'], $Script:Reporting['GPOOwners']['Variables']['IsNotConsistent']
             } -Title 'Group Policy Owners' -TitleAlignment center
         }
+        #>
     }
     Summary        = {
         New-HTMLText -FontSize 10pt -TextBlock {
@@ -77,12 +94,24 @@
             New-HTMLListItem -Text "Owners consistent in AD and SYSVOL: ", $Script:Reporting['GPOOwners']['Variables']['IsConsistent'] -FontWeight normal, bold
             New-HTMLListItem -Text "Owners not-consistent in AD and SYSVOL: ", $Script:Reporting['GPOOwners']['Variables']['IsNotConsistent'] -FontWeight normal, bold
         } -FontSize 10pt
-        New-HTMLText -FontSize 10pt -Text "This gives us: "
+        New-HTMLText -FontSize 10pt -Text "Following will need to happen: " -FontWeight bold
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Group Policies requiring owner change: ', $Script:Reporting['GPOOwners']['Variables']['WillFix'] -FontWeight normal, bold
             New-HTMLListItem -Text "Group Policies which can't be fixed (no SYSVOL?): ", $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFix'] -FontWeight normal, bold
             New-HTMLListItem -Text "Group Policies unaffected: ", $Script:Reporting['GPOOwners']['Variables']['WillNotTouch'] -FontWeight normal, bold
         } -FontSize 10pt
+        New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
+        New-HTMLList -Type Unordered {
+            foreach ($Domain in $Script:Reporting['GPOOwners']['Variables']['WillFixPerDomain'].Keys) {
+                New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOOwners']['Variables']['WillFixPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
+            }
+        } -FontSize 10pt
+        New-HTMLText -Text 'Following domains require fixing using, ', 'different methods:' -FontSize 10pt -FontWeight bold, bold -Color Black, RedRobin -TextDecoration none, underline
+        New-HTMLList -Type Unordered {
+            foreach ($Domain in $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'].Keys) {
+                New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
+            }
+        } -FontSize 10pt
     }
     Solution       = {
         New-HTMLSection -Invisible {
@@ -104,18 +133,10 @@
                 New-HTMLTableCondition -Name 'IsOwnerAdministrative' -Value $false -BackgroundColor Salmon -ComparisonType string -Row
             } -PagingOptions 10, 20, 30, 40, 50
         }
-        if ($Script:Reporting['GPOOwners']['WarningsAndErrors']) {
-            New-HTMLSection -Name 'Warnings & Errors to Review' {
-                New-HTMLTable -DataTable $Script:Reporting['GPOOwners']['WarningsAndErrors'] -Filtering {
-                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
-                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
-                }
-            }
-        }
         New-HTMLSection -Name 'Steps to fix Group Policy Owners' {
             New-HTMLContainer {
                 New-HTMLSpanStyle -FontSize 10pt {
-                    New-HTMLText -Text 'Following steps will guide you how to fix group policy owners'
+                    #New-HTMLText -Text 'Following steps will guide you how to fix group policy owners'
                     New-HTMLWizard {
                         New-HTMLWizardStep -Name 'Prepare environment' {
                             New-HTMLText -Text "To be able to execute actions in automated way please install required modules. Those modules will be installed straight from Microsoft PowerShell Gallery."
@@ -141,19 +162,44 @@
                             }
                             New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
                         }
+                        New-HTMLWizardStep -Name 'Make a backup (optional)' {
+                            New-HTMLText -TextBlock {
+                                "The process of fixing GPO Owner does NOT touch GPO content. It simply changes owners on AD and SYSVOL at the same time. "
+                                "However, it's always good to have a backup before executing changes that may impact Active Directory. "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                $GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All
+                                $GPOSummary | Format-Table # only if you want to display output of backup
+                            }
+                            New-HTMLText -TextBlock {
+                                "Above command when executed will make a backup to Desktop, create GPO folder and within it it will put all those GPOs. "
+                            }
+                        }
                         New-HTMLWizardStep -Name 'Set GPO Owners to Administrative (Domain Admins)' {
                             New-HTMLText -Text "Following command will find any GPO which doesn't have proper GPO Owner (be it due to inconsistency or not being Domain Admin) and will enforce new GPO Owner. "
                             New-HTMLText -Text "Make sure when running it for the first time to run it with ", "WhatIf", " parameter as shown below to prevent accidental removal." -FontWeight normal, bold, normal -Color Black, Red, Black
-
                             New-HTMLCodeBlock -Code {
                                 Set-GPOZaurrOwner -Type All -Verbose -WhatIf
                             }
                             New-HTMLText -TextBlock {
-                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be changed matches expected data. Once happy with results please follow with command: "
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
                             }
+                            New-HTMLCodeBlock -Code {
+                                Set-GPOZaurrOwner -Type All -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be changed matches expected data."
+                            } -LineBreak
+                            New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
                             New-HTMLCodeBlock -Code {
                                 Set-GPOZaurrOwner -Type All -Verbose -LimitProcessing 2
                             }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Set-GPOZaurrOwner -Type All -Verbose -LimitProcessing 2 -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
                             New-HTMLText -TextBlock {
                                 "This command when executed sets new owner only on first X non-compliant GPO Owners for AD/SYSVOL. Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur."
                                 "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
@@ -172,5 +218,13 @@
                 }
             }
         }
+        if ($Script:Reporting['GPOOwners']['WarningsAndErrors']) {
+            New-HTMLSection -Name 'Warnings & Errors to Review' {
+                New-HTMLTable -DataTable $Script:Reporting['GPOOwners']['WarningsAndErrors'] -Filtering {
+                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
+                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
+                } -PagingOptions 10, 20, 30, 40, 50
+            }
+        }
     }
 }

Private/Invoke.GPOZaurrPermissionsRead.ps1

@@ -0,0 +1,246 @@
+$GPOZaurrPermissionsRead = [ordered] @{
+    Name       = 'Group Policy Authenticated Users Permissions'
+    Enabled    = $true
+    Action     = $null
+    Data       = $null
+    Execute    = {
+        [ordered] @{
+            Permissions = Get-GPOZaurrPermission -Type AuthenticatedUsers -ReturnSecurityWhenNoData
+            Issues      = Get-GPOZaurrPermissionIssue
+        }
+    }
+    Processing = {
+        # This is a workaround - we need to use it since we have 0 permissions
+
+        # Create Per Domain Variables
+        $Script:Reporting['GPOPermissionsRead']['Variables']['WillFixPerDomain'] = @{}
+        $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouchPerDomain'] = @{}
+        $Script:Reporting['GPOPermissionsRead']['Variables']['ReadPerDomain'] = @{}
+        $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotReadPerDomain'] = @{}
+
+        foreach ($GPO in $Script:Reporting['GPOPermissionsRead']['Data'].Issues) {
+            # Create Per Domain Variables
+            if (-not $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotReadPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotReadPerDomain'][$GPO.DomainName] = 0
+            }
+            if (-not $Script:Reporting['GPOPermissionsRead']['Variables']['ReadPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['ReadPerDomain'][$GPO.DomainName] = 0
+            }
+            if ($GPO.PermissionIssue) {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotRead']++
+                $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotReadPerDomain'][$GPO.DomainName]++
+            } else {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['Read']++
+                $Script:Reporting['GPOPermissionsRead']['Variables']['ReadPerDomain'][$GPO.DomainName]++
+            }
+        }
+        foreach ($GPO in $Script:Reporting['GPOPermissionsRead']['Data'].Permissions) {
+            # Create Per Domain Variables
+            if (-not $Script:Reporting['GPOPermissionsRead']['Variables']['WillFixPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['WillFixPerDomain'][$GPO.DomainName] = 0
+            }
+            if (-not $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouchPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouchPerDomain'][$GPO.DomainName] = 0
+            }
+            # Checks
+            if ($GPO.Permission -in 'GpoApply', 'GpoRead') {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouch']++
+                $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouchPerDomain'][$GPO.DomainName]++
+            } else {
+                $Script:Reporting['GPOPermissionsRead']['Variables']['WillFix']++
+                $Script:Reporting['GPOPermissionsRead']['Variables']['WillFixPerDomain'][$GPO.DomainName]++
+            }
+        }
+        if ($Script:Reporting['GPOPermissionsRead']['Variables']['WillFix'] -gt 0 -or $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotRead'] -gt 0) {
+            $Script:Reporting['GPOPermissionsRead']['ActionRequired'] = $true
+        } else {
+            $Script:Reporting['GPOPermissionsRead']['ActionRequired'] = $false
+        }
+        # Summary from 2 reports
+        $Script:Reporting['GPOPermissionsRead']['Variables']['TotalToFix'] = $Script:Reporting['GPOPermissionsRead']['Variables']['WillFix'] + $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotRead']
+    }
+    Variables  = @{
+        WillFix               = 0
+        WillNotTouch          = 0
+        WillFixPerDomain      = $null
+        WillNotTouchPerDomain = $null
+        CouldNotRead          = 0
+        CouldNotReadPerDomain = $null
+        Read                  = 0
+        ReadPerDomain         = $null
+        TotalToFix            = 0
+    }
+    Overview   = {
+
+    }
+    Summary    = {
+        New-HTMLText -FontSize 10pt -TextBlock {
+            "When GPO is created one of the permissions that are required for proper functioning of Group Policies is NT AUTHORITY\Authenticated Users. "
+            "Some Administrators don't follow best practices and trying to remove GpoApply permission, remove also GpoRead permission from a GPO which can have consequences. "
+        } -LineBreak
+        New-HTMLText -Text "On June 14th, 2016 Microsoft released [HotFix](https://support.microsoft.com/en-gb/help/3159398/ms16-072-description-of-the-security-update-for-group-policy-june-14-2) that requires Authenticated Users to be present on all Group Policies to function properly: " -FontSize 10pt
+        New-HTMLText -TextBlock {
+            "MS16-072 changes the security context with which user group policies are retrieved. "
+            "This by-design behavior change protects customers’ computers from a security vulnerability. "
+            "Before MS16-072 is installed, user group policies were retrieved by using the user’s security context. "
+            "After MS16-072 is installed, user group policies are retrieved by using the computer's security context."
+        } -FontStyle italic -FontSize 10pt -FontWeight bold -LineBreak
+        New-HTMLText -FontSize 10pt -Text @(
+            "There are two parts to this assesment. Reading all Group Policies Permissions that account ",
+            $($Env:USERNAME.ToUpper()),
+            " has permissions to read and provide detailed assesment about permissions. ",
+            "Second assesment checks for permissions that this account is not able to read at all, and therefore it has no visibility about permissions set on it. "
+            "We just were able to detect the problem, but hopefully higher level account (Domain Admin) should be able to provide full assesment. "
+        ) -FontWeight normal, bold, normal
+        New-HTMLText -FontSize 10pt -Text "First assesment results: " -FontWeight bold
+        New-HTMLList -Type Unordered {
+            New-HTMLListItem -Text 'Group Policies requiring Authenticated Users with GpoRead permission: ', $Script:Reporting['GPOPermissionsRead']['Variables']['WillFix'] -FontWeight normal, bold
+            New-HTMLListItem -Text "Group Policies which don't require changes: ", $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouch'] -FontWeight normal, bold
+        } -FontSize 10pt
+        New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
+        New-HTMLList -Type Unordered {
+            foreach ($Domain in $Script:Reporting['GPOPermissionsRead']['Variables']['WillFixPerDomain'].Keys) {
+                New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOPermissionsRead']['Variables']['WillFixPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
+            }
+        } -FontSize 10pt
+        New-HTMLText -FontSize 10pt -Text "Secondary assesment results: " -FontWeight bold
+        New-HTMLList -Type Unordered {
+            New-HTMLListItem -Text "Group Policies couldn't read at all: ", $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotRead'] -FontWeight normal, bold
+            New-HTMLListItem -Text "Group Policies with permissions allowing read: ", $Script:Reporting['GPOPermissionsRead']['Variables']['Read'] -FontWeight normal, bold
+        } -FontSize 10pt
+        New-HTMLText -Text @(
+            "That means we need to fix permissions on: "
+            $($Script:Reporting['GPOPermissionsRead']['Variables']['TotalToFix'])
+            " out of "
+            $($Script:Reporting['GPOPermissionsRead']['Data'].Issues).Count
+            " Group Policies. "
+        ) -FontSize 10pt -FontWeight bold, bold, normal, bold, normal -Color Black, FreeSpeechRed, Black, Black -LineBreak -TextDecoration none, underline, underline, underline, none
+    }
+    Solution   = {
+        New-HTMLSection -Invisible {
+            New-HTMLPanel {
+                & $Script:GPOConfiguration['GPOPermissionsRead']['Summary']
+            }
+            New-HTMLPanel {
+                New-HTMLChart {
+                    New-ChartBarOptions -Type barStacked
+                    New-ChartLegend -Name 'Yes', 'No' -Color LightGreen, Salmon
+                    New-ChartBar -Name 'Authenticated Users Available' -Value $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouch'], $Script:Reporting['GPOPermissionsRead']['Variables']['WillFix']
+                    New-ChartBar -Name 'Accessible Group Policies' -Value $Script:Reporting['GPOPermissionsRead']['Variables']['Read'], $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotRead']
+                } -Title 'Group Policy Permissions' -TitleAlignment center
+            }
+        }
+        New-HTMLSection -Name 'Group Policy Authenticated Users Analysis' {
+            New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsRead']['Data'].Permissions -Filtering {
+                New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row
+            } -PagingOptions 7, 15, 30, 45, 60
+        }
+        New-HTMLSection -Name 'Group Policy Issues Assesment' {
+            New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsRead']['Data'].Issues -Filtering {
+                New-HTMLTableCondition -Name 'PermissionIssue' -Value $true -BackgroundColor Salmon -ComparisonType string -Row
+            } -PagingOptions 7, 15, 30, 45, 60 -DefaultSortColumn PermissionIssue -DefaultSortOrder Descending
+        }
+        New-HTMLSection -Name 'Steps to fix Group Policy Authenticated Users' {
+            New-HTMLContainer {
+                New-HTMLSpanStyle -FontSize 10pt {
+                    New-HTMLWizard {
+                        New-HTMLWizardStep -Name 'Prepare environment' {
+                            New-HTMLText -Text "To be able to execute actions in automated way please install required modules. Those modules will be installed straight from Microsoft PowerShell Gallery."
+                            New-HTMLCodeBlock -Code {
+                                Install-Module GPOZaurr -Force
+                                Import-Module GPOZaurr -Force
+                            } -Style powershell
+                            New-HTMLText -Text "Using force makes sure newest version is downloaded from PowerShellGallery regardless of what is currently installed. Once installed you're ready for next step."
+                        }
+                        New-HTMLWizardStep -Name 'Prepare report' {
+                            New-HTMLText -Text "Depending when this report was run you may want to prepare new report before proceeding with fixing Group Policy Authenticated Users. To generate new report please use:"
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPermissionsReadBefore.html -Verbose -Type GPOPermissionsRead
+                            }
+                            New-HTMLText -TextBlock {
+                                "When executed it will take a while to generate all data and provide you with new report depending on size of environment. "
+                                "GPOs with problems will be those not having any value for Permission/PermissionType columns. "
+                                "Once confirmed that data is still showing issues and requires fixing please proceed with next step."
+                            }
+                            New-HTMLText -Text "Alternatively if you prefer working with console you can run: "
+                            New-HTMLCodeBlock -Code {
+                                $AuthenticatedUsers = Get-GPOZaurrPermission -Type AuthenticatedUsers -ReturnSecurityWhenNoData
+                                $AuthenticatedUsers | Format-Table
+                            }
+                            New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
+                        }
+                        New-HTMLWizardStep -Name 'Make a backup (optional)' {
+                            New-HTMLText -TextBlock {
+                                "The process of fixing GPO Permissions does NOT touch GPO content. It simply adds permissionss on AD and SYSVOL at the same time for given GPO. "
+                                "However, it's always good to have a backup before executing changes that may impact Active Directory. "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                $GPOSummary = Backup-GPOZaurr -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -Type All
+                                $GPOSummary | Format-Table # only if you want to display output of backup
+                            }
+                            New-HTMLText -TextBlock {
+                                "Above command when executed will make a backup to Desktop, create GPO folder and within it it will put all those GPOs. "
+                            }
+                        }
+
+                        New-HTMLWizardStep -Name 'Add Authenticated Users ability to read all GPO' {
+                            New-HTMLText -Text @(
+                                "Following command will find any GPO which doesn't have Authenticated User as GpoRead or GpoApply and will add it as GpoRead. ",
+                                "This change doesn't change GpoApply permission, therefore it won't change to whom the GPO applies to. ",
+                                "It ensures that COMPUTERS can read GPO properly to be able to Apply it. ",
+                                "Make sure when running it for the first time to run it with ",
+                                "WhatIf",
+                                " parameter as shown below to prevent accidental adding of permissions."
+                            ) -FontWeight normal, normal, normal, normal, bold, normal -Color Black, Black, Black, Black, Red, Black
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type AuthenticatedUsers -PermissionType GpoRead -All -WhatIf -Verbose
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type AuthenticatedUsers -PermissionType GpoRead -All -WhatIf -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be changed matches expected data."
+                            } -LineBreak
+                            New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type AuthenticatedUsers -PermissionType GpoRead -All -Verbose -LimitProcessing 2
+                            }
+                            New-HTMLText -TextBlock {
+                                "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Add-GPOZaurrPermission -Type AuthenticatedUsers -PermissionType GpoRead -All -Verbose -LimitProcessing 2 -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                            }
+                            New-HTMLText -TextBlock {
+                                "This command when executed adds Authenticated Users (GpoRead permission) only on first X non-compliant Group Policies. "
+                                "Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur."
+                                "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. "
+                                "In case of any issues please review and action accordingly."
+                            }
+                        }
+                        New-HTMLWizardStep -Name 'Verification report' {
+                            New-HTMLText -TextBlock {
+                                "Once cleanup task was executed properly, we need to verify that report now shows no problems."
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPermissionsReadAfter.html -Verbose -Type GPOPermissionsRead
+                            }
+                            New-HTMLText -Text "If everything is healthy in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
+                        }
+                    } -RemoveDoneStepOnNavigateBack -Theme arrows -ToolbarButtonPosition center
+                }
+            }
+        }
+        if ($Script:Reporting['GPOPermissionsRead']['WarningsAndErrors']) {
+            New-HTMLSection -Name 'Warnings & Errors to Review' {
+                New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsRead']['WarningsAndErrors'] -Filtering {
+                    New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
+                    New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
+                } -PagingOptions 10, 20, 30, 40, 50
+            }
+        }
+    }
+}

Private/Remove-PrivPermission.ps1

@@ -6,16 +6,16 @@
         [PSCustomObject] $GPOPermission,
         [alias('PermissionType')][Microsoft.GroupPolicy.GPPermissionType[]] $IncludePermissionType
     )
-    if ($GPOPermission.Name) {
-        $Text = "Removing SID: $($GPOPermission.Sid), Name: $($GPOPermission.Domain)\$($GPOPermission.Name), SidType: $($GPOPermission.SidType) from domain $($GPOPermission.DomainName)"
+    if ($GPOPermission.PrincipalName) {
+        $Text = "Removing SID: $($GPOPermission.PrincipalSid), Name: $($GPOPermission.PrincipalDomainName)\$($GPOPermission.PrincipalName), SidType: $($GPOPermission.PrincipalSidType) from domain $($GPOPermission.DomainName)"
     } else {
-        $Text = "Removing SID: $($GPOPermission.Sid), Name: EMPTY, SidType: $($GPOPermission.SidType) from domain $($GPOPermission.DomainName)"
+        $Text = "Removing SID: $($GPOPermission.PrincipalSid), Name: EMPTY, SidType: $($GPOPermission.PrincipalSidType) from domain $($GPOPermission.DomainName)"
     }
     if ($PrincipalType -eq 'DistinguishedName') {
         if ($GPOPermission.DistinguishedName -eq $Principal -and $GPOPermission.Permission -eq $IncludePermissionType) {
             if ($PSCmdlet.ShouldProcess($GPOPermission.DisplayName, $Text)) {
                 try {
-                    Write-Verbose "Remove-GPOZaurrPermission - Removing permission $IncludePermissionType for $($Principal) / $($GPOPermission.Name) / Type: $($GPOPermission.PermissionType)"
+                    Write-Verbose "Remove-GPOZaurrPermission - Removing permission $IncludePermissionType for $($Principal) / $($GPOPermission.PrincipalName) / Type: $($GPOPermission.PermissionType)"
                     $GPOPermission.GPOSecurity.Remove($GPOPermission.GPOSecurityPermissionItem)
                     $GPOPermission.GPOObject.SetSecurityInfo($GPOPermission.GPOSecurity)
                 } catch {
@@ -24,10 +24,10 @@
             }
         }
     } elseif ($PrincipalType -eq 'Sid') {
-        if ($GPOPermission.Sid -eq $Principal -and $GPOPermission.Permission -eq $IncludePermissionType) {
+        if ($GPOPermission.PrincipalSid -eq $Principal -and $GPOPermission.Permission -eq $IncludePermissionType) {
             if ($PSCmdlet.ShouldProcess($GPOPermission.DisplayName, $Text)) {
                 try {
-                    Write-Verbose "Remove-GPOZaurrPermission - Removing permission $IncludePermissionType for $($Principal) / $($GPOPermission.Name) / Type: $($GPOPermission.PermissionType)"
+                    Write-Verbose "Remove-GPOZaurrPermission - Removing permission $IncludePermissionType for $($Principal) / $($GPOPermission.PrincipalName) / Type: $($GPOPermission.PermissionType)"
                     $GPOPermission.GPOSecurity.Remove($GPOPermission.GPOSecurityPermissionItem)
                     $GPOPermission.GPOObject.SetSecurityInfo($GPOPermission.GPOSecurity)
                 } catch {
@@ -51,10 +51,10 @@
             }
         }
     } elseif ($PrincipalType -eq 'Name') {
-        if ($GPOPermission.Name -eq $Principal -and $GPOPermission.Permission -eq $IncludePermissionType) {
+        if ($GPOPermission.PrincipalName -eq $Principal -and $GPOPermission.Permission -eq $IncludePermissionType) {
             if ($PSCmdlet.ShouldProcess($GPOPermission.DisplayName, $Text)) {
                 try {
-                    Write-Verbose "Remove-GPOZaurrPermission - Removing permission $IncludePermissionType for $($Principal) / $($GPOPermission.Name) / Type: $($GPOPermission.PermissionType)"
+                    Write-Verbose "Remove-GPOZaurrPermission - Removing permission $IncludePermissionType for $($Principal) / $($GPOPermission.PrincipalName) / Type: $($GPOPermission.PermissionType)"
                     $GPOPermission.GPOSecurity.Remove($GPOPermission.GPOSecurityPermissionItem)
                     $GPOPermission.GPOObject.SetSecurityInfo($GPOPermission.GPOSecurity)
                 } catch {

Private/Script.GPOConfiguration.ps1

@@ -6,6 +6,7 @@
     GPOList               = $GPOZaurrList
     GPOPassword           = $GPOZaurrPassword
     GPOPermissions        = $GPOZaurrPermissions
+    GPOPermissionsRead    = $GPOZaurrPermissionsRead
     GPOPermissionsRoot    = $GPOZaurrPermissionsRoot
     GPOFiles              = $GPOZaurrFiles
     GPOBlockedInheritance = $GPOZaurrBlockedInheritance

Public/Add-GPOZaurrPermission.ps1

@@ -1,11 +1,9 @@
 function Add-GPOZaurrPermission {
-    [cmdletBinding(SupportsShouldProcess, DefaultParameterSetName = 'GPOGUID')]
+    [cmdletBinding(SupportsShouldProcess, DefaultParameterSetName = 'GPOName')]
     param(
-        [Parameter(ParameterSetName = 'GPOName', Mandatory)]
-        [string] $GPOName,
-
-        [Parameter(ParameterSetName = 'GPOGUID', Mandatory)]
-        [alias('GUID', 'GPOID')][string] $GPOGuid,
+        [Parameter(ParameterSetName = 'GPOName', Mandatory)][string] $GPOName,
+        [Parameter(ParameterSetName = 'GPOGUID', Mandatory)][alias('GUID', 'GPOID')][string] $GPOGuid,
+        [Parameter(ParameterSetName = 'All', Mandatory)][switch] $All,
 
         [Parameter(ParameterSetName = 'ADObject', Mandatory)]
         [alias('OrganizationalUnit', 'DistinguishedName')][Microsoft.ActiveDirectory.Management.ADObject[]] $ADObject,
@@ -55,7 +53,6 @@
     }
     $Splat['ExcludeDomains'] = $ExcludeDomains
     $Splat['ExtendedForestInformation'] = $ExtendedForestInformation
-    #$Splat['ExcludePermissionType'] = $ExcludePermissionType
     $Splat['IncludePermissionType'] = $PermissionType
     $Splat['SkipWellKnown'] = $SkipWellKnown.IsPresent
     $Splat['SkipAdministrative'] = $SkipAdministrative.IsPresent
@@ -64,150 +61,176 @@
         DomainAdmins     = $false
         EnterpriseAdmins = $false
     }
+    $CountFixed = 0
 
-    # This should always return results. When no data is found it should return basic information that will allow us to add credentials.
-    [Array] $GPOPermissions = Get-GPOZaurrPermission @Splat -ReturnSecurityWhenNoData
-    # When it has GPOSecurityPermissionItem property it means it has permissions, if it doesn't it means we have clean object to process
-    if ($GPOPermissions.GPOSecurityPermissionItem) {
-        # Permission exists, but may be incomplete
-        foreach ($GPOPermission in $GPOPermissions) {
-            if ($Type -eq 'Default') {
-                # We were looking for specific principal and we got it. nothing to do
-                # this is for standard users such as przemyslaw.klys / adam.gonzales
-                return
-            } elseif ($Type -eq 'Administrative') {
-                # We are looking for administrative but we need to make sure we got correct administrative
-                if ($GPOPermission.Permission -eq $PermissionType) {
-                    $AdministrativeGroup = $ADAdministrativeGroups['BySID'][$GPOPermission.SID]
-                    if ($AdministrativeGroup.SID -like '*-519') {
-                        $AdministrativeExists['EnterpriseAdmins'] = $true
-                    } elseif ($AdministrativeGroup.SID -like '*-512') {
-                        $AdministrativeExists['DomainAdmins'] = $true
+    Do {
+        # This should always return results. When no data is found it should return basic information that will allow us to add credentials.
+        Get-GPOZaurrPermission @Splat -ReturnSecurityWhenNoData -ReturnSingleObject | ForEach-Object {
+            # Prepare data to clean
+            $Skip = $false
+            $AdministrativeExists['EnterpriseAdmins'] = $false
+            $AdministrativeExists['DomainAdmins'] = $false
+            $GPOPermissions = $_
+            # Verification Phase
+            # When it has GPOSecurityPermissionItem property it means it has permissions, if it doesn't it means we have clean object to process
+            if ($GPOPermissions.GPOSecurityPermissionItem) {
+                # Permission exists, but may be incomplete
+                foreach ($GPOPermission in $GPOPermissions) {
+                    if ($Type -eq 'Default') {
+                        # We were looking for specific principal and we got it. nothing to do
+                        # this is for standard users such as przemyslaw.klys / adam.gonzales
+                        $Skip = $true
+                        break
+                    } elseif ($Type -eq 'Administrative') {
+                        # We are looking for administrative but we need to make sure we got correct administrative
+                        if ($GPOPermission.Permission -eq $PermissionType) {
+                            $AdministrativeGroup = $ADAdministrativeGroups['BySID'][$GPOPermission.PrincipalSid]
+                            if ($AdministrativeGroup.SID -like '*-519') {
+                                $AdministrativeExists['EnterpriseAdmins'] = $true
+                            } elseif ($AdministrativeGroup.SID -like '*-512') {
+                                $AdministrativeExists['DomainAdmins'] = $true
+                            }
+                        }
+                        if ($AdministrativeExists['DomainAdmins'] -and $AdministrativeExists['EnterpriseAdmins']) {
+                            $Skip = $true
+                            break
+                        }
+                    } elseif ($Type -eq 'WellKnownAdministrative') {
+                        # this is for SYSTEM account
+                        $Skip = $true
+                        break
+                    } elseif ($Type -eq 'AuthenticatedUsers') {
+                        # this is for Authenticated Users
+                        $Skip = $true
+                        break
                     }
-                    <#
-                    if ($AdministrativeGroup) {
-                        $DomainAdminsSID = -join ($ForestInformation['DomainsExtended'][$GPOPermission.DomainName].DomainSID, '-512')
-                        $EnterpriseAdminsSID = -join ($ForestInformation['DomainsExtended'][$GPOPermission.DomainName].DomainSID, '-519')
-                        if ($GPOPermission.SID -eq $DomainAdminsSID) {
-                            $AdministrativeExists['DomainAdmins'] = $true
-                        } elseif ($GPOPermission.SID -eq $EnterpriseAdminsSID) {
-                            $AdministrativeExists['EnterpriseAdmins'] = $true
+                }
+            }
+            if (-not $Skip) {
+                if (-not $GPOPermissions) {
+                    # This is bad - things went wrong
+                    Write-Warning "Add-GPOZaurrPermission - Couldn't get permissions for GPO. Things aren't what they should be. Skipping!"
+                } else {
+                    $GPO = $GPOPermissions[0]
+                    if ($GPOPermissions.GPOSecurityPermissionItem) {
+                        # We asked, we got response, now we need to check if maybe we're missing one of the two administrative groups
+                        if ($Type -eq 'Administrative') {
+                            # this is a case where something was returned. Be it Domain Admins or Enterprise Admins or both. But we still need to check because it may have been Domain Admins from other domain or just one of the two required groups
+                            if ($AdministrativeExists['DomainAdmins'] -eq $false) {
+                                $Principal = $ADAdministrativeGroups[$GPO.DomainName]['DomainAdmins']
+                                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                                $CountFixed++
+                                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                    try {
+                                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                        $GPO.GPOSecurity.Add($AddPermission)
+                                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                    } catch {
+                                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
+                                    }
+                                }
+                            }
+                            if ($AdministrativeExists['EnterpriseAdmins'] -eq $false) {
+                                $Principal = $ADAdministrativeGroups[$ForestInformation.Forest.RootDomain]['EnterpriseAdmins']
+                                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                                $CountFixed++
+                                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                    try {
+                                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                        $GPO.GPOSecurity.Add($AddPermission)
+                                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                    } catch {
+                                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
+                                    }
+                                }
+                            }
+                        } elseif ($Type -eq 'Default') {
+                            # This shouldn't really happen, as if we got response, and it didn't exists it wouldn't be here
+                            Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType skipped for $($Principal). This shouldn't even happen!"
+                        }
+                    } else {
+                        # We got no response. That means we either asked incorrectly or we need to fix permission. Trying to do so
+                        if ($Type -eq 'Default') {
+                            Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                            $CountFixed++
+                            if ($PrincipalType -eq 'DistinguishedName') {
+                                $ADIdentity = Get-WinADObject -Identity $Principal
+                                if ($ADIdentity) {
+                                    Write-Verbose "Add-GPOZaurrPermission - Need to convert DN $Principal to SID $($ADIdentity.ObjectSID) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                                    $Principal = $ADIdentity.ObjectSID
+                                }
+                            }
+                            if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                try {
+                                    Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal)"
+                                    $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                    $GPO.GPOSecurity.Add($AddPermission)
+                                    $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                } catch {
+                                    Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
+                                }
+                            }
+                        } elseif ($Type -eq 'Administrative') {
+                            # this is a case where both Domain Admins/Enterprise Admins were missing
+                            $Principal = $ADAdministrativeGroups[$GPO.DomainName]['DomainAdmins']
+                            Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                            $CountFixed++
+                            if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                try {
+                                    $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                    $GPO.GPOSecurity.Add($AddPermission)
+                                    $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                } catch {
+                                    Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
+                                }
+                            }
+                            $Principal = $ADAdministrativeGroups[$ForestInformation.Forest.RootDomain]['EnterpriseAdmins']
+                            Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                            $CountFixed++
+                            if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                try {
+                                    $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                    $GPO.GPOSecurity.Add($AddPermission)
+                                    $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                } catch {
+                                    Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
+                                }
+                            }
+                        } elseif ($Type -eq 'WellKnownAdministrative') {
+                            $Principal = 'S-1-5-18'
+                            Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                            $CountFixed++
+                            if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal (SYSTEM) / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                try {
+                                    $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                    $GPO.GPOSecurity.Add($AddPermission)
+                                    $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                } catch {
+                                    Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) (SYSTEM) with error: $($_.Exception.Message)"
+                                }
+                            }
+                        } elseif ($Type -eq 'AuthenticatedUsers') {
+                            $Principal = 'S-1-5-11'
+                            Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
+                            $CountFixed++
+                            if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal (Authenticated Users) / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
+                                try {
+                                    $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
+                                    $GPO.GPOSecurity.Add($AddPermission)
+                                    $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
+                                } catch {
+                                    Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) (Authenticated Users) with error: $($_.Exception.Message)"
+                                }
+                            }
                         }
                     }
-                    #>
                 }
-            } elseif ($Type -eq 'WellKnownAdministrative') {
-                # this is for SYSTEM account
-                return
-            } elseif ($Type -eq 'AuthenticatedUsers') {
-                # this is for Authenticated Users
-                return
+            }
+            if ($CountFixed -ge $LimitProcessing) {
+                # We want to exit foreach-object, but ForEach-Object doesn't really allow that
+                # that's why there is Do/While which will make sure that breaks doesn't break what it's not supposed to
+                break
             }
         }
-    }
-    if (-not $GPOPermissions) {
-        # This is bad - things went wrong
-        Write-Warning "Add-GPOZaurrPermission - Couldn't get permissions for GPO. Things aren't what they should be. Skipping!"
-    } else {
-        $GPO = $GPOPermissions[0]
-        if ($GPOPermissions.GPOSecurityPermissionItem) {
-            # We asked, we got response, now we need to check if maybe we're missing one of the two administrative groups
-            if ($Type -eq 'Administrative') {
-                # this is a case where something was returned. Be it Domain Admins or Enterprise Admins or both. But we still need to check because it may have been Domain Admins from other domain or just one of the two required groups
-                if ($AdministrativeExists['DomainAdmins'] -eq $false) {
-                    $Principal = $ADAdministrativeGroups[$GPO.DomainName]['DomainAdmins']
-                    Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                    if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                        try {
-                            $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                            $GPO.GPOSecurity.Add($AddPermission)
-                            $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                        } catch {
-                            Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
-                        }
-                    }
-                }
-                if ($AdministrativeExists['EnterpriseAdmins'] -eq $false) {
-                    $Principal = $ADAdministrativeGroups[$ForestInformation.Forest.RootDomain]['EnterpriseAdmins']
-                    Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                    if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                        try {
-                            $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                            $GPO.GPOSecurity.Add($AddPermission)
-                            $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                        } catch {
-                            Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
-                        }
-                    }
-                }
-            } elseif ($Type -eq 'Default') {
-                # This shouldn't really happen, as if we got response, and it didn't exists it wouldn't be here
-                Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType skipped for $($Principal). This shouldn't even happen!"
-            }
-        } else {
-            # We got no response. That means we either asked incorrectly or we need to fix permission. Trying to do so
-            if ($Type -eq 'Default') {
-                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                    try {
-                        Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal)"
-                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                        $GPO.GPOSecurity.Add($AddPermission)
-                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                    } catch {
-                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
-                    }
-                }
-            } elseif ($Type -eq 'Administrative') {
-                # this is a case where both Domain Admins/Enterprise Admins were missing
-                $Principal = $ADAdministrativeGroups[$GPO.DomainName]['DomainAdmins']
-                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                    try {
-                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                        $GPO.GPOSecurity.Add($AddPermission)
-                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                    } catch {
-                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
-                    }
-                }
-                $Principal = $ADAdministrativeGroups[$ForestInformation.Forest.RootDomain]['EnterpriseAdmins']
-                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                    try {
-                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                        $GPO.GPOSecurity.Add($AddPermission)
-                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                    } catch {
-                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) with error: $($_.Exception.Message)"
-                    }
-                }
-            } elseif ($Type -eq 'WellKnownAdministrative') {
-                $Principal = 'S-1-5-18'
-                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal (SYSTEM) / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                    try {
-                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                        $GPO.GPOSecurity.Add($AddPermission)
-                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                    } catch {
-                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) (SYSTEM) with error: $($_.Exception.Message)"
-                    }
-                }
-            } elseif ($Type -eq 'AuthenticatedUsers') {
-                $Principal = 'S-1-5-11'
-                Write-Verbose "Add-GPOZaurrPermission - Adding permission $PermissionType for $($Principal) to $($GPO.DisplayName) at $($GPO.DomainName)"
-                if ($PSCmdlet.ShouldProcess($GPO.DisplayName, "Adding $Principal (Authenticated Users) / $PermissionType to $($GPO.DisplayName) at $($GPO.DomainName)")) {
-                    try {
-                        $AddPermission = [Microsoft.GroupPolicy.GPPermission]::new($Principal, $PermissionType, $Inheritable.IsPresent)
-                        $GPO.GPOSecurity.Add($AddPermission)
-                        $GPO.GPOObject.SetSecurityInfo($GPO.GPOSecurity)
-                    } catch {
-                        Write-Warning "Add-GPOZaurrPermission - Adding permission $PermissionType failed for $($Principal) (Authenticated Users) with error: $($_.Exception.Message)"
-                    }
-                }
-            }
-        }
-
-    }
+    } while ($false)
 }

Public/Get-GPOZaurrOwner.ps1

@@ -19,7 +19,7 @@
     Doesn't display GPOs that have no SYSVOL content (orphaned GPOs)
 
     .PARAMETER Forest
-    Target different Forest
+    Target different Forest, by default current forest is used
 
     .PARAMETER ExcludeDomains
     Exclude domain from search, by default whole forest is scanned

Public/Get-GPOZaurrPassword.ps1

@@ -7,16 +7,16 @@
     Tries to find CPassword in Group Policies or given path and translate it to readable value
 
     .PARAMETER Forest
-    Specify forest name. By default current forest is used
+    Target different Forest, by default current forest is used
 
     .PARAMETER ExcludeDomains
-    Exclude Domain or Domains
+    Exclude domain from search, by default whole forest is scanned
 
     .PARAMETER IncludeDomains
-    Include only certain Domain or Domains
+    Include only specific domains, by default whole forest is scanned
 
     .PARAMETER ExtendedForestInformation
-    Ability to provide extended forest information in advanced scenarios
+    Ability to provide Forest Information from another command to speed up processing
 
     .PARAMETER GPOPath
     Path where Group Policy content is located or where backup is located

Public/Get-GPOZaurrPermission.ps1

@@ -31,7 +31,8 @@
         [alias('Domain', 'Domains')][string[]] $IncludeDomains,
         [System.Collections.IDictionary] $ExtendedForestInformation,
         [System.Collections.IDictionary] $ADAdministrativeGroups,
-        [switch] $ReturnSecurityWhenNoData # if no data return all data
+        [switch] $ReturnSecurityWhenNoData, # if no data return all data
+        [switch] $ReturnSingleObject # forces return of single object per GPO as one for ForEach-Object processing
     )
     Begin {
         $ForestInformation = Get-WinADForestDetails -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation -Extended
@@ -136,7 +137,11 @@
                             $ReturnObject
                         }
                     } else {
-                        $Output
+                        if ($ReturnSingleObject) {
+                            , $Output
+                        } else {
+                            $Output
+                        }
                     }
                 }
             } catch {

Public/Get-GPOZaurrPermissionIssue.ps1

@@ -0,0 +1,65 @@
+function Get-GPOZaurrPermissionIssue {
+    <#
+    .SYNOPSIS
+    Detects Group Policy missing Authenticated Users permission while not having higher permissions.
+
+    .DESCRIPTION
+    Detects Group Policy missing Authenticated Users permission while not having higher permissions.
+
+    .PARAMETER Forest
+    Target different Forest, by default current forest is used
+
+    .PARAMETER ExcludeDomains
+    Exclude domain from search, by default whole forest is scanned
+
+    .PARAMETER IncludeDomains
+    Include only specific domains, by default whole forest is scanned
+
+    .PARAMETER ExtendedForestInformation
+    Ability to provide Forest Information from another command to speed up processing
+
+    .EXAMPLE
+    $Issues = Get-GPOZaurrPermissionIssue
+    $Issues | Format-Table
+
+    .NOTES
+    General notes
+    #>
+    [cmdletBinding()]
+    param(
+        [alias('ForestName')][string] $Forest,
+        [string[]] $ExcludeDomains,
+        [alias('Domain', 'Domains')][string[]] $IncludeDomains,
+        [System.Collections.IDictionary] $ExtendedForestInformation
+    )
+    $ForestInformation = Get-WinADForestDetails -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExcludeDomainControllers $ExcludeDomainControllers -IncludeDomainControllers $IncludeDomainControllers -SkipRODC:$SkipRODC -ExtendedForestInformation $ExtendedForestInformation -Extended
+    foreach ($Domain in $ForestInformation.Domains) {
+        $TimeLog = Start-TimeLog
+        Write-Verbose "Get-GPOZaurrPermissionIssue - Starting process for $Domain"
+        $QueryServer = $ForestInformation['QueryServers']["$Domain"].HostName[0]
+        $SystemsContainer = $ForestInformation['DomainsExtended'][$Domain].SystemsContainer
+        if ($SystemsContainer) {
+            $PoliciesSearchBase = -join ("CN=Policies,", $SystemsContainer)
+            $Properties = 'DisplayName', 'Name', 'DistinguishedName', 'ObjectClass', 'WhenCreated', 'WhenChanged'
+            $PoliciesInAD = Get-ADObject -SearchBase $PoliciesSearchBase -SearchScope OneLevel -Filter * -Server $QueryServer -Properties $Properties
+            foreach ($Policy in $PoliciesInAD) {
+                $GUIDFromDN = ConvertFrom-DistinguishedName -DistinguishedName $Policy.DistinguishedName
+                $GUIDFromDN = $GUIDFromDN -replace '{' -replace '}'
+                $GUID = $Policy.Name -replace '{' -replace '}'
+                [PSCustomObject] @{
+                    DisplayName       = $Policy.DisplayName
+                    DomainName        = $Domain
+                    PermissionIssue   = -not ($GUID -and $GUIDFromDN)
+                    ObjectClass       = $Policy.ObjectClass
+                    Name              = $Policy.Name
+                    DistinguishedName = $Policy.DistinguishedName
+                    GUID              = $GUIDFromDN
+                    WhenCreated       = $Policy.WhenCreated
+                    WhenChanged       = $Policy.WhenChanged
+                }
+            }
+        }
+        $TimeEnd = Stop-TimeLog -Time $TimeLog -Option OneLiner
+        Write-Verbose "Get-GPOZaurrPermissionIssue - Finishing process for $Domain (Time to process: $TimeEnd)"
+    }
+}

Public/Remove-GPOZaurrPermission.ps1

@@ -72,11 +72,11 @@
                 }
             }
             Get-GPO @getGPOSplat | ForEach-Object -Process {
+                $GPOSecurity = $_.GetSecurityInfo()
                 $getPrivPermissionSplat = @{
                     Principal              = $Principal
                     PrincipalType          = $PrincipalType
-                    Accounts               = $Accounts
-                    Type                   = $Type
+                    #Accounts               = $Accounts
                     GPO                    = $_
                     SkipWellKnown          = $SkipWellKnown.IsPresent
                     SkipAdministrative     = $SkipAdministrative.IsPresent
@@ -85,11 +85,15 @@
                     IncludePermissionType  = $IncludePermissionType
                     ExcludePermissionType  = $ExcludePermissionType
                     ADAdministrativeGroups = $ADAdministrativeGroups
+                    SecurityRights         = $GPOSecurity
+                }
+                if ($Type -ne 'Default') {
+                    $getPrivPermissionSplat['Type'] = $Type
                 }
                 [Array] $GPOPermissions = Get-PrivPermission @getPrivPermissionSplat
                 if ($GPOPermissions.Count -gt 0) {
                     foreach ($Permission in $GPOPermissions) {
-                        Remove-PrivPermission -Principal $Permission.Sid -PrincipalType Sid -GPOPermission $Permission -IncludePermissionType $Permission.Permission #-IncludeDomains $GPO.DomainName
+                        Remove-PrivPermission -Principal $Permission.PrincipalSid -PrincipalType Sid -GPOPermission $Permission -IncludePermissionType $Permission.Permission #-IncludeDomains $GPO.DomainName
                     }
                     $Count++
                     if ($Count -eq $LimitProcessing) {

Public/Set-GPOZaurrOwner.ps1

@@ -18,7 +18,7 @@
     GUID of GPO. By default all GPOs are targetted
 
     .PARAMETER Forest
-    Target different Forest
+    Target different Forest, by default current forest is used
 
     .PARAMETER ExcludeDomains
     Exclude domain from search, by default whole forest is scanned
@@ -76,7 +76,8 @@
 
         [Parameter(ParameterSetName = 'Type')]
         [Parameter(ParameterSetName = 'Named')]
-        [int] $LimitProcessing = [int32]::MaxValue
+        [int] $LimitProcessing = [int32]::MaxValue,
+        [switch] $Force
     )
     Begin {
         #Write-Verbose "Set-GPOZaurrOwner - Getting ADAdministrativeGroups"
@@ -114,45 +115,50 @@
                     $AdministrativeGroupSysvol = $null
                 }
             }
-            if ($Type -eq 'NotAdministrative') {
-                if (-not $AdministrativeGroup -or (-not $AdministrativeGroupSysvol -and -not $SkipSysvol)) {
-                    $_
-                } else {
-                    if ($AdministrativeGroup -ne $AdministrativeGroupSysvol) {
-                        Write-Verbose "Set-GPOZaurrOwner - Detected mismatch GPO: $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner). Fixing required."
-                        $_
-                    }
-                }
-            } elseif ($Type -eq 'Unknown') {
-                if (-not $_.Owner -or (-not $_.SysvolOwner -and -not $SkipSysvol)) {
-                    $_
-                }
-            } elseif ($Type -eq 'NotMatching') {
-                if ($SkipSysvol) {
-                    Write-Verbose "Set-GPOZaurrOwner - Detected mismatch GPO: $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner). SysVol scanning is disabled. Skipping."
-                } else {
-                    if ($AdministrativeGroup -ne $AdministrativeGroupSysvol) {
-                        #Write-Verbose "Set-GPOZaurrOwner - Detected mismatch GPO: $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner). Fixing required."
-                        $_
-                    }
-                }
+            if ($Force) {
+                Write-Verbose "Set-GPOZaurrOwner - Force was used to push new owner to $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner)."
+                $_
             } else {
-                # we run with no type, that means we need to either set it to principal or to Administrative
-                if ($_.Owner) {
-                    # we check if Principal is not set
-                    $AdministrativeGroup = $ADAdministrativeGroups['ByNetBIOS']["$($_.Owner)"]
-                    if (-not $SkipSysvol -and $_.SysvolOwner) {
-                        $AdministrativeGroupSysvol = $ADAdministrativeGroups['ByNetBIOS']["$($_.SysvolOwner)"]
-                        if (-not $AdministrativeGroup -or -not $AdministrativeGroupSysvol) {
+                if ($Type -eq 'NotAdministrative') {
+                    if (-not $AdministrativeGroup -or (-not $AdministrativeGroupSysvol -and -not $SkipSysvol)) {
+                        $_
+                    } else {
+                        if ($AdministrativeGroup -ne $AdministrativeGroupSysvol) {
+                            Write-Verbose "Set-GPOZaurrOwner - Detected mismatch GPO: $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner). Fixing required."
                             $_
                         }
+                    }
+                } elseif ($Type -eq 'Unknown') {
+                    if (-not $_.Owner -or (-not $_.SysvolOwner -and -not $SkipSysvol)) {
+                        $_
+                    }
+                } elseif ($Type -eq 'NotMatching') {
+                    if ($SkipSysvol) {
+                        Write-Verbose "Set-GPOZaurrOwner - Detected mismatch GPO: $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner). SysVol scanning is disabled. Skipping."
+                    } else {
+                        if ($AdministrativeGroup -ne $AdministrativeGroupSysvol) {
+                            #Write-Verbose "Set-GPOZaurrOwner - Detected mismatch GPO: $($_.DisplayName) from domain: $($_.DomainName) - owner $($_.Owner) / sysvol owner $($_.SysvolOwner). Fixing required."
+                            $_
+                        }
+                    }
+                } else {
+                    # we run with no type, that means we need to either set it to principal or to Administrative
+                    if ($_.Owner) {
+                        # we check if Principal is not set
+                        $AdministrativeGroup = $ADAdministrativeGroups['ByNetBIOS']["$($_.Owner)"]
+                        if (-not $SkipSysvol -and $_.SysvolOwner) {
+                            $AdministrativeGroupSysvol = $ADAdministrativeGroups['ByNetBIOS']["$($_.SysvolOwner)"]
+                            if (-not $AdministrativeGroup -or -not $AdministrativeGroupSysvol) {
+                                $_
+                            }
+                        } else {
+                            if (-not $AdministrativeGroup) {
+                                $_
+                            }
+                        }
                     } else {
-                        if (-not $AdministrativeGroup) {
-                            $_
-                        }
+                        $_
                     }
-                } else {
-                    $_
                 }
             }
         } | Select-Object -First $LimitProcessing | ForEach-Object -Process {

README.md

@@ -57,10 +57,35 @@ That's it. Whenever there's a new version, you run the command, and you can enjo
 
 ## Changelog
 
-- 0.0.78 -
+- 0.0.83 - 14.11.2020
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Fix for wrong ActionRequired count
+- 0.0.82 - 14.11.2020
+  - [x] Added `Get-GPOZaurrPermissionIssue` to detect permission issue with no rights
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Type `GPOPermissionsRead` improved detection of problems with low permissions
+- 0.0.81 - 12.11.2020
+  - [x] Fix for `Set-GPOZaurrOwner` in case of missing permissions to not throw errors
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Type `GPOPermissionsRead` added
+- 0.0.80 - 12.11.2020
+  - [x] Improves `Invoke-GPOZaurr` (WIP)
+    - [x] Type `GPOOrphans` clearer options, updated texts, split per domain
+    - [x] Type `GPOOwners` clearer options, updated texts, split per domain
+  - [x] Improves `Add-GPOZaurrPermission`
+    - [x] Fixes LimitProcessing to work correctly
+    - [x] Added `All` to process all GPOs
+  - [x] Fixes `Remove-GPOZaurrPermission`
+  - [x] Improves `Set-GPOZaurrOwner`
+    - [x] Added `Force` to force `GPO Owner` to any principal (normally only Domain Admins)
+- 0.0.79 - 10.11.2020
+  - Improved `Invoke-GPOZaurr` - type `GPOOrphans`
+- 0.0.78 - 10.11.2020
   - Improved `Remove-GPOZaurrBroken` more verbose
   - Improved `Get-GPOZaurrBroken` more verbose
   - Improved `Invoke-GPOZaurr` - type `GPOOrphans`
+  - Improved `Invoke-GPOZaurr` - type `GPOList` - needs more work
+  - Improved `Get-GPOZaurr` with better detection of Empty Policies (needs testing)
 - 0.0.77 - 9.11.2020
   - Improved `Invoke-GPOZaurr` (WIP)
 - 0.0.76 - 8.11.2020

Tests/GPOOwners.Tests.ps1

@@ -0,0 +1,42 @@
+Describe 'GPO Owners Management - Simple' {
+    BeforeAll {
+        # just in case some tests failed before and added user stays
+        Import-Module $PSScriptRoot\..\*.psd1 -Force
+
+    }
+    It 'Get-GPOZaurrOwner - Should return proper data' {
+        $GPOs = Get-GPOZaurrOwner -IncludeSysvol
+        $GPOs.Count | Should -BeGreaterThan 5
+        $GPOs[0].PSObject.Properties.Name | Should -Be @(
+            'DisplayName', 'DomainName',
+            'GUID', 'Owner', 'OwnerSID',
+            'OwnerType', 'SysvolOwner', 'SysvolSid',
+            'SysvolType', 'SysvolPath', 'IsOwnerConsistent',
+            'IsOwnerAdministrative', 'SysvolExists', 'DistinguishedName'
+        )
+    }
+    It 'Set-GPOZaurrOwner - Should set proper data' {
+        Set-GPOZaurrOwner -GPOName 'TEST | GPOZaurr Permissions Testing' -Verbose -Principal 'przemyslaw.klys' -WhatIf:$false -Force
+    }
+    It 'Get-GPOZaurrOwner - Should return proper data for one GPO' {
+        $GPOs = Get-GPOZaurrOwner -IncludeSysvol -GPOName 'TEST | GPOZaurr Permissions Testing'
+        $GPOs.SysvolOwner | Should -Be 'EVOTEC\przemyslaw.klys'
+        $GPOs.SysvolType | Should -Be 'NotAdministrative'
+        $GPOs.Owner | Should -Be 'EVOTEC\przemyslaw.klys'
+        $GPOs.OwnerType | Should -Be 'NotAdministrative'
+        $GPOS.IsOwnerConsistent | Should -Be $true
+        $GPOS.IsOwnerAdministrative | Should -Be $false
+    }
+    It 'Set-GPOZaurrOwner - Should set proper data' {
+        Set-GPOZaurrOwner -GPOName 'TEST | GPOZaurr Permissions Testing' -Verbose
+    }
+    It 'Get-GPOZaurrOwner - Should return proper data for one GPO (Domain Admins)' {
+        $GPOs = Get-GPOZaurrOwner -IncludeSysvol -GPOName 'TEST | GPOZaurr Permissions Testing'
+        $GPOs.SysvolOwner | Should -Be 'EVOTEC\Domain Admins'
+        $GPOs.SysvolType | Should -Be 'Administrative'
+        $GPOs.Owner | Should -Be 'EVOTEC\Domain Admins'
+        $GPOs.OwnerType | Should -Be 'Administrative'
+        $GPOS.IsOwnerConsistent | Should -Be $true
+        $GPOS.IsOwnerAdministrative | Should -Be $true
+    }
+}

Tests/GPOPermissions.Tests.ps1

@@ -0,0 +1,70 @@
+Describe 'GPO Permissions Management - Simple' {
+    BeforeAll {
+        # just in case some tests failed before and added user stays
+        Import-Module $PSScriptRoot\..\*.psd1 -Force
+        Remove-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -PermissionType GpoEdit -Principal 'EVOTEC\przemyslaw.klys' -PrincipalType NetbiosName -Verbose
+    }
+    It 'Get-GPOZaurrPermission - Should return proper data' {
+        $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing'
+        ($GPOPermissions | Where-Object { $_.Permission -eq 'GPOApply' }) | Should -BeOfType PSCustomObject
+        ($GPOPermissions | Where-Object { $_.Permission -eq 'GPOApply' }).PrincipalNetBiosName | Should -Be 'NT AUTHORITY\Authenticated Users'
+
+        $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -IncludePermissionType GpoEditDeleteModifySecurity -Type NotAdministrative
+        $GPOPermissions.PrincipalNetBiosName | Should -Be 'NT AUTHORITY\SYSTEM'
+        $GPOPermissions.PrincipalSidType | Should -Be 'WellKnownAdministrative'
+        $GPOPermissions.PrincipalObjectClass | Should -Be 'foreignSecurityPrincipal'
+        $GPOPermissions.DisplayName | Should -be 'TEST | GPOZaurr Permissions Testing'
+        $GPOPermissions.Permission | Should -Be 'GpoEditDeleteModifySecurity'
+
+        [Array] $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -IncludePermissionType GpoEditDeleteModifySecurity
+        $GPOPermissions.Count | Should -be 3
+        $SYSTEM = $GPOPermissions | Where-Object { $_.PrincipalNetBiosName -eq 'NT AUTHORITY\SYSTEM' }
+        $SYSTEM.PrincipalNetBiosName | Should -Be 'NT AUTHORITY\SYSTEM'
+        $SYSTEM.PrincipalSidType | Should -Be 'WellKnownAdministrative'
+        $SYSTEM.PrincipalObjectClass | Should -Be 'foreignSecurityPrincipal'
+        $SYSTEM.DisplayName | Should -be 'TEST | GPOZaurr Permissions Testing'
+        $SYSTEM.Permission | Should -Be 'GpoEditDeleteModifySecurity'
+
+        $DomainAdmins = $GPOPermissions | Where-Object { $_.PrincipalNetBiosName -eq 'EVOTEC\Domain Admins' }
+        $DomainAdmins.PrincipalNetBiosName | Should -Be 'EVOTEC\Domain Admins'
+        $DomainAdmins.PrincipalSidType | Should -Be 'Administrative'
+        $DomainAdmins.PrincipalObjectClass | Should -Be 'group'
+        $DomainAdmins.DisplayName | Should -be 'TEST | GPOZaurr Permissions Testing'
+        $DomainAdmins.Permission | Should -Be 'GpoEditDeleteModifySecurity'
+
+        $EnterpriseAdmins = $GPOPermissions | Where-Object { $_.PrincipalNetBiosName -eq 'EVOTEC\Enterprise Admins' }
+        $EnterpriseAdmins.PrincipalNetBiosName | Should -Be 'EVOTEC\Enterprise Admins'
+        $EnterpriseAdmins.PrincipalSidType | Should -Be 'Administrative'
+        $EnterpriseAdmins.PrincipalObjectClass | Should -Be 'group'
+        $EnterpriseAdmins.DisplayName | Should -be 'TEST | GPOZaurr Permissions Testing'
+        $EnterpriseAdmins.Permission | Should -Be 'GpoEditDeleteModifySecurity'
+    }
+    It 'Add-GPOZaurrPermission - With WHATIF works' {
+        # Tests WHATIF
+        Add-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name -Verbose -WhatIf
+
+        $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -IncludePermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name
+        $GPOPermissions | Should -be $null
+    }
+    It 'Add-GPOZaurrPermission - Without WHATIF works' {
+        Add-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name -Verbose
+
+        $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -IncludePermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name
+        $GPOPermissions | Should -be -Not $null
+        $GPOPermissions.PrincipalNetBiosName | Should -Be 'EVOTEC\przemyslaw.klys'
+    }
+    It 'Remove-GPOZaurrPermission - With WHATIF' {
+        # Tests WHATIF
+        Remove-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -PermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name -Verbose -WhatIf
+
+        $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -IncludePermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name
+        $GPOPermissions | Should -be -Not $null
+        $GPOPermissions.PrincipalNetBiosName | Should -Be 'EVOTEC\przemyslaw.klys'
+
+    }
+    It 'Remove-GPOZaurrPermission - Without WHATIF' {
+        Remove-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -PermissionType GpoEdit -Principal 'EVOTEC\przemyslaw.klys' -PrincipalType NetbiosName -Verbose
+        $GPOPermissions = Get-GPOZaurrPermission -GPOName 'TEST | GPOZaurr Permissions Testing' -IncludePermissionType GpoEdit -Principal 'przemyslaw.klys' -PrincipalType Name
+        $GPOPermissions | Should -be $null
+    }
+}