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 staticfiles
|
2015-10-21 07:08:36 +08:00
|
|
|
|
|
|
|
import (
|
2017-02-28 20:54:12 +08:00
|
|
|
"context"
|
2015-10-21 07:08:36 +08:00
|
|
|
"errors"
|
|
|
|
"net/http"
|
|
|
|
"net/http/httptest"
|
2016-04-17 00:57:16 +08:00
|
|
|
"net/url"
|
2015-10-21 07:08:36 +08:00
|
|
|
"os"
|
|
|
|
"path/filepath"
|
2017-03-13 06:41:49 +08:00
|
|
|
"strconv"
|
2015-10-21 07:08:36 +08:00
|
|
|
"strings"
|
|
|
|
"testing"
|
2016-04-02 05:24:04 +08:00
|
|
|
"time"
|
2015-10-21 07:08:36 +08:00
|
|
|
)
|
|
|
|
|
2016-04-17 00:57:16 +08:00
|
|
|
var (
|
|
|
|
ErrCustom = errors.New("Custom Error")
|
|
|
|
|
|
|
|
testDir = filepath.Join(os.TempDir(), "caddy_testdir")
|
|
|
|
testWebRoot = filepath.Join(testDir, "webroot")
|
|
|
|
)
|
2015-10-21 07:08:36 +08:00
|
|
|
|
2017-02-19 06:52:50 +08:00
|
|
|
var (
|
2017-03-13 06:41:49 +08:00
|
|
|
webrootFile1HTML = filepath.Join("webroot", "file1.html")
|
|
|
|
webrootDirFile2HTML = filepath.Join("webroot", "dir", "file2.html")
|
|
|
|
webrootDirHiddenHTML = filepath.Join("webroot", "dir", "hidden.html")
|
|
|
|
webrootDirwithindexIndeHTML = filepath.Join("webroot", "dirwithindex", "index.html")
|
|
|
|
webrootSubGzippedHTML = filepath.Join("webroot", "sub", "gzipped.html")
|
|
|
|
webrootSubGzippedHTMLGz = filepath.Join("webroot", "sub", "gzipped.html.gz")
|
|
|
|
webrootSubGzippedHTMLBr = filepath.Join("webroot", "sub", "gzipped.html.br")
|
|
|
|
webrootSubBrotliHTML = filepath.Join("webroot", "sub", "brotli.html")
|
|
|
|
webrootSubBrotliHTMLGz = filepath.Join("webroot", "sub", "brotli.html.gz")
|
|
|
|
webrootSubBrotliHTMLBr = filepath.Join("webroot", "sub", "brotli.html.br")
|
2017-02-28 20:54:12 +08:00
|
|
|
webrootSubBarDirWithIndexIndexHTML = filepath.Join("webroot", "bar", "dirwithindex", "index.html")
|
2017-02-19 06:52:50 +08:00
|
|
|
)
|
|
|
|
|
2015-10-21 07:08:36 +08:00
|
|
|
// testFiles is a map with relative paths to test files as keys and file content as values.
|
|
|
|
// The map represents the following structure:
|
|
|
|
// - $TEMP/caddy_testdir/
|
2016-04-17 00:57:16 +08:00
|
|
|
// '-- unreachable.html
|
|
|
|
// '-- webroot/
|
|
|
|
// '---- file1.html
|
|
|
|
// '---- dirwithindex/
|
|
|
|
// '------ index.html
|
|
|
|
// '---- dir/
|
|
|
|
// '------ file2.html
|
|
|
|
// '------ hidden.html
|
2015-10-21 07:08:36 +08:00
|
|
|
var testFiles = map[string]string{
|
2017-02-28 20:54:12 +08:00
|
|
|
"unreachable.html": "<h1>must not leak</h1>",
|
2017-03-13 06:41:49 +08:00
|
|
|
webrootFile1HTML: "<h1>file1.html</h1>",
|
|
|
|
webrootDirFile2HTML: "<h1>dir/file2.html</h1>",
|
|
|
|
webrootDirwithindexIndeHTML: "<h1>dirwithindex/index.html</h1>",
|
|
|
|
webrootDirHiddenHTML: "<h1>dir/hidden.html</h1>",
|
|
|
|
webrootSubGzippedHTML: "<h1>gzipped.html</h1>",
|
|
|
|
webrootSubGzippedHTMLGz: "1.gzipped.html.gz",
|
|
|
|
webrootSubGzippedHTMLBr: "2.gzipped.html.br",
|
|
|
|
webrootSubBrotliHTML: "3.brotli.html",
|
|
|
|
webrootSubBrotliHTMLGz: "4.brotli.html.gz",
|
|
|
|
webrootSubBrotliHTMLBr: "5.brotli.html.br",
|
2017-02-28 20:54:12 +08:00
|
|
|
webrootSubBarDirWithIndexIndexHTML: "<h1>bar/dirwithindex/index.html</h1>",
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// TestServeHTTP covers positive scenarios when serving files.
|
|
|
|
func TestServeHTTP(t *testing.T) {
|
|
|
|
|
2015-11-03 03:28:50 +08:00
|
|
|
beforeServeHTTPTest(t)
|
|
|
|
defer afterServeHTTPTest(t)
|
2015-10-21 07:08:36 +08:00
|
|
|
|
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
|
|
|
fileserver := FileServer{
|
|
|
|
Root: http.Dir(testWebRoot),
|
|
|
|
Hide: []string{"dir/hidden.html"},
|
|
|
|
}
|
2015-10-21 07:08:36 +08:00
|
|
|
|
|
|
|
movedPermanently := "Moved Permanently"
|
|
|
|
|
|
|
|
tests := []struct {
|
2017-03-13 06:41:49 +08:00
|
|
|
url string
|
|
|
|
cleanedPath string
|
|
|
|
acceptEncoding string
|
|
|
|
expectedLocation string
|
|
|
|
expectedStatus int
|
|
|
|
expectedBodyContent string
|
|
|
|
expectedEtag string
|
|
|
|
expectedVary string
|
|
|
|
expectedEncoding string
|
|
|
|
expectedContentLength string
|
2015-10-21 07:08:36 +08:00
|
|
|
}{
|
2016-02-14 15:10:57 +08:00
|
|
|
// Test 0 - access without any path
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
|
|
|
url: "https://foo",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
|
|
|
// Test 1 - access root (without index.html)
|
|
|
|
{
|
|
|
|
url: "https://foo/",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
|
|
|
// Test 2 - access existing file
|
|
|
|
{
|
2017-03-13 06:41:49 +08:00
|
|
|
url: "https://foo/file1.html",
|
|
|
|
expectedStatus: http.StatusOK,
|
|
|
|
expectedBodyContent: testFiles[webrootFile1HTML],
|
|
|
|
expectedEtag: `"2n9cj"`,
|
|
|
|
expectedContentLength: strconv.Itoa(len(testFiles[webrootFile1HTML])),
|
2015-10-21 07:08:36 +08:00
|
|
|
},
|
|
|
|
// Test 3 - access folder with index file with trailing slash
|
|
|
|
{
|
2017-03-13 06:41:49 +08:00
|
|
|
url: "https://foo/dirwithindex/",
|
|
|
|
expectedStatus: http.StatusOK,
|
|
|
|
expectedBodyContent: testFiles[webrootDirwithindexIndeHTML],
|
|
|
|
expectedEtag: `"2n9cw"`,
|
|
|
|
expectedContentLength: strconv.Itoa(len(testFiles[webrootDirwithindexIndeHTML])),
|
2015-10-21 07:08:36 +08:00
|
|
|
},
|
|
|
|
// Test 4 - access folder with index file without trailing slash
|
|
|
|
{
|
|
|
|
url: "https://foo/dirwithindex",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
2017-02-28 20:54:12 +08:00
|
|
|
expectedLocation: "https://foo/dirwithindex/",
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
|
|
|
// Test 5 - access folder without index file
|
|
|
|
{
|
|
|
|
url: "https://foo/dir/",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-02-14 15:10:57 +08:00
|
|
|
// Test 6 - access folder without trailing slash
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
2017-02-28 20:54:12 +08:00
|
|
|
expectedLocation: "https://foo/dir/",
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 7 - access file with trailing slash
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/file1.html/",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
2017-02-28 20:54:12 +08:00
|
|
|
expectedLocation: "https://foo/file1.html",
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 8 - access not existing path
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/not_existing",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 9 - access a file, marked as hidden
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir/hidden.html",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 10 - access a index file directly
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
2017-03-13 06:41:49 +08:00
|
|
|
url: "https://foo/dirwithindex/index.html",
|
|
|
|
expectedStatus: http.StatusOK,
|
|
|
|
expectedBodyContent: testFiles[webrootDirwithindexIndeHTML],
|
|
|
|
expectedEtag: `"2n9cw"`,
|
|
|
|
expectedContentLength: strconv.Itoa(len(testFiles[webrootDirwithindexIndeHTML])),
|
2015-10-21 07:08:36 +08:00
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 11 - send a request with query params
|
2015-10-21 07:08:36 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir?param1=val",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
2017-02-28 20:54:12 +08:00
|
|
|
expectedLocation: "https://foo/dir/?param1=val",
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 12 - attempt to bypass hidden file
|
2016-03-12 06:44:50 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir/hidden.html%20",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 13 - attempt to bypass hidden file
|
2016-03-12 06:44:50 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir/hidden.html.",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 14 - attempt to bypass hidden file
|
2016-03-12 06:44:50 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir/hidden.html.%20",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 15 - attempt to bypass hidden file
|
2016-03-12 06:44:50 +08:00
|
|
|
{
|
|
|
|
url: "https://foo/dir/hidden.html%20.",
|
2017-02-19 06:52:50 +08:00
|
|
|
acceptEncoding: "br, gzip",
|
2016-03-12 06:44:50 +08:00
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-03-13 00:47:53 +08:00
|
|
|
// Test 16 - serve another file with same name as hidden file.
|
|
|
|
{
|
|
|
|
url: "https://foo/hidden.html",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-04-17 00:57:16 +08:00
|
|
|
// Test 17 - try to get below the root directory.
|
|
|
|
{
|
|
|
|
url: "https://foo/%2f..%2funreachable.html",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2016-12-20 00:51:09 +08:00
|
|
|
// Test 18 - try to get pre-gzipped file.
|
|
|
|
{
|
2017-03-13 06:41:49 +08:00
|
|
|
url: "https://foo/sub/gzipped.html",
|
|
|
|
acceptEncoding: "gzip",
|
|
|
|
expectedStatus: http.StatusOK,
|
|
|
|
expectedBodyContent: testFiles[webrootSubGzippedHTMLGz],
|
|
|
|
expectedEtag: `"2n9ch"`,
|
|
|
|
expectedVary: "Accept-Encoding",
|
|
|
|
expectedEncoding: "gzip",
|
|
|
|
expectedContentLength: strconv.Itoa(len(testFiles[webrootSubGzippedHTMLGz])),
|
2016-12-20 00:51:09 +08:00
|
|
|
},
|
|
|
|
// Test 19 - try to get pre-brotli encoded file.
|
|
|
|
{
|
2017-03-13 06:41:49 +08:00
|
|
|
url: "https://foo/sub/brotli.html",
|
|
|
|
acceptEncoding: "br,gzip",
|
|
|
|
expectedStatus: http.StatusOK,
|
|
|
|
expectedBodyContent: testFiles[webrootSubBrotliHTMLBr],
|
|
|
|
expectedEtag: `"2n9cg"`,
|
|
|
|
expectedVary: "Accept-Encoding",
|
|
|
|
expectedEncoding: "br",
|
|
|
|
expectedContentLength: strconv.Itoa(len(testFiles[webrootSubBrotliHTMLBr])),
|
2017-02-19 06:52:50 +08:00
|
|
|
},
|
|
|
|
// Test 20 - not allowed to get pre-brotli encoded file.
|
|
|
|
{
|
2017-03-13 06:41:49 +08:00
|
|
|
url: "https://foo/sub/brotli.html",
|
|
|
|
acceptEncoding: "nicebrew", // contains "br" substring but not "br"
|
|
|
|
expectedStatus: http.StatusOK,
|
|
|
|
expectedBodyContent: testFiles[webrootSubBrotliHTML],
|
|
|
|
expectedEtag: `"2n9cd"`,
|
|
|
|
expectedVary: "",
|
|
|
|
expectedEncoding: "",
|
|
|
|
expectedContentLength: strconv.Itoa(len(testFiles[webrootSubBrotliHTML])),
|
2016-12-20 00:51:09 +08:00
|
|
|
},
|
2017-02-11 11:02:00 +08:00
|
|
|
// Test 20 - treat existing file as a directory.
|
|
|
|
{
|
|
|
|
url: "https://foo/file1.html/other",
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
},
|
2017-02-28 20:54:12 +08:00
|
|
|
// Test 20 - access folder with index file without trailing slash, with
|
|
|
|
// cleaned path
|
|
|
|
{
|
|
|
|
url: "https://foo/bar/dirwithindex",
|
|
|
|
cleanedPath: "/dirwithindex",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
|
|
|
expectedLocation: "https://foo/bar/dirwithindex/",
|
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
|
|
|
// Test 21 - access folder with index file without trailing slash, with
|
|
|
|
// cleaned path and query params
|
|
|
|
{
|
|
|
|
url: "https://foo/bar/dirwithindex?param1=val",
|
|
|
|
cleanedPath: "/dirwithindex",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
|
|
|
expectedLocation: "https://foo/bar/dirwithindex/?param1=val",
|
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
|
|
|
// Test 22 - access file with trailing slash with cleaned path
|
|
|
|
{
|
|
|
|
url: "https://foo/bar/file1.html/",
|
|
|
|
cleanedPath: "file1.html/",
|
|
|
|
expectedStatus: http.StatusMovedPermanently,
|
|
|
|
expectedLocation: "https://foo/bar/file1.html",
|
|
|
|
expectedBodyContent: movedPermanently,
|
|
|
|
},
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
for i, test := range tests {
|
|
|
|
responseRecorder := httptest.NewRecorder()
|
2016-04-17 00:57:16 +08:00
|
|
|
request, err := http.NewRequest("GET", test.url, nil)
|
2017-03-13 23:22:46 +08:00
|
|
|
ctx := context.WithValue(request.Context(), URLPathCtxKey, request.URL.Path)
|
2017-02-28 20:54:12 +08:00
|
|
|
request = request.WithContext(ctx)
|
2016-12-20 00:51:09 +08:00
|
|
|
|
2017-02-19 06:52:50 +08:00
|
|
|
request.Header.Add("Accept-Encoding", test.acceptEncoding)
|
2016-12-20 00:51:09 +08:00
|
|
|
|
2016-09-06 00:30:46 +08:00
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Test %d: Error making request: %v", i, err)
|
|
|
|
}
|
2016-04-17 00:57:16 +08:00
|
|
|
// prevent any URL sanitization within Go: we need unmodified paths here
|
|
|
|
if u, _ := url.Parse(test.url); u.RawPath != "" {
|
|
|
|
request.URL.Path = u.RawPath
|
|
|
|
}
|
2017-02-28 20:54:12 +08:00
|
|
|
// Caddy may trim a request's URL path. Overwrite the path with
|
|
|
|
// the cleanedPath to test redirects when the path has been
|
|
|
|
// modified.
|
|
|
|
if test.cleanedPath != "" {
|
|
|
|
request.URL.Path = test.cleanedPath
|
|
|
|
}
|
2015-10-21 07:08:36 +08:00
|
|
|
status, err := fileserver.ServeHTTP(responseRecorder, request)
|
2016-04-02 05:24:04 +08:00
|
|
|
etag := responseRecorder.Header().Get("Etag")
|
2017-02-19 06:52:50 +08:00
|
|
|
body := responseRecorder.Body.String()
|
|
|
|
vary := responseRecorder.Header().Get("Vary")
|
|
|
|
encoding := responseRecorder.Header().Get("Content-Encoding")
|
2017-03-13 06:41:49 +08:00
|
|
|
length := responseRecorder.Header().Get("Content-Length")
|
2015-10-21 07:08:36 +08:00
|
|
|
|
|
|
|
// check if error matches expectations
|
|
|
|
if err != nil {
|
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("Test %d: Serving file at %s failed. Error was: %v", i, test.url, err)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// check status code
|
|
|
|
if test.expectedStatus != status {
|
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("Test %d: Expected status %d, found %d", i, test.expectedStatus, status)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
2016-04-02 05:24:04 +08:00
|
|
|
// check etag
|
|
|
|
if test.expectedEtag != etag {
|
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("Test %d: Expected Etag header %s, found %s", i, test.expectedEtag, etag)
|
2016-04-02 05:24:04 +08:00
|
|
|
}
|
|
|
|
|
2017-02-19 06:52:50 +08:00
|
|
|
// check vary
|
|
|
|
if test.expectedVary != vary {
|
|
|
|
t.Errorf("Test %d: Expected Vary header %s, found %s", i, test.expectedVary, vary)
|
|
|
|
}
|
|
|
|
|
|
|
|
// check content-encoding
|
|
|
|
if test.expectedEncoding != encoding {
|
|
|
|
t.Errorf("Test %d: Expected Content-Encoding header %s, found %s", i, test.expectedEncoding, encoding)
|
|
|
|
}
|
|
|
|
|
2015-10-21 07:08:36 +08:00
|
|
|
// check body content
|
2017-02-19 06:52:50 +08:00
|
|
|
if !strings.Contains(body, test.expectedBodyContent) {
|
|
|
|
t.Errorf("Test %d: Expected body to contain %q, found %q", i, test.expectedBodyContent, body)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
2017-02-28 20:54:12 +08:00
|
|
|
|
|
|
|
if test.expectedLocation != "" {
|
|
|
|
l := responseRecorder.Header().Get("Location")
|
|
|
|
if test.expectedLocation != l {
|
|
|
|
t.Errorf("Test %d: Expected Location header %q, found %q", i, test.expectedLocation, l)
|
|
|
|
}
|
|
|
|
}
|
2017-03-13 06:41:49 +08:00
|
|
|
|
|
|
|
// check content length
|
|
|
|
if test.expectedContentLength != length {
|
|
|
|
t.Errorf("Test %d: Expected Content-Length header %s, found %s", i, test.expectedContentLength, length)
|
|
|
|
}
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-11-03 03:28:50 +08:00
|
|
|
// beforeServeHTTPTest creates a test directory with the structure, defined in the variable testFiles
|
|
|
|
func beforeServeHTTPTest(t *testing.T) {
|
2015-10-21 07:08:36 +08:00
|
|
|
// make the root test dir
|
2016-04-17 00:57:16 +08:00
|
|
|
err := os.MkdirAll(testWebRoot, os.ModePerm)
|
2015-10-21 07:08:36 +08:00
|
|
|
if err != nil {
|
|
|
|
if !os.IsExist(err) {
|
|
|
|
t.Fatalf("Failed to create test dir. Error was: %v", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-02 05:24:04 +08:00
|
|
|
fixedTime := time.Unix(123456, 0)
|
|
|
|
|
2015-10-21 07:08:36 +08:00
|
|
|
for relFile, fileContent := range testFiles {
|
|
|
|
absFile := filepath.Join(testDir, relFile)
|
|
|
|
|
|
|
|
// make sure the parent directories exist
|
|
|
|
parentDir := filepath.Dir(absFile)
|
|
|
|
_, err = os.Stat(parentDir)
|
|
|
|
if err != nil {
|
|
|
|
os.MkdirAll(parentDir, os.ModePerm)
|
|
|
|
}
|
|
|
|
|
|
|
|
// now create the test files
|
|
|
|
f, err := os.Create(absFile)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to create test file %s. Error was: %v", absFile, err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// and fill them with content
|
|
|
|
_, err = f.WriteString(fileContent)
|
|
|
|
if err != nil {
|
2015-10-21 07:18:33 +08:00
|
|
|
t.Fatalf("Failed to write to %s. Error was: %v", absFile, err)
|
2015-10-21 07:08:36 +08:00
|
|
|
return
|
|
|
|
}
|
|
|
|
f.Close()
|
2016-04-02 05:24:04 +08:00
|
|
|
|
|
|
|
// and set the last modified time
|
|
|
|
err = os.Chtimes(absFile, fixedTime, fixedTime)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to set file time to %s. Error was: %v", fixedTime, err)
|
|
|
|
}
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-11-03 03:28:50 +08:00
|
|
|
// afterServeHTTPTest removes the test dir and all its content
|
|
|
|
func afterServeHTTPTest(t *testing.T) {
|
2015-10-21 07:08:36 +08:00
|
|
|
// cleans up everything under the test dir. No need to clean the individual files.
|
|
|
|
err := os.RemoveAll(testDir)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to clean up test dir %s. Error was: %v", testDir, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// failingFS implements the http.FileSystem interface. The Open method always returns the error, assigned to err
|
|
|
|
type failingFS struct {
|
|
|
|
err error // the error to return when Open is called
|
|
|
|
fileImpl http.File // inject the file implementation
|
|
|
|
}
|
|
|
|
|
|
|
|
// Open returns the assigned failingFile and error
|
|
|
|
func (f failingFS) Open(path string) (http.File, error) {
|
|
|
|
return f.fileImpl, f.err
|
|
|
|
}
|
|
|
|
|
|
|
|
// failingFile implements http.File but returns a predefined error on every Stat() method call.
|
|
|
|
type failingFile struct {
|
|
|
|
http.File
|
|
|
|
err error
|
|
|
|
}
|
|
|
|
|
|
|
|
// Stat returns nil FileInfo and the provided error on every call
|
|
|
|
func (ff failingFile) Stat() (os.FileInfo, error) {
|
|
|
|
return nil, ff.err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Close is noop and returns no error
|
|
|
|
func (ff failingFile) Close() error {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestServeHTTPFailingFS tests error cases where the Open function fails with various errors.
|
|
|
|
func TestServeHTTPFailingFS(t *testing.T) {
|
|
|
|
|
|
|
|
tests := []struct {
|
|
|
|
fsErr error
|
|
|
|
expectedStatus int
|
|
|
|
expectedErr error
|
|
|
|
expectedHeaders map[string]string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
fsErr: os.ErrNotExist,
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
fsErr: os.ErrPermission,
|
|
|
|
expectedStatus: http.StatusForbidden,
|
|
|
|
expectedErr: os.ErrPermission,
|
|
|
|
},
|
|
|
|
{
|
2015-11-03 03:28:50 +08:00
|
|
|
fsErr: ErrCustom,
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedStatus: http.StatusServiceUnavailable,
|
2015-11-03 03:28:50 +08:00
|
|
|
expectedErr: ErrCustom,
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedHeaders: map[string]string{"Retry-After": "5"},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, test := range tests {
|
|
|
|
// initialize a file server with the failing FileSystem
|
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
|
|
|
fileserver := FileServer{Root: failingFS{err: test.fsErr}}
|
2015-10-21 07:08:36 +08:00
|
|
|
|
|
|
|
// prepare the request and response
|
|
|
|
request, err := http.NewRequest("GET", "https://foo/", nil)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to build request. Error was: %v", err)
|
|
|
|
}
|
|
|
|
responseRecorder := httptest.NewRecorder()
|
|
|
|
|
|
|
|
status, actualErr := fileserver.ServeHTTP(responseRecorder, request)
|
|
|
|
|
|
|
|
// check the status
|
|
|
|
if status != test.expectedStatus {
|
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("Test %d: Expected status %d, found %d", i, test.expectedStatus, status)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// check the error
|
|
|
|
if actualErr != test.expectedErr {
|
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("Test %d: Expected err %v, found %v", i, test.expectedErr, actualErr)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// check the headers - a special case for server under load
|
|
|
|
if test.expectedHeaders != nil && len(test.expectedHeaders) > 0 {
|
|
|
|
for expectedKey, expectedVal := range test.expectedHeaders {
|
|
|
|
actualVal := responseRecorder.Header().Get(expectedKey)
|
|
|
|
if expectedVal != actualVal {
|
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("Test %d: Expected header %s: %s, found %s", i, expectedKey, expectedVal, actualVal)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// TestServeHTTPFailingStat tests error cases where the initial Open function succeeds, but the Stat method on the opened file fails.
|
|
|
|
func TestServeHTTPFailingStat(t *testing.T) {
|
|
|
|
|
|
|
|
tests := []struct {
|
|
|
|
statErr error
|
|
|
|
expectedStatus int
|
|
|
|
expectedErr error
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
statErr: os.ErrNotExist,
|
|
|
|
expectedStatus: http.StatusNotFound,
|
|
|
|
expectedErr: nil,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
statErr: os.ErrPermission,
|
|
|
|
expectedStatus: http.StatusForbidden,
|
|
|
|
expectedErr: os.ErrPermission,
|
|
|
|
},
|
|
|
|
{
|
2015-11-03 03:28:50 +08:00
|
|
|
statErr: ErrCustom,
|
2015-10-21 07:08:36 +08:00
|
|
|
expectedStatus: http.StatusInternalServerError,
|
2015-11-03 03:28:50 +08:00
|
|
|
expectedErr: ErrCustom,
|
2015-10-21 07:08:36 +08:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, test := range tests {
|
|
|
|
// initialize a file server. The FileSystem will not fail, but calls to the Stat method of the returned File object will
|
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
|
|
|
fileserver := FileServer{Root: failingFS{err: nil, fileImpl: failingFile{err: test.statErr}}}
|
2015-10-21 07:08:36 +08:00
|
|
|
|
|
|
|
// prepare the request and response
|
|
|
|
request, err := http.NewRequest("GET", "https://foo/", nil)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Failed to build request. Error was: %v", err)
|
|
|
|
}
|
|
|
|
responseRecorder := httptest.NewRecorder()
|
|
|
|
|
|
|
|
status, actualErr := fileserver.ServeHTTP(responseRecorder, request)
|
|
|
|
|
|
|
|
// check the status
|
|
|
|
if status != test.expectedStatus {
|
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("Test %d: Expected status %d, found %d", i, test.expectedStatus, status)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// check the error
|
|
|
|
if actualErr != test.expectedErr {
|
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("Test %d: Expected err %v, found %v", i, test.expectedErr, actualErr)
|
2015-10-21 07:08:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-02-19 06:52:50 +08:00
|
|
|
|
|
|
|
//-------------------------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
type fileInfo struct {
|
|
|
|
name string
|
|
|
|
size int64
|
|
|
|
mode os.FileMode
|
|
|
|
modTime time.Time
|
|
|
|
isDir bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func (fi fileInfo) Name() string {
|
|
|
|
return fi.name
|
|
|
|
}
|
|
|
|
|
|
|
|
func (fi fileInfo) Size() int64 {
|
|
|
|
return fi.size
|
|
|
|
}
|
|
|
|
|
|
|
|
func (fi fileInfo) Mode() os.FileMode {
|
|
|
|
return fi.mode
|
|
|
|
}
|
|
|
|
|
|
|
|
func (fi fileInfo) ModTime() time.Time {
|
|
|
|
return fi.modTime
|
|
|
|
}
|
|
|
|
|
|
|
|
func (fi fileInfo) IsDir() bool {
|
|
|
|
return fi.isDir
|
|
|
|
}
|
|
|
|
|
|
|
|
func (fi fileInfo) Sys() interface{} {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
var _ os.FileInfo = fileInfo{}
|
|
|
|
|
|
|
|
//-------------------------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
func BenchmarkEtag(b *testing.B) {
|
|
|
|
d := fileInfo{
|
|
|
|
size: 1234567890,
|
|
|
|
modTime: time.Now(),
|
|
|
|
}
|
|
|
|
|
|
|
|
b.ResetTimer()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
|
|
calculateEtag(d)
|
|
|
|
}
|
|
|
|
}
|