mirror of
https://github.com/caddyserver/caddy.git
synced 2024-11-26 02:09:47 +08:00
ac4fa2c3a9
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!!
101 lines
1.8 KiB
Go
101 lines
1.8 KiB
Go
package gzip
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/mholt/caddy"
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
|
)
|
|
|
|
func TestSetup(t *testing.T) {
|
|
err := setup(caddy.NewTestController(`gzip`))
|
|
if err != nil {
|
|
t.Errorf("Expected no errors, but got: %v", err)
|
|
}
|
|
mids := httpserver.GetConfig("").Middleware()
|
|
if mids == nil {
|
|
t.Fatal("Expected middleware, was nil instead")
|
|
}
|
|
|
|
handler := mids[0](httpserver.EmptyNext)
|
|
myHandler, ok := handler.(Gzip)
|
|
if !ok {
|
|
t.Fatalf("Expected handler to be type Gzip, got: %#v", handler)
|
|
}
|
|
|
|
if !httpserver.SameNext(myHandler.Next, httpserver.EmptyNext) {
|
|
t.Error("'Next' field of handler was not set properly")
|
|
}
|
|
|
|
tests := []struct {
|
|
input string
|
|
shouldErr bool
|
|
}{
|
|
{`gzip {`, true},
|
|
{`gzip {}`, true},
|
|
{`gzip a b`, true},
|
|
{`gzip a {`, true},
|
|
{`gzip { not f } `, true},
|
|
{`gzip { not } `, true},
|
|
{`gzip { not /file
|
|
ext .html
|
|
level 1
|
|
} `, false},
|
|
{`gzip { level 9 } `, false},
|
|
{`gzip { ext } `, true},
|
|
{`gzip { ext /f
|
|
} `, true},
|
|
{`gzip { not /file
|
|
ext .html
|
|
level 1
|
|
}
|
|
gzip`, false},
|
|
{`gzip {
|
|
ext ""
|
|
}`, false},
|
|
{`gzip { not /file
|
|
ext .html
|
|
level 1
|
|
}
|
|
gzip { not /file1
|
|
ext .htm
|
|
level 3
|
|
}
|
|
`, false},
|
|
{`gzip { not /file
|
|
ext .html
|
|
level 1
|
|
}
|
|
gzip { not /file1
|
|
ext .htm
|
|
level 3
|
|
}
|
|
`, false},
|
|
{`gzip { not /file
|
|
ext *
|
|
level 1
|
|
}
|
|
`, false},
|
|
{`gzip { not /file
|
|
ext *
|
|
level 1
|
|
min_length ab
|
|
}
|
|
`, true},
|
|
{`gzip { not /file
|
|
ext *
|
|
level 1
|
|
min_length 1000
|
|
}
|
|
`, false},
|
|
}
|
|
for i, test := range tests {
|
|
_, err := gzipParse(caddy.NewTestController(test.input))
|
|
if test.shouldErr && err == nil {
|
|
t.Errorf("Test %v: Expected error but found nil", i)
|
|
} else if !test.shouldErr && err != nil {
|
|
t.Errorf("Test %v: Expected no error but found error: %v", i, err)
|
|
}
|
|
}
|
|
}
|