diff --git a/go.mod b/go.mod index 69081c6..a04582b 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,16 @@ module github.com/google/certtostore -go 1.24.0 +go 1.18 require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d github.com/google/deck v0.0.0-20230104221208-105ad94aa8ae - golang.org/x/crypto v0.45.0 - golang.org/x/sys v0.38.0 + github.com/hashicorp/go-multierror v1.1.1 + golang.org/x/crypto v0.31.0 + golang.org/x/sys v0.28.0 ) -require github.com/go-ole/go-ole v1.2.5 // indirect +require ( + github.com/go-ole/go-ole v1.2.5 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect +) diff --git a/go.sum b/go.sum index 2d358d6..57aa216 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,12 @@ github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/google/deck v0.0.0-20230104221208-105ad94aa8ae h1:Iy1Ad7L9qPtNAFJad+Ch2kwDXrcwu7QUBR0bfChjnEM= github.com/google/deck v0.0.0-20230104221208-105ad94aa8ae/go.mod h1:DoDv8G58DuLNZF0KysYn0bA/6ZWhmRW3fZE2VnGEH0w= -golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= -golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= -golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/sysinfo_windows.go b/sysinfo_windows.go index b463ca7..ec0a431 100644 --- a/sysinfo_windows.go +++ b/sysinfo_windows.go @@ -76,6 +76,9 @@ func CompInfo() (*Win32_ComputerSystem, error) { if err := wmi.Query(wmi.CreateQuery(&result, ""), &result); err != nil { return nil, err } + if len(result) == 0 { + return nil, errors.New("no computer system information found") + } if result[0].DNSHostName == "" { return nil, errors.New("could not determine the DNS Host Name") } @@ -99,6 +102,9 @@ func CompProdInfo() (*Win32_ComputerSystemProduct, error) { if err := wmi.Query(wmi.CreateQuery(&compProdInfo, ""), &compProdInfo); err != nil { return nil, err } + if len(compProdInfo) == 0 { + return nil, errors.New("no computer system product information found") + } return &compProdInfo[0], nil }