From f7730beb64f8a1069d101de91d5af121a58b119a Mon Sep 17 00:00:00 2001
From: Etienne Bruines <etienne@bruines.com>
Date: Fri, 21 Apr 2023 03:44:39 +0200
Subject: [PATCH] cni: fix plugin fingerprinting versions (#16776)

CNI plugins v1.2.0 and above output a second line, containing supported protocol versions.
---
 .changelog/16776.txt                        | 3 +++
 client/fingerprint/plugins_cni.go           | 4 ++--
 client/fingerprint/plugins_cni_test.go      | 4 ++++
 client/fingerprint/test_fixtures/cni/bridge | 1 +
 client/fingerprint/test_fixtures/cni/vlan   | 5 +++++
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .changelog/16776.txt
 create mode 100755 client/fingerprint/test_fixtures/cni/vlan

diff --git a/.changelog/16776.txt b/.changelog/16776.txt
new file mode 100644
index 000000000000..00971d3a19fc
--- /dev/null
+++ b/.changelog/16776.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+client: Fix CNI plugin version fingerprint when output includes protocol version
+```
diff --git a/client/fingerprint/plugins_cni.go b/client/fingerprint/plugins_cni.go
index aec171c64ad3..55e3b1d95219 100644
--- a/client/fingerprint/plugins_cni.go
+++ b/client/fingerprint/plugins_cni.go
@@ -108,9 +108,9 @@ func (f *PluginsCNIFingerprint) detectOnePlugin(pluginPath string, entry os.DirE
 	// e.g.
 	//  /opt/cni/bin/bridge <no args>
 	//  CNI bridge plugin v1.0.0
+	//  (and optionally another line that contains the supported CNI protocol versions)
 	tokens := strings.Fields(string(output))
-	for i := len(tokens) - 1; i >= 0; i-- {
-		token := tokens[i]
+	for _, token := range tokens {
 		if _, parseErr := version.NewSemver(token); parseErr == nil {
 			return token, true
 		}
diff --git a/client/fingerprint/plugins_cni_test.go b/client/fingerprint/plugins_cni_test.go
index 62d889cde213..45f9381b7d1a 100644
--- a/client/fingerprint/plugins_cni_test.go
+++ b/client/fingerprint/plugins_cni_test.go
@@ -29,8 +29,10 @@ func TestPluginsCNIFingerprint_Fingerprint_present(t *testing.T) {
 	must.True(t, response.Detected)
 	attrCustom := f.(*PluginsCNIFingerprint).attribute("custom")
 	attrBridge := f.(*PluginsCNIFingerprint).attribute("bridge")
+	attrVlan := f.(*PluginsCNIFingerprint).attribute("vlan")
 	must.Eq(t, "v1.2.3", response.Attributes[attrCustom])
 	must.Eq(t, "v1.0.2", response.Attributes[attrBridge])
+	must.Eq(t, "v1.2.0", response.Attributes[attrVlan])
 }
 
 func TestPluginsCNIFingerprint_Fingerprint_multi(t *testing.T) {
@@ -49,10 +51,12 @@ func TestPluginsCNIFingerprint_Fingerprint_multi(t *testing.T) {
 	must.True(t, response.Detected)
 	attrCustom := f.(*PluginsCNIFingerprint).attribute("custom")
 	attrBridge := f.(*PluginsCNIFingerprint).attribute("bridge")
+	attrVlan := f.(*PluginsCNIFingerprint).attribute("vlan")
 	attrCustom2 := f.(*PluginsCNIFingerprint).attribute("custom2")
 	must.Eq(t, "v1.2.3", response.Attributes[attrCustom])
 	must.Eq(t, "v1.0.2", response.Attributes[attrBridge])
 	must.Eq(t, "v9.9.9", response.Attributes[attrCustom2])
+	must.Eq(t, "v1.2.0", response.Attributes[attrVlan])
 }
 
 func TestPluginsCNIFingerprint_Fingerprint_absent(t *testing.T) {
diff --git a/client/fingerprint/test_fixtures/cni/bridge b/client/fingerprint/test_fixtures/cni/bridge
index 0b7f14f7f506..d62b0caa694f 100755
--- a/client/fingerprint/test_fixtures/cni/bridge
+++ b/client/fingerprint/test_fixtures/cni/bridge
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+# This fixture uses the old version output, without the supported CNI protocol versions.
 echo "CNI bridge plugin v1.0.2"
diff --git a/client/fingerprint/test_fixtures/cni/vlan b/client/fingerprint/test_fixtures/cni/vlan
new file mode 100755
index 000000000000..e10b36b1d750
--- /dev/null
+++ b/client/fingerprint/test_fixtures/cni/vlan
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# This fixture uses the new version output, including the supported CNI protocol versions.
+echo "CNI vlan plugin v1.2.0"
+echo "CNI protocol versions supported: 0.1.0, 0.2.0, 0.3.0, 0.3.1, 0.4.0, 1.0.0"