Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
package httpserver
|
|
|
|
|
|
|
|
import (
|
|
|
|
"net"
|
|
|
|
"strings"
|
|
|
|
)
|
|
|
|
|
|
|
|
// vhostTrie facilitates virtual hosting. It matches
|
|
|
|
// requests first by hostname (with support for
|
|
|
|
// wildcards as TLS certificates support them), then
|
|
|
|
// by longest matching path.
|
|
|
|
type vhostTrie struct {
|
|
|
|
edges map[string]*vhostTrie
|
2016-06-27 14:14:17 -05:00
|
|
|
site *SiteConfig // site to match on this node; also known as a virtual host
|
|
|
|
path string // the path portion of the key for the associated site
|
Rewrote Caddy from the ground up; initial commit of 0.9 branch
These changes span work from the last ~4 months in an effort to make
Caddy more extensible, reduce the coupling between its components, and
lay a more robust foundation of code going forward into 1.0. A bunch of
new features have been added, too, with even higher future potential.
The most significant design change is an overall inversion of
dependencies. Instead of the caddy package knowing about the server
and the notion of middleware and config, the caddy package exposes an
interface that other components plug into. This does introduce more
indirection when reading the code, but every piece is very modular and
pluggable. Even the HTTP server is pluggable.
The caddy package has been moved to the top level, and main has been
pushed into a subfolder called caddy. The actual logic of the main
file has been pushed even further into caddy/caddymain/run.go so that
custom builds of Caddy can be 'go get'able.
The HTTPS logic was surgically separated into two parts to divide the
TLS-specific code and the HTTPS-specific code. The caddytls package can
now be used by any type of server that needs TLS, not just HTTP. I also
added the ability to customize nearly every aspect of TLS at the site
level rather than all sites sharing the same TLS configuration. Not all
of this flexibility is exposed in the Caddyfile yet, but it may be in
the future. Caddy can also generate self-signed certificates in memory
for the convenience of a developer working on localhost who wants HTTPS.
And Caddy now supports the DNS challenge, assuming at least one DNS
provider is plugged in.
Dozens, if not hundreds, of other minor changes swept through the code
base as I literally started from an empty main function, copying over
functions or files as needed, then adjusting them to fit in the new
design. Most tests have been restored and adapted to the new API,
but more work is needed there.
A lot of what was "impossible" before is now possible, or can be made
possible with minimal disruption of the code. For example, it's fairly
easy to make plugins hook into another part of the code via callbacks.
Plugins can do more than just be directives; we now have plugins that
customize how the Caddyfile is loaded (useful when you need to get your
configuration from a remote store).
Site addresses no longer need be just a host and port. They can have a
path, allowing you to scope a configuration to a specific path. There is
no inheretance, however; each site configuration is distinct.
Thanks to amazing work by Lucas Clemente, this commit adds experimental
QUIC support. Turn it on using the -quic flag; your browser may have
to be configured to enable it.
Almost everything is here, but you will notice that most of the middle-
ware are missing. After those are transferred over, we'll be ready for
beta tests.
I'm very excited to get this out. Thanks for everyone's help and
patience these last few months. I hope you like it!!
2016-06-04 18:00:29 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// newVHostTrie returns a new vhostTrie.
|
|
|
|
func newVHostTrie() *vhostTrie {
|
|
|
|
return &vhostTrie{edges: make(map[string]*vhostTrie)}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Insert adds stack to t keyed by key. The key should be
|
|
|
|
// a valid "host/path" combination (or just host).
|
|
|
|
func (t *vhostTrie) Insert(key string, site *SiteConfig) {
|
|
|
|
host, path := t.splitHostPath(key)
|
|
|
|
if _, ok := t.edges[host]; !ok {
|
|
|
|
t.edges[host] = newVHostTrie()
|
|
|
|
}
|
|
|
|
t.edges[host].insertPath(path, path, site)
|
|
|
|
}
|
|
|
|
|
|
|
|
// insertPath expects t to be a host node (not a root node),
|
|
|
|
// and inserts site into the t according to remainingPath.
|
|
|
|
func (t *vhostTrie) insertPath(remainingPath, originalPath string, site *SiteConfig) {
|
|
|
|
if remainingPath == "" {
|
|
|
|
t.site = site
|
|
|
|
t.path = originalPath
|
|
|
|
return
|
|
|
|
}
|
|
|
|
ch := string(remainingPath[0])
|
|
|
|
if _, ok := t.edges[ch]; !ok {
|
|
|
|
t.edges[ch] = newVHostTrie()
|
|
|
|
}
|
|
|
|
t.edges[ch].insertPath(remainingPath[1:], originalPath, site)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Match returns the virtual host (site) in v with
|
|
|
|
// the closest match to key. If there was a match,
|
|
|
|
// it returns the SiteConfig and the path portion of
|
|
|
|
// the key used to make the match. The matched path
|
|
|
|
// would be a prefix of the path portion of the
|
|
|
|
// key, if not the whole path portion of the key.
|
|
|
|
// If there is no match, nil and empty string will
|
|
|
|
// be returned.
|
|
|
|
//
|
|
|
|
// A typical key will be in the form "host" or "host/path".
|
|
|
|
func (t *vhostTrie) Match(key string) (*SiteConfig, string) {
|
|
|
|
host, path := t.splitHostPath(key)
|
|
|
|
// try the given host, then, if no match, try wildcard hosts
|
|
|
|
branch := t.matchHost(host)
|
|
|
|
if branch == nil {
|
|
|
|
branch = t.matchHost("0.0.0.0")
|
|
|
|
}
|
|
|
|
if branch == nil {
|
|
|
|
branch = t.matchHost("")
|
|
|
|
}
|
|
|
|
if branch == nil {
|
|
|
|
return nil, ""
|
|
|
|
}
|
|
|
|
node := branch.matchPath(path)
|
|
|
|
if node == nil {
|
|
|
|
return nil, ""
|
|
|
|
}
|
|
|
|
return node.site, node.path
|
|
|
|
}
|
|
|
|
|
|
|
|
// matchHost returns the vhostTrie matching host. The matching
|
|
|
|
// algorithm is the same as used to match certificates to host
|
|
|
|
// with SNI during TLS handshakes. In other words, it supports,
|
|
|
|
// to some degree, the use of wildcard (*) characters.
|
|
|
|
func (t *vhostTrie) matchHost(host string) *vhostTrie {
|
|
|
|
// try exact match
|
|
|
|
if subtree, ok := t.edges[host]; ok {
|
|
|
|
return subtree
|
|
|
|
}
|
|
|
|
|
|
|
|
// then try replacing labels in the host
|
|
|
|
// with wildcards until we get a match
|
|
|
|
labels := strings.Split(host, ".")
|
|
|
|
for i := range labels {
|
|
|
|
labels[i] = "*"
|
|
|
|
candidate := strings.Join(labels, ".")
|
|
|
|
if subtree, ok := t.edges[candidate]; ok {
|
|
|
|
return subtree
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// matchPath traverses t until it finds the longest key matching
|
|
|
|
// remainingPath, and returns its node.
|
|
|
|
func (t *vhostTrie) matchPath(remainingPath string) *vhostTrie {
|
|
|
|
var longestMatch *vhostTrie
|
|
|
|
for len(remainingPath) > 0 {
|
|
|
|
ch := string(remainingPath[0])
|
|
|
|
next, ok := t.edges[ch]
|
|
|
|
if !ok {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if next.site != nil {
|
|
|
|
longestMatch = next
|
|
|
|
}
|
|
|
|
t = next
|
|
|
|
remainingPath = remainingPath[1:]
|
|
|
|
}
|
|
|
|
return longestMatch
|
|
|
|
}
|
|
|
|
|
|
|
|
// splitHostPath separates host from path in key.
|
|
|
|
func (t *vhostTrie) splitHostPath(key string) (host, path string) {
|
|
|
|
parts := strings.SplitN(key, "/", 2)
|
|
|
|
host, path = strings.ToLower(parts[0]), "/"
|
|
|
|
if len(parts) > 1 {
|
|
|
|
path += parts[1]
|
|
|
|
}
|
|
|
|
// strip out the port (if present) from the host, since
|
|
|
|
// each port has its own socket, and each socket has its
|
|
|
|
// own listener, and each listener has its own server
|
|
|
|
// instance, and each server instance has its own vhosts.
|
|
|
|
// removing the port is a simple way to standardize so
|
|
|
|
// when requests come in, we can be sure to get a match.
|
|
|
|
hostname, _, err := net.SplitHostPort(host)
|
|
|
|
if err == nil {
|
|
|
|
host = hostname
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
2016-06-27 14:14:17 -05:00
|
|
|
|
|
|
|
// String returns a list of all the entries in t; assumes that
|
|
|
|
// t is a root node.
|
|
|
|
func (t *vhostTrie) String() string {
|
|
|
|
var s string
|
|
|
|
for host, edge := range t.edges {
|
|
|
|
s += edge.str(host)
|
|
|
|
}
|
|
|
|
return s
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *vhostTrie) str(prefix string) string {
|
|
|
|
var s string
|
|
|
|
for key, edge := range t.edges {
|
|
|
|
if edge.site != nil {
|
|
|
|
s += prefix + key + "\n"
|
|
|
|
}
|
|
|
|
s += edge.str(prefix + key)
|
|
|
|
}
|
|
|
|
return s
|
|
|
|
}
|