Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
core: Rename ParsedAddress -> NetworkAddress
Matthew Holt committed
Apr 7, 2020 at 08:33 UTC
8b2dbc52ec6bc0359b4b8c47a3f9835e9460649e
6 files changed
+42
-42
listeners.go
+24
-24
@@ -254,49 +254,49 @@ type globalListener struct {
254
pc net.PacketConn
255
}
256
257
-// ParsedAddress contains the individual components
257
+// NetworkAddress contains the individual components
258
// for a parsed network address of the form accepted
259
// by ParseNetworkAddress(). Network should be a
260
// network value accepted by Go's net package. Port
261
// ranges are given by [StartPort, EndPort].
262
-type ParsedAddress struct {
262
+type NetworkAddress struct {
263
Network string
264
Host string
265
StartPort uint
266
EndPort uint
267
}
268
269
-// IsUnixNetwork returns true if pa.Network is
269
+// IsUnixNetwork returns true if na.Network is
270
// unix, unixgram, or unixpacket.
271
-func (pa ParsedAddress) IsUnixNetwork() bool {
272
- return isUnixNetwork(pa.Network)
271
+func (na NetworkAddress) IsUnixNetwork() bool {
272
+ return isUnixNetwork(na.Network)
273
}
274
275
// JoinHostPort is like net.JoinHostPort, but where the port
276
// is StartPort + offset.
277
-func (pa ParsedAddress) JoinHostPort(offset uint) string {
278
- if pa.IsUnixNetwork() {
279
- return pa.Host
277
+func (na NetworkAddress) JoinHostPort(offset uint) string {
278
+ if na.IsUnixNetwork() {
279
+ return na.Host
280
}
281
- return net.JoinHostPort(pa.Host, strconv.Itoa(int(pa.StartPort+offset)))
281
+ return net.JoinHostPort(na.Host, strconv.Itoa(int(na.StartPort+offset)))
282
}
283
284
// PortRangeSize returns how many ports are in
285
// pa's port range. Port ranges are inclusive,
286
// so the size is the difference of start and
287
// end ports plus one.
288
-func (pa ParsedAddress) PortRangeSize() uint {
289
- return (pa.EndPort - pa.StartPort) + 1
288
+func (na NetworkAddress) PortRangeSize() uint {
289
+ return (na.EndPort - na.StartPort) + 1
290
}
291
292
// String reconstructs the address string to the form expected
293
// by ParseNetworkAddress().
294
-func (pa ParsedAddress) String() string {
295
- port := strconv.FormatUint(uint64(pa.StartPort), 10)
296
- if pa.StartPort != pa.EndPort {
297
- port += "-" + strconv.FormatUint(uint64(pa.EndPort), 10)
294
+func (na NetworkAddress) String() string {
295
+ port := strconv.FormatUint(uint64(na.StartPort), 10)
296
+ if na.StartPort != na.EndPort {
297
+ port += "-" + strconv.FormatUint(uint64(na.EndPort), 10)
298
}
299
- return JoinNetworkAddress(pa.Network, pa.Host, port)
299
+ return JoinNetworkAddress(na.Network, na.Host, port)
300
}
301
302
func isUnixNetwork(netw string) bool {
@@ -311,17 +311,17 @@ func isUnixNetwork(netw string) bool {
311
//
312
// Network addresses are distinct from URLs and do not
313
// use URL syntax.
314
-func ParseNetworkAddress(addr string) (ParsedAddress, error) {
314
+func ParseNetworkAddress(addr string) (NetworkAddress, error) {
315
var host, port string
316
network, host, port, err := SplitNetworkAddress(addr)
317
if network == "" {
318
network = "tcp"
319
}
320
if err != nil {
321
- return ParsedAddress{}, err
321
+ return NetworkAddress{}, err
322
}
323
if isUnixNetwork(network) {
324
- return ParsedAddress{
324
+ return NetworkAddress{
325
Network: network,
326
Host: host,
327
}, nil
@@ -333,19 +333,19 @@ func ParseNetworkAddress(addr string) (ParsedAddress, error) {
333
var start, end uint64
334
start, err = strconv.ParseUint(ports[0], 10, 16)
335
if err != nil {
336
- return ParsedAddress{}, fmt.Errorf("invalid start port: %v", err)
336
+ return NetworkAddress{}, fmt.Errorf("invalid start port: %v", err)
337
}
338
end, err = strconv.ParseUint(ports[1], 10, 16)
339
if err != nil {
340
- return ParsedAddress{}, fmt.Errorf("invalid end port: %v", err)
340
+ return NetworkAddress{}, fmt.Errorf("invalid end port: %v", err)
341
}
342
if end < start {
343
- return ParsedAddress{}, fmt.Errorf("end port must not be less than start port")
343
+ return NetworkAddress{}, fmt.Errorf("end port must not be less than start port")
344
}
345
if (end - start) > maxPortSpan {
346
- return ParsedAddress{}, fmt.Errorf("port range exceeds %d ports", maxPortSpan)
346
+ return NetworkAddress{}, fmt.Errorf("port range exceeds %d ports", maxPortSpan)
347
}
348
- return ParsedAddress{
348
+ return NetworkAddress{
349
Network: network,
350
Host: host,
351
StartPort: uint(start),
listeners_test.go
+13
-13
@@ -153,7 +153,7 @@ func TestJoinNetworkAddress(t *testing.T) {
153
func TestParseNetworkAddress(t *testing.T) {
154
for i, tc := range []struct {
155
input string
156
- expectAddr ParsedAddress
156
+ expectAddr NetworkAddress
157
expectErr bool
158
}{
159
{
@@ -166,7 +166,7 @@ func TestParseNetworkAddress(t *testing.T) {
166
},
167
{
168
input: ":1234",
169
- expectAddr: ParsedAddress{
169
+ expectAddr: NetworkAddress{
170
Network: "tcp",
171
Host: "",
172
StartPort: 1234,
@@ -175,7 +175,7 @@ func TestParseNetworkAddress(t *testing.T) {
175
},
176
{
177
input: "tcp/:1234",
178
- expectAddr: ParsedAddress{
178
+ expectAddr: NetworkAddress{
179
Network: "tcp",
180
Host: "",
181
StartPort: 1234,
@@ -184,7 +184,7 @@ func TestParseNetworkAddress(t *testing.T) {
184
},
185
{
186
input: "tcp6/:1234",
187
- expectAddr: ParsedAddress{
187
+ expectAddr: NetworkAddress{
188
Network: "tcp6",
189
Host: "",
190
StartPort: 1234,
@@ -193,7 +193,7 @@ func TestParseNetworkAddress(t *testing.T) {
193
},
194
{
195
input: "tcp4/localhost:1234",
196
- expectAddr: ParsedAddress{
196
+ expectAddr: NetworkAddress{
197
Network: "tcp4",
198
Host: "localhost",
199
StartPort: 1234,
@@ -202,14 +202,14 @@ func TestParseNetworkAddress(t *testing.T) {
202
},
203
{
204
input: "unix//foo/bar",
205
- expectAddr: ParsedAddress{
205
+ expectAddr: NetworkAddress{
206
Network: "unix",
207
Host: "/foo/bar",
208
},
209
},
210
{
211
input: "localhost:1234-1234",
212
- expectAddr: ParsedAddress{
212
+ expectAddr: NetworkAddress{
213
Network: "tcp",
214
Host: "localhost",
215
StartPort: 1234,
@@ -222,7 +222,7 @@ func TestParseNetworkAddress(t *testing.T) {
222
},
223
{
224
input: "localhost:0",
225
- expectAddr: ParsedAddress{
225
+ expectAddr: NetworkAddress{
226
Network: "tcp",
227
Host: "localhost",
228
StartPort: 0,
@@ -253,12 +253,12 @@ func TestParseNetworkAddress(t *testing.T) {
253
254
func TestJoinHostPort(t *testing.T) {
255
for i, tc := range []struct {
256
- pa ParsedAddress
256
+ pa NetworkAddress
257
offset uint
258
expect string
259
}{
260
{
261
- pa: ParsedAddress{
261
+ pa: NetworkAddress{
262
Network: "tcp",
263
Host: "localhost",
264
StartPort: 1234,
@@ -267,7 +267,7 @@ func TestJoinHostPort(t *testing.T) {
267
expect: "localhost:1234",
268
},
269
{
270
- pa: ParsedAddress{
270
+ pa: NetworkAddress{
271
Network: "tcp",
272
Host: "localhost",
273
StartPort: 1234,
@@ -276,7 +276,7 @@ func TestJoinHostPort(t *testing.T) {
276
expect: "localhost:1234",
277
},
278
{
279
- pa: ParsedAddress{
279
+ pa: NetworkAddress{
280
Network: "tcp",
281
Host: "localhost",
282
StartPort: 1234,
@@ -286,7 +286,7 @@ func TestJoinHostPort(t *testing.T) {
286
expect: "localhost:1235",
287
},
288
{
289
- pa: ParsedAddress{
289
+ pa: NetworkAddress{
290
Network: "unix",
291
Host: "/run/php/php7.3-fpm.sock",
292
},
modules/caddyhttp/autohttps.go
+1
-1
@@ -82,7 +82,7 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
82
83
// this maps domain names for automatic HTTP->HTTPS
84
// redirects to their destination server address
85
- redirDomains := make(map[string]caddy.ParsedAddress)
85
+ redirDomains := make(map[string]caddy.NetworkAddress)
86
87
for srvName, srv := range app.Servers {
88
// as a prerequisite, provision route matchers; this is
modules/caddyhttp/reverseproxy/hosts.go
+1
-1
@@ -138,7 +138,7 @@ func (u *Upstream) Full() bool {
138
// field is used. Note that the returned value is not a pointer.
139
func (u *Upstream) fillDialInfo(r *http.Request) (DialInfo, error) {
140
repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
141
- var addr caddy.ParsedAddress
141
+ var addr caddy.NetworkAddress
142
143
if u.LookupSRV != "" {
144
// perform DNS lookup for SRV records and choose one
modules/caddyhttp/reverseproxy/selectionpolicies.go
+2
-2
@@ -370,12 +370,12 @@ func (s HeaderHashSelection) Select(pool UpstreamPool, req *http.Request) *Upstr
370
}
371
372
// UnmarshalCaddyfile sets up the module from Caddyfile tokens.
373
-func (r *HeaderHashSelection) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
373
+func (s *HeaderHashSelection) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
374
for d.Next() {
375
if !d.NextArg() {
376
return d.ArgErr()
377
}
378
- r.Field = d.Val()
378
+ s.Field = d.Val()
379
}
380
return nil
381
}
modules/logging/netwriter.go
+1
-1
@@ -31,7 +31,7 @@ func init() {
31
type NetWriter struct {
32
Address string `json:"address,omitempty"`
33
34
- addr caddy.ParsedAddress
34
+ addr caddy.NetworkAddress
35
}
36
37
// CaddyModule returns the Caddy module information.