mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 14:59:41 +02:00
* feat(api): decorate Docker resource creation response with resource control * fix(api): fix a potential resource control conflict between stacks/volumes * feat(api): generate a default private resource control instead of admin only * fix(api): fix default RC value * fix(api): update RC authorizations check to support admin only flag * refactor(api): relocate access control related methods * fix(api): fix a potential conflict when fetching RC from database * refactor(api): refactor access control logic * refactor(api): remove the concept of DecoratedStack * feat(api): automatically remove RC when removing a Docker resource * refactor(api): update filter resource methods documentation * refactor(api): update proxy package structure * refactor(api): renamed proxy/misc package * feat(api): re-introduce ResourceControlDelete operation as admin restricted * refactor(api): relocate default endpoint authorizations * feat(api): migrate RBAC data * feat(app): ResourceControl management refactor * fix(api): fix access control issue on stack deletion and automatically delete RC * fix(api): fix stack filtering * fix(api): fix UpdateResourceControl operation checks * refactor(api): introduce a NewTransport builder method * refactor(api): inject endpoint in Docker transport * refactor(api): introduce Docker client into Docker transport * refactor(api): refactor http/proxy package * feat(api): inspect a Docker resource labels during access control validation * fix(api): only apply automatic resource control creation on success response * fix(api): fix stack access control check * fix(api): use StatusCreated instead of StatusOK for automatic resource control creation * fix(app): resource control fixes * fix(api): fix an issue preventing administrator to inspect a resource with a RC * refactor(api): remove useless error return * refactor(api): document DecorateStacks function * fix(api): fix invalid resource control type for container deletion * feat(api): support Docker system networks * feat(api): update Swagger docs * refactor(api): rename transport variable * refactor(api): rename transport variable * feat(networks): add system tag for system networks * feat(api): add support for resource control labels * feat(api): upgrade to DBVersion 22 * refactor(api): refactor access control management in Docker proxy * refactor(api): re-implement docker proxy taskListOperation * refactor(api): review parameters declaration * refactor(api): remove extra blank line * refactor(api): review method comments * fix(api): fix invalid ServerAddress property and review method visibility * feat(api): update error message * feat(api): update restrictedVolumeBrowserOperation method * refactor(api): refactor method parameters * refactor(api): minor refactor * refactor(api): change Azure transport visibility * refactor(api): update struct documentation * refactor(api): update struct documentation * feat(api): review restrictedResourceOperation method * refactor(api): remove unused authorization methods * feat(api): apply RBAC when enabled on stack operations * fix(api): fix invalid data migration procedure for DBVersion = 22 * fix(app): RC duplicate on private resource * feat(api): change Docker API version logic for libcompose/client factory * fix(api): update access denied error message to be Docker API compliant * fix(api): update volume browsing authorizations data migration * fix(api): fix an issue with access control in multi-node agent Swarm cluster
56 lines
1.6 KiB
Go
56 lines
1.6 KiB
Go
package docker
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/portainer/portainer/api/archive"
|
|
)
|
|
|
|
type postDockerfileRequest struct {
|
|
Content string
|
|
}
|
|
|
|
// buildOperation inspects the "Content-Type" header to determine if it needs to alter the request.
|
|
// If the value of the header is empty, it means that a Dockerfile is posted via upload, the function
|
|
// will extract the file content from the request body, tar it, and rewrite the body.
|
|
// If the value of the header contains "application/json", it means that the content of a Dockerfile is posted
|
|
// in the request payload as JSON, the function will create a new file called Dockerfile inside a tar archive and
|
|
// rewrite the body of the request.
|
|
// In any other case, it will leave the request unaltered.
|
|
func buildOperation(request *http.Request) error {
|
|
contentTypeHeader := request.Header.Get("Content-Type")
|
|
if contentTypeHeader != "" && !strings.Contains(contentTypeHeader, "application/json") {
|
|
return nil
|
|
}
|
|
|
|
var dockerfileContent []byte
|
|
|
|
if contentTypeHeader == "" {
|
|
body, err := ioutil.ReadAll(request.Body)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
dockerfileContent = body
|
|
} else {
|
|
var req postDockerfileRequest
|
|
if err := json.NewDecoder(request.Body).Decode(&req); err != nil {
|
|
return err
|
|
}
|
|
dockerfileContent = []byte(req.Content)
|
|
}
|
|
|
|
buffer, err := archive.TarFileInBuffer(dockerfileContent, "Dockerfile", 0600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
request.Body = ioutil.NopCloser(bytes.NewReader(buffer))
|
|
request.ContentLength = int64(len(buffer))
|
|
request.Header.Set("Content-Type", "application/x-tar")
|
|
|
|
return nil
|
|
}
|