Rewrite Windows version detection; fix minor bug

Gopkg.lock

@@ -9,6 +9,14 @@
   pruneopts = "UT"
   revision = "e2d15f34fcf99d5dbb871c820ec73f710fca9815"
 
+[[projects]]
+  digest = "1:e92f5581902c345eb4ceffdcd4a854fb8f73cf436d47d837d1ec98ef1fe0a214"
+  name = "github.com/StackExchange/wmi"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
+  version = "1.0.0"
+
 [[projects]]
   digest = "1:dbd3a713434b6f32d9459b1e6786ad58cec128470b58555cdc7b3b7314a1706f"
   name = "github.com/aead/serpent"
@@ -56,6 +64,17 @@
   pruneopts = "UT"
   revision = "6a90982ecee230ff6cba02d5bd386acc030be9d3"
 
+[[projects]]
+  digest = "1:440028f55cb322d8cb5b9d5ebec298a00b7d74690a658fe6b1c0c0b44341bfae"
+  name = "github.com/go-ole/go-ole"
+  packages = [
+    ".",
+    "oleutil",
+  ]
+  pruneopts = "UT"
+  revision = "97b6244175ae18ea6eef668034fd6565847501c9"
+  version = "v1.2.4"
+
 [[projects]]
   digest = "1:318f1c959a8a740366fce4b1e1eb2fd914036b4af58fbd0a003349b305f118ad"
   name = "github.com/golang/protobuf"
@@ -88,6 +107,14 @@
   revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"
   version = "v1.4.0"
 
+[[projects]]
+  digest = "1:88e0b0baeb9072f0a4afbcf12dda615fc8be001d1802357538591155998da21b"
+  name = "github.com/hashicorp/go-version"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"
+  version = "v1.2.0"
+
 [[projects]]
   branch = "master"
   digest = "1:ae08d850ba158ea3ba4a7bb90f8372608172d8920644e5a6693b940a1f4e5d01"
@@ -118,6 +145,14 @@
   revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4"
   version = "v0.8.1"
 
+[[projects]]
+  branch = "develop"
+  digest = "1:d88649ff4a4a0746857dd9e39915aedddce2b08e442ac131a91e573cd45bde93"
+  name = "github.com/safing/portmaster"
+  packages = ["core/structure"]
+  pruneopts = "UT"
+  revision = "0ab150ba8948cf0b5c688384f5ac1bf234647f84"
+
 [[projects]]
   digest = "1:274f67cb6fed9588ea2521ecdac05a6d62a8c51c074c1fccc6a49a40ba80e925"
   name = "github.com/satori/go.uuid"
@@ -142,6 +177,29 @@
   pruneopts = "UT"
   revision = "e9f377c596061894b7f9ee69aab61e62c3ccc13e"
 
+[[projects]]
+  digest = "1:7ebe52387a847d276a9b9e7b379b2e3e4d536843ad840a9c4426a0152e6b3d54"
+  name = "github.com/shirou/gopsutil"
+  packages = [
+    "cpu",
+    "host",
+    "internal/common",
+    "mem",
+    "net",
+    "process",
+  ]
+  pruneopts = "UT"
+  revision = "d80c43f9c984a48783daf22f4bd9278006ae483a"
+  version = "v2.19.7"
+
+[[projects]]
+  branch = "master"
+  digest = "1:99c6a6dab47067c9b898e8c8b13d130c6ab4ffbcc4b7cc6236c2cd0b1e344f5b"
+  name = "github.com/shirou/w32"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
+
 [[projects]]
   branch = "master"
   digest = "1:93d6687fc19da8a35c7352d72117a6acd2072dfb7e9bfd65646227bf2a913b2a"
@@ -215,7 +273,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:8a3986af7a48f0991ce6168708859c56d39d2ff8b82b34d0805bbb545a9a32a6"
+  digest = "1:afce8593ac5918df05a46499b04b8c4e46a91e99566055e4a8ba829a8f389a09"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
@@ -223,7 +281,7 @@
     "windows",
   ]
   pruneopts = "UT"
-  revision = "46560c3f3c0a091352115a3d825af45663b983d8"
+  revision = "51ab0e2deafac1f46c46ad59cf0921be2f180c3d"
 
 [[projects]]
   branch = "master"
@@ -254,8 +312,11 @@
     "github.com/google/renameio",
     "github.com/gorilla/mux",
     "github.com/gorilla/websocket",
+    "github.com/hashicorp/go-version",
+    "github.com/safing/portmaster/core/structure",
     "github.com/satori/go.uuid",
     "github.com/seehuhn/fortuna",
+    "github.com/shirou/gopsutil/host",
     "github.com/tevino/abool",
     "github.com/tidwall/gjson",
     "github.com/tidwall/sjson",

Gopkg.toml

@@ -88,3 +88,11 @@
 [[constraint]]
   name = "github.com/satori/go.uuid"
   version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/shirou/gopsutil"
+  version = "2.19.6"
+
+[[constraint]]
+  name = "github.com/hashicorp/go-version"
+  version = "1.2.0"

utils/osdetail/colors_windows.go

@@ -20,12 +20,13 @@ func EnableColorSupport() bool {
 
 	if !colorSupportChecked {
 		colorSupport = enableColorSupport()
+		colorSupportChecked = true
 	}
 	return colorSupport
 }
 
 func enableColorSupport() bool {
-	if IsWindowsVersion("10.") {
+	if IsAtLeastWindowsNTVersionWithDefault("10", false) {
 
 		// check if windows.Stdout is file
 		if windows.GetFileInformationByHandle(windows.Stdout, &windows.ByHandleFileInformation{}) == nil {

utils/osdetail/version_windows.go

@@ -1,56 +1,100 @@
 package osdetail
 
 import (
-	"os/exec"
+	"fmt"
 	"regexp"
-	"strings"
 	"sync"
-)
 
-// FIXME: use https://godoc.org/github.com/shirou/gopsutil/host#PlatformInformation instead
+	"github.com/hashicorp/go-version"
+	versionCmp "github.com/hashicorp/go-version"
+	"github.com/shirou/gopsutil/host"
+)
 
 var (
 	versionRe = regexp.MustCompile(`[0-9\.]+`)
 
-	windowsVersion string
+	windowsNTVersion       string
+	windowsNTVersionForCmp *versionCmp.Version
 
 	fetching sync.Mutex
 	fetched  bool
 )
 
-func fetchVersion() {
+// WindowsNTVersion returns the current Windows version.
+func WindowsNTVersion() (string, error) {
+	var err error
+	fetching.Lock()
+	defer fetching.Unlock()
+
 	if !fetched {
-		fetched = true
+		_, _, windowsNTVersion, err = host.PlatformInformation()
 
-		output, err := exec.Command("cmd", "ver").Output()
 		if err != nil {
-			return
+			return "", fmt.Errorf("failed to obtain Windows-Version: %s", err)
 		}
 
-		match := versionRe.Find(output)
-		if match == nil {
-			return
+		windowsNTVersionForCmp, err = version.NewVersion(windowsNTVersion)
+
+		if err != nil {
+			return "", fmt.Errorf("failed to parse Windows-Version %s: %s", windowsNTVersion, err)
 		}
 
-		windowsVersion = string(match)
+		fetched = true
 	}
+
+	return windowsNTVersion, err
 }
 
-// WindowsVersion returns the current Windows version.
-func WindowsVersion() string {
-	fetching.Lock()
-	defer fetching.Unlock()
-	fetchVersion()
+// IsAtLeastWindowsNTVersion returns whether the current WindowsNT version is at least the given version or newer.
+func IsAtLeastWindowsNTVersion(otherVersion string) (bool, error) {
+	_, err := WindowsNTVersion()
+	if err != nil {
+		return false, err
+	}
 
-	return windowsVersion
+	otherVersionForCmp, err := version.NewVersion(otherVersion)
+	if err != nil {
+		return false, err
+	}
+
+	return windowsNTVersionForCmp.GreaterThanOrEqual(otherVersionForCmp), nil
 }
 
-// IsWindowsVersion returns whether the given version matches (HasPrefix) the current Windows version.
-func IsWindowsVersion(version string) bool {
-	fetching.Lock()
-	defer fetching.Unlock()
-	fetchVersion()
-
-	// TODO: we can do better.
-	return strings.HasPrefix(windowsVersion, version)
+// IsAtLeastWindowsNTVersionWithDefault is like IsAtLeastWindowsNTVersion(), but keeps the Error and returns the default Value in Errorcase
+func IsAtLeastWindowsNTVersionWithDefault(v string, defaultValue bool) bool {
+	val, err := IsAtLeastWindowsNTVersion(v)
+	if err != nil {
+		return defaultValue
+	}
+	return val
+}
+
+// IsAtLeastWindowsVersion returns whether the current Windows version is at least the given version or newer.
+func IsAtLeastWindowsVersion(v string) (bool, error) {
+	var (
+		NTVersion string
+	)
+	switch v {
+	case "7":
+		NTVersion = "6.1"
+	case "8":
+		NTVersion = "6.2"
+	case "8.1":
+		NTVersion = "6.3"
+	case "10":
+		NTVersion = "10"
+	default:
+		return false, fmt.Errorf("failed to compare Windows-Version: Windows %s is unknown", v)
+	}
+
+	return IsAtLeastWindowsNTVersion(NTVersion)
+}
+
+// IsAtLeastWindowsVersionWithDefault is like IsAtLeastWindowsVersion(), but keeps the Error and returns the default Value in Errorcase
+func IsAtLeastWindowsVersionWithDefault(v string, defaultValue bool) bool {
+	val, err := IsAtLeastWindowsVersion(v)
+	if err != nil {
+		return defaultValue
+	}
+	return val
 }

utils/osdetail/version_windows_test.go

@@ -2,8 +2,28 @@ package osdetail
 
 import "testing"
 
-func TestWindowsVersion(t *testing.T) {
-	if WindowsVersion() == "" {
-		t.Fatal("could not get windows version")
+func TestWindowsNTVersion(t *testing.T) {
+	if str, err := WindowsNTVersion(); str == "" || err != nil {
+		t.Fatalf("failed to obtain windows version: %s", err)
+	}
+}
+
+func TestIsAtLeastWindowsNTVersion(t *testing.T) {
+	ret, err := IsAtLeastWindowsNTVersion("6")
+	if err != nil {
+		t.Fatalf("failed to compare windows versions: %s", err)
+	}
+	if !ret {
+		t.Fatalf("WindowsNTVersion is less than 6 (Vista)")
+	}
+}
+
+func TestIsAtLeastWindowsVersion(t *testing.T) {
+	ret, err := IsAtLeastWindowsVersion("7")
+	if err != nil {
+		t.Fatalf("failed to compare windows versions: %s", err)
+	}
+	if !ret {
+		t.Fatalf("WindowsVersion is less than 7")
 	}
 }