Merge pull request #2 from viam-labs/find-win32-apps

Search Win32 hive for Win32 apps

Author: johnwalicki

models/module.go

@@ -163,45 +163,59 @@ func (s *winRegSensorRegistry) Close(context.Context) error {
 }
 
 func getWindowsProgramVersion(programName string) (string, error) {
-	var subkey string
+	if programName == "" {
+		return "", fmt.Errorf("program name cannot be empty")
+	}
+
+	for _, hive := range []string{
+		// win64
+		`SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall`,
+		//win32
+		`SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall`,
+	} {
+		version, err := searchRegistryHive(hive, programName)
+		if err == nil {
+			return version, nil
+		}
+	}
+
+	return "", fmt.Errorf("program '%s' not found or version information unavailable", programName)
+}
+
+// searches for programName in HKLM/subkey, returns an error if not found.
+func searchRegistryHive(subkey, programName string) (string, error) {
+	k, err := registry.OpenKey(registry.LOCAL_MACHINE, subkey, registry.QUERY_VALUE|registry.ENUMERATE_SUB_KEYS)
+	if err != nil {
+		return "", err
+	}
+	defer k.Close()
 
-	// Attempt to find the program's uninstall information in the registry.
-	if programName != "" {
-		// subkey = `SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall` // Hive for Win32 applications
-		subkey = `SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall`
+	subkeys, err := k.ReadSubKeyNames(-1)
+	if err != nil {
+		return "", err
+	}
 
-		k, err := registry.OpenKey(registry.LOCAL_MACHINE, subkey, registry.QUERY_VALUE|registry.ENUMERATE_SUB_KEYS)
+	for _, name := range subkeys {
+		appKeyPath := filepath.Join(subkey, name)
+		appKey, err := registry.OpenKey(registry.LOCAL_MACHINE, appKeyPath, registry.QUERY_VALUE)
 		if err != nil {
-			return "", err
+			continue
 		}
-		defer k.Close()
+		defer appKey.Close()
 
-		subkeys, err := k.ReadSubKeyNames(-1)
+		displayName, _, err := appKey.GetStringValue("DisplayName")
 		if err != nil {
-			return "", err
+			continue
 		}
 
-		for _, name := range subkeys {
-			appKeyPath := filepath.Join(subkey, name)
-			appKey, err := registry.OpenKey(registry.LOCAL_MACHINE, appKeyPath, registry.QUERY_VALUE)
-			if err != nil {
-				continue
-			}
-			defer appKey.Close()
-
-			displayName, _, err := appKey.GetStringValue("DisplayName")
+		if strings.Contains(displayName, programName) {
+			version, _, err := appKey.GetStringValue("DisplayVersion")
 			if err != nil {
-				continue
-			}
-
-			if strings.Contains(displayName, programName) {
-				version, _, err := appKey.GetStringValue("DisplayVersion")
-				if err != nil {
-					return "", err
-				}
-				return version, nil
+				return "", err
 			}
+			return version, nil
 		}
 	}
-	return "", fmt.Errorf("program '%s' not found or version information unavailable", programName)
+
+	return "", fmt.Errorf("not found in %s", subkey)
 }