Remove secret file existence check in Validate for headers

Julien · Julien · commit d64a7472ab6d · 2024-09-03T10:53:55.000+02:00
This commit removes the check for the existence of the secret file for
headers in the `Validate` function. The check is not valid for relative
paths since `Validate` is called before `SetDirectory`, which is
responsible for setting up the environment. This change aligns with the
handling of other secret files, which are not checked during config
validation.

Signed-off-by: Julien &lt;roidelapluie@o11y.eu&gt;
diff --git a/config/headers.go b/config/headers.go
@@ -78,17 +78,10 @@ func (h *Headers) SetDirectory(dir string) {
 
 // Validate validates the Headers config.
 func (h *Headers) Validate() error {
-	for n, header := range h.Headers {
+	for n := range h.Headers {
 		if _, ok := reservedHeaders[http.CanonicalHeaderKey(n)]; ok {
 			return fmt.Errorf("setting header %q is not allowed", http.CanonicalHeaderKey(n))
 		}
-		for _, v := range header.Files {
-			f := JoinDir(h.dir, v)
-			_, err := os.ReadFile(f)
-			if err != nil {
-				return fmt.Errorf("unable to read header %q from file %s: %w", http.CanonicalHeaderKey(n), f, err)
-			}
-		}
 	}
 	return nil
 }
diff --git a/config/http_config.go b/config/http_config.go
@@ -828,7 +828,7 @@ type basicAuthRoundTripper struct {
 
 // NewBasicAuthRoundTripper will apply a BASIC auth authorization header to a request unless it has
 // already been set.
-func NewBasicAuthRoundTripper(username SecretReader, password SecretReader, rt http.RoundTripper) http.RoundTripper {
+func NewBasicAuthRoundTripper(username, password SecretReader, rt http.RoundTripper) http.RoundTripper {
 	return &basicAuthRoundTripper{username, password, rt}
 }
 
diff --git a/config/http_config_test.go b/config/http_config_test.go
@@ -1107,7 +1107,7 @@ func getCertificateBlobs(t *testing.T) map[string][]byte {
 	return bs
 }
 
-func writeCertificate(bs map[string][]byte, src string, dst string) {
+func writeCertificate(bs map[string][]byte, src, dst string) {
 	b, ok := bs[src]
 	if !ok {
 		panic(fmt.Sprintf("Couldn't find %q in bs", src))

Original file line number	Diff line number	Diff line change
`@@ -78,17 +78,10 @@ func (h *Headers) SetDirectory(dir string) {`
`78`	`78`
`79`	`79`	`// Validate validates the Headers config.`
`80`	`80`	`func (h *Headers) Validate() error {`
`81`		`- for n, header := range h.Headers {`
	`81`	`+ for n := range h.Headers {`
`82`	`82`	`if _, ok := reservedHeaders[http.CanonicalHeaderKey(n)]; ok {`
`83`	`83`	`return fmt.Errorf("setting header %q is not allowed", http.CanonicalHeaderKey(n))`
`84`	`84`	`}`
`85`		`- for _, v := range header.Files {`
`86`		`- f := JoinDir(h.dir, v)`
`87`		`- _, err := os.ReadFile(f)`
`88`		`- if err != nil {`
`89`		`- return fmt.Errorf("unable to read header %q from file %s: %w", http.CanonicalHeaderKey(n), f, err)`
`90`		`- }`
`91`		`- }`
`92`	`85`	`}`
`93`	`86`	`return nil`
`94`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ type basicAuthRoundTripper struct {`
`828`	`828`
`829`	`829`	`// NewBasicAuthRoundTripper will apply a BASIC auth authorization header to a request unless it has`
`830`	`830`	`// already been set.`
`831`		`-func NewBasicAuthRoundTripper(username SecretReader, password SecretReader, rt http.RoundTripper) http.RoundTripper {`
	`831`	`+func NewBasicAuthRoundTripper(username, password SecretReader, rt http.RoundTripper) http.RoundTripper {`
`832`	`832`	`return &basicAuthRoundTripper{username, password, rt}`
`833`	`833`	`}`
`834`	`834`
Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,7 @@ func getCertificateBlobs(t *testing.T) map[string][]byte {`
`1107`	`1107`	`return bs`
`1108`	`1108`	`}`
`1109`	`1109`
`1110`		`-func writeCertificate(bs map[string][]byte, src string, dst string) {`
	`1110`	`+func writeCertificate(bs map[string][]byte, src, dst string) {`
`1111`	`1111`	`b, ok := bs[src]`
`1112`	`1112`	`if !ok {`
`1113`	`1113`	`panic(fmt.Sprintf("Couldn't find %q in bs", src))`