mirror of
https://github.com/portainer/portainer.git
synced 2025-07-21 14:29:40 +02:00
* feat(access-token): Multi-auth middleware support EE-1891 (#5936) * AnyAuth middleware initial implementation with tests * using mux.MiddlewareFunc instead of custom definition * removed redundant comments * - ExtractBearerToken bouncer func made private - changed helm token handling functionality to use jwt service to convert token to jwt string - updated tests - fixed helm list broken test due to missing token in request context * rename mwCheckAuthentication -> mwCheckJWTAuthentication * - introduce initial api-key auth support using X-API-KEY header - added tests to validate x-api-key request header presence * updated core mwAuthenticatedUser middleware to support multiple auth paradigms * - simplified anyAuth middleware - enforcing authmiddleware to implement verificationFunc interface - created tests for middleware * simplify bouncer Co-authored-by: Dmitry Salakhov <to@dimasalakhov.com> * feat(api-key): user-access-token generation endpoint EE-1889 EE-1888 EE-1895 (#6012) * user-access-token generation endpoint * fix comment * - introduction of apikey service - seperation of repository from service logic - called in handler * fixed tests * - fixed api key prefix - added tests * added another test for digest matching * updated swagger spec for access token creation * api key response returns raw key and struct - easing testability * test for api key prefix length * added another TODO to middleware * - api-key prefix rune -> string (rune does not auto-encode when response sent back to client) - digest -> pointer as we want to allow nil values and omit digest in responses (when nil) * - updated apikey struct - updated apikey service to support all common operations - updated apikey repo - integration of apikey service into bouncer - added test for all apikey service functions - boilerplate code for apikey service integration * - user access token generation tests - apiKeyLookup updated to support query params - added api-key tests for query params - added api-key tests for apiKeyLookup * get and remove access token handlers * get and remove access token handler tests * - delete user deletes all associated api keys - tests for this functionality * removed redundant []byte cast * automatic api-key eviction set within cache for 1 hour * fixed bug with loop var using final value * fixed service comment * ignore bolt error responses * case-insensitive query param check * simplified query var assignment * - added GetAPIKey func to get by unique id - updated DeleteAPIKey func to not require user ID - updated tests * GenerateRandomKey helper func from github.com/gorilla/securecookie moved to codebase * json response casing for api-keys fixed * updating api-key will update the cache * updated golang LRU cache * using hashicorps golang-LRU cache for api keys * simplified jwt check in create user access token * fixed api-key update logic on cache miss * Prefix generated api-keys with `ptr_` (#6067) * prefix api-keys with 'ptr_' * updated apikey description * refactor Co-authored-by: Dmitry Salakhov <to@dimasalakhov.com> * helm list test refactor * fixed user delete test * reduce test nil pointer errors * using correct http 201 created status code for token creation; updated tests * fixed swagger doc user id path param for user access token based endpoints * added api-key security openapi spec to existing jwt secured endpoints (#6091) * fixed flaky test * apikey datecreated and lastused attrs converted to unix timestamp * feat(user): added access token datatable. (#6124) * feat(user): added access token datatable. * feat(tokens): only display lastUsed time when it is not the default date * Update app/portainer/views/account/accountController.js Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com> * Update app/portainer/views/account/accountController.js Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com> * Update app/portainer/views/account/accountController.js Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com> * Update app/portainer/components/datatables/access-tokens-datatable/accessTokensDatatableController.js Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com> * Update app/portainer/services/api/userService.js Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com> * feat(improvements): proposed datatable improvements to speed up dev time (#6138) * modal code update * updated datatable filenames, updated controller to be default class export * fix(access-token): code improvement. Co-authored-by: zees-dev <63374656+zees-dev@users.noreply.github.com> * feat(apikeys): create access token view initial implementation EE-1886 (#6129) * CopyButton implementation * Code component implementation * ToolTip component migration to another folder * TextTip component implementation - continued * form Heading component * Button component updated to be more dynamic * copybutton - small size * form control pass tip error * texttip small text * CreateAccessToken react feature initial implementation * create user access token angularjs view implementation * registration of CreateAccessToken component in AngularJS * user token generation API request moved to angular service, method passed down instead * consistent naming of access token operations; clustered similar code together * any user can add access token * create access token page routing * moved code component to the correct location * removed isadmin check as all functionality applicable to all users * create access token angular view moved up a level * fixed PR issues, updated PR * addressed PR issues/improvements * explicit hr for horizontal line * fixed merge conflict storybook build breaking * - apikey test - cache test * addressed testing issues: - description validations - remove token description link on table * fix(api-keys): user role change evicts user keys in cache EE-2113 (#6168) * user role change evicts user api keys in cache * EvictUserKeyCache -> InvalidateUserKeyCache * godoc for InvalidateUserKeyCache func * additional test line * disable add access token button after adding token to prevent spam Co-authored-by: Dmitry Salakhov <to@dimasalakhov.com> Co-authored-by: fhanportainer <79428273+fhanportainer@users.noreply.github.com>
378 lines
15 KiB
Go
378 lines
15 KiB
Go
package customtemplates
|
|
|
|
import (
|
|
"errors"
|
|
"log"
|
|
"net/http"
|
|
"regexp"
|
|
"strconv"
|
|
|
|
"github.com/asaskevich/govalidator"
|
|
httperror "github.com/portainer/libhttp/error"
|
|
"github.com/portainer/libhttp/request"
|
|
"github.com/portainer/libhttp/response"
|
|
portainer "github.com/portainer/portainer/api"
|
|
"github.com/portainer/portainer/api/filesystem"
|
|
"github.com/portainer/portainer/api/http/security"
|
|
"github.com/portainer/portainer/api/internal/authorization"
|
|
)
|
|
|
|
// @id CustomTemplateCreate
|
|
// @summary Create a custom template
|
|
// @description Create a custom template.
|
|
// @description **Access policy**: authenticated
|
|
// @tags custom_templates
|
|
// @security ApiKeyAuth
|
|
// @security jwt
|
|
// @accept json,multipart/form-data
|
|
// @produce json
|
|
// @param method query string true "method for creating template" Enums(string, file, repository)
|
|
// @param body_string body customTemplateFromFileContentPayload false "Required when using method=string"
|
|
// @param body_repository body customTemplateFromGitRepositoryPayload false "Required when using method=repository"
|
|
// @param Title formData string false "Title of the template. required when method is file"
|
|
// @param Description formData string false "Description of the template. required when method is file"
|
|
// @param Note formData string false "A note that will be displayed in the UI. Supports HTML content"
|
|
// @param Platform formData int false "Platform associated to the template (1 - 'linux', 2 - 'windows'). required when method is file" Enums(1,2)
|
|
// @param Type formData int false "Type of created stack (1 - swarm, 2 - compose), required when method is file" Enums(1,2)
|
|
// @param file formData file false "required when method is file"
|
|
// @success 200 {object} portainer.CustomTemplate
|
|
// @failure 400 "Invalid request"
|
|
// @failure 500 "Server error"
|
|
// @router /custom_templates [post]
|
|
func (handler *Handler) customTemplateCreate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
|
|
method, err := request.RetrieveQueryParameter(r, "method", false)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusBadRequest, "Invalid query parameter: method", err}
|
|
}
|
|
|
|
tokenData, err := security.RetrieveTokenData(r)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve user details from authentication token", err}
|
|
}
|
|
|
|
customTemplate, err := handler.createCustomTemplate(method, r)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to create custom template", err}
|
|
}
|
|
|
|
customTemplate.CreatedByUserID = tokenData.ID
|
|
|
|
customTemplates, err := handler.DataStore.CustomTemplate().CustomTemplates()
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve custom templates from the database", err}
|
|
}
|
|
|
|
for _, existingTemplate := range customTemplates {
|
|
if existingTemplate.Title == customTemplate.Title {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Template name must be unique", errors.New("Template name must be unique")}
|
|
}
|
|
}
|
|
|
|
err = handler.DataStore.CustomTemplate().CreateCustomTemplate(customTemplate)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to create custom template", err}
|
|
}
|
|
|
|
resourceControl := authorization.NewPrivateResourceControl(strconv.Itoa(int(customTemplate.ID)), portainer.CustomTemplateResourceControl, tokenData.ID)
|
|
|
|
err = handler.DataStore.ResourceControl().CreateResourceControl(resourceControl)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist resource control inside the database", err}
|
|
}
|
|
|
|
customTemplate.ResourceControl = resourceControl
|
|
|
|
return response.JSON(w, customTemplate)
|
|
}
|
|
|
|
func (handler *Handler) createCustomTemplate(method string, r *http.Request) (*portainer.CustomTemplate, error) {
|
|
switch method {
|
|
case "string":
|
|
return handler.createCustomTemplateFromFileContent(r)
|
|
case "repository":
|
|
return handler.createCustomTemplateFromGitRepository(r)
|
|
case "file":
|
|
return handler.createCustomTemplateFromFileUpload(r)
|
|
}
|
|
return nil, errors.New("Invalid value for query parameter: method. Value must be one of: string, repository or file")
|
|
}
|
|
|
|
type customTemplateFromFileContentPayload struct {
|
|
// URL of the template's logo
|
|
Logo string `example:"https://cloudinovasi.id/assets/img/logos/nginx.png"`
|
|
// Title of the template
|
|
Title string `example:"Nginx" validate:"required"`
|
|
// Description of the template
|
|
Description string `example:"High performance web server" validate:"required"`
|
|
// A note that will be displayed in the UI. Supports HTML content
|
|
Note string `example:"This is my <b>custom</b> template"`
|
|
// Platform associated to the template.
|
|
// Valid values are: 1 - 'linux', 2 - 'windows'
|
|
// Required for Docker stacks
|
|
Platform portainer.CustomTemplatePlatform `example:"1" enums:"1,2"`
|
|
// Type of created stack (1 - swarm, 2 - compose, 3 - kubernetes)
|
|
Type portainer.StackType `example:"1" enums:"1,2,3" validate:"required"`
|
|
// Content of stack file
|
|
FileContent string `validate:"required"`
|
|
}
|
|
|
|
func (payload *customTemplateFromFileContentPayload) Validate(r *http.Request) error {
|
|
if govalidator.IsNull(payload.Title) {
|
|
return errors.New("Invalid custom template title")
|
|
}
|
|
if govalidator.IsNull(payload.Description) {
|
|
return errors.New("Invalid custom template description")
|
|
}
|
|
if govalidator.IsNull(payload.FileContent) {
|
|
return errors.New("Invalid file content")
|
|
}
|
|
if payload.Type != portainer.KubernetesStack && payload.Platform != portainer.CustomTemplatePlatformLinux && payload.Platform != portainer.CustomTemplatePlatformWindows {
|
|
return errors.New("Invalid custom template platform")
|
|
}
|
|
if payload.Type != portainer.KubernetesStack && payload.Type != portainer.DockerSwarmStack && payload.Type != portainer.DockerComposeStack {
|
|
return errors.New("Invalid custom template type")
|
|
}
|
|
if !isValidNote(payload.Note) {
|
|
return errors.New("Invalid note. <img> tag is not supported")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func isValidNote(note string) bool {
|
|
if govalidator.IsNull(note) {
|
|
return true
|
|
}
|
|
match, _ := regexp.MatchString("<img", note)
|
|
return !match
|
|
}
|
|
|
|
func (handler *Handler) createCustomTemplateFromFileContent(r *http.Request) (*portainer.CustomTemplate, error) {
|
|
var payload customTemplateFromFileContentPayload
|
|
err := request.DecodeAndValidateJSONPayload(r, &payload)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
customTemplateID := handler.DataStore.CustomTemplate().GetNextIdentifier()
|
|
customTemplate := &portainer.CustomTemplate{
|
|
ID: portainer.CustomTemplateID(customTemplateID),
|
|
Title: payload.Title,
|
|
EntryPoint: filesystem.ComposeFileDefaultName,
|
|
Description: payload.Description,
|
|
Note: payload.Note,
|
|
Platform: (payload.Platform),
|
|
Type: (payload.Type),
|
|
Logo: payload.Logo,
|
|
}
|
|
|
|
templateFolder := strconv.Itoa(customTemplateID)
|
|
projectPath, err := handler.FileService.StoreCustomTemplateFileFromBytes(templateFolder, customTemplate.EntryPoint, []byte(payload.FileContent))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
customTemplate.ProjectPath = projectPath
|
|
|
|
return customTemplate, nil
|
|
}
|
|
|
|
type customTemplateFromGitRepositoryPayload struct {
|
|
// URL of the template's logo
|
|
Logo string `example:"https://cloudinovasi.id/assets/img/logos/nginx.png"`
|
|
// Title of the template
|
|
Title string `example:"Nginx" validate:"required"`
|
|
// Description of the template
|
|
Description string `example:"High performance web server" validate:"required"`
|
|
// A note that will be displayed in the UI. Supports HTML content
|
|
Note string `example:"This is my <b>custom</b> template"`
|
|
// Platform associated to the template.
|
|
// Valid values are: 1 - 'linux', 2 - 'windows'
|
|
// Required for Docker stacks
|
|
Platform portainer.CustomTemplatePlatform `example:"1" enums:"1,2"`
|
|
// Type of created stack (1 - swarm, 2 - compose)
|
|
Type portainer.StackType `example:"1" enums:"1,2" validate:"required"`
|
|
|
|
// URL of a Git repository hosting the Stack file
|
|
RepositoryURL string `example:"https://github.com/openfaas/faas" validate:"required"`
|
|
// Reference name of a Git repository hosting the Stack file
|
|
RepositoryReferenceName string `example:"refs/heads/master"`
|
|
// Use basic authentication to clone the Git repository
|
|
RepositoryAuthentication bool `example:"true"`
|
|
// Username used in basic authentication. Required when RepositoryAuthentication is true.
|
|
RepositoryUsername string `example:"myGitUsername"`
|
|
// Password used in basic authentication. Required when RepositoryAuthentication is true.
|
|
RepositoryPassword string `example:"myGitPassword"`
|
|
// Path to the Stack file inside the Git repository
|
|
ComposeFilePathInRepository string `example:"docker-compose.yml" default:"docker-compose.yml"`
|
|
}
|
|
|
|
func (payload *customTemplateFromGitRepositoryPayload) Validate(r *http.Request) error {
|
|
if govalidator.IsNull(payload.Title) {
|
|
return errors.New("Invalid custom template title")
|
|
}
|
|
if govalidator.IsNull(payload.Description) {
|
|
return errors.New("Invalid custom template description")
|
|
}
|
|
if govalidator.IsNull(payload.RepositoryURL) || !govalidator.IsURL(payload.RepositoryURL) {
|
|
return errors.New("Invalid repository URL. Must correspond to a valid URL format")
|
|
}
|
|
if payload.RepositoryAuthentication && (govalidator.IsNull(payload.RepositoryUsername) || govalidator.IsNull(payload.RepositoryPassword)) {
|
|
return errors.New("Invalid repository credentials. Username and password must be specified when authentication is enabled")
|
|
}
|
|
if govalidator.IsNull(payload.ComposeFilePathInRepository) {
|
|
payload.ComposeFilePathInRepository = filesystem.ComposeFileDefaultName
|
|
}
|
|
|
|
if payload.Type == portainer.KubernetesStack {
|
|
return errors.New("Creating a Kubernetes custom template from git is not supported")
|
|
}
|
|
|
|
if payload.Platform != portainer.CustomTemplatePlatformLinux && payload.Platform != portainer.CustomTemplatePlatformWindows {
|
|
return errors.New("Invalid custom template platform")
|
|
}
|
|
if payload.Type != portainer.DockerSwarmStack && payload.Type != portainer.DockerComposeStack {
|
|
return errors.New("Invalid custom template type")
|
|
}
|
|
if !isValidNote(payload.Note) {
|
|
return errors.New("Invalid note. <img> tag is not supported")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (handler *Handler) createCustomTemplateFromGitRepository(r *http.Request) (*portainer.CustomTemplate, error) {
|
|
var payload customTemplateFromGitRepositoryPayload
|
|
err := request.DecodeAndValidateJSONPayload(r, &payload)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
customTemplateID := handler.DataStore.CustomTemplate().GetNextIdentifier()
|
|
customTemplate := &portainer.CustomTemplate{
|
|
ID: portainer.CustomTemplateID(customTemplateID),
|
|
Title: payload.Title,
|
|
EntryPoint: payload.ComposeFilePathInRepository,
|
|
Description: payload.Description,
|
|
Note: payload.Note,
|
|
Platform: payload.Platform,
|
|
Type: payload.Type,
|
|
Logo: payload.Logo,
|
|
}
|
|
|
|
projectPath := handler.FileService.GetCustomTemplateProjectPath(strconv.Itoa(customTemplateID))
|
|
customTemplate.ProjectPath = projectPath
|
|
|
|
repositoryUsername := payload.RepositoryUsername
|
|
repositoryPassword := payload.RepositoryPassword
|
|
if !payload.RepositoryAuthentication {
|
|
repositoryUsername = ""
|
|
repositoryPassword = ""
|
|
}
|
|
|
|
err = handler.GitService.CloneRepository(projectPath, payload.RepositoryURL, payload.RepositoryReferenceName, repositoryUsername, repositoryPassword)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
entryPath := filesystem.JoinPaths(projectPath, customTemplate.EntryPoint)
|
|
|
|
exists, err := handler.FileService.FileExists(entryPath)
|
|
if err != nil || !exists {
|
|
if err := handler.FileService.RemoveDirectory(projectPath); err != nil {
|
|
log.Printf("[WARN] [http,customtemplate,git] [error: %s] [message: unable to remove git repository directory]", err)
|
|
}
|
|
}
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !exists {
|
|
return nil, errors.New("Invalid Compose file, ensure that the Compose file path is correct")
|
|
}
|
|
|
|
return customTemplate, nil
|
|
}
|
|
|
|
type customTemplateFromFileUploadPayload struct {
|
|
Logo string
|
|
Title string
|
|
Description string
|
|
Note string
|
|
Platform portainer.CustomTemplatePlatform
|
|
Type portainer.StackType
|
|
FileContent []byte
|
|
}
|
|
|
|
func (payload *customTemplateFromFileUploadPayload) Validate(r *http.Request) error {
|
|
title, err := request.RetrieveMultiPartFormValue(r, "Title", false)
|
|
if err != nil {
|
|
return errors.New("Invalid custom template title")
|
|
}
|
|
payload.Title = title
|
|
|
|
description, err := request.RetrieveMultiPartFormValue(r, "Description", false)
|
|
if err != nil {
|
|
return errors.New("Invalid custom template description")
|
|
}
|
|
payload.Description = description
|
|
|
|
logo, _ := request.RetrieveMultiPartFormValue(r, "Logo", true)
|
|
payload.Logo = logo
|
|
|
|
note, _ := request.RetrieveMultiPartFormValue(r, "Note", true)
|
|
if !isValidNote(note) {
|
|
return errors.New("Invalid note. <img> tag is not supported")
|
|
}
|
|
payload.Note = note
|
|
|
|
typeNumeral, _ := request.RetrieveNumericMultiPartFormValue(r, "Type", true)
|
|
templateType := portainer.StackType(typeNumeral)
|
|
if templateType != portainer.KubernetesStack && templateType != portainer.DockerSwarmStack && templateType != portainer.DockerComposeStack {
|
|
return errors.New("Invalid custom template type")
|
|
}
|
|
payload.Type = templateType
|
|
|
|
platform, _ := request.RetrieveNumericMultiPartFormValue(r, "Platform", true)
|
|
templatePlatform := portainer.CustomTemplatePlatform(platform)
|
|
if templateType != portainer.KubernetesStack && templatePlatform != portainer.CustomTemplatePlatformLinux && templatePlatform != portainer.CustomTemplatePlatformWindows {
|
|
return errors.New("Invalid custom template platform")
|
|
}
|
|
|
|
payload.Platform = templatePlatform
|
|
|
|
composeFileContent, _, err := request.RetrieveMultiPartFormFile(r, "File")
|
|
if err != nil {
|
|
return errors.New("Invalid Compose file. Ensure that the Compose file is uploaded correctly")
|
|
}
|
|
payload.FileContent = composeFileContent
|
|
|
|
return nil
|
|
}
|
|
|
|
func (handler *Handler) createCustomTemplateFromFileUpload(r *http.Request) (*portainer.CustomTemplate, error) {
|
|
payload := &customTemplateFromFileUploadPayload{}
|
|
err := payload.Validate(r)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
customTemplateID := handler.DataStore.CustomTemplate().GetNextIdentifier()
|
|
customTemplate := &portainer.CustomTemplate{
|
|
ID: portainer.CustomTemplateID(customTemplateID),
|
|
Title: payload.Title,
|
|
Description: payload.Description,
|
|
Note: payload.Note,
|
|
Platform: payload.Platform,
|
|
Type: payload.Type,
|
|
Logo: payload.Logo,
|
|
EntryPoint: filesystem.ComposeFileDefaultName,
|
|
}
|
|
|
|
templateFolder := strconv.Itoa(customTemplateID)
|
|
projectPath, err := handler.FileService.StoreCustomTemplateFileFromBytes(templateFolder, customTemplate.EntryPoint, []byte(payload.FileContent))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
customTemplate.ProjectPath = projectPath
|
|
|
|
return customTemplate, nil
|
|
}
|