BUG/MEDIUM: runtime: be more permissive when parsing the HAProxy version

The current version was requiring a semver-compatible version string,
which did not work when the version was customized by distribution
vendors.

Author: oliwer

runtime/version.go

@@ -28,19 +28,24 @@ type HAProxyVersion struct {
 }
 
 func (v *HAProxyVersion) ParseHAProxyVersion(version string) error {
+	parts := strings.Split(version, "-")
 	sv, err := semver.NewVersion(version)
 	if err != nil {
-		return err
+		// Only use the first part.
+		sv, err = semver.NewVersion(parts[0])
+		if err != nil {
+			return err
+		}
 	}
 	v.Version = sv
-	// Commit lives in the prerelease tail: "dev6-2f6f36-13" → "2f6f36",
-	// "a42e6c-11" → "a42e6c", "34b2b10" → "34b2b10".
-	if pre := sv.Prerelease(); pre != "" {
-		parts := strings.Split(pre, "-")
-		if len(parts) < 2 {
-			v.Commit = parts[0]
-		} else {
-			v.Commit = parts[len(parts)-2]
+
+	// Look for a git commit hash.
+	if len(parts) > 1 {
+		for _, part := range parts[1:] {
+			if isGitTag(part) {
+				v.Commit = part
+				break
+			}
 		}
 	}
 	return nil
@@ -55,3 +60,18 @@ func IsBiggerOrEqual(minimum, current *HAProxyVersion) bool {
 	}
 	return current.GreaterThanEqual(minimum.Version)
 }
+
+// Matches git tags between 6 and 8 characters long.
+func isGitTag(s string) bool {
+	n := len(s)
+	if n < 6 || n > 8 {
+		return false
+	}
+	for _, c := range s {
+		match := (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')
+		if !match {
+			return false
+		}
+	}
+	return true
+}

runtime/version_test.go

@@ -50,6 +50,27 @@ func TestHAProxyVersion(t *testing.T) {
 			Commit:   "34b2b10",
 			Original: "2.2.5-34b2b10",
 		},
+		"3.4.3-0+ha34+ubuntu24.04u1": {
+			Major:    3,
+			Minor:    4,
+			Patch:    3,
+			Commit:   "",
+			Original: "3.4.3",
+		},
+		"3.2.22-1ppa1~noble": {
+			Major:    3,
+			Minor:    2,
+			Patch:    22,
+			Commit:   "",
+			Original: "3.2.22",
+		},
+		"3.4.0-aloha-e59b6a36-flx2.2_albva": {
+			Major:    3,
+			Minor:    4,
+			Patch:    0,
+			Commit:   "e59b6a36",
+			Original: "3.4.0",
+		},
 	}
 	for version, result := range tests {
 		t.Run(version, func(t *testing.T) {