serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-25 21:23:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

replacer: {file.*} global placeholder strips trailing newline (#6411)

Browse source 
Co-authored-by: Kanashimia <chad@redpilled.dev>
This commit is contained in:
Steffen Busch 2024-08-07 21:39:15 +02:00 committed by GitHub
parent 59cbb2c83a
commit b85b6c6469
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddytest/integration/testdata/foo_with_multiple_trailing_newlines.txt vendored Normal file
View file

@ -0,0 +1,2 @@
foo

1
caddytest/integration/testdata/foo_with_trailing_newline.txt vendored Normal file
View file

@ -0,0 +1 @@
foo

3
replacer.go
View file

@ -15,6 +15,7 @@
package caddy package caddy
import ( import (
"bytes"
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
@ -354,6 +355,8 @@ func (f fileReplacementProvider) replace(key string) (any, bool) {
zap.Error(err)) zap.Error(err))
return nil, true return nil, true
} }
body = bytes.TrimSuffix(body, []byte("\n"))
body = bytes.TrimSuffix(body, []byte("\r"))
return string(body), true return string(body), true
} }

15
replacer_test.go
View file

@ -431,6 +431,14 @@ func TestReplacerNew(t *testing.T) {
variable: "file.caddytest/integration/testdata/foo.txt", variable: "file.caddytest/integration/testdata/foo.txt",
value: "foo", value: "foo",
}, },
{
variable: "file.caddytest/integration/testdata/foo_with_trailing_newline.txt",
value: "foo",
},
{
variable: "file.caddytest/integration/testdata/foo_with_multiple_trailing_newlines.txt",
value: "foo" + getEOL(),
},
} { } {
if val, ok := repl.providers[1].replace(tc.variable); ok { if val, ok := repl.providers[1].replace(tc.variable); ok {
if val != tc.value { if val != tc.value {
@ -442,6 +450,13 @@ func TestReplacerNew(t *testing.T) {
} }
} }
func getEOL() string {
if os.PathSeparator == '\\' {
return "\r\n" // Windows EOL
}
return "\n" // Unix and modern macOS EOL
}
func TestReplacerNewWithoutFile(t *testing.T) { func TestReplacerNewWithoutFile(t *testing.T) {
repl := NewReplacer().WithoutFile() repl := NewReplacer().WithoutFile()