diff options
Diffstat (limited to 'internal/config')
| -rw-r--r-- | internal/config/config.go | 1 | ||||
| -rw-r--r-- | internal/config/helpers.gen.go | 46 | ||||
| -rw-r--r-- | internal/config/types.go | 8 | ||||
| -rw-r--r-- | internal/config/validate.go | 8 |
4 files changed, 63 insertions, 0 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index 303bf8266..5360389af 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -198,6 +198,7 @@ type HTTPClientConfiguration struct { BlockIPs []string `name:"block-ips"` Timeout time.Duration `name:"timeout"` TLSInsecureSkipVerify bool `name:"tls-insecure-skip-verify"` + InsecureOutgoing bool `name:"insecure-outgoing"` } type CacheConfiguration struct { diff --git a/internal/config/helpers.gen.go b/internal/config/helpers.gen.go index e710a9dc2..dd584e2f0 100644 --- a/internal/config/helpers.gen.go +++ b/internal/config/helpers.gen.go @@ -150,6 +150,7 @@ func (cfg *Configuration) RegisterFlags(flags *pflag.FlagSet) { flags.StringSlice("http-client-block-ips", cfg.HTTPClient.BlockIPs, "") flags.Duration("http-client-timeout", cfg.HTTPClient.Timeout, "") flags.Bool("http-client-tls-insecure-skip-verify", cfg.HTTPClient.TLSInsecureSkipVerify, "") + flags.Bool("http-client-insecure-outgoing", cfg.HTTPClient.InsecureOutgoing, "") flags.String("cache-memory-target", cfg.Cache.MemoryTarget.String(), "") flags.Float64("cache-account-mem-ratio", cfg.Cache.AccountMemRatio, "") flags.Float64("cache-account-note-mem-ratio", cfg.Cache.AccountNoteMemRatio, "") @@ -333,6 +334,7 @@ func (cfg *Configuration) MarshalMap() map[string]any { cfgmap["http-client-block-ips"] = cfg.HTTPClient.BlockIPs cfgmap["http-client-timeout"] = cfg.HTTPClient.Timeout cfgmap["http-client-tls-insecure-skip-verify"] = cfg.HTTPClient.TLSInsecureSkipVerify + cfgmap["http-client-insecure-outgoing"] = cfg.HTTPClient.InsecureOutgoing cfgmap["cache-memory-target"] = cfg.Cache.MemoryTarget.String() cfgmap["cache-account-mem-ratio"] = cfg.Cache.AccountMemRatio cfgmap["cache-account-note-mem-ratio"] = cfg.Cache.AccountNoteMemRatio @@ -1406,6 +1408,14 @@ func (cfg *Configuration) UnmarshalMap(cfgmap map[string]any) error { } } + if ival, ok := cfgmap["http-client-insecure-outgoing"]; ok { + var err error + cfg.HTTPClient.InsecureOutgoing, err = cast.ToBoolE(ival) + if err != nil { + return fmt.Errorf("error casting %#v -> bool for 'http-client-insecure-outgoing': %w", ival, err) + } + } + if ival, ok := cfgmap["cache-memory-target"]; ok { t, err := cast.ToStringE(ival) if err != nil { @@ -4969,6 +4979,31 @@ func GetHTTPClientTLSInsecureSkipVerify() bool { return global.GetHTTPClientTLSI // SetHTTPClientTLSInsecureSkipVerify safely sets the value for global configuration 'HTTPClient.TLSInsecureSkipVerify' field func SetHTTPClientTLSInsecureSkipVerify(v bool) { global.SetHTTPClientTLSInsecureSkipVerify(v) } +// HTTPClientInsecureOutgoingFlag returns the flag name for the 'HTTPClient.InsecureOutgoing' field +func HTTPClientInsecureOutgoingFlag() string { return "http-client-insecure-outgoing" } + +// GetHTTPClientInsecureOutgoing safely fetches the Configuration value for state's 'HTTPClient.InsecureOutgoing' field +func (st *ConfigState) GetHTTPClientInsecureOutgoing() (v bool) { + st.mutex.RLock() + v = st.config.HTTPClient.InsecureOutgoing + st.mutex.RUnlock() + return +} + +// SetHTTPClientInsecureOutgoing safely sets the Configuration value for state's 'HTTPClient.InsecureOutgoing' field +func (st *ConfigState) SetHTTPClientInsecureOutgoing(v bool) { + st.mutex.Lock() + defer st.mutex.Unlock() + st.config.HTTPClient.InsecureOutgoing = v + st.reloadToViper() +} + +// GetHTTPClientInsecureOutgoing safely fetches the value for global configuration 'HTTPClient.InsecureOutgoing' field +func GetHTTPClientInsecureOutgoing() bool { return global.GetHTTPClientInsecureOutgoing() } + +// SetHTTPClientInsecureOutgoing safely sets the value for global configuration 'HTTPClient.InsecureOutgoing' field +func SetHTTPClientInsecureOutgoing(v bool) { global.SetHTTPClientInsecureOutgoing(v) } + // CacheMemoryTargetFlag returns the flag name for the 'Cache.MemoryTarget' field func CacheMemoryTargetFlag() string { return "cache-memory-target" } @@ -6850,6 +6885,17 @@ func flattenConfigMap(cfgmap map[string]any) { } for _, key := range [][]string{ + {"http-client", "insecure-outgoing"}, + } { + ival, ok := mapGet(cfgmap, key...) + if ok { + cfgmap["http-client-insecure-outgoing"] = ival + nestedKeys[key[0]] = struct{}{} + break + } + } + + for _, key := range [][]string{ {"cache", "memory-target"}, } { ival, ok := mapGet(cfgmap, key...) diff --git a/internal/config/types.go b/internal/config/types.go index d88468e3d..8c03356b9 100644 --- a/internal/config/types.go +++ b/internal/config/types.go @@ -48,3 +48,11 @@ func (p *IPPrefixes) Strings() []string { } return strs } + +func GetHTTPClientOutgoingScheme() (schema string) { + if GetHTTPClientInsecureOutgoing() { + return "http://" + } + + return "https://" +} diff --git a/internal/config/validate.go b/internal/config/validate.go index f1c50e4a1..2b4e64662 100644 --- a/internal/config/validate.go +++ b/internal/config/validate.go @@ -181,5 +181,13 @@ func Validate() error { ) } + // http-client.insecure-outgoing + if GetHTTPClientInsecureOutgoing() { + log.Warn(nil, "http-client.insecure-outgoing was set to TRUE. "+ + "*****THIS SHOULD BE USED FOR TESTING ONLY, IF YOU TURN THIS ON WHILE "+ + "IF IN DOUBT, STOP YOUR SERVER *NOW* AND ADJUST YOUR CONFIGURATION!*****", + ) + } + return errs.Combine() } |
