Update examples

Examples/Example-01-BackupGPOs.ps1

@@ -2,8 +2,8 @@
 
 # Backup GPOs
 $BackupPath = "$Env:UserProfile\Desktop\GPO"
-$GPOSummary = Backup-GPOZaurr -BackupPath $BackupPath -Verbose -Type Unlinked -BackupDated #-LimitProcessing 1
+$GPOSummary = Backup-GPOZaurr -BackupPath $BackupPath -Verbose -Type All #-BackupDated #-LimitProcessing 1
 $GPOSummary | Format-Table -AutoSize
 
-# Confirm GPOs are backed up properly
+## Confirm GPOs are backed up properly
 Get-GPOZaurrBackupInformation -BackupFolder $GPOSummary[0].BackupDirectory | Format-Table -a

Examples/Example-02-RemoveEmptyAndUnlinkedGPOs.ps1

@@ -1,5 +1,4 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
 # Remove GPOS
-$BackupPath = "$Env:UserProfile\Desktop\GPO"
-Remove-GPOZaurr -Type Empty, Unlinked -BackupPath $BackupPath -BackupDated -LimitProcessing 2 -Verbose -WhatIf
+Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -BackupDated -LimitProcessing 2 -Verbose -WhatIf

Examples/Example-11-ReplaceGPOwner.ps1

@@ -5,7 +5,7 @@ $Report = Get-GPOZaurrOwner -IncludeSysvol
 $Report | ConvertTo-Excel -FilePath $Env:UserProfile\Desktop\GPOOwners.xlsx -ExcelWorkSheetName 'GPO Owners Before' -AutoFilter -AutoFit
 
 # Step 2 - Fix owners / use WhatIf and LimitProcessing / verify changes before/after
-Set-GPOZaurrOwner -Type NotAdministrative  -Verbose -LimitProcessing 2 -WhatIf
+Set-GPOZaurrOwner -Type All -Verbose:$true -WhatIf # -LimitProcessing 2
 
 # Step 3
 $Report = Get-GPOZaurrOwner -IncludeSysvol

Examples/Example-40-ShowGPO.ps1

@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+#Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
 Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type NetLogon, GPOOrphans, GPOList, GPOConsistency
 
@@ -8,7 +8,7 @@ Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type Net
 #Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurrEmptyUnlinked.html -Verbose -Type GPOConsistency
 #Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type NetLogon
 
-
+#Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type GPOOwners
 
 #Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type GPOPermissionsRoot
 
@@ -16,4 +16,4 @@ Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type Net
 #Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type GPOConsistency
 #Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type GPOOrphans, GPOConsistency
 #Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type GPOList
-#Optimize-HTML -File 'C:\Support\GitHub\GpoZaurr\Examples\Reports\GPOZaurr.html' -OutputFile 'C:\Support\GitHub\GpoZaurr\Examples\Reports\GPOZaurr-Minified.html'
+#Optimize-HTML -File 'C:\Support\GitHub\GpoZaurr\Examples\Reports\GPOZaurr.html' -OutputFile 'C:\Support\GitHub\GpoZaurr\Examples\Reports\GPOZaurr-Minified.html'

Examples/Example-40-ShowGPO1.ps1

@@ -0,0 +1 @@
+Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Verbose -Type NetLogon, GPOOrphans, GPOList, GPOConsistency,GPOOwners

Examples/Example-41-RepairNetLogonOwners.ps1

@@ -0,0 +1,3 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+Repair-GPOZaurrNetLogonOwner -WhatIf:$true -Verbose -IncludeDomains ad.evotec.pl

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-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', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrBroken', 'Remove-GPOZaurrFolders', 'Remove-GPOZaurrLegacyFiles', 'Remove-GPOZaurrPermission', 'Remove-GPOZaurrWMI', '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-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', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrBroken', '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.68'
+    ModuleVersion        = '0.0.69'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{

Private/Script.GPOConfiguration.GPOConsistency.ps1

@@ -0,0 +1,74 @@
+$ScriptGPOConfigurationGPOConsistency = [ordered] @{
+    Chart  = {
+        New-ChartLegend -Names 'Bad', 'Good' -Color PaleGreen, Salmon
+        New-ChartBarOptions -Type barStacked
+        New-ChartLegend -Name 'Consistent', 'Inconsistent'
+        New-ChartBar -Name 'TopLevel' -Value $Inconsistent[0].Count, $Inconsistent[1].Count
+        New-ChartBar -Name 'Inherited' -Value $InconsistentInside[0].Count, $InconsistentInside[1].Count
+    }
+    List   = {
+        New-HTMLListItem -Text 'Top level permissions consistency: ', $Inconsistent[0].Count -FontWeight normal, bold
+        New-HTMLListItem -Text 'Inherited permissions consistency: ', $InconsistentInside[0].Count -FontWeight normal, bold
+        New-HTMLListItem -Text 'Inconsistent top level permissions: ', $Inconsistent[1].Count -FontWeight normal, bold
+        New-HTMLListItem -Text "Inconsistent inherited permissions: ", $InconsistentInside[1].Count -FontWeight normal, bold
+    }
+    Wizard = {
+        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 fixing permissions inconsistencies. To generate new report please use:"
+            New-HTMLCodeBlock -Code {
+                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrPermissionsInconsistentBefore.html -Verbose -Type GPOConsistency
+            }
+            New-HTMLText -Text {
+                "When executed it will take a while to generate all data and provide you with new report depending on size of environment."
+                "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 {
+                $GPOOutput = Get-GPOZaurrPermissionConsistency
+                $GPOOutput | Format-Table # do your actions as desired
+            }
+            New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
+        }
+        New-HTMLWizardStep -Name 'Fix inconsistent permissions' {
+            New-HTMLText -Text "Following command when executed fixes inconsistent permissions."
+            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-HTMLText -Text "Make sure to fill in TargetDomain to match your Domain Admin permission account"
+
+            New-HTMLCodeBlock -Code {
+                Repair-GPOZaurrPermissionConsistency -IncludeDomains "TargetDomain" -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 deleted matches expected data. Once happy with results please follow with command: "
+            }
+            New-HTMLCodeBlock -Code {
+                Repair-GPOZaurrPermissionConsistency -LimitProcessing 2 -IncludeDomains "TargetDomain"
+            }
+            New-HTMLText -TextBlock {
+                "This command when executed repairs only first X inconsistent permissions. Use LimitProcessing parameter to prevent mass fixing 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-HTMLText -Text "If there's nothing else to be fixed, we can skip to next step step"
+        }
+        New-HTMLWizardStep -Name 'Fix inconsistent downlevel permissions' {
+            New-HTMLText -Text "Unfortunetly this step is manual until automation is developed. "
+            New-HTMLText -Text "If there are inconsistent permissions found inside GPO one has to fix them manually by going into SYSVOL and making sure inheritance is enabled, and that permissions are consistent across all files."
+        }
+        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\GPOZaurrPermissionsInconsistentAfter.html -Verbose -Type GPOConsistency
+            }
+            New-HTMLText -Text "If everything is health in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
+        }
+    }
+}

Private/Script.GPOConfiguration.NetLogon.ps1

@@ -0,0 +1,65 @@
+$ScriptGPOConfigurationNetLogon = [ordered] @{
+    List   = {
+        New-HTMLListItem -Text 'NetLogon Files in Total: ', $NetLogonOwners.Count -FontWeight normal, bold
+        New-HTMLListItem -Text 'NetLogon BUILTIN\Administrators as Owner: ', $NetLogonOwnersAdministrators.Count -FontWeight normal, bold
+        New-HTMLListItem -Text "NetLogon Owners requiring change: ", $NetLogonOwnersToFix.Count -FontWeight normal, bold {
+            New-HTMLList -Type Unordered {
+                New-HTMLListItem -Text 'Not Administrative: ', $NetLogonOwnersNotAdministrative.Count -FontWeight normal, bold
+                New-HTMLListItem -Text 'Administrative, but not BUILTIN\Administrators: ', $NetLogonOwnersAdministrativeNotAdministrators.Count -FontWeight normal, bold
+            }
+        }
+    }
+    Wizard = {
+        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 removal. To generate new report please use:"
+            New-HTMLCodeBlock -Code {
+                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrNetLogonBefore.html -Verbose -Type NetLogon
+            }
+            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."
+                "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 {
+                $NetLogonOutput = Get-GPOZaurrNetLogon -Verbose
+                $NetLogonOutput | 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 'Set non-compliant file owners to BUILTIN\Administrators' {
+            New-HTMLText -Text "Following command when executed runs internally command that lists all file owners and if it doesn't match changes it BUILTIN\Administrators. It doesn't change compliant owners."
+            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 {
+                Repair-GPOZaurrNetLogonOwner -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: "
+            }
+            New-HTMLCodeBlock -Code {
+                Repair-GPOZaurrNetLogonOwner -Verbose -LimitProcessing 2
+            }
+            New-HTMLText -TextBlock {
+                "This command when executed sets new owner only on first X non-compliant NetLogon files. 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\GPOZaurrNetLogonAfter.html -Verbose -Type NetLogon
+            }
+            New-HTMLText -Text "If everything is healthy in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
+        }
+    }
+}

Private/Script.GPOConfiguration.ps1

@@ -141,65 +141,7 @@
             }
         }
     }
-    GPOConsistency = [ordered] @{
-        Wizard = {
-            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 fixing permissions inconsistencies. To generate new report please use:"
-                New-HTMLCodeBlock -Code {
-                    Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrPermissionsInconsistentBefore.html -Verbose -Type GPOConsistency
-                }
-                New-HTMLText -Text {
-                    "When executed it will take a while to generate all data and provide you with new report depending on size of environment."
-                    "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 {
-                    $GPOOutput = Get-GPOZaurrPermissionConsistency
-                    $GPOOutput | Format-Table # do your actions as desired
-                }
-                New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
-            }
-            New-HTMLWizardStep -Name 'Fix inconsistent permissions' {
-                New-HTMLText -Text "Following command when executed fixes inconsistent permissions."
-                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-HTMLText -Text "Make sure to fill in TargetDomain to match your Domain Admin permission account"
-
-                New-HTMLCodeBlock -Code {
-                    Repair-GPOZaurrPermissionConsistency -IncludeDomains "TargetDomain" -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 deleted matches expected data. Once happy with results please follow with command: "
-                }
-                New-HTMLCodeBlock -Code {
-                    Repair-GPOZaurrPermissionConsistency -LimitProcessing 2 -IncludeDomains "TargetDomain"
-                }
-                New-HTMLText -TextBlock {
-                    "This command when executed repairs only first X inconsistent permissions. Use LimitProcessing parameter to prevent mass fixing 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-HTMLText -Text "If there's nothing else to be fixed, we can skip to next step step"
-            }
-            New-HTMLWizardStep -Name 'Fix inconsistent downlevel permissions' {
-                New-HTMLText -Text "Unfortunetly this step is manual until automation is developed. "
-                New-HTMLText -Text "If there are inconsistent permissions found inside GPO one has to fix them manually by going into SYSVOL and making sure inheritance is enabled, and that permissions are consistent across all files."
-            }
-            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\GPOZaurrPermissionsInconsistentAfter.html -Verbose -Type GPOConsistency
-                }
-                New-HTMLText -Text "If everything is health in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
-            }
-        }
-    }
+    GPOConsistency = $ScriptGPOConfigurationGPOConsistency
+    NetLogon       = $ScriptGPOConfigurationNetLogon
+    GPOOwners      = $ScriptGPOConfigurationGPOOwners
 }

Private/Script.GpoZaurrOwners.ps1

@@ -0,0 +1,157 @@
+$Script:GpoZaurrOwners = @{
+    Data       = $null
+    Execute    = { Get-GPOZaurrOwner -IncludeSysvol }
+    Processing = {
+        foreach ($GPO in $Script:GpoZaurrOwners['Data']) {
+            if ($GPO.IsOwnerConsistent) {
+                $Script:GpoZaurrOwners['Variables']['IsConsistent']++
+            } else {
+                $Script:GpoZaurrOwners['Variables']['IsNotConsistent']++
+            }
+            if ($GPO.IsOwnerAdministrative) {
+                $Script:GpoZaurrOwners['Variables']['IsAdministrative']++
+            } else {
+                $Script:GpoZaurrOwners['Variables']['IsNotAdministrative']++
+            }
+            if (($GPO.IsOwnerAdministrative -eq $false -or $GPO.IsOwnerConsistent -eq $false) -and $GPO.SysvolExists -eq $true) {
+                $Script:GpoZaurrOwners['Variables']['WillFix']++
+            } elseif ($GPO.SysvolExists -eq $false) {
+                $Script:GpoZaurrOwners['Variables']['RequiresDiffFix']++
+            } else {
+                $Script:GpoZaurrOwners['Variables']['WillNotTouch']++
+            }
+        }
+    }
+    Variables  = [ordered] @{
+        IsAdministrative    = 0
+        IsNotAdministrative = 0
+        IsConsistent        = 0
+        IsNotConsistent     = 0
+        WillFix             = 0
+        RequiresDiffFix     = 0
+        WillNotTouch        = 0
+    }
+    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
+            New-HTMLList -Type Unordered {
+                New-HTMLListItem -Text 'Administrative Owners: ', $Script:GpoZaurrOwners['Variables']['IsAdministrative'] -FontWeight normal, bold
+                New-HTMLListItem -Text 'Non-Administrative Owners: ', $Script:GpoZaurrOwners['Variables']['IsNotAdministrative'] -FontWeight normal, bold
+                New-HTMLListItem -Text "Owners consistent in AD and SYSVOL: ", $Script:GpoZaurrOwners['Variables']['IsConsistent'] -FontWeight normal, bold
+                New-HTMLListItem -Text "Owners not-consistent in AD and SYSVOL: ", $Script:GpoZaurrOwners['Variables']['IsNotConsistent'] -FontWeight normal, bold
+            } -FontSize 10pt
+            New-HTMLChart {
+                New-ChartBarOptions -Type barStacked
+                New-ChartLegend -Name 'Yes', 'No' -Color PaleGreen, Orchid
+                New-ChartBar -Name 'Is administrative' -Value $Script:GpoZaurrOwners['Variables']['IsAdministrative'], $Script:GpoZaurrOwners['Variables']['IsNotAdministrative']
+                New-ChartBar -Name 'Is consistent' -Value $Script:GpoZaurrOwners['Variables']['IsConsistent'], $Script:GpoZaurrOwners['Variables']['IsNotConsistent']
+            } -Title 'Group Policy Owners' -TitleAlignment center
+        }
+    }
+    Solution   = {
+        New-HTMLSection -Invisible {
+            New-HTMLPanel {
+                New-HTMLText -FontSize 10pt -TextBlock {
+                    "By default GPO creation is usually maintained by Domain Admins or Enterprise Admins. "
+                    "When GPO is created by member of Domain Admins or Enterprise Admins group the GPO Owner is set to Domain Admins. "
+                    "When GPO is created by member of Group Policy Creator Owners or other group has delegated rights to create a GPO the owner of said GPO is not Domain Admins group but is assigned to relevant user. "
+                    "GPO Owners should be Domain Admins or Enterprise Admins to prevent abuse. If that isn't so it means owner is able to fully control GPO and potentially change it's settings in uncontrolled way. "
+                    "While at the moment of creation of new GPO it's not a problem, in long term it's possible such person may no longer be admin, yet keep their rights over GPO. "
+                }
+                New-HTMLText -FontSize 10pt -TextBlock {
+                    "As you're aware Group Policies are stored in 2 places. In Active Directory (metadata) and SYSVOL (settings). This means that there are 2 places where GPO Owners exists. "
+                    "This also means that for multiple reasons AD and SYSVOL can be out of sync when it comes to their permissions which can lead to uncontrolled ability to modify them. "
+                    "Ownership in Active Directory and Ownership of SYSVOL for said GPO are required to be the same. "
+                }
+                New-HTMLText -Text "Here's a short summary of ", "Group Policy Owners", ": " -FontSize 10pt -FontWeight normal, bold, normal
+                New-HTMLList -Type Unordered {
+                    New-HTMLListItem -Text 'Administrative Owners: ', $Script:GpoZaurrOwners['Variables']['IsAdministrative'] -FontWeight normal, bold
+                    New-HTMLListItem -Text 'Non-Administrative Owners: ', $Script:GpoZaurrOwners['Variables']['IsNotAdministrative'] -FontWeight normal, bold
+                    New-HTMLListItem -Text "Owners consistent in AD and SYSVOL: ", $Script:GpoZaurrOwners['Variables']['IsConsistent'] -FontWeight normal, bold
+                    New-HTMLListItem -Text "Owners not-consistent in AD and SYSVOL: ", $Script:GpoZaurrOwners['Variables']['IsNotConsistent'] -FontWeight normal, bold
+                } -FontSize 10pt
+                New-HTMLText -FontSize 10pt -Text "This gives us: "
+                New-HTMLList -Type Unordered {
+                    New-HTMLListItem -Text 'Group Policies requiring owner change: ', $Script:GpoZaurrOwners['Variables']['WillFix'] -FontWeight normal, bold
+                    New-HTMLListItem -Text "Group Policies which can't be fixed (no SYSVOL?): ", $Script:GpoZaurrOwners['Variables']['RequiresDiffFix'] -FontWeight normal, bold
+                    New-HTMLListItem -Text "Group Policies unaffected: ", $Script:GpoZaurrOwners['Variables']['WillNotTouch'] -FontWeight normal, bold
+                } -FontSize 10pt
+            }
+            New-HTMLPanel {
+                New-HTMLChart {
+                    New-ChartBarOptions -Type barStacked
+                    New-ChartLegend -Name 'Yes', 'No' -Color LightGreen, Salmon
+                    New-ChartBar -Name 'Is administrative' -Value $Script:GpoZaurrOwners['Variables']['IsAdministrative'], $Script:GpoZaurrOwners['Variables']['IsNotAdministrative']
+                    New-ChartBar -Name 'Is consistent' -Value $Script:GpoZaurrOwners['Variables']['IsConsistent'], $Script:GpoZaurrOwners['Variables']['IsNotConsistent']
+                } -Title 'Group Policy Owners' -TitleAlignment center
+            }
+        }
+        New-HTMLSection -Name 'Group Policy Owners' {
+            New-HTMLTable -DataTable $Script:GpoZaurrOwners['Data'] -Filtering {
+                New-HTMLTableCondition -Name 'IsOwnerConsistent' -Value $false -BackgroundColor Salmon -ComparisonType string -Row
+                New-HTMLTableCondition -Name 'IsOwnerAdministrative' -Value $false -BackgroundColor Salmon -ComparisonType string -Row
+            } -PagingOptions 10, 20, 30, 40, 50
+        }
+        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-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 Owners. To generate new report please use:"
+                            New-HTMLCodeBlock -Code {
+                                Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOOwnersBefore.html -Verbose -Type GPOOwners
+                            }
+                            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."
+                                "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 {
+                                $OwnersGPO = Get-GPOZaurrOwner -IncludeSysvol -Verbose
+                                $OwnersGPO | 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 '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: "
+                            }
+                            New-HTMLCodeBlock -Code {
+                                Set-GPOZaurrOwner -Type All -Verbose -LimitProcessing 2
+                            }
+                            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."
+                            }
+                        }
+                        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\GPOZaurrGPOOwnersAfter.html -Verbose -Type GPOOwners
+                            }
+                            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
+                }
+            }
+        }
+    }
+}

Public/Get-GPOZaurrNetlogon.ps1

@@ -2,16 +2,22 @@
     [cmdletBinding(DefaultParameterSetName = 'Default')]
     param(
         [parameter(ParameterSetName = 'OwnerOnly')][switch] $OwnerOnly,
-        [parameter(ParameterSetName = 'SkipOwner')][switch] $SkipOwner
+        [parameter(ParameterSetName = 'SkipOwner')][switch] $SkipOwner,
+
+        [alias('ForestName')][string] $Forest,
+        [string[]] $ExcludeDomains,
+        [alias('Domain', 'Domains')][string[]] $IncludeDomains,
+        [System.Collections.IDictionary] $ExtendedForestInformation
     )
-    $ForestInformation = Get-WinADForestDetails -Extended
+    $ForestInformation = Get-WinADForestDetails -Extended -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation
     $FilesAll = foreach ($Domain in $ForestInformation.Domains) {
         $Path = -join ("\\", $Domain, '\Netlogon')
+        $PathOnSysvol = -join ("\\", $Domain, "\SYSVOL\", $Domain, "\Scripts")
         $Files = Get-ChildItem -LiteralPath $Path -Recurse -Force
         foreach ($_ in $Files) {
             $ACL = Get-Acl -Path $_.FullName
             if ($ACL.Owner) {
-                $IdentityOwner = Convert-Identity -Identity $ACL.Owner
+                $IdentityOwner = Convert-Identity -Identity $ACL.Owner -Verbose:$false
             } else {
                 $IdentityOwner = [PSCustomObject] @{ SID = ''; Type = 'Uknown' }
             }
@@ -30,12 +36,13 @@
                         PrincipalType     = $IdentityOwner.Type
                         FileSystemRights  = 'Owner'  # : FullControl
                         IsInherited       = $false
+                        FullNameOnSysVol  = $_.FullName.Replace($Path, $PathOnSysvol)
                         #Owner             = $ACL.Owner
                     }
                 }
-                $FilePermission = Get-FilePermissions -Path $_.FullName -ACLS $ACL
+                $FilePermission = Get-FilePermissions -Path $_.FullName -ACLS $ACL -Verbose:$false
                 foreach ($Perm in $FilePermission) {
-                    $Identity = Convert-Identity -Identity $Perm.Principal
+                    $Identity = Convert-Identity -Identity $Perm.Principal -Verbose:$false
                     [PSCustomObject] @{
                         FullName          = $_.FullName
                         Extension         = $_.Extension
@@ -49,19 +56,21 @@
                         PrincipalType     = $Identity.Type
                         FileSystemRights  = $Perm.FileSystemRights  # : FullControl
                         IsInherited       = $Perm.IsInherited       # : True
+                        FullNameOnSysVol  = $_.FullName.Replace($Path, $PathOnSysvol)
                     }
                 }
             } else {
                 [PSCustomObject] @{
-                    FullName       = $_.FullName
-                    Extension      = $_.Extension
-                    CreationTime   = $_.CreationTime
-                    LastAccessTime = $_.LastAccessTime
-                    LastWriteTime  = $_.LastWriteTime
-                    Attributes     = $_.Attributes
-                    Owner          = $IdentityOwner.Name
-                    OwnerSid       = $IdentityOwner.SID
-                    OwnerType      = $IdentityOwner.Type
+                    FullName         = $_.FullName
+                    Extension        = $_.Extension
+                    CreationTime     = $_.CreationTime
+                    LastAccessTime   = $_.LastAccessTime
+                    LastWriteTime    = $_.LastWriteTime
+                    Attributes       = $_.Attributes
+                    Owner            = $IdentityOwner.Name
+                    OwnerSid         = $IdentityOwner.SID
+                    OwnerType        = $IdentityOwner.Type
+                    FullNameOnSysVol = $_.FullName.Replace($Path, $PathOnSysvol)
                 }
             }
         }

Public/Get-GPOZaurrOwner.ps1

@@ -1,10 +1,54 @@
 function Get-GPOZaurrOwner {
+    <#
+    .SYNOPSIS
+    Gets owners of GPOs from Active Directory and SYSVOL
+
+    .DESCRIPTION
+    Gets owners of GPOs from Active Directory and SYSVOL
+
+    .PARAMETER GPOName
+    Name of GPO. By default all GPOs are returned
+
+    .PARAMETER GPOGuid
+    GUID of GPO. By default all GPOs are returned
+
+    .PARAMETER IncludeSysvol
+    Includes Owner from SYSVOL as well
+
+    .PARAMETER SkipBroken
+    Doesn't display GPOs that have no SYSVOL content (orphaned GPOs)
+
+    .PARAMETER Forest
+    Target different Forest
+
+    .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
+
+    .PARAMETER ADAdministrativeGroups
+    Ability to provide AD Administrative Groups from another command to speed up processing
+
+    .EXAMPLE
+    Get-GPOZaurrOwner -Verbose -IncludeSysvol
+
+    .EXAMPLE
+    Get-GPOZaurrOwner -Verbose -IncludeSysvol -SkipBroken
+
+    .NOTES
+    General notes
+    #>
     [cmdletbinding(DefaultParameterSetName = 'Default')]
     param(
         [Parameter(ParameterSetName = 'GPOName')][string] $GPOName,
         [Parameter(ParameterSetName = 'GPOGUID')][alias('GUID', 'GPOID')][string] $GPOGuid,
 
         [switch] $IncludeSysvol,
+        [switch] $SkipBroken,
 
         [alias('ForestName')][string] $Forest,
         [string[]] $ExcludeDomains,
@@ -17,6 +61,7 @@
         if (-not $ADAdministrativeGroups) {
             $ADAdministrativeGroups = Get-ADADministrativeGroups -Type DomainAdmins, EnterpriseAdmins -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation
         }
+        $Count = 0
     }
     Process {
         $getGPOZaurrADSplat = @{
@@ -32,8 +77,9 @@
         }
         $Objects = Get-GPOZaurrAD @getGPOZaurrADSplat
         foreach ($_ in $Objects) {
-            Write-Verbose "Get-GPOZaurrOwner - Processing GPO: $($_.DisplayName) from domain: $($_.DomainName)"
-            $ACL = Get-ADACLOwner -ADObject $_.GPODistinguishedName -Resolve -ADAdministrativeGroups $ADAdministrativeGroups
+            $Count++
+            Write-Verbose "Get-GPOZaurrOwner - Processing GPO [$Count/$($Objects.Count)]: $($_.DisplayName) from domain: $($_.DomainName)"
+            $ACL = Get-ADACLOwner -ADObject $_.GPODistinguishedName -Resolve -ADAdministrativeGroups $ADAdministrativeGroups -Verbose:$false
             $Object = [ordered] @{
                 DisplayName = $_.DisplayName
                 DomainName  = $_.DomainName
@@ -43,16 +89,24 @@
                 OwnerType   = $ACL.OwnerType
             }
             if ($IncludeSysvol) {
-                $FileOwner = Get-FileOwner -JustPath -Path $_.Path -Resolve
+                $FileOwner = Get-FileOwner -JustPath -Path $_.Path -Resolve -Verbose:$false
                 $Object['SysvolOwner'] = $FileOwner.OwnerName
                 $Object['SysvolSid'] = $FileOwner.OwnerSid
                 $Object['SysvolType'] = $FileOwner.OwnerType
                 $Object['SysvolPath'] = $_.Path
                 $Object['IsOwnerConsistent'] = if ($ACL.OwnerName -eq $FileOwner.OwnerName) { $true } else { $false }
                 $Object['IsOwnerAdministrative'] = if ($Object['SysvolType'] -eq 'Administrative' -and $Object['OwnerType'] -eq 'Administrative') { $true } else { $false }
+                if (Test-Path -LiteralPath $Object['SysvolPath']) {
+                    $Object['SysvolExists'] = $true
+                } else {
+                    $Object['SysvolExists'] = $false
+                }
             } else {
                 $Object['IsOwnerAdministrative'] = if ($Object['OwnerType'] -eq 'Administrative') { $true } else { $false }
             }
+            if ($SkipBroken -and $Object['SysvolExists'] -eq $false) {
+                continue
+            }
             $Object['DistinguishedName'] = $_.GPODistinguishedName
             [PSCUstomObject] $Object
         }

Public/Invoke-GPOZaurr.ps1

@@ -10,9 +10,7 @@
             'LegacyAdm'
         )][string[]] $Type
     )
-    $Script:Reporting = [ordered] @{
-
-    }
+    $Script:Reporting = [ordered] @{}
     # Provide version check for easy use
     $GPOZaurrVersion = Get-Command -Name 'Invoke-GPOZaurr' -ErrorAction SilentlyContinue
 
@@ -117,10 +115,12 @@
         $GPOPermissionsRoot = Get-GPOZaurrPermissionRoot -SkipNames
     }
     if ($Type -contains 'GPOOwners' -or $null -eq $Type) {
+        $TimeLogGPOList = Start-TimeLog
         Write-Verbose "Invoke-GPOZaurr - Processing GPO Owners"
-        $GPOOwners = Get-GPOZaurrOwner -IncludeSysvol
-        $IsOwnerConsistent = $GPOOwners.Where( { $_.IsOwnerConsistent -eq $true } , 'split' )
-        $IsOwnerAdministrative = $GPOOwners.Where( { $_.IsOwnerAdministrative -eq $true } , 'split' )
+        $Script:GpoZaurrOwners['Data'] = & $Script:GpoZaurrOwners['Execute']
+        & $Script:GpoZaurrOwners['Processing']
+        $TimeEndGPOList = Stop-TimeLog -Time $TimeLogGPOList -Option OneLiner
+        Write-Verbose -Message "Invoke-GPOZaurr - Processing GPO Owners $TimeEndGPOList"
     }
     if ($Type -contains 'NetLogon' -or $null -eq $Type) {
         $TimeLogSection = Start-TimeLog
@@ -224,18 +224,11 @@
                         New-HTMLPanel {
                             New-HTMLText -Text 'Following chart presents ', 'permissions consistency between Active Directory and SYSVOL for Group Policies' -FontSize 10pt -FontWeight normal, bold
                             New-HTMLList -Type Unordered {
-                                New-HTMLListItem -Text 'Top level permissions consistency: ', $Inconsistent[0].Count -FontWeight normal, bold
-                                New-HTMLListItem -Text 'Inherited permissions consistency: ', $InconsistentInside[0].Count -FontWeight normal, bold
-                                New-HTMLListItem -Text 'Inconsistent top level permissions: ', $Inconsistent[1].Count -FontWeight normal, bold
-                                New-HTMLListItem -Text "Inconsistent inherited permissions: ", $InconsistentInside[1].Count -FontWeight normal, bold
+                                & $Script:GPOConfiguration['GPOConsistency']['List']
                             } -FontSize 10pt
                             New-HTMLText -FontSize 10pt -Text 'Having incosistent permissions on AD in comparison to those on SYSVOL can lead to uncontrolled ability to modify them.'
                             New-HTMLChart {
-                                New-ChartLegend -Names 'Bad', 'Good' -Color PaleGreen, Salmon
-                                New-ChartBarOptions -Type barStacked
-                                New-ChartLegend -Name 'Consistent', 'Inconsistent'
-                                New-ChartBar -Name 'TopLevel' -Value $Inconsistent[0].Count, $Inconsistent[1].Count
-                                New-ChartBar -Name 'Inherited' -Value $InconsistentInside[0].Count, $InconsistentInside[1].Count
+                                & $Script:GPOConfiguration['GPOConsistency']['Chart']
                             } -Title 'Permissions Consistency' -TitleAlignment center
                         }
                     }
@@ -244,15 +237,8 @@
             if ($Type -contains 'GPOOwners' -or $Type -contains 'GPOOrphans' -or $null -eq $Type) {
                 New-HTMLSection -Invisible {
                     if ($Type -contains 'GPOOwners' -or $null -eq $Type) {
-                        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)."
-                            New-HTMLChart {
-                                New-ChartBarOptions -Type barStacked
-                                New-ChartLegend -Name 'Yes', 'No' -Color PaleGreen, Orchid
-                                New-ChartBar -Name 'Is administrative' -Value $IsOwnerAdministrative[0].Count, $IsOwnerAdministrative[1].Count
-                                New-ChartBar -Name 'Is consistent' -Value $IsOwnerConsistent[0].Count, $IsOwnerConsistent[1].Count
-                            } -Title 'Group Policy Owners'
+                        if ($Script:GpoZaurrOwners['Overview']) {
+                            & $Script:GpoZaurrOwners['Overview']
                         }
                     }
                     if ($Type -contains 'GPOOrphans' -or $null -eq $Type) {
@@ -278,14 +264,7 @@
                     New-HTMLPanel {
                         New-HTMLText -Text 'Following chart presents ', 'NetLogon Summary' -FontSize 10pt -FontWeight normal, bold
                         New-HTMLList -Type Unordered {
-                            New-HTMLListItem -Text 'NetLogon Files in Total: ', $NetLogonOwners.Count -FontWeight normal, bold
-                            New-HTMLListItem -Text 'NetLogon BUILTIN\Administrators as Owner: ', $NetLogonOwnersAdministrators.Count -FontWeight normal, bold
-                            New-HTMLListItem -Text "NetLogon Owners requiring change: ", $NetLogonOwnersToFix.Count -FontWeight normal, bold {
-                                New-HTMLList -Type Unordered {
-                                    New-HTMLListItem -Text 'Not Administrative: ', $NetLogonOwnersNotAdministrative.Count -FontWeight normal, bold
-                                    New-HTMLListItem -Text 'Administrative, but not BUILTIN\Administrators: ', $NetLogonOwnersAdministrativeNotAdministrators.Count -FontWeight normal, bold
-                                }
-                            }
+                            & $Script:GPOConfiguration['NetLogon']['List']
                         } -FontSize 10pt
                         #New-HTMLText -FontSize 10pt -Text 'Those problems must be resolved before doing other clenaup activities.'
                         New-HTMLChart {
@@ -387,14 +366,7 @@
                                 "That's why as a best-practice it's recommended to change any non-administrative owners to BUILTIN\Administrators, and even Administrative accounts should be replaced with it. "
                             } -FontSize 10pt
                             New-HTMLList -Type Unordered {
-                                New-HTMLListItem -Text 'NetLogon Files in Total: ', $NetLogonOwners.Count -FontWeight normal, bold
-                                New-HTMLListItem -Text 'NetLogon BUILTIN\Administrators as Owner: ', $NetLogonOwnersAdministrators.Count -FontWeight normal, bold
-                                New-HTMLListItem -Text "NetLogon Owners requiring change: ", $NetLogonOwnersToFix.Count -FontWeight normal, bold {
-                                    New-HTMLList -Type Unordered {
-                                        New-HTMLListItem -Text 'Not Administrative: ', $NetLogonOwnersNotAdministrative.Count -FontWeight normal, bold
-                                        New-HTMLListItem -Text 'Administrative, but not BUILTIN\Administrators: ', $NetLogonOwnersAdministrativeNotAdministrators.Count -FontWeight normal, bold
-                                    }
-                                }
+                                & $Script:GPOConfiguration['NetLogon']['List']
                             } -FontSize 10pt
                             New-HTMLText -Text "Follow the steps below table to get NetLogon Owners into compliant state." -FontSize 10pt
                         }
@@ -405,12 +377,12 @@
                                 New-HTMLTableCondition -Name 'PrincipalType' -Value "WellKnownAdministrative" -BackgroundColor LightGreen -ComparisonType string -Operator eq
                             }
                         }
-                        New-HTMLSection -Name 'Steps to fix - Owners ' {
+                        New-HTMLSection -Name 'Steps to fix NetLogon Owners ' {
                             New-HTMLContainer {
                                 New-HTMLSpanStyle -FontSize 10pt {
                                     New-HTMLText -Text 'Following steps will guide you how to fix NetLogon Owners and make them compliant.'
                                     New-HTMLWizard {
-                                        #& $Script:GPOConfiguration['GPOOrphans']['Wizard']
+                                        & $Script:GPOConfiguration['NetLogon']['Wizard']
                                     } -RemoveDoneStepOnNavigateBack -Theme arrows -ToolbarButtonPosition center
                                 }
                             }
@@ -442,7 +414,9 @@
                 }
                 if ($Type -contains 'GPOOwners' -or $null -eq $Type) {
                     New-HTMLTab -Name 'Owners' {
-                        New-HTMLTable -DataTable $GPOOwners -Filtering
+                        if ($Script:GpoZaurrOwners['Solution']) {
+                            & $Script:GpoZaurrOwners['Solution']
+                        }
                     }
                 }
                 if ($Type -contains 'GPOPermissions' -or $null -eq $Type) {

Public/Repair-GPOZaurrNetLogonOwner.ps1

@@ -0,0 +1,36 @@
+function Repair-GPOZaurrNetLogonOwner {
+    [cmdletBinding(SupportsShouldProcess)]
+    param(
+        [alias('ForestName')][string] $Forest,
+        [string[]] $ExcludeDomains,
+        [alias('Domain', 'Domains')][string[]] $IncludeDomains,
+        [System.Collections.IDictionary] $ExtendedForestInformation,
+
+        [string] $Principal = 'S-1-5-32-544',
+        [int] $LimitProcessing = [int32]::MaxValue
+    )
+    $Identity = Convert-Identity -Identity $Principal -Verbose:$false
+    if ($Identity.Error) {
+        Write-Warning "Repair-GPOZaurrNetLogonOwner - couldn't convert Identity $Principal to desired name. Error: $($Identity.Error)"
+        return
+    }
+    $Principal = $Identity.Name
+
+    $getGPOZaurrNetLogonSplat = @{
+        OwnerOnly = $true
+        Forest = $Forest
+        IncludeDomains = $IncludeDomains
+        ExcludeDomains = $ExcludeDomains
+        ExtendedForestInformation = $ExtendedForestInformation
+    }
+
+    Get-GPOZaurrNetLogon @getGPOZaurrNetLogonSplat | Select-Object -First $LimitProcessing | Where-Object {
+        if ($_.OwnerSid -ne 'S-1-5-32-544') {
+            $_
+        }
+    } | ForEach-Object {
+        if ($PSCmdlet.ShouldProcess($_.FullName, "Setting NetLogon Owner to $($Principal)")) {
+            Set-FileOwner -JustPath -Path $_.FullName -Owner $Principal -Verbose:$true -WhatIf:$WhatIfPreference
+        }
+    }
+}

Public/Set-GPOZaurrOwner.ps1

@@ -1,10 +1,10 @@
 function Set-GPOZaurrOwner {
     <#
     .SYNOPSIS
-    Short description
+    Sets GPO Owner to Domain Admins or other choosen account
 
     .DESCRIPTION
-    Long description
+    Sets GPO Owner to Domain Admins or other choosen account. GPO Owner is set in AD and SYSVOL unless specified otherwise. If account doesn't require change, no change is done.
 
     .PARAMETER Type
     Unknown - finds unknown Owners and sets them to Administrative (Domain Admins) or chosen principal
@@ -12,34 +12,34 @@
     NotAdministrative - combination of Unknown/NotMatching and NotAdministrative - replace with chosen principal or Domain Admins if not specified
     All - if Owner is known it checks if it's Administrative, if it sn't it fixes that. If owner is unknown it fixes it
     .PARAMETER GPOName
-    Parameter description
+    Name of GPO. By default all GPOs are targetted
 
     .PARAMETER GPOGuid
-    Parameter description
+    GUID of GPO. By default all GPOs are targetted
 
     .PARAMETER Forest
-    Parameter description
+    Target different Forest
 
     .PARAMETER ExcludeDomains
-    Parameter description
+    Exclude domain from search, by default whole forest is scanned
 
     .PARAMETER IncludeDomains
-    Parameter description
+    Include only specific domains, by default whole forest is scanned
 
     .PARAMETER ExtendedForestInformation
-    Parameter description
+    Ability to provide Forest Information from another command to speed up processing
 
     .PARAMETER Principal
     Parameter description
 
     .PARAMETER SkipSysvol
-    Parameter description
+    Set GPO Owner only in Active Directory. By default GPO Owner is being set in both places
 
     .PARAMETER LimitProcessing
-    Parameter description
+    Allows to specify maximum number of items that will be fixed in a single run. It doesn't affect amount of GPOs processed
 
     .EXAMPLE
-    An example
+    Set-GPOZaurrOwner -Type All -Verbose -WhatIf -LimitProcessing 2
 
     .NOTES
     General notes
@@ -92,13 +92,16 @@
             ExtendedForestInformation = $ExtendedForestInformation
             ADAdministrativeGroups    = $ADAdministrativeGroups
             Verbose                   = $VerbosePreference
+            SkipBroken                = $true
         }
         if ($GPOName) {
             $getGPOZaurrOwnerSplat['GPOName'] = $GPOName
         } elseif ($GPOGuid) {
             $getGPOZaurrOwnerSplat['GPOGuid'] = $GPOGUiD
         }
+        $Count = 0
         Get-GPOZaurrOwner @getGPOZaurrOwnerSplat | Where-Object {
+            $Count++
             if ($_.Owner) {
                 $AdministrativeGroup = $ADAdministrativeGroups['ByNetBIOS']["$($_.Owner)"]
             } else {
@@ -161,15 +164,15 @@
             }
             if ($Action -eq 'OnlyGPO') {
                 Write-Verbose "Set-GPOZaurrOwner - Changing GPO: $($GPO.DisplayName) from domain: $($GPO.DomainName) from owner $($GPO.Owner) (SID: $($GPO.OwnerSID)) to $DefaultPrincipal"
-                Set-ADACLOwner -ADObject $GPO.DistinguishedName -Principal $DefaultPrincipal  -Verbose:$false -WhatIf:$WhatIfPreference
+                Set-ADACLOwner -ADObject $GPO.DistinguishedName -Principal $DefaultPrincipal -Verbose:$false -WhatIf:$WhatIfPreference
             } elseif ($Action -eq 'OnlyFileSystem') {
                 if (-not $SkipSysvol) {
                     Write-Verbose "Set-GPOZaurrOwner - Changing Sysvol Owner GPO: $($GPO.DisplayName) from domain: $($GPO.DomainName) from owner $($GPO.SysvolOwner) (SID: $($GPO.SysvolSid)) to $DefaultPrincipal"
-                    Set-FileOwner -JustPath -Path $GPO.SysvolPath -Owner $DefaultPrincipal  -Verbose:$true -WhatIf:$WhatIfPreference
+                    Set-FileOwner -JustPath -Path $GPO.SysvolPath -Owner $DefaultPrincipal -Verbose:$true -WhatIf:$WhatIfPreference
                 }
             } else {
                 Write-Verbose "Set-GPOZaurrOwner - Changing GPO: $($GPO.DisplayName) from domain: $($GPO.DomainName) from owner $($GPO.Owner) (SID: $($GPO.OwnerSID)) to $DefaultPrincipal"
-                Set-ADACLOwner -ADObject $GPO.DistinguishedName -Principal $DefaultPrincipal  -Verbose:$false -WhatIf:$WhatIfPreference
+                Set-ADACLOwner -ADObject $GPO.DistinguishedName -Principal $DefaultPrincipal -Verbose:$false -WhatIf:$WhatIfPreference
                 if (-not $SkipSysvol) {
                     Write-Verbose "Set-GPOZaurrOwner - Changing Sysvol Owner GPO: $($GPO.DisplayName) from domain: $($GPO.DomainName) from owner $($GPO.SysvolOwner) (SID: $($GPO.SysvolSid)) to $DefaultPrincipal"
                     Set-FileOwner -JustPath -Path $GPO.SysvolPath -Owner $DefaultPrincipal -Verbose:$true -WhatIf:$WhatIfPreference

README.md

@@ -49,6 +49,14 @@ That's it. Whenever there's a new version, you run the command, and you can enjo
 
 ## Changelog
 
+- 0.0.70
+  - Improved `Invoke-GPOZaurr` (WIP)
+  - Improved `Get-GPOZaurrNetLogon`
+  - Improved `Get-GPOZaurrOwner`
+  - Improved `Set-GPOZaurrOwner`
+- 0.0.69 - 28.10.2020
+  - Added `Repair-GPOZaurrNetLogonOwner`
+  - Improved `Invoke-GPOZaurr` (WIP)
 - 0.0.68 - 28.10.2020
   - Renamed `Show-GPOZaurr` to `Invoke-GPOZaurr`
   - Renamed `Invoke-GPOZaurr` to `Invoke-GPOZaurrContent`