feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
|
|
|
package assets
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"io/ioutil"
|
|
|
|
"net/http"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
"github.com/caos/logging"
|
|
|
|
"github.com/gorilla/mux"
|
|
|
|
|
|
|
|
"github.com/caos/zitadel/internal/api/authz"
|
|
|
|
http_mw "github.com/caos/zitadel/internal/api/http/middleware"
|
|
|
|
"github.com/caos/zitadel/internal/command"
|
|
|
|
"github.com/caos/zitadel/internal/domain"
|
|
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
|
|
|
"github.com/caos/zitadel/internal/id"
|
|
|
|
"github.com/caos/zitadel/internal/management/repository"
|
|
|
|
"github.com/caos/zitadel/internal/static"
|
|
|
|
)
|
|
|
|
|
|
|
|
type Handler struct {
|
|
|
|
errorHandler ErrorHandler
|
|
|
|
storage static.Storage
|
|
|
|
commands *command.Commands
|
|
|
|
authInterceptor *http_mw.AuthInterceptor
|
|
|
|
idGenerator id.Generator
|
|
|
|
orgRepo repository.OrgRepository
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Handler) AuthInterceptor() *http_mw.AuthInterceptor {
|
|
|
|
return h.authInterceptor
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Handler) Commands() *command.Commands {
|
|
|
|
return h.commands
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Handler) ErrorHandler() ErrorHandler {
|
|
|
|
return DefaultErrorHandler
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Handler) Storage() static.Storage {
|
|
|
|
return h.storage
|
|
|
|
}
|
|
|
|
|
|
|
|
type Uploader interface {
|
|
|
|
Callback(ctx context.Context, info *domain.AssetInfo, orgID string, commands *command.Commands) error
|
|
|
|
ObjectName(data authz.CtxData) (string, error)
|
|
|
|
BucketName(data authz.CtxData) string
|
|
|
|
ContentTypeAllowed(contentType string) bool
|
|
|
|
MaxFileSize() int64
|
|
|
|
}
|
|
|
|
|
|
|
|
type Downloader interface {
|
|
|
|
ObjectName(ctx context.Context, path string) (string, error)
|
|
|
|
BucketName(ctx context.Context, id string) string
|
|
|
|
}
|
|
|
|
|
|
|
|
type ErrorHandler func(http.ResponseWriter, *http.Request, error)
|
|
|
|
|
|
|
|
func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error) {
|
|
|
|
logging.Log("ASSET-g5ef1").WithError(err).WithField("uri", r.RequestURI).Error("error occurred on asset api")
|
|
|
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewHandler(
|
|
|
|
commands *command.Commands,
|
|
|
|
verifier *authz.TokenVerifier,
|
|
|
|
authConfig authz.Config,
|
|
|
|
idGenerator id.Generator,
|
|
|
|
storage static.Storage,
|
|
|
|
orgRepo repository.OrgRepository,
|
|
|
|
) http.Handler {
|
|
|
|
h := &Handler{
|
|
|
|
commands: commands,
|
|
|
|
errorHandler: DefaultErrorHandler,
|
|
|
|
authInterceptor: http_mw.AuthorizationInterceptor(verifier, authConfig),
|
|
|
|
idGenerator: idGenerator,
|
|
|
|
storage: storage,
|
|
|
|
orgRepo: orgRepo,
|
|
|
|
}
|
|
|
|
|
|
|
|
verifier.RegisterServer("Management-API", "assets", AssetsService_AuthMethods) //TODO: separate api?
|
|
|
|
router := mux.NewRouter()
|
|
|
|
RegisterRoutes(router, h)
|
|
|
|
router.PathPrefix("/{id}").Methods("GET").HandlerFunc(DownloadHandleFunc(h, h.GetFile()))
|
|
|
|
return router
|
|
|
|
}
|
|
|
|
|
|
|
|
func (h *Handler) GetFile() Downloader {
|
|
|
|
return &publicFileDownloader{}
|
|
|
|
}
|
|
|
|
|
|
|
|
type publicFileDownloader struct{}
|
|
|
|
|
|
|
|
func (l *publicFileDownloader) ObjectName(_ context.Context, path string) (string, error) {
|
|
|
|
return path, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *publicFileDownloader) BucketName(_ context.Context, id string) string {
|
|
|
|
return id
|
|
|
|
}
|
|
|
|
|
|
|
|
const maxMemory = 2 << 20
|
|
|
|
const paramFile = "file"
|
|
|
|
|
|
|
|
func UploadHandleFunc(s AssetsService, uploader Uploader) func(http.ResponseWriter, *http.Request) {
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
ctx := r.Context()
|
|
|
|
ctxData := authz.GetCtxData(ctx)
|
|
|
|
err := r.ParseMultipartForm(maxMemory)
|
|
|
|
file, handler, err := r.FormFile(paramFile)
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
err = file.Close()
|
|
|
|
logging.Log("UPLOAD-GDg34").OnError(err).Warn("could not close file")
|
|
|
|
}()
|
|
|
|
contentType := handler.Header.Get("content-type")
|
|
|
|
size := handler.Size
|
|
|
|
if !uploader.ContentTypeAllowed(contentType) {
|
2021-06-08 07:48:44 +00:00
|
|
|
s.ErrorHandler()(w, r, caos_errs.ThrowInvalidArgumentf(nil, "UPLOAD-Dbvfs", "invalid content-type: %s", contentType))
|
feat: label policy (#1708)
* feat: label policy proto extension
* feat: label policy and activate event
* feat: label policy asset events
* feat: label policy asset commands
* feat: add storage key
* feat: storage key validation
* feat: label policy asset tests
* feat: label policy query side
* feat: avatar
* feat: avatar event
* feat: human avatar
* feat: avatar read side
* feat: font on iam label policy
* feat: label policy font
* feat: possiblity to create bucket on put file
* uplaoder
* login policy logo
* set bucket prefix
* feat: avatar upload
* feat: avatar upload
* feat: use assets on command side
* feat: fix human avatar removed event
* feat: remove human avatar
* feat: mock asset storage
* feat: remove human avatar
* fix(operator): add configuration of asset storage to zitadel operator
* feat(console): private labeling policy (#1697)
* private labeling component, routing, preview
* font, colors, upload, i18n
* show logo
* fix: uniqueness (#1710)
* fix: uniqueconstraint to lower
* feat: change org
* feat: org change test
* feat: change org
* fix: tests
* fix: handle domain claims correctly
* feat: update org
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: handle domain claimed event correctly for service users (#1711)
* fix: handle domain claimed event correctly on user view
* fix: ignore domain claimed events for email notifications
* fix: change org
* handle org changed in read models correctly
* fix: change org in user grant handler
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
* fix: correct value (#1695)
* docs(api): correct link (#1712)
* upload service
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* feat: fix tests,
* feat: remove assets from label policy
* fix npm, set environment
* lint ts
* remove stylelinting
* fix(operator): add mapping for console with changed unit tests
* fix(operator): add secrets as env variables to pod
* feat: remove human avatar
* fix(operator): add secrets as env variables to pod
* feat: map label policy
* feat: labelpolicy, admin, mgmt, adv settings (#1715)
* fetch label policy, mgmt, admin service
* feat: advanced beh, links, add, update
* lint ts
* feat: watermark
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: remove human avatar
* feat: custom css
* css
* css
* css
* css
* css
* getobject
* feat: dynamic handler
* feat: varibale css
* content info
* css overwrite
* feat: variablen css
* feat: generate css file
* feat: dark mode
* feat: dark mode
* fix logo css
* feat: upload logos
* dark mode with cookie
* feat: handle images in login
* avatar css and begin font
* feat: avatar
* feat: user avatar
* caching of static assets in login
* add avatar.js to main.html
* feat: header dont show logo if no url
* feat: label policy colors
* feat: mock asset storage
* feat: mock asset storage
* feat: fix tests
* feat: user avatar
* feat: header logo
* avatar
* avatar
* make it compatible with go 1.15
* feat: remove unused logos
* fix handler
* fix: styling error handling
* fonts
* fix: download func
* switch to mux
* fix: change upload api to assets
* fix build
* fix: download avatar
* fix: download logos
* fix: my avatar
* font
* fix: remove error msg popup possibility
* fix: docs
* fix: svalidate colors
* rem msg popup from frontend
* fix: email with private labeling
* fix: tests
* fix: email templates
* fix: change migration version
* fix: fix duplicate imports
* fix(console): assets, service url, upload, policy current and preview (#1781)
* upload endpoint, layout
* fetch current, preview, fix upload
* cleanup private labeling
* fix linting
* begin generated asset handler
* generate asset api in dockerfile
* features for label policy
* features for label policy
* features
* flag for asset generator
* change asset generator flag
* fix label policy view in grpc
* fix: layout, activate policy (#1786)
* theme switcher up on top
* change layout
* activate policy
* feat(console): label policy back color, layout (#1788)
* theme switcher up on top
* change layout
* activate policy
* fix overwrite value fc
* reset policy, reset service
* autosave policy, preview desc, layout impv
* layout, i18n
* background colors, inject material styles
* load images
* clean, lint
* fix layout
* set custom hex
* fix content size conversion
* remove font format in generated css
* fix features for assets
* fix(console): label policy colors, image downloads, preview (#1804)
* load images
* colors, images binding
* lint
* refresh emitter
* lint
* propagate font colors
* upload error handling
* label policy feature check
* add blob in csp for console
* log
* fix: feature edits for label policy, refresh state on upload (#1807)
* show error on load image, stop spinner
* fix merge
* fix migration versions
* fix assets
* fix csp
* fix background color
* scss
* fix build
* lint scss
* fix statik for console
* fix features check for label policy
* cleanup
* lint
* public links
* fix notifications
* public links
* feat: merge main
* feat: fix translation files
* fix migration
* set api domain
* fix logo in email
* font face in email
* font face in email
* validate assets on upload
* cleanup
* add missing translations
* add missing translations
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Stefan Benz <stefan@caos.ch>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
2021-06-04 12:53:51 +00:00
|
|
|
return
|
|
|
|
}
|
|
|
|
if size > uploader.MaxFileSize() {
|
|
|
|
s.ErrorHandler()(w, r, caos_errs.ThrowInvalidArgumentf(nil, "UPLOAD-Bfb32", "file to big, max file size is %v", uploader.MaxFileSize()))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
bucketName := uploader.BucketName(ctxData)
|
|
|
|
objectName, err := uploader.ObjectName(ctxData)
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
info, err := s.Commands().UploadAsset(ctx, bucketName, objectName, contentType, file, size)
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
err = uploader.Callback(ctx, info, ctxData.OrgID, s.Commands())
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func DownloadHandleFunc(s AssetsService, downloader Downloader) func(http.ResponseWriter, *http.Request) {
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
if s.Storage() == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ctx := r.Context()
|
|
|
|
id := mux.Vars(r)["id"]
|
|
|
|
bucketName := downloader.BucketName(ctx, id)
|
|
|
|
path := ""
|
|
|
|
if id != "" {
|
|
|
|
path = strings.Split(r.RequestURI, id+"/")[1]
|
|
|
|
}
|
|
|
|
objectName, err := downloader.ObjectName(ctx, path)
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if objectName == "" {
|
|
|
|
s.ErrorHandler()(w, r, caos_errs.ThrowNotFound(nil, "UPLOAD-adf4f", "file not found"))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
reader, getInfo, err := s.Storage().GetObject(ctx, bucketName, objectName)
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
data, err := ioutil.ReadAll(reader)
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
info, err := getInfo()
|
|
|
|
if err != nil {
|
|
|
|
s.ErrorHandler()(w, r, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
w.Header().Set("content-length", strconv.FormatInt(info.Size, 10))
|
|
|
|
w.Header().Set("content-type", info.ContentType)
|
|
|
|
w.Header().Set("ETag", info.ETag)
|
|
|
|
w.Write(data)
|
|
|
|
}
|
|
|
|
}
|