diff --git a/config/setup/basicauth_test.go b/config/setup/basicauth_test.go index 7588f0f07..a94d6e695 100644 --- a/config/setup/basicauth_test.go +++ b/config/setup/basicauth_test.go @@ -38,7 +38,7 @@ func TestBasicAuthParse(t *testing.T) { md5:$apr1$l42y8rex$pOA2VJ0x/0TwaFeAF9nX61` var skipHtpassword bool - htfh, err := ioutil.TempFile("", "basicauth-") + htfh, err := ioutil.TempFile(".", "basicauth-") if err != nil { t.Logf("Error creating temp file (%v), will skip htpassword test", err) skipHtpassword = true diff --git a/config/setup/controller.go b/config/setup/controller.go index 0399ab814..c917a148f 100644 --- a/config/setup/controller.go +++ b/config/setup/controller.go @@ -24,7 +24,9 @@ type Controller struct { // add-ons can use this as a convenience. func NewTestController(input string) *Controller { return &Controller{ - Config: &server.Config{}, + Config: &server.Config{ + Root: ".", + }, Dispenser: parse.NewDispenser("Testfile", strings.NewReader(input)), } } diff --git a/config/setup/errors.go b/config/setup/errors.go index bc131976b..5aa09b9ff 100644 --- a/config/setup/errors.go +++ b/config/setup/errors.go @@ -5,7 +5,7 @@ import ( "io" "log" "os" - "path" + "path/filepath" "strconv" "github.com/hashicorp/go-syslog" @@ -105,7 +105,7 @@ func errorsParse(c *Controller) (*errors.ErrorHandler, error) { } } else { // Error page; ensure it exists - where = path.Join(c.Root, where) + where = filepath.Join(c.Root, where) f, err := os.Open(where) if err != nil { fmt.Println("Warning: Unable to open error page '" + where + "': " + err.Error()) diff --git a/config/setup/markdown.go b/config/setup/markdown.go index eb24a5955..65344a741 100644 --- a/config/setup/markdown.go +++ b/config/setup/markdown.go @@ -114,11 +114,11 @@ func loadParams(c *Controller, mdc *markdown.Config) error { if _, ok := mdc.Templates[markdown.DefaultTemplate]; ok { return c.Err("only one default template is allowed, use alias.") } - fpath := filepath.Clean(c.Root + string(filepath.Separator) + tArgs[0]) + fpath := filepath.ToSlash(filepath.Clean(c.Root + string(filepath.Separator) + tArgs[0])) mdc.Templates[markdown.DefaultTemplate] = fpath return nil case 2: - fpath := filepath.Clean(c.Root + string(filepath.Separator) + tArgs[1]) + fpath := filepath.ToSlash(filepath.Clean(c.Root + string(filepath.Separator) + tArgs[1])) mdc.Templates[tArgs[0]] = fpath return nil default: diff --git a/config/setup/markdown_test.go b/config/setup/markdown_test.go index 1ada8a1f1..5bf012b08 100644 --- a/config/setup/markdown_test.go +++ b/config/setup/markdown_test.go @@ -1,6 +1,7 @@ package setup import ( + "bytes" "fmt" "io/ioutil" "net/http" @@ -92,7 +93,7 @@ func TestMarkdownStaticGen(t *testing.T) { t.Fatalf("An error occured when getting the file content: %v", err) } - expectedBody := ` + expectedBody := []byte(` first_post @@ -104,9 +105,10 @@ func TestMarkdownStaticGen(t *testing.T) { -` - if string(html) != expectedBody { - t.Fatalf("Expected file content: %v got: %v", expectedBody, html) +`) + + if !bytes.Equal(html, expectedBody) { + t.Fatalf("Expected file content: %s got: %s", string(expectedBody), string(html)) } fp := filepath.Join(c.Root, markdown.DefaultStaticDir) diff --git a/middleware/basicauth/basicauth_test.go b/middleware/basicauth/basicauth_test.go index aa1fc2443..aad5ed399 100644 --- a/middleware/basicauth/basicauth_test.go +++ b/middleware/basicauth/basicauth_test.go @@ -7,6 +7,7 @@ import ( "net/http" "net/http/httptest" "os" + "path/filepath" "testing" "github.com/mholt/caddy/middleware" @@ -124,15 +125,18 @@ md5:$apr1$l42y8rex$pOA2VJ0x/0TwaFeAF9nX61` t.Skipf("Error creating temp file (%v), will skip htpassword test") return } + defer os.Remove(htfh.Name()) if _, err = htfh.Write([]byte(htpasswdFile)); err != nil { t.Fatalf("write htpasswd file %q: %v", htfh.Name(), err) } htfh.Close() - defer os.Remove(htfh.Name()) for i, username := range []string{"sha1", "md5"} { rule := Rule{Username: username, Resources: []string{"/testing"}} - if rule.Password, err = GetHtpasswdMatcher(htfh.Name(), rule.Username, "/"); err != nil { + + siteRoot := filepath.Dir(htfh.Name()) + filename := filepath.Base(htfh.Name()) + if rule.Password, err = GetHtpasswdMatcher(filename, rule.Username, siteRoot); err != nil { t.Fatalf("GetHtpasswdMatcher(%q, %q): %v", htfh.Name(), rule.Username, err) } t.Logf("%d. username=%q password=%v", i, rule.Username, rule.Password) diff --git a/middleware/markdown/generator.go b/middleware/markdown/generator.go index c1dfd67ad..a02cb3b05 100644 --- a/middleware/markdown/generator.go +++ b/middleware/markdown/generator.go @@ -70,7 +70,7 @@ func generateLinks(md Markdown, cfg *Config) (bool, error) { return generated, g.lastErr } -// generateStaticFiles generates static html files from markdowns. +// generateStaticHTML generates static HTML files from markdowns. func generateStaticHTML(md Markdown, cfg *Config) error { // If generated site already exists, clear it out _, err := os.Stat(cfg.StaticDir) @@ -98,6 +98,7 @@ func generateStaticHTML(md Markdown, cfg *Config) error { if err != nil { return err } + reqPath = filepath.ToSlash(reqPath) reqPath = "/" + reqPath // Generate the static file diff --git a/middleware/markdown/page.go b/middleware/markdown/page.go index 2b7816bab..3185d8ece 100644 --- a/middleware/markdown/page.go +++ b/middleware/markdown/page.go @@ -116,7 +116,7 @@ func (l *linkGen) generateLinks(md Markdown, cfg *Config) bool { if err != nil { return err } - reqPath = "/" + reqPath + reqPath = "/" + filepath.ToSlash(reqPath) parser := findParser(body) if parser == nil { diff --git a/middleware/markdown/process.go b/middleware/markdown/process.go index 93fe51479..0fb48dba1 100644 --- a/middleware/markdown/process.go +++ b/middleware/markdown/process.go @@ -134,7 +134,10 @@ func (md Markdown) generatePage(c *Config, requestPath string, content []byte) e } } - filePath := filepath.Join(c.StaticDir, requestPath) + // the URL will always use "/" as a path separator, + // convert that to a native path to support OS that + // use different path separators + filePath := filepath.Join(c.StaticDir, filepath.FromSlash(requestPath)) // If it is index file, use the directory instead if md.IsIndexFile(filepath.Base(requestPath)) { @@ -154,7 +157,7 @@ func (md Markdown) generatePage(c *Config, requestPath string, content []byte) e } c.Lock() - c.StaticFiles[requestPath] = filePath + c.StaticFiles[requestPath] = filepath.ToSlash(filePath) c.Unlock() } diff --git a/middleware/middleware.go b/middleware/middleware.go index 0310ba2f5..ba7699ce4 100644 --- a/middleware/middleware.go +++ b/middleware/middleware.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "path/filepath" + "path" ) type ( @@ -57,12 +57,19 @@ func (f HandlerFunc) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, err // and false is returned. fpath must end in a forward slash '/' // otherwise no index files will be tried (directory paths must end // in a forward slash according to HTTP). +// +// All paths passed into and returned from this function use '/' as the +// path separator, just like URLs. IndexFle handles path manipulation +// internally for systems that use different path separators. func IndexFile(root http.FileSystem, fpath string, indexFiles []string) (string, bool) { if fpath[len(fpath)-1] != '/' || root == nil { return "", false } for _, indexFile := range indexFiles { - fp := filepath.Join(fpath, indexFile) + // func (http.FileSystem).Open wants all paths separated by "/", + // regardless of operating system convention, so use + // path.Join instead of filepath.Join + fp := path.Join(fpath, indexFile) f, err := root.Open(fp) if err == nil { f.Close() diff --git a/middleware/middleware_test.go b/middleware/middleware_test.go index e5b238e6b..700beed84 100644 --- a/middleware/middleware_test.go +++ b/middleware/middleware_test.go @@ -15,9 +15,12 @@ func TestIndexfile(t *testing.T) { expectedBoolValue bool //return value }{ { - http.Dir("./templates/testdata"), "/images/", []string{"img.htm"}, + http.Dir("./templates/testdata"), + "/images/", + []string{"img.htm"}, false, - "/images/img.htm", true, + "/images/img.htm", + true, }, } for i, test := range tests {