mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-16 21:56:40 -05:00
1e18afb5c8
Previously, our "duplicate key in server block" logic was flawed because it did not account for the site's bind address. We defer this check to when the listener addresses have been assigned, but before we commit a server block to its listener. Also refined how network address parsing and joining works, which was necessary for a less convoluted fix.
333 lines
6.8 KiB
Go
333 lines
6.8 KiB
Go
// Copyright 2015 Matthew Holt and The Caddy Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package caddy
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
func TestSplitNetworkAddress(t *testing.T) {
|
|
for i, tc := range []struct {
|
|
input string
|
|
expectNetwork string
|
|
expectHost string
|
|
expectPort string
|
|
expectErr bool
|
|
}{
|
|
{
|
|
input: "",
|
|
expectErr: true,
|
|
},
|
|
{
|
|
input: "foo",
|
|
expectHost: "foo",
|
|
},
|
|
{
|
|
input: ":", // empty host & empty port
|
|
},
|
|
{
|
|
input: "::",
|
|
expectErr: true,
|
|
},
|
|
{
|
|
input: "[::]",
|
|
expectHost: "::",
|
|
},
|
|
{
|
|
input: ":1234",
|
|
expectPort: "1234",
|
|
},
|
|
{
|
|
input: "foo:1234",
|
|
expectHost: "foo",
|
|
expectPort: "1234",
|
|
},
|
|
{
|
|
input: "foo:1234-5678",
|
|
expectHost: "foo",
|
|
expectPort: "1234-5678",
|
|
},
|
|
{
|
|
input: "udp/foo:1234",
|
|
expectNetwork: "udp",
|
|
expectHost: "foo",
|
|
expectPort: "1234",
|
|
},
|
|
{
|
|
input: "tcp6/foo:1234-5678",
|
|
expectNetwork: "tcp6",
|
|
expectHost: "foo",
|
|
expectPort: "1234-5678",
|
|
},
|
|
{
|
|
input: "udp/",
|
|
expectNetwork: "udp",
|
|
expectErr: true,
|
|
},
|
|
{
|
|
input: "unix//foo/bar",
|
|
expectNetwork: "unix",
|
|
expectHost: "/foo/bar",
|
|
},
|
|
{
|
|
input: "unixgram//foo/bar",
|
|
expectNetwork: "unixgram",
|
|
expectHost: "/foo/bar",
|
|
},
|
|
{
|
|
input: "unixpacket//foo/bar",
|
|
expectNetwork: "unixpacket",
|
|
expectHost: "/foo/bar",
|
|
},
|
|
} {
|
|
actualNetwork, actualHost, actualPort, err := SplitNetworkAddress(tc.input)
|
|
if tc.expectErr && err == nil {
|
|
t.Errorf("Test %d: Expected error but got %v", i, err)
|
|
}
|
|
if !tc.expectErr && err != nil {
|
|
t.Errorf("Test %d: Expected no error but got %v", i, err)
|
|
}
|
|
if actualNetwork != tc.expectNetwork {
|
|
t.Errorf("Test %d: Expected network '%s' but got '%s'", i, tc.expectNetwork, actualNetwork)
|
|
}
|
|
if actualHost != tc.expectHost {
|
|
t.Errorf("Test %d: Expected host '%s' but got '%s'", i, tc.expectHost, actualHost)
|
|
}
|
|
if actualPort != tc.expectPort {
|
|
t.Errorf("Test %d: Expected port '%s' but got '%s'", i, tc.expectPort, actualPort)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestJoinNetworkAddress(t *testing.T) {
|
|
for i, tc := range []struct {
|
|
network, host, port string
|
|
expect string
|
|
}{
|
|
{
|
|
network: "", host: "", port: "",
|
|
expect: "",
|
|
},
|
|
{
|
|
network: "tcp", host: "", port: "",
|
|
expect: "tcp/",
|
|
},
|
|
{
|
|
network: "", host: "foo", port: "",
|
|
expect: "foo",
|
|
},
|
|
{
|
|
network: "", host: "", port: "1234",
|
|
expect: ":1234",
|
|
},
|
|
{
|
|
network: "", host: "", port: "1234-5678",
|
|
expect: ":1234-5678",
|
|
},
|
|
{
|
|
network: "", host: "foo", port: "1234",
|
|
expect: "foo:1234",
|
|
},
|
|
{
|
|
network: "udp", host: "foo", port: "1234",
|
|
expect: "udp/foo:1234",
|
|
},
|
|
{
|
|
network: "udp", host: "", port: "1234",
|
|
expect: "udp/:1234",
|
|
},
|
|
{
|
|
network: "unix", host: "/foo/bar", port: "",
|
|
expect: "unix//foo/bar",
|
|
},
|
|
{
|
|
network: "unix", host: "/foo/bar", port: "0",
|
|
expect: "unix//foo/bar",
|
|
},
|
|
{
|
|
network: "unix", host: "/foo/bar", port: "1234",
|
|
expect: "unix//foo/bar",
|
|
},
|
|
{
|
|
network: "", host: "::1", port: "1234",
|
|
expect: "[::1]:1234",
|
|
},
|
|
} {
|
|
actual := JoinNetworkAddress(tc.network, tc.host, tc.port)
|
|
if actual != tc.expect {
|
|
t.Errorf("Test %d: Expected '%s' but got '%s'", i, tc.expect, actual)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestParseNetworkAddress(t *testing.T) {
|
|
for i, tc := range []struct {
|
|
input string
|
|
expectAddr NetworkAddress
|
|
expectErr bool
|
|
}{
|
|
{
|
|
input: "",
|
|
expectErr: true,
|
|
},
|
|
{
|
|
input: ":",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp",
|
|
},
|
|
},
|
|
{
|
|
input: "[::]",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "::",
|
|
},
|
|
},
|
|
{
|
|
input: ":1234",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "",
|
|
StartPort: 1234,
|
|
EndPort: 1234,
|
|
},
|
|
},
|
|
{
|
|
input: "tcp/:1234",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "",
|
|
StartPort: 1234,
|
|
EndPort: 1234,
|
|
},
|
|
},
|
|
{
|
|
input: "tcp6/:1234",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp6",
|
|
Host: "",
|
|
StartPort: 1234,
|
|
EndPort: 1234,
|
|
},
|
|
},
|
|
{
|
|
input: "tcp4/localhost:1234",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp4",
|
|
Host: "localhost",
|
|
StartPort: 1234,
|
|
EndPort: 1234,
|
|
},
|
|
},
|
|
{
|
|
input: "unix//foo/bar",
|
|
expectAddr: NetworkAddress{
|
|
Network: "unix",
|
|
Host: "/foo/bar",
|
|
},
|
|
},
|
|
{
|
|
input: "localhost:1234-1234",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "localhost",
|
|
StartPort: 1234,
|
|
EndPort: 1234,
|
|
},
|
|
},
|
|
{
|
|
input: "localhost:2-1",
|
|
expectErr: true,
|
|
},
|
|
{
|
|
input: "localhost:0",
|
|
expectAddr: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "localhost",
|
|
StartPort: 0,
|
|
EndPort: 0,
|
|
},
|
|
},
|
|
{
|
|
input: "localhost:1-999999999999",
|
|
expectErr: true,
|
|
},
|
|
} {
|
|
actualAddr, err := ParseNetworkAddress(tc.input)
|
|
if tc.expectErr && err == nil {
|
|
t.Errorf("Test %d: Expected error but got: %v", i, err)
|
|
}
|
|
if !tc.expectErr && err != nil {
|
|
t.Errorf("Test %d: Expected no error but got: %v", i, err)
|
|
}
|
|
|
|
if actualAddr.Network != tc.expectAddr.Network {
|
|
t.Errorf("Test %d: Expected network '%v' but got '%v'", i, tc.expectAddr, actualAddr)
|
|
}
|
|
if !reflect.DeepEqual(tc.expectAddr, actualAddr) {
|
|
t.Errorf("Test %d: Expected addresses %v but got %v", i, tc.expectAddr, actualAddr)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestJoinHostPort(t *testing.T) {
|
|
for i, tc := range []struct {
|
|
pa NetworkAddress
|
|
offset uint
|
|
expect string
|
|
}{
|
|
{
|
|
pa: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "localhost",
|
|
StartPort: 1234,
|
|
EndPort: 1234,
|
|
},
|
|
expect: "localhost:1234",
|
|
},
|
|
{
|
|
pa: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "localhost",
|
|
StartPort: 1234,
|
|
EndPort: 1235,
|
|
},
|
|
expect: "localhost:1234",
|
|
},
|
|
{
|
|
pa: NetworkAddress{
|
|
Network: "tcp",
|
|
Host: "localhost",
|
|
StartPort: 1234,
|
|
EndPort: 1235,
|
|
},
|
|
offset: 1,
|
|
expect: "localhost:1235",
|
|
},
|
|
{
|
|
pa: NetworkAddress{
|
|
Network: "unix",
|
|
Host: "/run/php/php7.3-fpm.sock",
|
|
},
|
|
expect: "/run/php/php7.3-fpm.sock",
|
|
},
|
|
} {
|
|
actual := tc.pa.JoinHostPort(tc.offset)
|
|
if actual != tc.expect {
|
|
t.Errorf("Test %d: Expected '%s' but got '%s'", i, tc.expect, actual)
|
|
}
|
|
}
|
|
}
|