Merge pull request #137 from sudo-bmitch/pr-valid-oauth-username

Require a valid oauth2 username

config/const.go

@@ -18,6 +18,7 @@ package config
 import (
  "context"
  "fmt"
+ "regexp"
  "runtime/debug"
  "strings"
 
@@ -124,4 +125,13 @@ var GCRScopes = []string{"https://www.googleapis.com/auth/devstorage.read_write"
 var OAuthHTTPContext = context.Background()
 
 // GcrOAuth2Username is the Basic auth username accompanying Docker requests to GCR.
-var GcrOAuth2Username = fmt.Sprintf("_dcgcr_%s_token", strings.ReplaceAll(Version, ".", "_"))
+var GcrOAuth2Username string
+
+func init() {
+ re := regexp.MustCompile(`^(?:[0-9]+\._)*$`)
+ if re.MatchString(Version) {
+ GcrOAuth2Username = fmt.Sprintf("_dcgcr_%s_token", strings.ReplaceAll(Version, ".", "_"))
+ } else {
+ GcrOAuth2Username = "_dcgcr_0_0_0_token"
+ }
+}