Skip to content

Modern Docker Management, Designed for Everyone

fix: generate remote swarm node agent tokens on the manager

Kyle Mendella0a77dcfaf2f
diff --git a/backend/internal/middleware/environment_middleware.go b/backend/internal/middleware/environment_middleware.go
index 0cc3cf220..4cfe06a0d 100644
--- a/backend/internal/middleware/environment_middleware.go
+++ b/backend/internal/middleware/environment_middleware.go
@@ -309,7 +309,7 @@ func isCentralSwarmManagementPathInternal(method, suffix string) bool {
return method == http.MethodPut || method == http.MethodDelete
}
if parts[4] == "deployment" {
- return method == http.MethodDelete
+ return method == http.MethodPost || method == http.MethodDelete
}
}
diff --git a/backend/internal/middleware/environment_middleware_test.go b/backend/internal/middleware/environment_middleware_test.go
index 29a9e9f93..bb82feed4 100644
--- a/backend/internal/middleware/environment_middleware_test.go
+++ b/backend/internal/middleware/environment_middleware_test.go
@@ -368,11 +368,31 @@ func TestEnvironmentMiddleware_CreateProxyRequest_RejectsInvalidProxyTarget(t *t
assert.Contains(t, err.Error(), "Invalid proxy target URL")
}
+func TestEnvironmentMiddleware_KeepsNodeAgentDeploymentCreationLocal(t *testing.T) {
+ middleware := newTestEnvironmentMiddleware()
+ router := echo.New()
+ api := attachMiddleware(router, middleware)
+
+ localHandlerHit := false
+ api.POST("/environments/:id/swarm/nodes/:nodeId/agent/deployment", func(c echo.Context) error {
+ localHandlerHit = true
+ return c.JSON(http.StatusOK, map[string]any{"success": true})
+ })
+
+ req := httptest.NewRequest(http.MethodPost, "/api/environments/env-edge/swarm/nodes/node-1/agent/deployment", nil)
+ recorder := httptest.NewRecorder()
+ router.ServeHTTP(recorder, req)
+
+ assert.Equal(t, http.StatusOK, recorder.Code)
+ assert.Contains(t, recorder.Body.String(), "\"success\":true")
+ assert.True(t, localHandlerHit)
+}
+
func TestIsCentralSwarmManagementPathInternal_IsMethodAware(t *testing.T) {
assert.True(t, isCentralSwarmManagementPathInternal(http.MethodGet, "/swarm/nodes"))
assert.True(t, isCentralSwarmManagementPathInternal(http.MethodGet, "/swarm/nodes/node-1"))
assert.False(t, isCentralSwarmManagementPathInternal(http.MethodPatch, "/swarm/nodes/node-1"))
- assert.False(t, isCentralSwarmManagementPathInternal(http.MethodPost, "/swarm/nodes/node-1/agent/deployment"))
+ assert.True(t, isCentralSwarmManagementPathInternal(http.MethodPost, "/swarm/nodes/node-1/agent/deployment"))
assert.True(t, isCentralSwarmManagementPathInternal(http.MethodDelete, "/swarm/nodes/node-1/agent/deployment"))
assert.True(t, isCentralSwarmManagementPathInternal(http.MethodPut, "/swarm/nodes/node-1/agent/binding"))
assert.True(t, isCentralSwarmManagementPathInternal(http.MethodDelete, "/swarm/nodes/node-1/agent/binding"))