archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed tests after EAP set to Stop globally, ci_complete

Browse Source
pull/46444/head
Jordan Borean 7 years ago committed by Matt Clay
parent cd4415d4ec
commit e283e7d5dd
2 changed files with 188 additions and 177 deletions
Show Stats Download Patch File Download Diff File

48
lib/ansible/modules/windows/win_regmerge.ps1
Unescape Escape View File

@ -3,6 +3,8 @@
# Copyright: (c) 2015, Jon Hawkesworth (@jhawkesworth) <figs@unity.demon.co.uk> # Copyright: (c) 2015, Jon Hawkesworth (@jhawkesworth) <figs@unity.demon.co.uk>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
#Requires -Module Ansible.ModuleUtils.ArgvParser
#Requires -Module Ansible.ModuleUtils.CommandUtil
#Requires -Module Ansible.ModuleUtils.Legacy #Requires -Module Ansible.ModuleUtils.Legacy
Function Convert-RegistryPath { Function Convert-RegistryPath {
@ -46,24 +48,31 @@ If ( $do_comparison -eq $True ) {
$expanded_compare_key = Convert-RegistryPath ($compare_to_key) $expanded_compare_key = Convert-RegistryPath ($compare_to_key)
# export from the reg key location to a file # export from the reg key location to a file
$reg_args = @("EXPORT", "$expanded_compare_key", $exported_path) $reg_args = Argv-ToString -Arguments @("reg.exe", "EXPORT", $expanded_compare_key, $exported_path)
& reg.exe $reg_args $res = Run-Command -command $reg_args
if ($res.rc -ne 0) {
$result.rc = $res.rc
$result.stdout = $res.stdout
$result.stderr = $res.stderr
Fail-Json -obj $result -message "error exporting registry '$expanded_compare_key' to '$exported_path'"
}
# compare the two files # compare the two files
$comparison_result = Compare-Object -ReferenceObject $(Get-Content $path) -DifferenceObject $(Get-Content $exported_path) $comparison_result = Compare-Object -ReferenceObject $(Get-Content $path) -DifferenceObject $(Get-Content $exported_path)
If (Get-Member -InputObject $comparison_result -Name "count" -MemberType Properties ) If ($null -ne $comparison_result -and (Get-Member -InputObject $comparison_result -Name "count" -MemberType Properties ))
{ {
# Something is different, actually do reg merge # Something is different, actually do reg merge
$reg_import_args = @("IMPORT", "$path") $reg_import_args = Argv-ToString -Arguments @("reg.exe", "IMPORT", $path)
$ret = & reg.exe $reg_import_args 2>&1 $res = Run-Command -command $reg_import_args
If ($LASTEXITCODE -eq 0) { if ($res.rc -ne 0) {
$result.changed = $true $result.rc = $res.rc
$result.difference_count = $comparison_result.count $result.stdout = $res.stdout
} Else { $result.stderr = $res.stderr
$result.rc = $LASTEXITCODE Fail-Json -obj $result -message "error importing registry values from '$path'"
Fail-Json $result "$ret"
} }
$result.changed = $true
$result.difference_count = $comparison_result.count
} Else { } Else {
$result.difference_count = 0 $result.difference_count = 0
} }
@ -73,15 +82,16 @@ If ( $do_comparison -eq $True ) {
} Else { } Else {
# not comparing, merge and report changed # not comparing, merge and report changed
$reg_import_args = @("IMPORT", "$path") $reg_import_args = Argv-ToString -Arguments @("reg.exe", "IMPORT", $path)
$ret = & reg.exe $reg_import_args 2>&1 $res = Run-Command -command $reg_import_args
If ( $LASTEXITCODE -eq 0 ) { if ($res.rc -ne 0) {
$result.changed = $true $result.rc = $res.rc
$result.compared = $false $result.stdout = $res.stdout
} Else { $result.stderr = $res.stderr
$result.rc = $LASTEXITCODE Fail-Json -obj $result -message "error importing registry value from '$path'"
Fail-Json $result "$ret"
} }
$result.changed = $true
$result.compared = $false
} }
Exit-Json $result Exit-Json $result

317
lib/ansible/modules/windows/win_share.ps1
Unescape Escape View File

@ -52,196 +52,197 @@ if (-not (Get-Command -Name Get-SmbShare -ErrorAction SilentlyContinue)) {
Fail-Json $result "The current host does not support the -SmbShare cmdlets required by this module. Please run on Server 2012 or Windows 8 and later" Fail-Json $result "The current host does not support the -SmbShare cmdlets required by this module. Please run on Server 2012 or Windows 8 and later"
} }
Try { $share = Get-SmbShare -Name $name -ErrorAction SilentlyContinue
$share = Get-SmbShare -Name $name -ErrorAction SilentlyContinue If ($state -eq "absent") {
If ($state -eq "absent") { If ($share) {
If ($share) { # See message around -WhatIf where $check_mode is defined
# See message around -WhatIf where $check_mode is defined if (-not $check_mode) {
if (-not $check_mode) { Remove-SmbShare -Force -Name $name | Out-Null
Remove-SmbShare -Force -Name $name | Out-Null }
} $result.actions += "Remove-SmbShare -Force -Name $name"
$result.actions += "Remove-SmbShare -Force -Name $name" $result.changed = $true
$result.changed = $true }
} } Else {
} Else { $path = Get-AnsibleParam -obj $params -name "path" -type "path" -failifempty $true
$path = Get-AnsibleParam -obj $params -name "path" -type "path" -failifempty $true $description = Get-AnsibleParam -obj $params -name "description" -type "str" -default ""
$description = Get-AnsibleParam -obj $params -name "description" -type "str" -default ""
$permissionList = Get-AnsibleParam -obj $params -name "list" -type "bool" -default $false
$folderEnum = if ($permissionList) { "Unrestricted" } else { "AccessBased" }
$permissionRead = Get-AnsibleParam -obj $params -name "read" -type "str" -default "" | NormalizeAccounts $permissionList = Get-AnsibleParam -obj $params -name "list" -type "bool" -default $false
$permissionChange = Get-AnsibleParam -obj $params -name "change" -type "str" -default "" | NormalizeAccounts $folderEnum = if ($permissionList) { "Unrestricted" } else { "AccessBased" }
$permissionFull = Get-AnsibleParam -obj $params -name "full" -type "str" -default "" | NormalizeAccounts
$permissionDeny = Get-AnsibleParam -obj $params -name "deny" -type "str" -default "" | NormalizeAccounts
$cachingMode = Get-AnsibleParam -obj $params -name "caching_mode" -type "str" -default "Manual" -validateSet "BranchCache","Documents","Manual","None","Programs","Unknown" $permissionRead = Get-AnsibleParam -obj $params -name "read" -type "str" -default "" | NormalizeAccounts
$encrypt = Get-AnsibleParam -obj $params -name "encrypt" -type "bool" -default $false $permissionChange = Get-AnsibleParam -obj $params -name "change" -type "str" -default "" | NormalizeAccounts
$permissionFull = Get-AnsibleParam -obj $params -name "full" -type "str" -default "" | NormalizeAccounts
$permissionDeny = Get-AnsibleParam -obj $params -name "deny" -type "str" -default "" | NormalizeAccounts
If (-Not (Test-Path -Path $path)) { $cachingMode = Get-AnsibleParam -obj $params -name "caching_mode" -type "str" -default "Manual" -validateSet "BranchCache","Documents","Manual","None","Programs","Unknown"
Fail-Json $result "$path directory does not exist on the host" $encrypt = Get-AnsibleParam -obj $params -name "encrypt" -type "bool" -default $false
}
# normalize path and remove slash at the end If (-Not (Test-Path -Path $path)) {
$path = (Get-Item $path).FullName -replace "\\$" Fail-Json $result "$path directory does not exist on the host"
}
# need to (re-)create share # normalize path and remove slash at the end
If (-not $share) { $path = (Get-Item $path).FullName -replace "\\$"
if (-not $check_mode) {
New-SmbShare -Name $name -Path $path | Out-Null
}
$share = Get-SmbShare -Name $name -ErrorAction SilentlyContinue
$result.changed = $true # need to (re-)create share
$result.actions += "New-SmbShare -Name $name -Path $path" If (-not $share) {
if (-not $check_mode) {
New-SmbShare -Name $name -Path $path | Out-Null
} }
If ($share.Path -ne $path) { $share = Get-SmbShare -Name $name -ErrorAction SilentlyContinue
if (-not $check_mode) {
Remove-SmbShare -Force -Name $name | Out-Null $result.changed = $true
New-SmbShare -Name $name -Path $path | Out-Null $result.actions += "New-SmbShare -Name $name -Path $path"
} # if in check mode we cannot run the below as no share exists so just
$share = Get-SmbShare -Name $name -ErrorAction SilentlyContinue # exit early
$result.changed = $true if ($check_mode) {
$result.actions += "Remove-SmbShare -Force -Name $name" Exit-Json -obj $result
$result.actions += "New-SmbShare -Name $name -Path $path"
} }
}
If ($share.Path -ne $path) {
if (-not $check_mode) {
Remove-SmbShare -Force -Name $name | Out-Null
New-SmbShare -Name $name -Path $path | Out-Null
}
$share = Get-SmbShare -Name $name -ErrorAction SilentlyContinue
$result.changed = $true
$result.actions += "Remove-SmbShare -Force -Name $name"
$result.actions += "New-SmbShare -Name $name -Path $path"
}
# updates # updates
If ($share.Description -ne $description) { If ($share.Description -ne $description) {
if (-not $check_mode) { if (-not $check_mode) {
Set-SmbShare -Force -Name $name -Description $description | Out-Null Set-SmbShare -Force -Name $name -Description $description | Out-Null
}
$result.changed = $true
$result.actions += "Set-SmbShare -Force -Name $name -Description $description"
} }
If ($share.FolderEnumerationMode -ne $folderEnum) { $result.changed = $true
if (-not $check_mode) { $result.actions += "Set-SmbShare -Force -Name $name -Description $description"
Set-SmbShare -Force -Name $name -FolderEnumerationMode $folderEnum | Out-Null }
} If ($share.FolderEnumerationMode -ne $folderEnum) {
$result.changed = $true if (-not $check_mode) {
$result.actions += "Set-SmbShare -Force -Name $name -FolderEnumerationMode $folderEnum" Set-SmbShare -Force -Name $name -FolderEnumerationMode $folderEnum | Out-Null
} }
if ($share.CachingMode -ne $cachingMode) { $result.changed = $true
if (-not $check_mode) { $result.actions += "Set-SmbShare -Force -Name $name -FolderEnumerationMode $folderEnum"
Set-SmbShare -Force -Name $name -CachingMode $cachingMode | Out-Null }
} if ($share.CachingMode -ne $cachingMode) {
$result.changed = $true if (-not $check_mode) {
$result.actions += "Set-SmbShare -Force -Name $name -CachingMode $cachingMode" Set-SmbShare -Force -Name $name -CachingMode $cachingMode | Out-Null
} }
if ($share.EncryptData -ne $encrypt) { $result.changed = $true
if (-not $check_mode) { $result.actions += "Set-SmbShare -Force -Name $name -CachingMode $cachingMode"
Set-SmbShare -Force -Name $name -EncryptData $encrypt | Out-Null }
} if ($share.EncryptData -ne $encrypt) {
$result.changed = $true if (-not $check_mode) {
$result.actions += "Set-SmbShare -Force -Name $name -EncryptData $encrypt" Set-SmbShare -Force -Name $name -EncryptData $encrypt | Out-Null
} }
$result.changed = $true
$result.actions += "Set-SmbShare -Force -Name $name -EncryptData $encrypt"
}
# clean permissions that imply others # clean permissions that imply others
ForEach ($user in $permissionFull) { ForEach ($user in $permissionFull) {
$permissionChange.remove($user) | Out-Null $permissionChange.remove($user) | Out-Null
$permissionRead.remove($user) | Out-Null $permissionRead.remove($user) | Out-Null
} }
ForEach ($user in $permissionChange) { ForEach ($user in $permissionChange) {
$permissionRead.remove($user) | Out-Null $permissionRead.remove($user) | Out-Null
} }
# remove permissions # remove permissions
$permissions = Get-SmbShareAccess -Name $name $permissions = Get-SmbShareAccess -Name $name
ForEach ($permission in $permissions) { ForEach ($permission in $permissions) {
If ($permission.AccessControlType -eq "Deny") { If ($permission.AccessControlType -eq "Deny") {
$cim_count = 0 $cim_count = 0
foreach ($count in $permissions) { foreach ($count in $permissions) {
$cim_count++ $cim_count++
} }
# Don't remove the Deny entry for Everyone if there are no other permissions set (cim_count == 1) # Don't remove the Deny entry for Everyone if there are no other permissions set (cim_count == 1)
if (-not ($permission.AccountName -eq 'Everyone' -and $cim_count -eq 1)) { if (-not ($permission.AccountName -eq 'Everyone' -and $cim_count -eq 1)) {
If (-not ($permissionDeny.Contains($permission.AccountName))) { If (-not ($permissionDeny.Contains($permission.AccountName))) {
if (-not $check_mode) { if (-not $check_mode) {
Unblock-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null Unblock-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null
}
$result.changed = $true
$result.actions += "Unblock-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
} else {
# Remove from the deny list as it already has the permissions
$permissionDeny.remove($permission.AccountName) | Out-Null
} }
$result.changed = $true
$result.actions += "Unblock-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
} else {
# Remove from the deny list as it already has the permissions
$permissionDeny.remove($permission.AccountName) | Out-Null
} }
} ElseIf ($permission.AccessControlType -eq "Allow") { }
If ($permission.AccessRight -eq "Full") { } ElseIf ($permission.AccessControlType -eq "Allow") {
If (-not ($permissionFull.Contains($permission.AccountName))) { If ($permission.AccessRight -eq "Full") {
if (-not $check_mode) { If (-not ($permissionFull.Contains($permission.AccountName))) {
Revoke-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null if (-not $check_mode) {
} Revoke-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null
$result.changed = $true
$result.actions += "Revoke-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
Continue
} }
$result.changed = $true
$result.actions += "Revoke-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
Continue
}
# user got requested permissions # user got requested permissions
$permissionFull.remove($permission.AccountName) | Out-Null $permissionFull.remove($permission.AccountName) | Out-Null
} ElseIf ($permission.AccessRight -eq "Change") { } ElseIf ($permission.AccessRight -eq "Change") {
If (-not ($permissionChange.Contains($permission.AccountName))) { If (-not ($permissionChange.Contains($permission.AccountName))) {
if (-not $check_mode) { if (-not $check_mode) {
Revoke-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null Revoke-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null
}
$result.changed = $true
$result.actions += "Revoke-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
Continue
} }
$result.changed = $true
$result.actions += "Revoke-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
Continue
}
# user got requested permissions # user got requested permissions
$permissionChange.remove($permission.AccountName) | Out-Null $permissionChange.remove($permission.AccountName) | Out-Null
} ElseIf ($permission.AccessRight -eq "Read") { } ElseIf ($permission.AccessRight -eq "Read") {
If (-not ($permissionRead.Contains($permission.AccountName))) { If (-not ($permissionRead.Contains($permission.AccountName))) {
if (-not $check_mode) { if (-not $check_mode) {
Revoke-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null Revoke-SmbShareAccess -Force -Name $name -AccountName $permission.AccountName | Out-Null
}
$result.changed = $true
$result.actions += "Revoke-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
Continue
} }
$result.changed = $true
$result.actions += "Revoke-SmbShareAccess -Force -Name $name -AccountName $($permission.AccountName)"
# user got requested permissions Continue
$permissionRead.Remove($permission.AccountName) | Out-Null
} }
# user got requested permissions
$permissionRead.Remove($permission.AccountName) | Out-Null
} }
} }
}
# add missing permissions # add missing permissions
ForEach ($user in $permissionRead) { ForEach ($user in $permissionRead) {
if (-not $check_mode) { if (-not $check_mode) {
Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight "Read" | Out-Null Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight "Read" | Out-Null
}
$result.changed = $true
$result.actions += "Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight Read"
} }
ForEach ($user in $permissionChange) { $result.changed = $true
if (-not $check_mode) { $result.actions += "Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight Read"
Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight "Change" | Out-Null }
} ForEach ($user in $permissionChange) {
$result.changed = $true if (-not $check_mode) {
$result.actions += "Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight Change" Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight "Change" | Out-Null
} }
ForEach ($user in $permissionFull) { $result.changed = $true
if (-not $check_mode) { $result.actions += "Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight Change"
Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight "Full" | Out-Null }
} ForEach ($user in $permissionFull) {
$result.changed = $true if (-not $check_mode) {
$result.actions += "Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight Full" Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight "Full" | Out-Null
} }
ForEach ($user in $permissionDeny) { $result.changed = $true
if (-not $check_mode) { $result.actions += "Grant-SmbShareAccess -Force -Name $name -AccountName $user -AccessRight Full"
Block-SmbShareAccess -Force -Name $name -AccountName $user | Out-Null }
} ForEach ($user in $permissionDeny) {
$result.changed = $true if (-not $check_mode) {
$result.actions += "Block-SmbShareAccess -Force -Name $name -AccountName $user" Block-SmbShareAccess -Force -Name $name -AccountName $user | Out-Null
} }
$result.changed = $true
$result.actions += "Block-SmbShareAccess -Force -Name $name -AccountName $user"
} }
} Catch {
Fail-Json $result "an error occurred when attempting to create share $($name): $($_.Exception.Message)"
} }
Exit-Json $result Exit-Json $result

Write Preview
Loading…
Cancel
Save