mirror of https://github.com/portainer/portainer
fix(aeec): enforce non-empty EdgeIDs for global key environment retrieval EE-3013 (#6808)
parent
bcec6a8915
commit
5b77edb76d
|
@ -1,6 +1,7 @@
|
||||||
package endpoints
|
package endpoints
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
httperror "github.com/portainer/libhttp/error"
|
httperror "github.com/portainer/libhttp/error"
|
||||||
|
@ -21,6 +22,9 @@ type endpointCreateGlobalKeyResponse struct {
|
||||||
// @router /endpoints/global-key [post]
|
// @router /endpoints/global-key [post]
|
||||||
func (handler *Handler) endpointCreateGlobalKey(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
|
func (handler *Handler) endpointCreateGlobalKey(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
|
||||||
edgeID := r.Header.Get(portainer.PortainerAgentEdgeIDHeader)
|
edgeID := r.Header.Get(portainer.PortainerAgentEdgeIDHeader)
|
||||||
|
if edgeID == "" {
|
||||||
|
return httperror.BadRequest("Invalid Edge ID", errors.New("the Edge ID cannot be empty"))
|
||||||
|
}
|
||||||
|
|
||||||
// Search for existing endpoints for the given edgeID
|
// Search for existing endpoints for the given edgeID
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
package endpoints
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
portainer "github.com/portainer/portainer/api"
|
||||||
|
helper "github.com/portainer/portainer/api/internal/testhelpers"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestEmptyGlobalKey(t *testing.T) {
|
||||||
|
handler := NewHandler(
|
||||||
|
helper.NewTestRequestBouncer(),
|
||||||
|
)
|
||||||
|
|
||||||
|
req, err := http.NewRequest(http.MethodPost, "https://portainer.io:9443/endpoints/global-key", nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("request error:", err)
|
||||||
|
}
|
||||||
|
req.Header.Set(portainer.PortainerAgentEdgeIDHeader, "")
|
||||||
|
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
handler.ServeHTTP(rec, req)
|
||||||
|
|
||||||
|
if rec.Code != http.StatusBadRequest {
|
||||||
|
t.Fatal("expected a 400 response, found:", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue