fix: return not found on invalid metadata keys

webmeshproj · Oct 20, 2023 · b44cc03 · b44cc03
1 parent 8f39aff
commit b44cc03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/examples/id-auth/deploy/kustomization.yaml b/examples/id-auth/deploy/kustomization.yaml
@@ -37,3 +37,4 @@ patches:
                 - --host.services.api.disabled=false
                 - --host.services.api.mesh-enabled=true
                 - --host.wireguard.listen-port=61820
+                - --manager.enable-metadata-id-tokens=true
diff --git a/internal/metadata/server.go b/internal/metadata/server.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net"
 	"net/http"
@@ -197,6 +198,11 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 		result, err := jmespath.Search(path, jsondata)
 		if err != nil {
+			if errors.As(err, &jmespath.SyntaxError{}) {
+				// Return a not found error
+				http.Error(w, "null", http.StatusNotFound)
+				return
+			}
 			s.returnError(w, err)
 			return
 		}