mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-24 06:28:42 +01:00
Code Issues Projects Releases Wiki Activity

chore: improves security by updating all find containers with user scope (#3464)

Browse Source
This commit is contained in:
Amir Raminfar
2024-12-16 13:49:12 -08:00
committed by GitHub
parent 3adf56018a
commit 23ba1f6603
10 changed files with 263 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/agent/server.go
View File

@@ -47,12 +47,12 @@ func (s *server) StreamLogs(in *pb.StreamLogsRequest, out pb.AgentService_Stream
since = in.Since.AsTime()
}
reader, err := s.client.ContainerLogs(out.Context(), in.ContainerId, since, docker.StdType(in.StreamTypes))
container, err := s.store.FindContainer(in.ContainerId, docker.ContainerFilter{})
if err != nil {
return err
}
container, err := s.store.FindContainer(in.ContainerId)
reader, err := s.client.ContainerLogs(out.Context(), in.ContainerId, since, docker.StdType(in.StreamTypes))
if err != nil {
return err
}
@@ -172,7 +172,14 @@ func (s *server) StreamStats(in *pb.StreamStatsRequest, out pb.AgentService_Stre
}
func (s *server) FindContainer(ctx context.Context, in *pb.FindContainerRequest) (*pb.FindContainerResponse, error) {
container, err := s.store.FindContainer(in.ContainerId)
filter := make(docker.ContainerFilter)
if in.GetFilter() != nil {
for k, v := range in.GetFilter() {
filter[k] = append(filter[k], v.GetValues()...)
}
}
container, err := s.store.FindContainer(in.ContainerId, filter)
if err != nil {
return nil, status.Error(codes.NotFound, err.Error())
}