mirror of
https://github.com/portainer/portainer.git
synced 2025-07-19 05:19:39 +02:00
* feat(app): rework private registries and support private registries in kubernetes [EE-30] feat(api): backport private registries backend changes (#5072) * feat(api/bolt): backport bolt changes * feat(api/exec): backport exec changes * feat(api/http): backport http/handler/dockerhub changes * feat(api/http): backport http/handler/endpoints changes * feat(api/http): backport http/handler/registries changes * feat(api/http): backport http/handler/stacks changes * feat(api/http): backport http/handler changes * feat(api/http): backport http/proxy/factory/azure changes * feat(api/http): backport http/proxy/factory/docker changes * feat(api/http): backport http/proxy/factory/utils changes * feat(api/http): backport http/proxy/factory/kubernetes changes * feat(api/http): backport http/proxy/factory changes * feat(api/http): backport http/security changes * feat(api/http): backport http changes * feat(api/internal): backport internal changes * feat(api): backport api changes * feat(api/kubernetes): backport kubernetes changes * fix(api/http): changes on backend following backport feat(app): backport private registries frontend changes (#5056) * feat(app/docker): backport docker/components changes * feat(app/docker): backport docker/helpers changes * feat(app/docker): backport docker/views/container changes * feat(app/docker): backport docker/views/images changes * feat(app/docker): backport docker/views/registries changes * feat(app/docker): backport docker/views/services changes * feat(app/docker): backport docker changes * feat(app/kubernetes): backport kubernetes/components changes * feat(app/kubernetes): backport kubernetes/converters changes * feat(app/kubernetes): backport kubernetes/models changes * feat(app/kubernetes): backport kubernetes/registries changes * feat(app/kubernetes): backport kubernetes/services changes * feat(app/kubernetes): backport kubernetes/views/applications changes * feat(app/kubernetes): backport kubernetes/views/configurations changes * feat(app/kubernetes): backport kubernetes/views/configure changes * feat(app/kubernetes): backport kubernetes/views/resource-pools changes * feat(app/kubernetes): backport kubernetes/views changes * feat(app/portainer): backport portainer/components/accessManagement changes * feat(app/portainer): backport portainer/components/datatables changes * feat(app/portainer): backport portainer/components/forms changes * feat(app/portainer): backport portainer/components/registry-details changes * feat(app/portainer): backport portainer/models changes * feat(app/portainer): backport portainer/rest changes * feat(app/portainer): backport portainer/services changes * feat(app/portainer): backport portainer/views changes * feat(app/portainer): backport portainer changes * feat(app): backport app changes * config(project): gitignore + jsconfig changes gitignore all files under api/cmd/portainer but main.go and enable Code Editor autocomplete on import ... from '@/...' fix(app): fix pull rate limit checker fix(app/registries): sidebar menus and registry accesses users filtering fix(api): add missing kube client factory fix(kube): fetch dockerhub pull limits (#5133) fix(app): pre review fixes (#5142) * fix(app/registries): remove checkbox for endpointRegistries view * fix(endpoints): allow access to default namespace * fix(docker): fetch pull limits * fix(kube/ns): show selected registries for non admin Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com> chore(webpack): ignore missing sourcemaps fix(registries): fetch registry config from url feat(kube/registries): ignore not found when deleting secret feat(db): move migration to db 31 fix(registries): fix bugs in PR EE-869 (#5169) * fix(registries): hide role * fix(endpoints): set empty access policy to edge endpoint * fix(registry): remove double arguments * fix(admin): ignore warning * feat(kube/configurations): tag registry secrets (#5157) * feat(kube/configurations): tag registry secrets * feat(kube/secrets): show registry secrets for admins * fix(registries): move dockerhub to beginning * refactor(registries): use endpoint scoped registries feat(registries): filter by namespace if supplied feat(access-managment): filter users for registry (#5191) * refactor(access-manage): move users selector to component * feat(access-managment): filter users for registry refactor(registries): sync code with CE (#5200) * refactor(registry): add inspect handler under endpoints * refactor(endpoint): sync endpoint_registries_list * refactor(endpoints): sync registry_access * fix(db): rename migration functions * fix(registries): show accesses for admin * fix(kube): set token on transport * refactor(kube): move secret help to bottom * fix(kuberentes): remove shouldLog parameter * style(auth): add description of security.IsAdmin * feat(security): allow admin access to registry * feat(edge): connect to edge endpoint when creating client * style(portainer): change deprecation version * refactor(sidebar): hide manage * refactor(containers): revert changes * style(container): remove whitespace * fix(endpoint): add handler to registy on endpointService * refactor(image): use endpointService.registries * fix(kueb/namespaces): rename resource pool to namespace * fix(kube/namespace): move selected registries * fix(api/registries): hide accesses on registry creation Co-authored-by: LP B <xAt0mZ@users.noreply.github.com> refactor(api): remove code duplication after rebase fix(app/registries): replace last registry api usage by endpoint registry api fix(api/endpoints): update registry access policies on endpoint deletion (#5226) [EE-1027] fix(db): update db version * fix(dockerhub): fetch rate limits * fix(registry/tests): supply restricred context * fix(registries): show proget registry only when selected * fix(registry): create dockerhub registry * feat(db): move migrations to db 32 Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com>
142 lines
4.6 KiB
Go
142 lines
4.6 KiB
Go
package docker
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"io/ioutil"
|
|
"net/http"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/client"
|
|
|
|
portainer "github.com/portainer/portainer/api"
|
|
"github.com/portainer/portainer/api/http/proxy/factory/utils"
|
|
"github.com/portainer/portainer/api/internal/authorization"
|
|
)
|
|
|
|
const (
|
|
serviceObjectIdentifier = "ID"
|
|
)
|
|
|
|
func getInheritedResourceControlFromServiceLabels(dockerClient *client.Client, endpointID portainer.EndpointID, serviceID string, resourceControls []portainer.ResourceControl) (*portainer.ResourceControl, error) {
|
|
service, _, err := dockerClient.ServiceInspectWithRaw(context.Background(), serviceID, types.ServiceInspectOptions{})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
stackResourceID := getStackResourceIDFromLabels(service.Spec.Labels, endpointID)
|
|
if stackResourceID != "" {
|
|
return authorization.GetResourceControlByResourceIDAndType(stackResourceID, portainer.StackResourceControl, resourceControls), nil
|
|
}
|
|
|
|
return nil, nil
|
|
}
|
|
|
|
// serviceListOperation extracts the response as a JSON array, loop through the service array
|
|
// decorate and/or filter the services based on resource controls before rewriting the response.
|
|
func (transport *Transport) serviceListOperation(response *http.Response, executor *operationExecutor) error {
|
|
// ServiceList response is a JSON array
|
|
// https://docs.docker.com/engine/api/v1.28/#operation/ServiceList
|
|
responseArray, err := utils.GetResponseAsJSONArray(response)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
resourceOperationParameters := &resourceOperationParameters{
|
|
resourceIdentifierAttribute: serviceObjectIdentifier,
|
|
resourceType: portainer.ServiceResourceControl,
|
|
labelsObjectSelector: selectorServiceLabels,
|
|
}
|
|
|
|
responseArray, err = transport.applyAccessControlOnResourceList(resourceOperationParameters, responseArray, executor)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return utils.RewriteResponse(response, responseArray, http.StatusOK)
|
|
}
|
|
|
|
// serviceInspectOperation extracts the response as a JSON object, verify that the user
|
|
// has access to the service based on resource control and either rewrite an access denied response or a decorated service.
|
|
func (transport *Transport) serviceInspectOperation(response *http.Response, executor *operationExecutor) error {
|
|
//ServiceInspect response is a JSON object
|
|
//https://docs.docker.com/engine/api/v1.28/#operation/ServiceInspect
|
|
responseObject, err := utils.GetResponseAsJSONObject(response)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
resourceOperationParameters := &resourceOperationParameters{
|
|
resourceIdentifierAttribute: serviceObjectIdentifier,
|
|
resourceType: portainer.ServiceResourceControl,
|
|
labelsObjectSelector: selectorServiceLabels,
|
|
}
|
|
|
|
return transport.applyAccessControlOnResource(resourceOperationParameters, responseObject, response, executor)
|
|
}
|
|
|
|
// selectorServiceLabels retrieve the labels object associated to the service object.
|
|
// Labels are available under the "Spec.Labels" property.
|
|
// API schema references:
|
|
// https://docs.docker.com/engine/api/v1.28/#operation/ServiceInspect
|
|
// https://docs.docker.com/engine/api/v1.28/#operation/ServiceList
|
|
func selectorServiceLabels(responseObject map[string]interface{}) map[string]interface{} {
|
|
serviceSpecObject := utils.GetJSONObject(responseObject, "Spec")
|
|
if serviceSpecObject != nil {
|
|
return utils.GetJSONObject(serviceSpecObject, "Labels")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (transport *Transport) decorateServiceCreationOperation(request *http.Request) (*http.Response, error) {
|
|
type PartialService struct {
|
|
TaskTemplate struct {
|
|
ContainerSpec struct {
|
|
Mounts []struct {
|
|
Type string
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
forbiddenResponse := &http.Response{
|
|
StatusCode: http.StatusForbidden,
|
|
}
|
|
|
|
isAdminOrEndpointAdmin, err := transport.isAdminOrEndpointAdmin(request)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !isAdminOrEndpointAdmin {
|
|
securitySettings, err := transport.fetchEndpointSecuritySettings()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
body, err := ioutil.ReadAll(request.Body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
partialService := &PartialService{}
|
|
err = json.Unmarshal(body, partialService)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !securitySettings.AllowBindMountsForRegularUsers && (len(partialService.TaskTemplate.ContainerSpec.Mounts) > 0) {
|
|
for _, mount := range partialService.TaskTemplate.ContainerSpec.Mounts {
|
|
if mount.Type == "bind" {
|
|
return forbiddenResponse, errors.New("forbidden to use bind mounts")
|
|
}
|
|
}
|
|
}
|
|
|
|
request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
|
|
}
|
|
|
|
return transport.replaceRegistryAuthenticationHeader(request)
|
|
}
|