mirror of
https://github.com/caddyserver/caddy.git
synced 2024-12-23 22:27:38 -05:00
Bugfix for issue #1628 where Caddyfile
is not being hidden correctly on windows.
Added test case to check if Caddyfile is added to HiddenFiles correctly.
This commit is contained in:
parent
49d79d7ebc
commit
8f09ed8f0d
2 changed files with 25 additions and 1 deletions
|
@ -70,7 +70,7 @@ func hideCaddyfile(cctx caddy.Context) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if strings.HasPrefix(absOriginCaddyfile, absRoot) {
|
if strings.HasPrefix(absOriginCaddyfile, absRoot) {
|
||||||
cfg.HiddenFiles = append(cfg.HiddenFiles, strings.TrimPrefix(absOriginCaddyfile, absRoot))
|
cfg.HiddenFiles = append(cfg.HiddenFiles, filepath.ToSlash(strings.TrimPrefix(absOriginCaddyfile, absRoot)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|
|
@ -209,3 +209,27 @@ func TestContextSaveConfig(t *testing.T) {
|
||||||
t.Errorf("Expected len(siteConfigs) == %d, but was %d", want, got)
|
t.Errorf("Expected len(siteConfigs) == %d, but was %d", want, got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test to make sure we are correctly hiding the Caddyfile
|
||||||
|
func TestHideCaddyfile(t *testing.T) {
|
||||||
|
ctx := newContext().(*httpContext)
|
||||||
|
ctx.saveConfig("test", &SiteConfig{
|
||||||
|
Root: Root,
|
||||||
|
originCaddyfile: "Testfile",
|
||||||
|
})
|
||||||
|
err := hideCaddyfile(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Failed to hide Caddyfile, got: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(ctx.siteConfigs[0].HiddenFiles) == 0 {
|
||||||
|
t.Fatal("Failed to add Caddyfile to HiddenFiles.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, file := range ctx.siteConfigs[0].HiddenFiles {
|
||||||
|
if file == "/Testfile" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Fatal("Caddyfile missing from HiddenFiles")
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue