Updated tests to reflect merged changes
This commit is contained in:
parent
4f288aeeab
commit
55df531587
|
@ -38,7 +38,10 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
|
||||||
|
|
||||||
#only validate owner and ACEs of the file
|
#only validate owner and ACEs of the file
|
||||||
function ValidateKeyFile {
|
function ValidateKeyFile {
|
||||||
param([string]$FilePath)
|
param(
|
||||||
|
[string]$FilePath,
|
||||||
|
[bool]$IsHostKey = $true
|
||||||
|
)
|
||||||
|
|
||||||
$myACL = Get-ACL $FilePath
|
$myACL = Get-ACL $FilePath
|
||||||
$currentOwnerSid = Get-UserSid -User $myACL.Owner
|
$currentOwnerSid = Get-UserSid -User $myACL.Owner
|
||||||
|
@ -53,8 +56,14 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
|
||||||
$FullControlPerm = [System.UInt32] [System.Security.AccessControl.FileSystemRights]::FullControl.value__
|
$FullControlPerm = [System.UInt32] [System.Security.AccessControl.FileSystemRights]::FullControl.value__
|
||||||
|
|
||||||
if($FilePath.EndsWith(".pub")) {
|
if($FilePath.EndsWith(".pub")) {
|
||||||
$myACL.Access.Count | Should Be 4
|
if ($IsHostKey) {
|
||||||
$identities = @($systemSid, $adminsSid, $currentUserSid, $everyoneSid)
|
$myACL.Access.Count | Should Be 3
|
||||||
|
$identities = @($systemSid, $adminsSid, $currentUserSid)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$myACL.Access.Count | Should Be 4
|
||||||
|
$identities = @($systemSid, $adminsSid, $currentUserSid, $everyoneSid)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$myACL.Access.Count | Should Be 3
|
$myACL.Access.Count | Should Be 3
|
||||||
|
@ -135,7 +144,7 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
|
||||||
ssh-keygen -t $type -P $keypassphrase -f $keyPath
|
ssh-keygen -t $type -P $keypassphrase -f $keyPath
|
||||||
}
|
}
|
||||||
ValidateKeyFile -FilePath $keyPath
|
ValidateKeyFile -FilePath $keyPath
|
||||||
ValidateKeyFile -FilePath "$keyPath.pub"
|
ValidateKeyFile -FilePath "$keyPath.pub" -IsHostKey $false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue