Backwards compatibility for smbios headers (#137)

Author: Itxaka

pkg/server/register.go

@@ -245,13 +245,21 @@ func buildName(data map[string]interface{}, name string) string {
 
 func getSMBios(req *http.Request) (map[string]interface{}, error) {
 	var smbios string
-	// 200 * 875bytes per header = 175Kb of smbios data, should be enough?
-	for i := 1; i <= 200; i++ {
-		header := req.Header.Get(fmt.Sprintf("X-Cattle-Smbios-%d", i))
-		if header == "" {
-			break
+	// Old header sent by clients on commit < be788bcfd899977770d84c996abd967c30942822
+	headerOld := req.Header.Get("X-Cattle-Smbios")
+
+	// If old header not found try to get the new ones
+	if headerOld == "" {
+		// 200 * 875bytes per header = 175Kb of smbios data, should be enough?
+		for i := 1; i <= 200; i++ {
+			header := req.Header.Get(fmt.Sprintf("X-Cattle-Smbios-%d", i))
+			if header == "" {
+				break
+			}
+			smbios = smbios + header
 		}
-		smbios = smbios + header
+	} else {
+		smbios = headerOld
 	}
 
 	if smbios == "" {

pkg/server/register_test.go

@@ -17,8 +17,13 @@ limitations under the License.
 package server
 
 import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"net/http"
 	"testing"
 
+	values "github.com/rancher/wrangler/pkg/data"
 	"gotest.tools/assert"
 )
 
@@ -95,3 +100,58 @@ func TestBuildName(t *testing.T) {
 		assert.Equal(t, testCase.Output, buildName(data, testCase.Format))
 	}
 }
+
+func TestSmbios(t *testing.T) {
+	dmiEncoded := map[string]interface{}{}
+	values.PutValue(dmiEncoded, "Myself", "System Information", "Manufacturer")
+	var buf bytes.Buffer
+	b64Enc := base64.NewEncoder(base64.StdEncoding, &buf)
+	json.NewEncoder(b64Enc).Encode(dmiEncoded)
+	_ = b64Enc.Close()
+
+	testCase := []struct {
+		header http.Header
+		path   []string // Path to the value
+		value  string   // Actual value
+		gotIt  bool     // Did we get the value
+	}{
+		{
+			http.Header{"X-Cattle-Smbios": {buf.String()}}, // Old header
+			[]string{"System Information", "Manufacturer"},
+			"Myself",
+			true,
+		},
+		{
+			http.Header{"X-Cattle-Smbios-1": {buf.String()}}, // New header
+			[]string{"System Information", "Manufacturer"},
+			"Myself",
+			true,
+		},
+		{
+			http.Header{"X-Cattle-Smbios-2": {buf.String()}}, // New header but missing the first part
+			[]string{"System Information", "Manufacturer"},
+			"",
+			false,
+		},
+		{
+			http.Header{}, // Empty header
+			[]string{"System Information", "Manufacturer"},
+			"",
+			false,
+		},
+	}
+
+	for _, test := range testCase {
+		data, err := getSMBios(&http.Request{Header: test.header})
+		assert.Equal(t, err, nil)
+		d, gotIt := values.GetValue(data, test.path...)
+		assert.Equal(t, gotIt, test.gotIt)
+		// Cant compare string and nil and values.GetValue returns either a string or a nil
+		if test.value == "" {
+			assert.Equal(t, d, nil)
+		} else {
+			assert.Equal(t, d, test.value)
+		}
+
+	}
+}