⭐️ support Windows 2025 on arm via SSH #4808
Conversation
chris-rock
commented
Nov 2, 2024
chris-rock
commented
chris-rock
force-pushed
the
chris-rock/windows-2025-arm
branch
from
568dc10 to
8d7b70c
Compare
Test Results3 135 tests 3 134 ✅ 1m 26s ⏱️ Results for commit 8d7b70c. |
| @@ -3,11 +3,16 @@ stdout = """Node,BootDevice,BuildNumber,BuildType,Caption,CodeSet,CountryCode,Cr | |||
| VAGRANT,\\Device\\HarddiskVolume1,17763,Multiprocessor Free,Microsoft Windows Server 2019 Datacenter Evaluation,1252,1,Win32_OperatingSystem,Win32_ComputerSystem,,VAGRANT,-420,TRUE,TRUE,TRUE,3,FALSE,,FALSE,256,2,721716,979372,1922780,20190906065515.000000-420,,20190908011749.580533-420,20190908042731.608000-420,0409,Microsoft Corporation,4294967295,137438953344,{en-US},Microsoft Windows Server 2019 Datacenter Evaluation|C:\\Windows|\\Device\\Harddisk0\\Partition2,0,69,1,80,Vagrant,64-bit,1033,400,18,,,,,FALSE,TRUE,3,,00431-20000-00000-AA838,0,0,1179648,OK,400,\\Device\\HarddiskVolume2,C:\\Windows\\system32,C:,,3276340,2096692,10.0.17763,C:\\Windows | |||
| """ | |||
|
|
|||
| [commands."powershell -c \"Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion' -Name CurrentBuild, UBR, EditionID | ConvertTo-Json\""] | |||
| [commands."55dbc0e9b838caa11145eed07f6e73644bda27bf65a0c58a52291f9a18384481"] | |||
There was a problem hiding this comment.
why are we replacing the verbose subsection name with a sha?
There was a problem hiding this comment.
Because this is a longer script now, we use the script hash.
| var productType string | ||
| switch current.ProductType { | ||
| case "WinNT": | ||
| productType = "1" // Workstation |
There was a problem hiding this comment.
is there any reason why we use the digits here and not Workstation, Server, etc?
There was a problem hiding this comment.
I think it makes sense to change this, but this way it is compatible to the current implementation. We need to check and adjust policies like https://github.com/mondoohq/cnspec-policies/blob/main/core/mondoo-windows-11-compatibility.mql.yaml#L22-L23 to use a new label based approach.
There was a problem hiding this comment.
Same question, specially since PS command returns a string as a product type and here we are using a number as a string? 🤔
| pscommand := "Get-ItemProperty -Path 'HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion' -Name CurrentBuild, UBR, EditionID | ConvertTo-Json" | ||
| cmd, err := conn.RunCommand(powershell.Wrap(pscommand)) | ||
| pscommand := ` | ||
| $info = Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\ProductOptions' -Name ProductType |
There was a problem hiding this comment.
nit: why not use our existing way of fetching registry keys to build this? the only thing thats extra here seems to be the processor architecture which can be a separate smaller pwsh cmd to fetch
There was a problem hiding this comment.
I was just adjusting the current implementation with minimal change. I agree, that we should use the new registry key implementation for this. Since I have no time to do this, I recommend we do this in a follow up PR.
|
|
||
| // try to get build + ubr number (win 10+, 2019+) | ||
| current, err := win.GetWindowsOSBuild(conn) | ||
| if err == nil && current.UBR > 0 { |
There was a problem hiding this comment.
Would be nice to log this error even though we are falling back to wmi
There was a problem hiding this comment.
Feel free to add this to the PR.
| var productType string | ||
| switch current.ProductType { | ||
| case "WinNT": | ||
| productType = "1" // Workstation |
There was a problem hiding this comment.
Same question, specially since PS command returns a string as a product type and here we are using a number as a string? 🤔
