Skip to content

Update 20150108 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2015
Merged

Update 20150108 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...erShellAccessControl_cAccessControlEntry/PowerShellAccessControl_cAccessControlEntry.psm1
View file
Open in desktop
Binary file not shown.
Binary file modified ...erShellAccessControl_cSecurityDescriptor/PowerShellAccessControl_cSecurityDescriptor.psm1
View file
Open in desktop
Binary file not shown.
Binary file modified PowerShellAccessControl.psd1
View file
Open in desktop
Binary file not shown.
25 changes: 15 additions & 10 deletions PowerShellAccessControl.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,19 +997,23 @@ function New-AdaptedSecurityDescriptor {
} | Add-Member -MemberType ScriptProperty -Name AccessPresent -PassThru -Value {
$this.SecurityDescriptor.ControlFlags -match "DiscretionaryAcl"
} | Add-Member -MemberType ScriptProperty -Name Access -PassThru -Value {
$this | Get-AccessControlEntry -AceType AccessAllowed, AccessDenied
"Use Get-AccessControlEntry"
# $this | Get-AccessControlEntry -AceType AccessAllowed, AccessDenied
} | Add-Member -MemberType ScriptProperty -Name Owner -PassThru -Value {
$this | GetPrincipalString -IdentityReference $this.SecurityDescriptor.Owner
} | Add-Member -MemberType ScriptProperty -Name Group -PassThru -Value {
$this | GetPrincipalString -IdentityReference $this.SecurityDescriptor.Group
} | Add-Member -MemberType ScriptProperty -Name AccessToString -PassThru -Value {
$this | Get-AccessControlEntry -AceType AccessAllowed, AccessDenied | Convert-AclToString -DefaultAppliesTo (GetDefaultAppliesTo -IsContainer:$this.SecurityDescriptor.IsContainer -AccessMaskEnumeration $this.GetAccessMaskEnumeration())
"Use Get-AccessControlEntry"
# $this | Get-AccessControlEntry -AceType AccessAllowed, AccessDenied | Convert-AclToString -DefaultAppliesTo (GetDefaultAppliesTo -IsContainer:$this.SecurityDescriptor.IsContainer -AccessMaskEnumeration $this.GetAccessMaskEnumeration())
} | Add-Member -MemberType ScriptProperty -Name AuditPresent -PassThru -Value {
$this.SecurityDescriptor.ControlFlags -match "SystemAcl"
} | Add-Member -MemberType ScriptProperty -Name Audit -PassThru -Value {
$this | Get-AccessControlEntry -AceType SystemAudit
"Use Get-AccessControlEntry"
# $this | Get-AccessControlEntry -AceType SystemAudit
} | Add-Member -MemberType ScriptProperty -Name AuditToString -PassThru -Value {
$this | Get-AccessControlEntry -AceType SystemAudit | Convert-AclToString -DefaultAppliesTo (GetDefaultAppliesTo -IsContainer:$this.SecurityDescriptor.IsContainer -AccessMaskEnumeration $this.GetAccessMaskEnumeration())
"Use Get-AccessControlEntry"
# $this | Get-AccessControlEntry -AceType SystemAudit | Convert-AclToString -DefaultAppliesTo (GetDefaultAppliesTo -IsContainer:$this.SecurityDescriptor.IsContainer -AccessMaskEnumeration $this.GetAccessMaskEnumeration())
} | Add-Member -MemberType ScriptMethod -Name RemoveAccessRule -PassThru -Value {
param(
$Rule
Expand Down Expand Up @@ -1296,8 +1300,9 @@ function New-AdaptedSecurityDescriptor {
Add-Member -MemberType ScriptProperty -Name HasGroupChanged -PassThru -Value {
-not ($this.OriginalGroup -eq $this.SecurityDescriptor.Group)
} | Add-Member -MemberType ScriptProperty -Name MandatoryIntegrityLabel -PassThru -Value {
Get-MandatoryIntegrityLabel -Path $this.SdPath -ObjectType $this.ObjectType |
Add-Member -MemberType ScriptMethod -Name ToString -Force -PassThru -Value { "{0} ({1})" -f $this.Principal, $this.AccessMaskDisplay }
"Use Get-MandatoryIntegrityLabel"
# Get-MandatoryIntegrityLabel -Path $this.SdPath -ObjectType $this.ObjectType |
# Add-Member -MemberType ScriptMethod -Name ToString -Force -PassThru -Value { "{0} ({1})" -f $this.Principal, $this.AccessMaskDisplay }
} | Add-Member -MemberType ScriptMethod -Name GetAceCsv -PassThru -Value {
param(
[char] $Delimiter = ","
Expand Down Expand Up @@ -2304,11 +2309,11 @@ or -Force flags with the {1} command.
}
}
}

$ActionTextSecInfo = 0
if ($DiscretionaryAcl) { $ActionTextSecInfo = $ActionTextSecInfo -bor [PowerShellAccessControl.PInvoke.SecurityInformation]::ProtectedDacl }
if ($SystemAcl) { $ActionTextSecInfo = $ActionTextSecInfo -bor [PowerShellAccessControl.PInvoke.SecurityInformation]::ProtectedSacl }
}

$ActionTextSecInfo = 0
if ($DiscretionaryAcl) { $ActionTextSecInfo = $ActionTextSecInfo -bor [PowerShellAccessControl.PInvoke.SecurityInformation]::UnprotectedDacl }
if ($SystemAcl) { $ActionTextSecInfo = $ActionTextSecInfo -bor [PowerShellAccessControl.PInvoke.SecurityInformation]::UnprotectedSacl }
}

process {
Expand Down