mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
54c63002cc
* Feature #1282 - Support pre-gzipped files * Fix broken test cases * Support brotli encoding as well * Fix for #1276 - support integers and floats as metadata in markdown (#1278) * Fix for #1276 * Use strconv.Format * Use map[string]interface{} as variables * One more file * Always run all tests before commit * Get rid of DocFlags * Fix syntax in caddy.conf * Update to Go 1.7.4 * Add send_timeout property to fastcgi directive. * Convert rwc field on FCGIClient from type io.ReadWriteCloser to net.Conn. * Return HTTP 504 to the client when a timeout occurs. * In Handler.ServeHTTP(), close the connection before returning an HTTP 502/504. * Refactor tests and add coverage. * Return HTTP 504 when FastCGI connect times out. * test: add unit test for #1283 (#1288) * After review fixes * Limit the number of restarts with systemd * Prevent fd leak * Prevent fd leak * Refactor loops * gofmt
119 lines
2.9 KiB
Go
119 lines
2.9 KiB
Go
package gzip
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
|
)
|
|
|
|
func TestGzipHandler(t *testing.T) {
|
|
pathFilter := PathFilter{make(Set)}
|
|
badPaths := []string{"/bad", "/nogzip", "/nongzip"}
|
|
for _, p := range badPaths {
|
|
pathFilter.IgnoredPaths.Add(p)
|
|
}
|
|
extFilter := ExtFilter{make(Set)}
|
|
for _, e := range []string{".txt", ".html", ".css", ".md"} {
|
|
extFilter.Exts.Add(e)
|
|
}
|
|
gz := Gzip{Configs: []Config{
|
|
{RequestFilters: []RequestFilter{pathFilter, extFilter}},
|
|
}}
|
|
|
|
w := httptest.NewRecorder()
|
|
gz.Next = nextFunc(true)
|
|
var exts = []string{
|
|
".html", ".css", ".md",
|
|
}
|
|
for _, e := range exts {
|
|
url := "/file" + e
|
|
r, err := http.NewRequest("GET", url, nil)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
r.Header.Set("Accept-Encoding", "gzip")
|
|
_, err = gz.ServeHTTP(w, r)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
}
|
|
|
|
w = httptest.NewRecorder()
|
|
gz.Next = nextFunc(false)
|
|
for _, p := range badPaths {
|
|
for _, e := range exts {
|
|
url := p + "/file" + e
|
|
r, err := http.NewRequest("GET", url, nil)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
r.Header.Set("Accept-Encoding", "gzip")
|
|
_, err = gz.ServeHTTP(w, r)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
w = httptest.NewRecorder()
|
|
gz.Next = nextFunc(false)
|
|
exts = []string{
|
|
".htm1", ".abc", ".mdx",
|
|
}
|
|
for _, e := range exts {
|
|
url := "/file" + e
|
|
r, err := http.NewRequest("GET", url, nil)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
r.Header.Set("Accept-Encoding", "gzip")
|
|
_, err = gz.ServeHTTP(w, r)
|
|
if err != nil {
|
|
t.Error(err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func nextFunc(shouldGzip bool) httpserver.Handler {
|
|
return httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
|
|
// write a relatively large text file
|
|
b, err := ioutil.ReadFile("testdata/test.txt")
|
|
if err != nil {
|
|
return 500, err
|
|
}
|
|
if _, err := w.Write(b); err != nil {
|
|
return 500, err
|
|
}
|
|
|
|
if shouldGzip {
|
|
if w.Header().Get("Content-Encoding") != "gzip" {
|
|
return 0, fmt.Errorf("Content-Encoding must be gzip, found %v", r.Header.Get("Content-Encoding"))
|
|
}
|
|
if w.Header().Get("Vary") != "Accept-Encoding" {
|
|
return 0, fmt.Errorf("Vary must be Accept-Encoding, found %v", r.Header.Get("Vary"))
|
|
}
|
|
if _, ok := w.(*gzipResponseWriter); !ok {
|
|
return 0, fmt.Errorf("ResponseWriter should be gzipResponseWriter, found %T", w)
|
|
}
|
|
if strings.Contains(w.Header().Get("Content-Type"), "application/x-gzip") {
|
|
return 0, fmt.Errorf("Content-Type should not be gzip")
|
|
}
|
|
return 0, nil
|
|
}
|
|
if r.Header.Get("Accept-Encoding") == "" {
|
|
return 0, fmt.Errorf("Accept-Encoding header expected")
|
|
}
|
|
if w.Header().Get("Content-Encoding") == "gzip" {
|
|
return 0, fmt.Errorf("Content-Encoding must not be gzip, found gzip")
|
|
}
|
|
if _, ok := w.(*gzipResponseWriter); ok {
|
|
return 0, fmt.Errorf("ResponseWriter should not be gzipResponseWriter")
|
|
}
|
|
return 0, nil
|
|
})
|
|
}
|