Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fixing size comparison in sanity check function - Check should consider optional strings (#9019)

Browse source
This commit is contained in:
Marcos Oviedo 2022-12-14 15:17:58 -03:00 committed by GitHub
parent 4c084da762
commit 2f77a50903
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
orbit/pkg/platform/platform_windows.go
View file

@ -197,13 +197,15 @@ func wmiGetSMBiosUUID() (string, error) {
return strings.TrimSpace(outputByLines[1]), nil
}
// It perform a UUID sanity check on a given byte array
func isValidUUID(uuidBytes []byte) (bool, error) {
// It performs a UUID sanity check on a given byte array
// The sectionPayloadBytes buffer contains the Smbios Structure Type 1 payload - This includes the actual UUID bytes + Optional section strings
func isValidUUID(sectionPayloadBytes []byte) (bool, error) {
// SMBIOS constants from spec here - https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.1.1.pdf
const uuidSize int = 0x10 // UUID size is calculated with field offset value (0xA) + node field length (6 bytes)
const uuidSize int = 0x10 // UUID size is calculated with field offset value (0xA) + node field length (6 bytes) - 16 bytes - 128bits long
// Sanity check on size
if len(uuidBytes) != uuidSize {
// Sanity check on min size of the input buffer
// Buffer should be long enough to contain an UUID
if len(sectionPayloadBytes) < uuidSize {
return false, errors.New("Invalid input UUID size")
}
@ -211,10 +213,10 @@ func isValidUUID(uuidBytes []byte) (bool, error) {
// Logic is based on https://github.com/ContinuumLLC/godep-go-smbios/blob/ab7c733f1be8e55ed3e0587d1aa2d5883fe8801e/smbios/decoder.go#L135
only0xFF, only0x00 := true, true
for i := 0; i < uuidSize && (only0x00 || only0xFF); i++ {
if uuidBytes[i] != 0x00 {
if sectionPayloadBytes[i] != 0x00 {
only0x00 = false
}
if uuidBytes[i] != 0xFF {
if sectionPayloadBytes[i] != 0xFF {
only0xFF = false
}
}

7
orbit/pkg/platform/platform_windows_test.go
View file

@ -36,3 +36,10 @@ func TestUUIDValid(t *testing.T) {
assert.Nil(t, err, "UUID validation error: ")
}
func TestUUIDStringsIncludedInSectionPayload(t *testing.T) {
payloadWithUUIDAndStrings := []byte{0x11, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x73, 0x6d, 0x62, 0x69, 0x6f, 0x73, 0x00}
_, err := isValidUUID(payloadWithUUIDAndStrings)
assert.Nil(t, err, "UUID validation error: ")
}