pillar/collectinfo: use IsToken* from zedUpload

christoph-zededa · rene · commit 76800b3378a1 · 2026-06-14T21:42:05.000+02:00
this fixes a bug in IsToken68 that disallowed
strings ending with '=='

Signed-off-by: Christoph Ostarek &lt;christoph@zededa.com&gt;
diff --git a/pkg/pillar/cmd/collectinfo/collectinfo.go b/pkg/pillar/cmd/collectinfo/collectinfo.go
@@ -10,11 +10,11 @@ import (
 	"net/url"
 	"path"
 	"reflect"
-	"regexp"
 	"strings"
 	"time"
 
 	zconfig "github.com/lf-edge/eve-api/go/config"
+	"github.com/lf-edge/eve-libs/zedUpload"
 	"github.com/lf-edge/eve/pkg/pillar/agentbase"
 	"github.com/lf-edge/eve/pkg/pillar/base"
 	"github.com/lf-edge/eve/pkg/pillar/cipher"
@@ -80,20 +80,6 @@ func Run(ps *pubsub.PubSub, loggerArg *logrus.Logger, logArg *base.LogObject, ar
 	return 0
 }
 
-func isToken(str string) bool {
-	// https://datatracker.ietf.org/doc/html/rfc7230#section-3.2.6
-	rex := regexp.MustCompile(`^[a-zA-Z0-9-._~+/!#\$%&'\*\+^` + "`" + `|']*$`)
-
-	return rex.MatchString(str)
-}
-
-func isToken68(str string) bool {
-	// https://datatracker.ietf.org/doc/html/rfc7235#appendix-C
-	rex := regexp.MustCompile(`^[a-zA-Z0-9-._~+/]*=?$`)
-
-	return rex.MatchString(str)
-}
-
 type uploadInfo struct {
 	url string
 	// authMethod can be f.e. Bearer, Basic, NTLM
@@ -171,10 +157,10 @@ func (ci *collectInfo) retrieveDSUploadInfo() (uploadInfo, error) {
 		return uploadInfo{}, fmt.Errorf("no datastore with upload URL found")
 	}
 
-	if !isToken68(apiPassword) {
+	if !zedUpload.IsToken68(apiPassword) {
 		return uploadInfo{}, fmt.Errorf("DsPassword is not token68-conform")
 	}
-	if !isToken(apiKey) {
+	if !zedUpload.IsToken(apiKey) {
 		return uploadInfo{}, fmt.Errorf("DsAPIKey is not token-conform")
 	}
 
diff --git a/pkg/pillar/cmd/collectinfo/collectinfo_test.go b/pkg/pillar/cmd/collectinfo/collectinfo_test.go
@@ -114,112 +114,6 @@ func TestCollectInfoRetrieveDSUploadInfo(t *testing.T) {
 	}
 }
 
-func TestIsToken(t *testing.T) {
-	tests := []struct {
-		name string // description of this test case
-		// Named input parameters for target function.
-		str  string
-		want bool
-	}{
-		{
-			name: "NTLM",
-			str:  "NTLM",
-			want: true,
-		},
-		{
-			name: "Bearer",
-			str:  "Bearer",
-			want: true,
-		},
-		{
-			name: "Basic",
-			str:  "Basic",
-			want: true,
-		},
-		{
-			name: "Spaces",
-			str:  " ",
-			want: false,
-		},
-		{
-			name: "Empty",
-			str:  "",
-			want: true,
-		},
-		{
-			name: "Newline",
-			str:  "\n",
-			want: false,
-		},
-		{
-			name: "Colon",
-			str:  ":",
-			want: false,
-		},
-		{
-			name: "Equal sign",
-			str:  "=",
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := isToken(tt.str)
-			if got != tt.want {
-				t.Errorf("isToken() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestIsToken68(t *testing.T) {
-	tests := []struct {
-		name string // description of this test case
-		// Named input parameters for target function.
-		str  string
-		want bool
-	}{
-		{
-			name: "Spaces",
-			str:  " ",
-			want: false,
-		},
-		{
-			name: "Empty",
-			str:  "",
-			want: true,
-		},
-		{
-			name: "Newline",
-			str:  "\n",
-			want: false,
-		},
-		{
-			name: "Colon",
-			str:  ":",
-			want: false,
-		},
-		{
-			name: "Trailing equal sign",
-			str:  "=",
-			want: true,
-		},
-		{
-			name: "Non-Trailing equal sign",
-			str:  "=A",
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := isToken68(tt.str)
-			if got != tt.want {
-				t.Errorf("isToken68() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
 func TestCreateHttpURLFromDatastore(t *testing.T) {
 	tests := []struct {
 		name string // description of this test case
