Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-12-08 06:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

caddyhttp: Pluggable trusted proxy IP range sources (#5328)

Browse source 
* caddyhttp: Pluggable trusted proxy IP range sources

* Add request to the IPRangeSource interface
This commit is contained in:
Francis Lavoie 2023-02-06 14:44:11 -05:00 • committed by GitHub
parent f6f1d8fc89
commit 12bcbe2c49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 188 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/caddyhttp/app.go
View file

@ -20,9 +20,7 @@ import (
"fmt"
"net"
"net/http"
"net/netip"
"strconv"
"strings"
"sync"
"time"
@ -224,22 +222,13 @@ func (app *App) Provision(ctx caddy.Context) error {
srv.StrictSNIHost = &trueBool
}
// parse trusted proxy CIDRs ahead of time
for _, str := range srv.TrustedProxies {
if strings.Contains(str, "/") {
ipNet, err := netip.ParsePrefix(str)
if err != nil {
return fmt.Errorf("parsing CIDR expression: '%s': %v", str, err)
}
srv.trustedProxies = append(srv.trustedProxies, ipNet)
} else {
ipAddr, err := netip.ParseAddr(str)
if err != nil {
return fmt.Errorf("invalid IP address: '%s': %v", str, err)
}
ipNew := netip.PrefixFrom(ipAddr, ipAddr.BitLen())
srv.trustedProxies = append(srv.trustedProxies, ipNew)
// set up the trusted proxies source
for srv.TrustedProxiesRaw != nil {
val, err := ctx.LoadModule(srv, "TrustedProxiesRaw")
if err != nil {
return fmt.Errorf("loading trusted proxies modules: %v", err)
}
srv.trustedProxies = val.(IPRangeSource)
}
// process each listener address