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 root
|
2015-10-09 23:20:28 +08:00
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
|
|
|
"path/filepath"
|
|
|
|
"strings"
|
|
|
|
"testing"
|
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
|
|
|
|
|
|
|
"github.com/mholt/caddy"
|
|
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
2015-10-09 23:20:28 +08:00
|
|
|
)
|
|
|
|
|
|
|
|
func TestRoot(t *testing.T) {
|
|
|
|
// Predefined error substrings
|
|
|
|
parseErrContent := "Parse error:"
|
2015-10-10 09:15:25 +08:00
|
|
|
unableToAccessErrContent := "Unable to access root path"
|
2015-10-09 23:20:28 +08:00
|
|
|
|
|
|
|
existingDirPath, err := getTempDirPath()
|
|
|
|
if err != nil {
|
2015-10-10 09:15:25 +08:00
|
|
|
t.Fatalf("BeforeTest: Failed to find an existing directory for testing! Error was: %v", err)
|
2015-10-09 23:20:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
nonExistingDir := filepath.Join(existingDirPath, "highly_unlikely_to_exist_dir")
|
|
|
|
|
|
|
|
existingFile, err := ioutil.TempFile("", "root_test")
|
|
|
|
if err != nil {
|
2015-10-10 09:15:25 +08:00
|
|
|
t.Fatalf("BeforeTest: Failed to create temp file for testing! Error was: %v", err)
|
2015-10-09 23:20:28 +08:00
|
|
|
}
|
2015-10-14 14:35:50 +08:00
|
|
|
defer func() {
|
2015-10-14 04:35:24 +08:00
|
|
|
existingFile.Close()
|
|
|
|
os.Remove(existingFile.Name())
|
|
|
|
}()
|
2015-10-09 23:20:28 +08:00
|
|
|
|
2015-10-14 14:35:50 +08:00
|
|
|
inaccessiblePath := getInaccessiblePath(existingFile.Name())
|
|
|
|
|
2015-10-09 23:20:28 +08:00
|
|
|
tests := []struct {
|
|
|
|
input string
|
|
|
|
shouldErr bool
|
|
|
|
expectedRoot string // expected root, set to the controller. Empty for negative cases.
|
|
|
|
expectedErrContent string // substring from the expected error. Empty for positive cases.
|
|
|
|
}{
|
|
|
|
// positive
|
|
|
|
{
|
|
|
|
fmt.Sprintf(`root %s`, nonExistingDir), false, nonExistingDir, "",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
fmt.Sprintf(`root %s`, existingDirPath), false, existingDirPath, "",
|
|
|
|
},
|
|
|
|
// negative
|
|
|
|
{
|
|
|
|
`root `, true, "", parseErrContent,
|
|
|
|
},
|
2017-01-24 13:06:29 +08:00
|
|
|
{
|
|
|
|
`root /a /b`, true, "", parseErrContent,
|
|
|
|
},
|
2015-10-09 23:20:28 +08:00
|
|
|
{
|
2015-10-14 14:35:50 +08:00
|
|
|
fmt.Sprintf(`root %s`, inaccessiblePath), true, "", unableToAccessErrContent,
|
2015-10-09 23:20:28 +08:00
|
|
|
},
|
|
|
|
{
|
|
|
|
fmt.Sprintf(`root {
|
|
|
|
%s
|
|
|
|
}`, existingDirPath), true, "", parseErrContent,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, test := range tests {
|
2016-06-21 01:44:20 +08:00
|
|
|
c := caddy.NewTestController("http", test.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
|
|
|
err := setupRoot(c)
|
2016-06-21 01:44:20 +08:00
|
|
|
cfg := httpserver.GetConfig(c)
|
2015-10-14 04:35:24 +08:00
|
|
|
|
2015-10-09 23:20:28 +08:00
|
|
|
if test.shouldErr && err == nil {
|
2017-01-24 13:06:29 +08:00
|
|
|
t.Errorf("Test %d: Expected error but got nil for input '%s'", i, test.input)
|
2015-10-09 23:20:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
if !test.shouldErr {
|
|
|
|
t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !strings.Contains(err.Error(), test.expectedErrContent) {
|
|
|
|
t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.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
|
|
|
// check root only if we are in a positive test.
|
|
|
|
if !test.shouldErr && test.expectedRoot != cfg.Root {
|
|
|
|
t.Errorf("Root not correctly set for input %s. Expected: %s, actual: %s", test.input, test.expectedRoot, cfg.Root)
|
2015-10-09 23:20:28 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-16 13:02:51 +08:00
|
|
|
// getTempDirPath returns the path to the system temp directory. If it does not exists - an error is returned.
|
2015-10-09 23:20:28 +08:00
|
|
|
func getTempDirPath() (string, error) {
|
|
|
|
tempDir := os.TempDir()
|
|
|
|
_, err := os.Stat(tempDir)
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
return tempDir, nil
|
|
|
|
}
|
2015-10-14 04:35:24 +08:00
|
|
|
|
2015-10-14 14:35:50 +08:00
|
|
|
func getInaccessiblePath(file string) 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
|
|
|
return filepath.Join("C:", "file\x00name") // null byte in filename is not allowed on Windows AND unix
|
2015-10-14 14:35:50 +08:00
|
|
|
}
|
2017-02-16 13:02:51 +08:00
|
|
|
|
|
|
|
func TestSymlinkRoot(t *testing.T) {
|
|
|
|
origDir, err := ioutil.TempDir("", "root_test")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("BeforeTest: Failed to create temp dir for testing! Error was: %v", err)
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
os.Remove(origDir)
|
|
|
|
}()
|
|
|
|
|
|
|
|
tempDir, err := getTempDirPath()
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("BeforeTest: Failed to find an existing directory for testing! Error was: %v", err)
|
|
|
|
}
|
|
|
|
symlinkDir := filepath.Join(tempDir, "symlink")
|
|
|
|
|
|
|
|
err = os.Symlink(origDir, symlinkDir)
|
|
|
|
if err != nil {
|
|
|
|
if strings.Contains(err.Error(), "A required privilege is not held by the client") {
|
|
|
|
t.Skip("BeforeTest: A required privilege is not held by the client and is required to create a symlink to run this test.")
|
|
|
|
}
|
|
|
|
t.Fatalf("BeforeTest: Cannot create symlink! Error was: %v", err)
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
os.Remove(symlinkDir)
|
|
|
|
}()
|
|
|
|
|
|
|
|
input := fmt.Sprintf(`root %s`, symlinkDir)
|
|
|
|
c := caddy.NewTestController("http", input)
|
|
|
|
err = setupRoot(c)
|
|
|
|
_ = httpserver.GetConfig(c)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Test Symlink Root: Expected no error but found one for input %s. Error was: %v", input, err)
|
|
|
|
}
|
|
|
|
}
|