Portainer
/
portainer
mirror of https://github.com/portainer/portainer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(snapshots): remove the attempt to snapshot untrusted environments EE-7407 (#12044)

pull/12051/head
andres-portainer 2024-07-23 18:43:31 -03:00 committed by GitHub
parent 6eb9e906af
commit 66119a8b57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/chisel/service_test.go
View File

@ -15,9 +15,10 @@ import (
func TestPingAgentPanic(t *testing.T) { func TestPingAgentPanic(t *testing.T) {
endpoint := &portainer.Endpoint{ endpoint := &portainer.Endpoint{
ID: 1, ID: 1,
EdgeID: "test-edge-id", EdgeID: "test-edge-id",
Type: portainer.EdgeAgentOnDockerEnvironment, Type: portainer.EdgeAgentOnDockerEnvironment,
UserTrusted: true,
} }
_, store := datastore.MustNewTestStore(t, true, true) _, store := datastore.MustNewTestStore(t, true, true)

2
api/chisel/tunnel.go
View File

@ -40,7 +40,7 @@ func (s *Service) Open(endpoint *portainer.Endpoint) error {
return ErrAsyncEnv return ErrAsyncEnv
} }
if endpoint.ID == 0 || endpoint.EdgeID == "" { if endpoint.ID == 0 || endpoint.EdgeID == "" || !endpoint.UserTrusted {
return ErrInvalidEnv return ErrInvalidEnv
} }

2
api/internal/snapshot/snapshot.go
View File

@ -64,7 +64,7 @@ func NewBackgroundSnapshotter(dataStore dataservices.DataStore, tunnelService po
} }
for _, e := range endpoints { for _, e := range endpoints {
if !endpointutils.IsEdgeEndpoint(&e) || e.Edge.AsyncMode { if !endpointutils.IsEdgeEndpoint(&e) || e.Edge.AsyncMode || !e.UserTrusted {
continue continue
} }