diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2023-05-03 13:07:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 17:07:22 +0000 |
| commit | 3f20a7c9f348122d5fae7074b9fa17651189bb9a (patch) | |
| tree | 138182ce81eb94eccab71c28528ecf0c7b8e0712 /listeners.go | |
| parent | 1af419e7eca0c7b8559ec2f3b397f948f1ef13c2 (diff) | |
acmeserver: Configurable `resolvers`, fix smallstep deprecations (#5500)
* acmeserver: Configurable `resolvers`, fix smallstep deprecations
* Improve default net/port
* Update proxy resolvers parsing to use the new function
* Update listeners.go
Co-authored-by: itsxaos <33079230+itsxaos@users.noreply.github.com>
---------
Co-authored-by: itsxaos <33079230+itsxaos@users.noreply.github.com>
Diffstat (limited to 'listeners.go')
| -rw-r--r-- | listeners.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/listeners.go b/listeners.go index 7c5401a..14a5c49 100644 --- a/listeners.go +++ b/listeners.go @@ -303,13 +303,19 @@ func IsUnixNetwork(netw string) bool { // Network addresses are distinct from URLs and do not // use URL syntax. func ParseNetworkAddress(addr string) (NetworkAddress, error) { + return ParseNetworkAddressWithDefaults(addr, "tcp", 0) +} + +// ParseNetworkAddressWithDefaults is like ParseNetworkAddress but allows +// the default network and port to be specified. +func ParseNetworkAddressWithDefaults(addr, defaultNetwork string, defaultPort uint) (NetworkAddress, error) { var host, port string network, host, port, err := SplitNetworkAddress(addr) if err != nil { return NetworkAddress{}, err } if network == "" { - network = "tcp" + network = defaultNetwork } if IsUnixNetwork(network) { return NetworkAddress{ @@ -318,7 +324,10 @@ func ParseNetworkAddress(addr string) (NetworkAddress, error) { }, nil } var start, end uint64 - if port != "" { + if port == "" { + start = uint64(defaultPort) + end = uint64(defaultPort) + } else { before, after, found := strings.Cut(port, "-") if !found { after = before |