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-05 07:00:29 +08:00
|
|
|
package caddyfile
|
|
|
|
|
|
|
|
import (
|
|
|
|
"os"
|
|
|
|
"strings"
|
|
|
|
"testing"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestAllTokens(t *testing.T) {
|
|
|
|
input := strings.NewReader("a b c\nd e")
|
|
|
|
expected := []string{"a", "b", "c", "d", "e"}
|
2016-08-18 07:17:26 +08:00
|
|
|
tokens, err := allTokens(input)
|
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-05 07:00:29 +08:00
|
|
|
|
2016-08-18 07:17:26 +08:00
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Expected no error, got %v", err)
|
|
|
|
}
|
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-05 07:00:29 +08:00
|
|
|
if len(tokens) != len(expected) {
|
|
|
|
t.Fatalf("Expected %d tokens, got %d", len(expected), len(tokens))
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, val := range expected {
|
2016-06-05 12:50:23 +08:00
|
|
|
if tokens[i].Text != val {
|
|
|
|
t.Errorf("Token %d should be '%s' but was '%s'", i, val, tokens[i].Text)
|
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-05 07:00:29 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestParseOneAndImport(t *testing.T) {
|
|
|
|
testParseOne := func(input string) (ServerBlock, error) {
|
|
|
|
p := testParser(input)
|
|
|
|
p.Next() // parseOne doesn't call Next() to start, so we must
|
|
|
|
err := p.parseOne()
|
|
|
|
return p.block, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
input string
|
|
|
|
shouldErr bool
|
|
|
|
keys []string
|
|
|
|
tokens map[string]int // map of directive name to number of tokens expected
|
|
|
|
}{
|
|
|
|
{`localhost`, false, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{}},
|
|
|
|
|
|
|
|
{`localhost
|
|
|
|
dir1`, false, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 1,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost:1234
|
|
|
|
dir1 foo bar`, false, []string{
|
|
|
|
"localhost:1234",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost {
|
|
|
|
dir1
|
|
|
|
}`, false, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 1,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost:1234 {
|
|
|
|
dir1 foo bar
|
|
|
|
dir2
|
|
|
|
}`, false, []string{
|
|
|
|
"localhost:1234",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
"dir2": 1,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`http://localhost https://localhost
|
|
|
|
dir1 foo bar`, false, []string{
|
|
|
|
"http://localhost",
|
|
|
|
"https://localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`http://localhost https://localhost {
|
|
|
|
dir1 foo bar
|
|
|
|
}`, false, []string{
|
|
|
|
"http://localhost",
|
|
|
|
"https://localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`http://localhost, https://localhost {
|
|
|
|
dir1 foo bar
|
|
|
|
}`, false, []string{
|
|
|
|
"http://localhost",
|
|
|
|
"https://localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`http://localhost, {
|
|
|
|
}`, true, []string{
|
|
|
|
"http://localhost",
|
|
|
|
}, map[string]int{}},
|
|
|
|
|
|
|
|
{`host1:80, http://host2.com
|
|
|
|
dir1 foo bar
|
|
|
|
dir2 baz`, false, []string{
|
|
|
|
"host1:80",
|
|
|
|
"http://host2.com",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
"dir2": 2,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`http://host1.com,
|
|
|
|
http://host2.com,
|
|
|
|
https://host3.com`, false, []string{
|
|
|
|
"http://host1.com",
|
|
|
|
"http://host2.com",
|
|
|
|
"https://host3.com",
|
|
|
|
}, map[string]int{}},
|
|
|
|
|
|
|
|
{`http://host1.com:1234, https://host2.com
|
|
|
|
dir1 foo {
|
|
|
|
bar baz
|
|
|
|
}
|
|
|
|
dir2`, false, []string{
|
|
|
|
"http://host1.com:1234",
|
|
|
|
"https://host2.com",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 6,
|
|
|
|
"dir2": 1,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`127.0.0.1
|
|
|
|
dir1 {
|
|
|
|
bar baz
|
|
|
|
}
|
|
|
|
dir2 {
|
|
|
|
foo bar
|
|
|
|
}`, false, []string{
|
|
|
|
"127.0.0.1",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 5,
|
|
|
|
"dir2": 5,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost
|
|
|
|
dir1 {
|
|
|
|
foo`, true, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost
|
|
|
|
dir1 {
|
|
|
|
}`, false, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost
|
|
|
|
dir1 {
|
|
|
|
} }`, true, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost
|
|
|
|
dir1 {
|
|
|
|
nested {
|
|
|
|
foo
|
|
|
|
}
|
|
|
|
}
|
|
|
|
dir2 foo bar`, false, []string{
|
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 7,
|
|
|
|
"dir2": 3,
|
|
|
|
}},
|
|
|
|
|
|
|
|
{``, false, []string{}, map[string]int{}},
|
|
|
|
|
|
|
|
{`localhost
|
|
|
|
dir1 arg1
|
2016-07-14 00:58:42 +08:00
|
|
|
import testdata/import_test1.txt`, false, []string{
|
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-05 07:00:29 +08:00
|
|
|
"localhost",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 2,
|
|
|
|
"dir2": 3,
|
|
|
|
"dir3": 1,
|
|
|
|
}},
|
|
|
|
|
2016-07-14 00:58:42 +08:00
|
|
|
{`import testdata/import_test2.txt`, false, []string{
|
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-05 07:00:29 +08:00
|
|
|
"host1",
|
|
|
|
}, map[string]int{
|
|
|
|
"dir1": 1,
|
|
|
|
"dir2": 2,
|
|
|
|
}},
|
|
|
|
|
2016-07-14 00:58:42 +08:00
|
|
|
{`import testdata/import_test1.txt testdata/import_test2.txt`, true, []string{}, map[string]int{}},
|
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-05 07:00:29 +08:00
|
|
|
|
2016-07-14 00:58:42 +08:00
|
|
|
{`import testdata/not_found.txt`, true, []string{}, map[string]int{}},
|
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-05 07:00:29 +08:00
|
|
|
|
|
|
|
{`""`, false, []string{}, map[string]int{}},
|
|
|
|
|
|
|
|
{``, false, []string{}, map[string]int{}},
|
|
|
|
} {
|
|
|
|
result, err := testParseOne(test.input)
|
|
|
|
|
|
|
|
if test.shouldErr && err == nil {
|
|
|
|
t.Errorf("Test %d: Expected an error, but didn't get one", i)
|
|
|
|
}
|
|
|
|
if !test.shouldErr && err != nil {
|
|
|
|
t.Errorf("Test %d: Expected no error, but got: %v", i, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(result.Keys) != len(test.keys) {
|
|
|
|
t.Errorf("Test %d: Expected %d keys, got %d",
|
|
|
|
i, len(test.keys), len(result.Keys))
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
for j, addr := range result.Keys {
|
|
|
|
if addr != test.keys[j] {
|
|
|
|
t.Errorf("Test %d, key %d: Expected '%s', but was '%s'",
|
|
|
|
i, j, test.keys[j], addr)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(result.Tokens) != len(test.tokens) {
|
|
|
|
t.Errorf("Test %d: Expected %d directives, had %d",
|
|
|
|
i, len(test.tokens), len(result.Tokens))
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
for directive, tokens := range result.Tokens {
|
|
|
|
if len(tokens) != test.tokens[directive] {
|
|
|
|
t.Errorf("Test %d, directive '%s': Expected %d tokens, counted %d",
|
|
|
|
i, directive, test.tokens[directive], len(tokens))
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestParseAll(t *testing.T) {
|
|
|
|
for i, test := range []struct {
|
|
|
|
input string
|
|
|
|
shouldErr bool
|
|
|
|
keys [][]string // keys per server block, in order
|
|
|
|
}{
|
|
|
|
{`localhost`, false, [][]string{
|
|
|
|
{"localhost"},
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost:1234`, false, [][]string{
|
|
|
|
{"localhost:1234"},
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost:1234 {
|
|
|
|
}
|
|
|
|
localhost:2015 {
|
|
|
|
}`, false, [][]string{
|
|
|
|
{"localhost:1234"},
|
|
|
|
{"localhost:2015"},
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost:1234, http://host2`, false, [][]string{
|
|
|
|
{"localhost:1234", "http://host2"},
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`localhost:1234, http://host2,`, true, [][]string{}},
|
|
|
|
|
|
|
|
{`http://host1.com, http://host2.com {
|
|
|
|
}
|
|
|
|
https://host3.com, https://host4.com {
|
|
|
|
}`, false, [][]string{
|
|
|
|
{"http://host1.com", "http://host2.com"},
|
|
|
|
{"https://host3.com", "https://host4.com"},
|
|
|
|
}},
|
|
|
|
|
|
|
|
{`import testdata/import_glob*.txt`, false, [][]string{
|
|
|
|
{"glob0.host0"},
|
|
|
|
{"glob0.host1"},
|
|
|
|
{"glob1.host0"},
|
|
|
|
{"glob2.host0"},
|
|
|
|
}},
|
|
|
|
} {
|
|
|
|
p := testParser(test.input)
|
|
|
|
blocks, err := p.parseAll()
|
|
|
|
|
|
|
|
if test.shouldErr && err == nil {
|
|
|
|
t.Errorf("Test %d: Expected an error, but didn't get one", i)
|
|
|
|
}
|
|
|
|
if !test.shouldErr && err != nil {
|
|
|
|
t.Errorf("Test %d: Expected no error, but got: %v", i, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(blocks) != len(test.keys) {
|
|
|
|
t.Errorf("Test %d: Expected %d server blocks, got %d",
|
|
|
|
i, len(test.keys), len(blocks))
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
for j, block := range blocks {
|
|
|
|
if len(block.Keys) != len(test.keys[j]) {
|
|
|
|
t.Errorf("Test %d: Expected %d keys in block %d, got %d",
|
|
|
|
i, len(test.keys[j]), j, len(block.Keys))
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
for k, addr := range block.Keys {
|
|
|
|
if addr != test.keys[j][k] {
|
|
|
|
t.Errorf("Test %d, block %d, key %d: Expected '%s', but got '%s'",
|
|
|
|
i, j, k, test.keys[j][k], addr)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestEnvironmentReplacement(t *testing.T) {
|
|
|
|
os.Setenv("PORT", "8080")
|
|
|
|
os.Setenv("ADDRESS", "servername.com")
|
|
|
|
os.Setenv("FOOBAR", "foobar")
|
|
|
|
|
|
|
|
// basic test; unix-style env vars
|
|
|
|
p := testParser(`{$ADDRESS}`)
|
|
|
|
blocks, _ := p.parseAll()
|
|
|
|
if actual, expected := blocks[0].Keys[0], "servername.com"; expected != actual {
|
|
|
|
t.Errorf("Expected key to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// multiple vars per token
|
|
|
|
p = testParser(`{$ADDRESS}:{$PORT}`)
|
|
|
|
blocks, _ = p.parseAll()
|
|
|
|
if actual, expected := blocks[0].Keys[0], "servername.com:8080"; expected != actual {
|
|
|
|
t.Errorf("Expected key to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// windows-style var and unix style in same token
|
|
|
|
p = testParser(`{%ADDRESS%}:{$PORT}`)
|
|
|
|
blocks, _ = p.parseAll()
|
|
|
|
if actual, expected := blocks[0].Keys[0], "servername.com:8080"; expected != actual {
|
|
|
|
t.Errorf("Expected key to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// reverse order
|
|
|
|
p = testParser(`{$ADDRESS}:{%PORT%}`)
|
|
|
|
blocks, _ = p.parseAll()
|
|
|
|
if actual, expected := blocks[0].Keys[0], "servername.com:8080"; expected != actual {
|
|
|
|
t.Errorf("Expected key to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// env var in server block body as argument
|
|
|
|
p = testParser(":{%PORT%}\ndir1 {$FOOBAR}")
|
|
|
|
blocks, _ = p.parseAll()
|
|
|
|
if actual, expected := blocks[0].Keys[0], ":8080"; expected != actual {
|
|
|
|
t.Errorf("Expected key to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
2016-06-05 12:50:23 +08:00
|
|
|
if actual, expected := blocks[0].Tokens["dir1"][1].Text, "foobar"; expected != actual {
|
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-05 07:00:29 +08:00
|
|
|
t.Errorf("Expected argument to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// combined windows env vars in argument
|
|
|
|
p = testParser(":{%PORT%}\ndir1 {%ADDRESS%}/{%FOOBAR%}")
|
|
|
|
blocks, _ = p.parseAll()
|
2016-06-05 12:50:23 +08:00
|
|
|
if actual, expected := blocks[0].Tokens["dir1"][1].Text, "servername.com/foobar"; expected != actual {
|
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-05 07:00:29 +08:00
|
|
|
t.Errorf("Expected argument to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// malformed env var (windows)
|
|
|
|
p = testParser(":1234\ndir1 {%ADDRESS}")
|
|
|
|
blocks, _ = p.parseAll()
|
2016-06-05 12:50:23 +08:00
|
|
|
if actual, expected := blocks[0].Tokens["dir1"][1].Text, "{%ADDRESS}"; expected != actual {
|
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-05 07:00:29 +08:00
|
|
|
t.Errorf("Expected host to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// malformed (non-existent) env var (unix)
|
|
|
|
p = testParser(`:{$PORT$}`)
|
|
|
|
blocks, _ = p.parseAll()
|
|
|
|
if actual, expected := blocks[0].Keys[0], ":"; expected != actual {
|
|
|
|
t.Errorf("Expected key to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
|
|
|
|
// in quoted field
|
|
|
|
p = testParser(":1234\ndir1 \"Test {$FOOBAR} test\"")
|
|
|
|
blocks, _ = p.parseAll()
|
2016-06-05 12:50:23 +08:00
|
|
|
if actual, expected := blocks[0].Tokens["dir1"][1].Text, "Test foobar test"; expected != actual {
|
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-05 07:00:29 +08:00
|
|
|
t.Errorf("Expected argument to be '%s' but was '%s'", expected, actual)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func testParser(input string) parser {
|
|
|
|
buf := strings.NewReader(input)
|
2016-07-14 00:58:42 +08:00
|
|
|
p := parser{Dispenser: NewDispenser("Caddyfile", buf)}
|
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-05 07:00:29 +08:00
|
|
|
return p
|
|
|
|
}
|