From d0bd7b1cdcadd42693a1ad1b519c243e584f6d11 Mon Sep 17 00:00:00 2001 From: Przemyslaw Klys Date: Thu, 1 Oct 2020 22:52:28 +0200 Subject: [PATCH] Update --- Examples/Example-37-GPOPermissionSummary.ps1 | 5 ++--- Public/Get-GPOZaurrPermissionRoot.ps1 | 8 ++++---- Public/Get-GPOZaurrPermissionSummary.ps1 | 9 ++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Examples/Example-37-GPOPermissionSummary.ps1 b/Examples/Example-37-GPOPermissionSummary.ps1 index 06cc259..73ae104 100644 --- a/Examples/Example-37-GPOPermissionSummary.ps1 +++ b/Examples/Example-37-GPOPermissionSummary.ps1 @@ -5,7 +5,6 @@ # If you want to see also owners # 'GpoOwner' # If you want to include Root Level Permissions -# 'GpoCustomCreate', 'GpoCustomOwner' - -$SummaryPermission = Get-GPOZaurrPermissionSummary -IncludePermissionType 'GPOCustom', 'GpoEdit', 'GpoEditDeleteModifySecurity', 'GpoOwner', 'GpoCustomCreate', 'GpoCustomOwner' +# 'GpoRootCreate', 'GpoRootOwner' +$SummaryPermission = Get-GPOZaurrPermissionSummary -IncludePermissionType 'GpoCustom', 'GpoEdit', 'GpoEditDeleteModifySecurity', 'GpoOwner', 'GpoRootCreate', 'GpoRootOwner' $SummaryPermission | Sort-Object -Property Permission | Format-Table \ No newline at end of file diff --git a/Public/Get-GPOZaurrPermissionRoot.ps1 b/Public/Get-GPOZaurrPermissionRoot.ps1 index bb4fd29..87559fd 100644 --- a/Public/Get-GPOZaurrPermissionRoot.ps1 +++ b/Public/Get-GPOZaurrPermissionRoot.ps1 @@ -1,8 +1,8 @@ function Get-GPOZaurrPermissionRoot { [cmdletBinding()] param( - [ValidateSet('GpoCustomCreate', 'GpoCustomOwner')][string[]] $IncludePermissionType, - [ValidateSet('GpoCustomCreate', 'GpoCustomOwner')][string[]] $ExcludePermissionType, + [ValidateSet('GpoRootCreate', 'GpoRootOwner')][string[]] $IncludePermissionType, + [ValidateSet('GpoRootCreate', 'GpoRootOwner')][string[]] $ExcludePermissionType, [alias('ForestName')][string] $Forest, [string[]] $ExcludeDomains, [alias('Domain', 'Domains')][string[]] $IncludeDomains, @@ -29,10 +29,10 @@ foreach ($Permission in $GPOPermissionsGlobal) { $CustomPermission = foreach ($_ in $Permission.ActiveDirectoryRights) { if ($_ -in 'WriteDACL', 'WriteOwner', 'GenericAll' ) { - 'GpoCustomOwner' + 'GpoRootOwner' } if ($_ -in 'CreateChild', 'GenericAll') { - 'GpoCustomCreate' + 'GpoRootCreate' } } $CustomPermission = $CustomPermission | Sort-Object -Unique diff --git a/Public/Get-GPOZaurrPermissionSummary.ps1 b/Public/Get-GPOZaurrPermissionSummary.ps1 index e1769c8..814074b 100644 --- a/Public/Get-GPOZaurrPermissionSummary.ps1 +++ b/Public/Get-GPOZaurrPermissionSummary.ps1 @@ -3,9 +3,8 @@ param( [validateSet('AuthenticatedUsers', 'DomainComputers', 'Unknown', 'WellKnownAdministrative', 'NotWellKnown', 'NotWellKnownAdministrative', 'NotAdministrative', 'Administrative', 'All')][string[]] $Type = 'All', [validateSet('Allow', 'Deny', 'All')][string] $PermitType = 'All', - [ValidateSet('GpoApply', 'GpoEdit', 'GpoCustom', 'GpoEditDeleteModifySecurity', 'GpoRead', 'GpoOwner', 'GpoCustomCreate', 'GpoCustomOwner')][string[]] $IncludePermissionType, - [ValidateSet('GpoApply', 'GpoEdit', 'GpoCustom', 'GpoEditDeleteModifySecurity', 'GpoRead', 'GpoOwner', 'GpoCustomCreate', 'GpoCustomOwner')][string[]] $ExcludePermissionType, - + [ValidateSet('GpoApply', 'GpoEdit', 'GpoCustom', 'GpoEditDeleteModifySecurity', 'GpoRead', 'GpoOwner', 'GpoRootCreate', 'GpoRootOwner')][string[]] $IncludePermissionType, + [ValidateSet('GpoApply', 'GpoEdit', 'GpoCustom', 'GpoEditDeleteModifySecurity', 'GpoRead', 'GpoOwner', 'GpoRootCreate', 'GpoRootOwner')][string[]] $ExcludePermissionType, [alias('ForestName')][string] $Forest, [string[]] $ExcludeDomains, [alias('Domain', 'Domains')][string[]] $IncludeDomains, @@ -22,7 +21,7 @@ $IncludePermTypes.Add([Microsoft.GroupPolicy.GPPermissionType]::$PermType) } elseif ($PermType -in 'GpoOwner') { $IncludeOwner = $true - } elseif ($PermType -in 'GpoCustomCreate', 'GpoCustomOwner') { + } elseif ($PermType -in 'GpoRootCreate', 'GpoRootOwner') { $CustomPermissions.Add($PermType) } } @@ -31,7 +30,7 @@ $ExcludePermTypes.Add([Microsoft.GroupPolicy.GPPermissionType]::$PermType) } elseif ($PermType -in 'GpoOwner') { $IncludeOwner = $false - } elseif ($PermType -in 'GpoCustomCreate', 'GpoCustomOwner') { + } elseif ($PermType -in 'GpoRootCreate', 'GpoRootOwner') { $CustomPermissions.Add($PermType) } }