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

capitalization

Browse source
This commit is contained in:
Aaron Paterson 2025-11-19 04:14:39 -07:00
parent d9b21453e7
commit 932f14d2ac
11 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin.go
View file

@ -222,7 +222,7 @@ func (admin *AdminConfig) newAdminHandler(addr NetworkAddress, remote bool, _ Co
muxWrap.remoteControl = admin.Remote muxWrap.remoteControl = admin.Remote
} else { } else {
// see comment in allowedOrigins() as to why we disable the host check for unix/fd networks // see comment in allowedOrigins() as to why we disable the host check for unix/fd networks
muxWrap.enforceHost = !addr.isWildcardInterface() && !addr.IsUnixNetwork() && !addr.IsFdNetwork() muxWrap.enforceHost = !addr.isWildcardInterface() && !addr.IsUnixNetwork() && !addr.IsFDNetwork()
muxWrap.allowedOrigins = admin.allowedOrigins(addr) muxWrap.allowedOrigins = admin.allowedOrigins(addr)
muxWrap.enforceOrigin = admin.EnforceOrigin muxWrap.enforceOrigin = admin.EnforceOrigin
} }
@ -342,7 +342,7 @@ func (admin AdminConfig) allowedOrigins(addr NetworkAddress) []*url.URL {
// and a false sense of security. // and a false sense of security.
// //
// See also the discussion in #6832. // See also the discussion in #6832.
if admin.Origins == nil && !addr.IsUnixNetwork() && !addr.IsFdNetwork() { if admin.Origins == nil && !addr.IsUnixNetwork() && !addr.IsFDNetwork() {
if addr.isLoopback() { if addr.isLoopback() {
uniqueOrigins[net.JoinHostPort("localhost", addr.port())] = struct{}{} uniqueOrigins[net.JoinHostPort("localhost", addr.port())] = struct{}{}
uniqueOrigins[net.JoinHostPort("::1", addr.port())] = struct{}{} uniqueOrigins[net.JoinHostPort("::1", addr.port())] = struct{}{}

4
cmd/commandfuncs.go
View file

@ -729,7 +729,7 @@ func AdminAPIRequest(adminAddr, method, uri string, headers http.Header, body io
return nil, err return nil, err
} }
parsedAddr.Host = addr parsedAddr.Host = addr
} else if parsedAddr.IsFdNetwork() { } else if parsedAddr.IsFDNetwork() {
origin = "http://127.0.0.1" origin = "http://127.0.0.1"
} }
@ -738,7 +738,7 @@ func AdminAPIRequest(adminAddr, method, uri string, headers http.Header, body io
if err != nil { if err != nil {
return nil, fmt.Errorf("making request: %v", err) return nil, fmt.Errorf("making request: %v", err)
} }
if parsedAddr.IsUnixNetwork() || parsedAddr.IsFdNetwork() { if parsedAddr.IsUnixNetwork() || parsedAddr.IsFDNetwork() {
// We used to conform to RFC 2616 Section 14.26 which requires // We used to conform to RFC 2616 Section 14.26 which requires
// an empty host header when there is no host, as is the case // an empty host header when there is no host, as is the case
// with unix sockets and socket fds. However, Go required a // with unix sockets and socket fds. However, Go required a

2
listen.go
View file

@ -36,7 +36,7 @@ func reuseUnixSocket(_, _ string) (any, error) {
func listenReusable(ctx context.Context, lnKey string, network, address string, config net.ListenConfig) (any, error) { func listenReusable(ctx context.Context, lnKey string, network, address string, config net.ListenConfig) (any, error) {
var socketFile *os.File var socketFile *os.File
fd := IsFdNetwork(network) fd := IsFDNetwork(network)
if fd { if fd {
socketFd, err := strconv.ParseUint(address, 0, strconv.IntSize) socketFd, err := strconv.ParseUint(address, 0, strconv.IntSize)
if err != nil { if err != nil {

2
listen_unix.go
View file

@ -101,7 +101,7 @@ func listenReusable(ctx context.Context, lnKey string, network, address string,
socketFile *os.File socketFile *os.File
) )
fd := IsFdNetwork(network) fd := IsFDNetwork(network)
if fd { if fd {
socketFd, err := strconv.ParseUint(address, 0, strconv.IntSize) socketFd, err := strconv.ParseUint(address, 0, strconv.IntSize)
if err != nil { if err != nil {

26
listeners.go
View file

@ -160,7 +160,7 @@ func (na NetworkAddress) Listen(ctx context.Context, portOffset uint, config net
if err != nil { if err != nil {
return nil, err return nil, err
} }
} else if na.IsFdNetwork() { } else if na.IsFDNetwork() {
socketFd, err := strconv.ParseUint(na.Host, 0, strconv.IntSize) socketFd, err := strconv.ParseUint(na.Host, 0, strconv.IntSize)
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid file descriptor: %v", err) return nil, fmt.Errorf("invalid file descriptor: %v", err)
@ -171,7 +171,7 @@ func (na NetworkAddress) Listen(ctx context.Context, portOffset uint, config net
address = na.JoinHostPort(portOffset) address = na.JoinHostPort(portOffset)
} }
if na.IsIpNetwork() { if na.IsIPNetwork() {
ln, err = config.ListenPacket(ctx, na.Network, address) ln, err = config.ListenPacket(ctx, na.Network, address)
} else { } else {
if na.IsUnixNetwork() { if na.IsUnixNetwork() {
@ -225,22 +225,22 @@ func (na NetworkAddress) IsUDPNetwork() bool {
return IsUDPNetwork(na.Network) return IsUDPNetwork(na.Network)
} }
// IsIpNetwork returns true if na.Network starts with // IsIPNetwork returns true if na.Network starts with
// ip: ip4: or ip6: // ip: ip4: or ip6:
func (na NetworkAddress) IsIpNetwork() bool { func (na NetworkAddress) IsIPNetwork() bool {
return IsIpNetwork(na.Network) return IsIPNetwork(na.Network)
} }
// IsFdNetwork returns true if na.Network is // IsFDNetwork returns true if na.Network is
// fd or fdgram. // fd or fdgram.
func (na NetworkAddress) IsFdNetwork() bool { func (na NetworkAddress) IsFDNetwork() bool {
return IsFdNetwork(na.Network) return IsFDNetwork(na.Network)
} }
// JoinHostPort is like net.JoinHostPort, but where the port // JoinHostPort is like net.JoinHostPort, but where the port
// is StartPort + offset. // is StartPort + offset.
func (na NetworkAddress) JoinHostPort(offset uint) string { func (na NetworkAddress) JoinHostPort(offset uint) string {
if na.IsUnixNetwork() || na.IsFdNetwork() { if na.IsUnixNetwork() || na.IsFDNetwork() {
return na.Host return na.Host
} }
return net.JoinHostPort(na.Host, strconv.FormatUint(uint64(na.StartPort+offset), 10)) return net.JoinHostPort(na.Host, strconv.FormatUint(uint64(na.StartPort+offset), 10))
@ -277,7 +277,7 @@ func (na NetworkAddress) PortRangeSize() uint {
} }
func (na NetworkAddress) isLoopback() bool { func (na NetworkAddress) isLoopback() bool {
if na.IsUnixNetwork() || na.IsFdNetwork() { if na.IsUnixNetwork() || na.IsFDNetwork() {
return true return true
} }
if na.Host == "localhost" { if na.Host == "localhost" {
@ -346,7 +346,7 @@ func ParseNetworkAddressWithDefaults(addr, defaultNetwork string, defaultPort ui
Host: host, Host: host,
}, err }, err
} }
if IsFdNetwork(network) { if IsFDNetwork(network) {
return NetworkAddress{ return NetworkAddress{
Network: network, Network: network,
Host: host, Host: host,
@ -391,7 +391,7 @@ func SplitNetworkAddress(a string) (network, host, port string, err error) {
if slashFound { if slashFound {
network = strings.ToLower(strings.TrimSpace(beforeSlash)) network = strings.ToLower(strings.TrimSpace(beforeSlash))
a = afterSlash a = afterSlash
if IsUnixNetwork(network) || IsFdNetwork(network) { if IsUnixNetwork(network) || IsFDNetwork(network) {
host = a host = a
return network, host, port, err return network, host, port, err
} }
@ -426,7 +426,7 @@ func JoinNetworkAddress(network, host, port string) string {
if network != "" { if network != "" {
a = network + "/" a = network + "/"
} }
if (host != "" && port == "") || IsUnixNetwork(network) || IsFdNetwork(network) { if (host != "" && port == "") || IsUnixNetwork(network) || IsFDNetwork(network) {
a += host a += host
} else if port != "" { } else if port != "" {
a += net.JoinHostPort(host, port) a += net.JoinHostPort(host, port)

2
modules/caddyhttp/app.go
View file

@ -590,7 +590,7 @@ func (app *App) Start() error {
// if binding to port 0, the OS chooses a port for us; // if binding to port 0, the OS chooses a port for us;
// but the user won't know the port unless we print it // but the user won't know the port unless we print it
if !listenAddr.IsUnixNetwork() && !listenAddr.IsFdNetwork() && listenAddr.StartPort == 0 && listenAddr.EndPort == 0 { if !listenAddr.IsUnixNetwork() && !listenAddr.IsFDNetwork() && listenAddr.StartPort == 0 && listenAddr.EndPort == 0 {
app.logger.Info("port 0 listener", app.logger.Info("port 0 listener",
zap.String("input_address", lnAddr), zap.String("input_address", lnAddr),
zap.String("actual_address", ln.Addr().String())) zap.String("actual_address", ln.Addr().String()))

2
modules/caddyhttp/proxyprotocol/listenerwrapper.go
View file

@ -104,7 +104,7 @@ func (pp *ListenerWrapper) Provision(ctx caddy.Context) error {
pp.policy = func(options goproxy.ConnPolicyOptions) (goproxy.Policy, error) { pp.policy = func(options goproxy.ConnPolicyOptions) (goproxy.Policy, error) {
// trust unix sockets // trust unix sockets
if network := options.Upstream.Network(); caddy.IsUnixNetwork(network) || caddy.IsFdNetwork(network) { if network := options.Upstream.Network(); caddy.IsUnixNetwork(network) || caddy.IsFDNetwork(network) {
return goproxy.USE, nil return goproxy.USE, nil
} }
ret := pp.FallbackPolicy ret := pp.FallbackPolicy

2
modules/caddyhttp/reverseproxy/addresses.go
View file

@ -137,7 +137,7 @@ func parseUpstreamDialAddress(upstreamAddr string) (parsedAddr, error) {
} }
// we can assume a port if only a hostname is specified, but use of a // we can assume a port if only a hostname is specified, but use of a
// placeholder without a port likely means a port will be filled in // placeholder without a port likely means a port will be filled in
if port == "" && !strings.Contains(host, "{") && !caddy.IsUnixNetwork(network) && !caddy.IsFdNetwork(network) { if port == "" && !strings.Contains(host, "{") && !caddy.IsUnixNetwork(network) && !caddy.IsFDNetwork(network) {
port = "80" port = "80"
} }
} }

4
modules/caddyhttp/reverseproxy/healthchecks.go
View file

@ -332,7 +332,7 @@ func (h *Handler) doActiveHealthCheckForAllHosts() {
return return
} }
if hcp := uint(upstream.activeHealthCheckPort); hcp != 0 { if hcp := uint(upstream.activeHealthCheckPort); hcp != 0 {
if addr.IsUnixNetwork() || addr.IsFdNetwork() { if addr.IsUnixNetwork() || addr.IsFDNetwork() {
addr.Network = "tcp" // I guess we just assume TCP since we are using a port?? addr.Network = "tcp" // I guess we just assume TCP since we are using a port??
} }
addr.StartPort, addr.EndPort = hcp, hcp addr.StartPort, addr.EndPort = hcp, hcp
@ -346,7 +346,7 @@ func (h *Handler) doActiveHealthCheckForAllHosts() {
return return
} }
hostAddr := addr.JoinHostPort(0) hostAddr := addr.JoinHostPort(0)
if addr.IsUnixNetwork() || addr.IsFdNetwork() { if addr.IsUnixNetwork() || addr.IsFDNetwork() {
// this will be used as the Host portion of a http.Request URL, and // this will be used as the Host portion of a http.Request URL, and
// paths to socket files would produce an error when creating URL, // paths to socket files would produce an error when creating URL,
// so use a fake Host value instead; unix sockets are usually local // so use a fake Host value instead; unix sockets are usually local

2
modules/caddyhttp/staticresp.go
View file

@ -382,7 +382,7 @@ func cmdRespond(fl caddycmd.Flags) (int, error) {
return caddy.ExitCodeFailedStartup, err return caddy.ExitCodeFailedStartup, err
} }
if !listenAddr.IsUnixNetwork() && !listenAddr.IsFdNetwork() { if !listenAddr.IsUnixNetwork() && !listenAddr.IsFDNetwork() {
listenAddrs := make([]string, 0, listenAddr.PortRangeSize()) listenAddrs := make([]string, 0, listenAddr.PortRangeSize())
for offset := uint(0); offset < listenAddr.PortRangeSize(); offset++ { for offset := uint(0); offset < listenAddr.PortRangeSize(); offset++ {
listenAddrs = append(listenAddrs, listenAddr.JoinHostPort(offset)) listenAddrs = append(listenAddrs, listenAddr.JoinHostPort(offset))

12
networks.go
View file

@ -55,13 +55,13 @@ func IsUDPNetwork(netw string) bool {
return netw == UDP || netw == UDP4 || netw == UDP6 return netw == UDP || netw == UDP4 || netw == UDP6
} }
// IsIpNetwork returns true if the netw is an ip network. // IsIPNetwork returns true if the netw is an ip network.
func IsIpNetwork(netw string) bool { func IsIPNetwork(netw string) bool {
return strings.HasPrefix(netw, IP_) || strings.HasPrefix(netw, IP4_) || strings.HasPrefix(netw, IP6_) return strings.HasPrefix(netw, IP_) || strings.HasPrefix(netw, IP4_) || strings.HasPrefix(netw, IP6_)
} }
// IsFdNetwork returns true if the netw is a fd network. // IsFdNetwork returns true if the netw is a fd network.
func IsFdNetwork(netw string) bool { func IsFDNetwork(netw string) bool {
return netw == FD || netw == FDGRAM return netw == FD || netw == FDGRAM
} }
@ -69,8 +69,8 @@ func IsReservedNetwork(network string) bool {
return IsUnixNetwork(network) || return IsUnixNetwork(network) ||
IsTCPNetwork(network) || IsTCPNetwork(network) ||
IsUDPNetwork(network) || IsUDPNetwork(network) ||
IsIpNetwork(network) || IsIPNetwork(network) ||
IsFdNetwork(network) IsFDNetwork(network)
} }
func IsIPv4Network(netw string) bool { func IsIPv4Network(netw string) bool {
@ -86,7 +86,7 @@ func IsStreamNetwork(netw string) bool {
} }
func IsPacketNetwork(netw string) bool { func IsPacketNetwork(netw string) bool {
return netw == UNIXGRAM || IsUDPNetwork(netw) || IsIpNetwork(netw) || netw == FDGRAM return netw == UNIXGRAM || IsUDPNetwork(netw) || IsIPNetwork(netw) || netw == FDGRAM
} }
// ListenerFunc is a function that can return a listener given a network and address. // ListenerFunc is a function that can return a listener given a network and address.