mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +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>
233 lines
7.2 KiB
Go
233 lines
7.2 KiB
Go
package edgejobs
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"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"
|
|
)
|
|
|
|
// @id EdgeJobCreate
|
|
// @summary Create an EdgeJob
|
|
// @description **Access policy**: administrator
|
|
// @tags edge_jobs
|
|
// @security ApiKeyAuth
|
|
// @security jwt
|
|
// @produce json
|
|
// @param method query string true "Creation Method" Enums(file, string)
|
|
// @param body_string body edgeJobCreateFromFileContentPayload true "EdgeGroup data when method is string"
|
|
// @param body_file body edgeJobCreateFromFilePayload true "EdgeGroup data when method is file"
|
|
// @success 200 {object} portainer.EdgeGroup
|
|
// @failure 503 "Edge compute features are disabled"
|
|
// @failure 500
|
|
// @router /edge_jobs [post]
|
|
func (handler *Handler) edgeJobCreate(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. Valid values are: file or string", err}
|
|
}
|
|
|
|
switch method {
|
|
case "string":
|
|
return handler.createEdgeJobFromFileContent(w, r)
|
|
case "file":
|
|
return handler.createEdgeJobFromFile(w, r)
|
|
default:
|
|
return &httperror.HandlerError{http.StatusBadRequest, "Invalid query parameter: method. Valid values are: file or string", errors.New(request.ErrInvalidQueryParameter)}
|
|
}
|
|
}
|
|
|
|
type edgeJobCreateFromFileContentPayload struct {
|
|
Name string
|
|
CronExpression string
|
|
Recurring bool
|
|
Endpoints []portainer.EndpointID
|
|
FileContent string
|
|
}
|
|
|
|
func (payload *edgeJobCreateFromFileContentPayload) Validate(r *http.Request) error {
|
|
if govalidator.IsNull(payload.Name) {
|
|
return errors.New("Invalid Edge job name")
|
|
}
|
|
|
|
if !govalidator.Matches(payload.Name, `^[a-zA-Z0-9][a-zA-Z0-9_.-]*$`) {
|
|
return errors.New("Invalid Edge job name format. Allowed characters are: [a-zA-Z0-9_.-]")
|
|
}
|
|
|
|
if govalidator.IsNull(payload.CronExpression) {
|
|
return errors.New("Invalid cron expression")
|
|
}
|
|
|
|
if payload.Endpoints == nil || len(payload.Endpoints) == 0 {
|
|
return errors.New("Invalid environment payload")
|
|
}
|
|
|
|
if govalidator.IsNull(payload.FileContent) {
|
|
return errors.New("Invalid script file content")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (handler *Handler) createEdgeJobFromFileContent(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
|
|
var payload edgeJobCreateFromFileContentPayload
|
|
err := request.DecodeAndValidateJSONPayload(r, &payload)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
|
|
}
|
|
|
|
edgeJob := handler.createEdgeJobObjectFromFileContentPayload(&payload)
|
|
|
|
err = handler.addAndPersistEdgeJob(edgeJob, []byte(payload.FileContent))
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to schedule Edge job", err}
|
|
}
|
|
|
|
return response.JSON(w, edgeJob)
|
|
}
|
|
|
|
type edgeJobCreateFromFilePayload struct {
|
|
Name string
|
|
CronExpression string
|
|
Recurring bool
|
|
Endpoints []portainer.EndpointID
|
|
File []byte
|
|
}
|
|
|
|
func (payload *edgeJobCreateFromFilePayload) Validate(r *http.Request) error {
|
|
name, err := request.RetrieveMultiPartFormValue(r, "Name", false)
|
|
if err != nil {
|
|
return errors.New("Invalid Edge job name")
|
|
}
|
|
|
|
if !govalidator.Matches(name, `^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`) {
|
|
return errors.New("Invalid Edge job name format. Allowed characters are: [a-zA-Z0-9_.-]")
|
|
}
|
|
payload.Name = name
|
|
|
|
cronExpression, err := request.RetrieveMultiPartFormValue(r, "CronExpression", false)
|
|
if err != nil {
|
|
return errors.New("Invalid cron expression")
|
|
}
|
|
payload.CronExpression = cronExpression
|
|
|
|
var endpoints []portainer.EndpointID
|
|
err = request.RetrieveMultiPartFormJSONValue(r, "Environments", &endpoints, false)
|
|
if err != nil {
|
|
return errors.New("Invalid environments")
|
|
}
|
|
payload.Endpoints = endpoints
|
|
|
|
file, _, err := request.RetrieveMultiPartFormFile(r, "file")
|
|
if err != nil {
|
|
return errors.New("Invalid script file. Ensure that the file is uploaded correctly")
|
|
}
|
|
payload.File = file
|
|
|
|
return nil
|
|
}
|
|
|
|
func (handler *Handler) createEdgeJobFromFile(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
|
|
payload := &edgeJobCreateFromFilePayload{}
|
|
err := payload.Validate(r)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
|
|
}
|
|
|
|
edgeJob := handler.createEdgeJobObjectFromFilePayload(payload)
|
|
|
|
err = handler.addAndPersistEdgeJob(edgeJob, payload.File)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to schedule Edge job", err}
|
|
}
|
|
|
|
return response.JSON(w, edgeJob)
|
|
}
|
|
|
|
func (handler *Handler) createEdgeJobObjectFromFilePayload(payload *edgeJobCreateFromFilePayload) *portainer.EdgeJob {
|
|
edgeJobIdentifier := portainer.EdgeJobID(handler.DataStore.EdgeJob().GetNextIdentifier())
|
|
|
|
endpoints := convertEndpointsToMetaObject(payload.Endpoints)
|
|
|
|
edgeJob := &portainer.EdgeJob{
|
|
ID: edgeJobIdentifier,
|
|
Name: payload.Name,
|
|
CronExpression: payload.CronExpression,
|
|
Recurring: payload.Recurring,
|
|
Created: time.Now().Unix(),
|
|
Endpoints: endpoints,
|
|
Version: 1,
|
|
}
|
|
|
|
return edgeJob
|
|
}
|
|
|
|
func (handler *Handler) createEdgeJobObjectFromFileContentPayload(payload *edgeJobCreateFromFileContentPayload) *portainer.EdgeJob {
|
|
edgeJobIdentifier := portainer.EdgeJobID(handler.DataStore.EdgeJob().GetNextIdentifier())
|
|
|
|
endpoints := convertEndpointsToMetaObject(payload.Endpoints)
|
|
|
|
edgeJob := &portainer.EdgeJob{
|
|
ID: edgeJobIdentifier,
|
|
Name: payload.Name,
|
|
CronExpression: payload.CronExpression,
|
|
Recurring: payload.Recurring,
|
|
Created: time.Now().Unix(),
|
|
Endpoints: endpoints,
|
|
Version: 1,
|
|
}
|
|
|
|
return edgeJob
|
|
}
|
|
|
|
func (handler *Handler) addAndPersistEdgeJob(edgeJob *portainer.EdgeJob, file []byte) error {
|
|
edgeCronExpression := strings.Split(edgeJob.CronExpression, " ")
|
|
if len(edgeCronExpression) == 6 {
|
|
edgeCronExpression = edgeCronExpression[1:]
|
|
}
|
|
edgeJob.CronExpression = strings.Join(edgeCronExpression, " ")
|
|
|
|
for ID := range edgeJob.Endpoints {
|
|
endpoint, err := handler.DataStore.Endpoint().Endpoint(ID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if endpoint.Type != portainer.EdgeAgentOnDockerEnvironment && endpoint.Type != portainer.EdgeAgentOnKubernetesEnvironment {
|
|
delete(edgeJob.Endpoints, ID)
|
|
}
|
|
}
|
|
|
|
if len(edgeJob.Endpoints) == 0 {
|
|
return errors.New("Environments are mandatory for an Edge job")
|
|
}
|
|
|
|
scriptPath, err := handler.FileService.StoreEdgeJobFileFromBytes(strconv.Itoa(int(edgeJob.ID)), file)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
edgeJob.ScriptPath = scriptPath
|
|
|
|
for endpointID := range edgeJob.Endpoints {
|
|
handler.ReverseTunnelService.AddEdgeJob(endpointID, edgeJob)
|
|
}
|
|
|
|
return handler.DataStore.EdgeJob().CreateEdgeJob(edgeJob)
|
|
}
|
|
|
|
func convertEndpointsToMetaObject(endpoints []portainer.EndpointID) map[portainer.EndpointID]portainer.EdgeJobEndpointMeta {
|
|
endpointsMap := map[portainer.EndpointID]portainer.EdgeJobEndpointMeta{}
|
|
|
|
for _, endpointID := range endpoints {
|
|
endpointsMap[endpointID] = portainer.EdgeJobEndpointMeta{}
|
|
}
|
|
|
|
return endpointsMap
|
|
}
|