api: return 404 for alloc FS list/stat endpoints

If the alloc filesystem doesn't have a file requested by the List Files or Stat File API, we currently return a HTTP 500 error with the expected "file not found" error message. Return a HTTP 404 error instead.
hashicorp · Nov 9, 2021 · 79fea58 · 79fea58
1 parent 6bbcb18
commit 79fea58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/command/agent/fs_endpoint.go b/command/agent/fs_endpoint.go
@@ -80,7 +80,7 @@ func (s *HTTPServer) DirectoryListRequest(resp http.ResponseWriter, req *http.Re
 	}
 
 	if rpcErr != nil {
-		if structs.IsErrNoNodeConn(rpcErr) || structs.IsErrUnknownAllocation(rpcErr) {
+		if structs.IsErrNoNodeConn(rpcErr) || structs.IsErrUnknownAllocation(rpcErr) || structs.IsErrNoSuchFileOrDirectory(rpcErr) {
 			rpcErr = CodedError(404, rpcErr.Error())
 		}
 
@@ -120,7 +120,7 @@ func (s *HTTPServer) FileStatRequest(resp http.ResponseWriter, req *http.Request
 	}
 
 	if rpcErr != nil {
-		if structs.IsErrNoNodeConn(rpcErr) || structs.IsErrUnknownAllocation(rpcErr) {
+		if structs.IsErrNoNodeConn(rpcErr) || structs.IsErrUnknownAllocation(rpcErr) || structs.IsErrNoSuchFileOrDirectory(rpcErr) {
 			rpcErr = CodedError(404, rpcErr.Error())
 		}
 

diff --git a/nomad/structs/errors.go b/nomad/structs/errors.go
@@ -177,6 +177,10 @@ func IsErrNodeLacksRpc(err error) bool {
 	return err != nil && strings.Contains(err.Error(), errNodeLacksRpc)
 }
 
+func IsErrNoSuchFileOrDirectory(err error) bool {
+	return err != nil && strings.Contains(err.Error(), "no such file or directory")
+}
+
 // NewErrRPCCoded wraps an RPC error with a code to be converted to HTTP status
 // code
 func NewErrRPCCoded(code int, msg string) error {