mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:17:32 +00:00

<!--
Please inform yourself about the contribution guidelines on submitting a
PR here:
https://github.com/zitadel/zitadel/blob/main/CONTRIBUTING.md#submit-a-pull-request-pr.
Take note of how PR/commit titles should be written and replace the
template texts in the sections below. Don't remove any of the sections.
It is important that the commit history clearly shows what is changed
and why.
Important: By submitting a contribution you agree to the terms from our
Licensing Policy as described here:
https://github.com/zitadel/zitadel/blob/main/LICENSING.md#community-contributions.
-->
# Which Problems Are Solved
A customer reached out that after an upgrade, actions would always fail
with the error "host is denied" when calling an external API.
This is due to a security fix
(https://github.com/zitadel/zitadel/security/advisories/GHSA-6cf5-w9h3-4rqv),
where a DNS lookup was added to check whether the host name resolves to
a denied IP or subnet.
If the lookup fails due to the internal DNS setup, the action fails as
well. Additionally, the lookup was also performed when the deny list was
empty.
# How the Problems Are Solved
- Prevent DNS lookup when deny list is empty
- Properly initiate deny list and prevent empty entries
# Additional Changes
- Log the reason for blocked address (domain, IP, subnet)
# Additional Context
- reported by a customer
- needs backport to 2.70.x, 2.71.x and 3.0.0 rc
(cherry picked from commit 4ffd4ef381
)
120 lines
2.5 KiB
Go
120 lines
2.5 KiB
Go
package actions
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/mitchellh/mapstructure"
|
|
)
|
|
|
|
func SetHTTPConfig(config *HTTPConfig) {
|
|
httpConfig = config
|
|
}
|
|
|
|
var httpConfig *HTTPConfig
|
|
|
|
type HTTPConfig struct {
|
|
DenyList []AddressChecker
|
|
}
|
|
|
|
func HTTPConfigDecodeHook(from, to reflect.Value) (interface{}, error) {
|
|
if to.Type() != reflect.TypeOf(HTTPConfig{}) {
|
|
return from.Interface(), nil
|
|
}
|
|
|
|
config := struct {
|
|
DenyList []string
|
|
}{}
|
|
|
|
decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
|
|
DecodeHook: mapstructure.StringToTimeDurationHookFunc(),
|
|
WeaklyTypedInput: true,
|
|
Result: &config,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if err = decoder.Decode(from.Interface()); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
c := HTTPConfig{
|
|
DenyList: make([]AddressChecker, 0),
|
|
}
|
|
|
|
for _, unsplit := range config.DenyList {
|
|
for _, split := range strings.Split(unsplit, ",") {
|
|
parsed, parseErr := NewHostChecker(split)
|
|
if parseErr != nil {
|
|
return nil, parseErr
|
|
}
|
|
if parsed != nil {
|
|
c.DenyList = append(c.DenyList, parsed)
|
|
}
|
|
}
|
|
}
|
|
|
|
return c, nil
|
|
}
|
|
|
|
func NewHostChecker(entry string) (AddressChecker, error) {
|
|
if entry == "" {
|
|
return nil, nil
|
|
}
|
|
_, network, err := net.ParseCIDR(entry)
|
|
if err == nil {
|
|
return &HostChecker{Net: network}, nil
|
|
}
|
|
if ip := net.ParseIP(entry); ip != nil {
|
|
return &HostChecker{IP: ip}, nil
|
|
}
|
|
return &HostChecker{Domain: entry}, nil
|
|
}
|
|
|
|
type HostChecker struct {
|
|
Net *net.IPNet
|
|
IP net.IP
|
|
Domain string
|
|
}
|
|
|
|
type AddressDeniedError struct {
|
|
deniedBy string
|
|
}
|
|
|
|
func NewAddressDeniedError(deniedBy string) *AddressDeniedError {
|
|
return &AddressDeniedError{deniedBy: deniedBy}
|
|
}
|
|
|
|
func (e *AddressDeniedError) Error() string {
|
|
return fmt.Sprintf("address is denied by '%s'", e.deniedBy)
|
|
}
|
|
|
|
func (e *AddressDeniedError) Is(target error) bool {
|
|
var addressDeniedErr *AddressDeniedError
|
|
if !errors.As(target, &addressDeniedErr) {
|
|
return false
|
|
}
|
|
return e.deniedBy == addressDeniedErr.deniedBy
|
|
}
|
|
|
|
func (c *HostChecker) IsDenied(ips []net.IP, address string) error {
|
|
// if the address matches the domain, no additional checks as needed
|
|
if c.Domain == address {
|
|
return NewAddressDeniedError(c.Domain)
|
|
}
|
|
// otherwise we need to check on ips (incl. the resolved ips of the host)
|
|
for _, ip := range ips {
|
|
if c.Net != nil && c.Net.Contains(ip) {
|
|
return NewAddressDeniedError(c.Net.String())
|
|
}
|
|
if c.IP != nil && c.IP.Equal(ip) {
|
|
return NewAddressDeniedError(c.IP.String())
|
|
}
|
|
}
|
|
return nil
|
|
}
|