mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 19:07:30 +00:00
feat(actions): add token customization flow and extend functionally with modules (#4337)
* fix: potential memory leak * feat(actions): possibility to parse json feat(actions): possibility to perform http calls * add query call * feat(api): list flow and trigger types fix(api): switch flow and trigger types to dynamic objects * fix(translations): add action translations * use `domain.FlowType` * localizers * localization * trigger types * options on `query.Action` * add functions for actions * feat: management api: add list flow and trigger (#4352) * console changes * cleanup * fix: wrong localization Co-authored-by: Max Peintner <max@caos.ch> * id token works * check if claims not nil * feat(actions): metadata api * refactor(actions): modules * fix: allow prerelease * fix: test * feat(actions): deny list for http hosts * feat(actions): deny list for http hosts * refactor: actions * fix: different error ids * fix: rename statusCode to status * Actions objects as options (#4418) * fix: rename statusCode to status * fix(actions): objects as options * fix(actions): objects as options * fix(actions): set fields * add http client to old actions * fix(actions): add log module * fix(actions): add user to context where possible * fix(actions): add user to ctx in external authorization/pre creation * fix(actions): query correct flow in claims * test: actions * fix(id-generator): panic if no machine id * tests * maybe this? * fix linting * refactor: improve code * fix: metadata and usergrant usage in actions * fix: appendUserGrant * fix: allowedToFail and timeout in action execution * fix: allowed to fail in token complement flow * docs: add action log claim * Update defaults.yaml * fix log claim * remove prerelease build Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
@@ -16,6 +16,7 @@ import (
|
||||
"github.com/drone/envsubst"
|
||||
"github.com/jarcoal/jpath"
|
||||
"github.com/sony/sonyflake"
|
||||
"github.com/zitadel/logging"
|
||||
)
|
||||
|
||||
type sonyflakeGenerator struct {
|
||||
@@ -31,10 +32,12 @@ func (s *sonyflakeGenerator) Next() (string, error) {
|
||||
}
|
||||
|
||||
var (
|
||||
GeneratorConfig *Config = nil
|
||||
sonyFlakeGenerator *Generator = nil
|
||||
GeneratorConfig *Config = nil
|
||||
sonyFlakeGenerator Generator = nil
|
||||
)
|
||||
|
||||
// SonyFlakeGenerator creates a new id generator
|
||||
// the function panics if the generator cannot be created
|
||||
func SonyFlakeGenerator() Generator {
|
||||
if sonyFlakeGenerator == nil {
|
||||
sfg := Generator(&sonyflakeGenerator{
|
||||
@@ -44,10 +47,10 @@ func SonyFlakeGenerator() Generator {
|
||||
}),
|
||||
})
|
||||
|
||||
sonyFlakeGenerator = &sfg
|
||||
sonyFlakeGenerator = sfg
|
||||
}
|
||||
|
||||
return *sonyFlakeGenerator
|
||||
return sonyFlakeGenerator
|
||||
}
|
||||
|
||||
// the following is a copy of sonyflake (https://github.com/sony/sonyflake/blob/master/sonyflake.go)
|
||||
@@ -88,40 +91,41 @@ func isPrivateIPv4(ip net.IP) bool {
|
||||
|
||||
func machineID() (uint16, error) {
|
||||
if GeneratorConfig == nil {
|
||||
return 0, errors.New("cannot create a unique id for the machine, generator has not been configured")
|
||||
logging.Panic("cannot create a unique id for the machine, generator has not been configured")
|
||||
}
|
||||
|
||||
errors := []string{}
|
||||
if GeneratorConfig.Identification.PrivateIp.Enabled {
|
||||
ip, ipErr := lower16BitPrivateIP()
|
||||
if ipErr == nil {
|
||||
ip, err := lower16BitPrivateIP()
|
||||
if err == nil {
|
||||
return ip, nil
|
||||
}
|
||||
errors = append(errors, fmt.Sprintf("failed to get Private IP address %s", ipErr))
|
||||
errors = append(errors, fmt.Sprintf("failed to get Private IP address %s", err))
|
||||
}
|
||||
|
||||
if GeneratorConfig.Identification.Hostname.Enabled {
|
||||
hn, hostErr := hostname()
|
||||
if hostErr == nil {
|
||||
hn, err := hostname()
|
||||
if err == nil {
|
||||
return hn, nil
|
||||
}
|
||||
errors = append(errors, fmt.Sprintf("failed to get Hostname %s", hostErr))
|
||||
errors = append(errors, fmt.Sprintf("failed to get Hostname %s", err))
|
||||
}
|
||||
|
||||
if GeneratorConfig.Identification.Webhook.Enabled {
|
||||
cid, cidErr := metadataWebhookID()
|
||||
if cidErr == nil {
|
||||
cid, err := metadataWebhookID()
|
||||
if err == nil {
|
||||
return cid, nil
|
||||
}
|
||||
|
||||
errors = append(errors, fmt.Sprintf("failed to query metadata webhook %s", cidErr))
|
||||
errors = append(errors, fmt.Sprintf("failed to query metadata webhook %s", err))
|
||||
}
|
||||
|
||||
if len(errors) == 0 {
|
||||
errors = append(errors, "No machine identification method enabled.")
|
||||
}
|
||||
|
||||
return 0, fmt.Errorf("none of the enabled methods for identifying the machine succeeded: %s", strings.Join(errors, ". "))
|
||||
logging.WithFields("errors", strings.Join(errors, ", ")).Panic("none of the enabled methods for identifying the machine succeeded")
|
||||
//this return will never happen because of panic one line before
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
func lower16BitPrivateIP() (uint16, error) {
|
||||
|
Reference in New Issue
Block a user