maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Feature]

Browse source 
fix Get-ComputerInfo return of status for DeviceGuard
fix corresponding tests
This commit is contained in:
SteveL-MSFT 2017-07-26 15:03:02 -07:00
parent 4df979a475
commit 700a1c41ff
2 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
View file

@ -436,8 +436,14 @@ namespace Microsoft.PowerShell.Commands
var wmiGuard = session.GetFirst<WmiDeviceGuard>(CIMHelper.DeviceGuardNamespace,
CIMHelper.ClassNames.DeviceGuard);
if (wmiGuard != null)
if (wmiGuard != null) {
var smartStatus = EnumConverter<DeviceGuardSmartStatus>.Convert((int?)wmiGuard.VirtualizationBasedSecurityStatus ?? 0);
if (smartStatus != null)
{
status = (DeviceGuardSmartStatus)smartStatus;
}
guard = wmiGuard.AsOutputType;
}
}
return new DeviceGuardInfo

42
test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
View file

@ -23,6 +23,23 @@ function Get-ComputerInfoForTest
}
}
function Get-StringValuesFromValueMap
{
param([string[]] $values, [hashtable] $valuemap)
[string] $stringValues = [string]::Empty
foreach ($value in $values)
{
if ($stringValues -ne [string]::Empty)
{
$stringValues += ","
}
$stringValues += $valuemap[$value]
}
$stringValues
}
function Get-PropertyNamesForComputerInfoTest
{
$propertyNames = @()
@ -1346,11 +1363,30 @@ try {
else
{
$deviceGuard = Get-DeviceGuard
$observed.DeviceGuardSmartStatus | Should Be $deviceGuard.SmartStatus
$observed.DeviceGuardRequiredSecurityProperties | Should Be $deviceGuard.RequiredSecurityProperties
# can't get amended qualifiers using cim cmdlets so we define them here
$requiredSecurityPropertiesValues = @{
"1" = "BaseVirtualizationSupport"
"2" = "SecureBoot"
"3" = "DMAProtection"
"4" = "SecureMemoryOverwrite"
"5" = "UEFICodeReadonly"
"6" = "SMMSecurityMitigations1.0"
}
$smartStatusValues = @{
"0" = "Off"
"1" = "Enabled"
"2" = "Running"
}
$securityServicesRunningValues = @{
"0" = "0"
"1" = "CredentialGuard"
"2" = "HypervisorEnforcedCodeIntegrity"
}
$observed.DeviceGuardSmartStatus | Should Be (Get-StringValuesFromValueMap -valuemap $smartStatusValues -values $deviceGuard.SmartStatus)
[string]::Join(",", $observed.DeviceGuardRequiredSecurityProperties) | Should Be (Get-StringValuesFromValueMap -valuemap $requiredSecurityPropertiesValues -values $deviceGuard.RequiredSecurityProperties)
$observed.DeviceGuardAvailableSecurityProperties | Should Be $deviceGuard.AvailableSecurityProperties
$observed.DeviceGuardSecurityServicesConfigured | Should Be $deviceGuard.SecurityServicesConfigured
$observed.DeviceGuardSecurityServicesRunning | Should Be $deviceGuard.SecurityServicesRunning
[string]::Join(",", $observed.DeviceGuardSecurityServicesRunning) | Should Be (Get-StringValuesFromValueMap -valuemap $securityServicesRunningValues -values $deviceGuard.SecurityServicesRunning)
$observed.DeviceGuardCodeIntegrityPolicyEnforcementStatus | Should Be $deviceGuard.CodeIntegrityPolicyEnforcementStatus
$observed.DeviceGuardUserModeCodeIntegrityPolicyEnforcementStatus | Should Be $deviceGuard.UserModeCodeIntegrityPolicyEnforcementStatus
}