Merge pull request #1059 from d1ss0nanz/issue1058

use ioreg to read IOPlatformUUID as HostID
shirou · Oct 30, 2021 · e032a1c · e032a1c
2 parents 9928258 + 9916462
commit e032a1c
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/host/host_darwin.go b/host/host_darwin.go
@@ -6,6 +6,7 @@ import (
  "bytes"
  "context"
  "encoding/binary"
+ "errors"
  "io/ioutil"
  "os"
  "os/exec"
@@ -21,11 +22,27 @@ import (
 const USER_PROCESS = 7
 
 func HostIDWithContext(ctx context.Context) (string, error) {
- uuid, err := unix.Sysctl("kern.uuid")
+ ioreg, err := exec.LookPath("ioreg")
  if err != nil {
  return "", err
  }
- return strings.ToLower(uuid), err
+
+ out, err := invoke.CommandWithContext(ctx, ioreg, "-rd1", "-c", "IOPlatformExpertDevice")
+ if err != nil {
+ return "", err
+ }
+
+ for _, line := range strings.Split(string(out), "\n") {
+ if strings.Contains(line, "IOPlatformUUID") {
+ parts := strings.SplitAfter(line, `" = "`)
+ if len(parts) == 2 {
+ uuid := strings.TrimRight(parts[1], `"`)
+ return strings.ToLower(uuid), nil
+ }
+ }
+ }
+
+ return "", errors.New("cannot find host id")
 }
 
 func numProcs(ctx context.Context) (uint64, error) {

diff --git a/v3/host/host_darwin.go b/v3/host/host_darwin.go
@@ -6,6 +6,7 @@ import (
  "bytes"
  "context"
  "encoding/binary"
+ "errors"
  "io/ioutil"
  "os"
  "os/exec"
@@ -21,11 +22,27 @@ import (
 const user_PROCESS = 7
 
 func HostIDWithContext(ctx context.Context) (string, error) {
- uuid, err := unix.Sysctl("kern.uuid")
+ ioreg, err := exec.LookPath("ioreg")
  if err != nil {
  return "", err
  }
- return strings.ToLower(uuid), err
+
+ out, err := invoke.CommandWithContext(ctx, ioreg, "-rd1", "-c", "IOPlatformExpertDevice")
+ if err != nil {
+ return "", err
+ }
+
+ for _, line := range strings.Split(string(out), "\n") {
+ if strings.Contains(line, "IOPlatformUUID") {
+ parts := strings.SplitAfter(line, `" = "`)
+ if len(parts) == 2 {
+ uuid := strings.TrimRight(parts[1], `"`)
+ return strings.ToLower(uuid), nil
+ }
+ }
+ }
+
+ return "", errors.New("cannot find host id")
 }
 
 func numProcs(ctx context.Context) (uint64, error) {