sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-09-01 03:31:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

logical_disk: fix BitLocker shell property handling (#2482)

Browse Source 
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
Jan-Otto Kröpke
2026-08-24 00:49:59 +02:00
committed by GitHub
parent 2fe26866db
commit 066fd65d0b
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/headers/shell32/shell32.go
View File

@@ -52,8 +52,13 @@ func SHCreateItemFromParsingName(path string) (*IShellItem2, error) {
uintptr(unsafe.Pointer(iidIShellItem2)),
uintptr(unsafe.Pointer(&result)),
)
if hr != 0 {
return nil, fmt.Errorf("syscall failed: %w", err)
// procSHCreateItemFromParsingName.Call returns an HRESULT as its first value.
// Only the sign bit indicates failure (the FAILED macro); success codes such
// as S_OK (0) and S_FALSE (1) must not be treated as errors. The HRESULT, not
// GetLastError, carries the COM error information.
if int32(hr) < 0 {
return nil, fmt.Errorf("SHCreateItemFromParsingName failed: %w", ole.NewError(hr))
}
if result == nil {
@@ -64,15 +69,27 @@ func SHCreateItemFromParsingName(path string) (*IShellItem2, error) {
}
func (item *IShellItem2) GetProperty(key *propsys.PROPERTYKEY, v *ole.VARIANT) error {
hr, _, err := syscall.SyscallN(
hr, _, _ := syscall.SyscallN(
item.lpVtbl.GetProperty,
uintptr(unsafe.Pointer(item)),
uintptr(unsafe.Pointer(key)),
uintptr(unsafe.Pointer(v)),
)
if hr != 0 {
return fmt.Errorf("GetProperty failed: %w", err)
// GetProperty is a COM method whose return value is an HRESULT. Only the sign
// bit indicates failure (the FAILED macro); success codes such as S_OK (0)
// and S_FALSE (1) must not be treated as errors. The third return value of
// SyscallN is GetLastError, which COM methods do not set, so it would report
// stale, unrelated errors (e.g. "Too many posts were made to a semaphore").
if int32(hr) < 0 {
return fmt.Errorf("GetProperty failed: %w", ole.NewError(hr))
}
// A successful property lookup may still return VT_EMPTY when the Shell
// property is unavailable. Keep that distinct from a real numeric zero,
// which the BitLocker collector maps to the "disabled" state.
if v.VT == ole.VT_EMPTY {
v.Val = -1
}
return nil