mirror of
https://github.com/zitadel/zitadel.git
synced 2025-04-06 23:24:32 +00:00

* 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>
100 lines
2.4 KiB
Go
100 lines
2.4 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/caos/logging"
|
|
|
|
"github.com/caos/zitadel/internal/domain"
|
|
caos_errs "github.com/caos/zitadel/internal/errors"
|
|
)
|
|
|
|
type dynamicResourceData struct {
|
|
OrgID string `schema:"orgId"`
|
|
DefaultPolicy bool `schema:"default-policy"`
|
|
FileName string `schema:"filename"`
|
|
}
|
|
|
|
func (l *Login) handleResources(staticDir http.FileSystem) http.Handler {
|
|
return http.FileServer(staticDir)
|
|
}
|
|
|
|
func (l *Login) handleDynamicResources(w http.ResponseWriter, r *http.Request) {
|
|
data := new(dynamicResourceData)
|
|
err := l.getParseData(r, data)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
bucketName := domain.IAMID
|
|
if data.OrgID != "" && !data.DefaultPolicy {
|
|
bucketName = data.OrgID
|
|
}
|
|
|
|
etag := r.Header.Get("If-None-Match")
|
|
asset, info, err := l.getStatic(r.Context(), bucketName, data.FileName)
|
|
if info != nil && info.ETag == etag {
|
|
w.WriteHeader(304)
|
|
return
|
|
}
|
|
if err != nil {
|
|
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(asset)
|
|
}
|
|
|
|
func (l *Login) getStatic(ctx context.Context, bucketName, fileName string) ([]byte, *domain.AssetInfo, error) {
|
|
s := new(staticAsset)
|
|
key := bucketName + "-" + fileName
|
|
err := l.staticCache.Get(key, s)
|
|
if err == nil && s.Info != nil && (s.Info.Expiration.After(time.Now().Add(-1 * time.Minute))) { //TODO: config?
|
|
return s.Data, s.Info, nil
|
|
}
|
|
|
|
info, err := l.staticStorage.GetObjectInfo(ctx, bucketName, fileName)
|
|
if err != nil {
|
|
if caos_errs.IsNotFound(err) {
|
|
return nil, nil, err
|
|
}
|
|
return s.Data, s.Info, err
|
|
}
|
|
if s.Info != nil && s.Info.ETag == info.ETag {
|
|
if info.Expiration.After(s.Info.Expiration) {
|
|
s.Info = info
|
|
l.cacheStatic(bucketName, fileName, s)
|
|
}
|
|
return s.Data, s.Info, nil
|
|
}
|
|
|
|
reader, _, err := l.staticStorage.GetObject(ctx, bucketName, fileName)
|
|
if err != nil {
|
|
return s.Data, s.Info, err
|
|
}
|
|
s.Data, err = ioutil.ReadAll(reader)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
s.Info = info
|
|
l.cacheStatic(bucketName, fileName, s)
|
|
return s.Data, s.Info, nil
|
|
}
|
|
|
|
func (l *Login) cacheStatic(bucketName, fileName string, s *staticAsset) {
|
|
key := bucketName + "-" + fileName
|
|
err := l.staticCache.Set(key, &s)
|
|
logging.Log("HANDLER-dfht2").OnError(err).Warnf("caching of asset %s: %s failed", bucketName, fileName)
|
|
}
|
|
|
|
type staticAsset struct {
|
|
Data []byte
|
|
Info *domain.AssetInfo
|
|
}
|