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

caddyhttp: Trim dot/space only on Windows (fix #5613)

Browse source 
Follow-up to #2917. Path matcher needs to trim dots and spaces but only
on Windows.
This commit is contained in:
Matthew Holt 2023-07-08 13:42:13 -06:00
parent 7914ba3573
commit 66114cb155
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/caddyhttp/matchers.go
View file

@ -25,6 +25,7 @@ import (
"path" "path"
"reflect" "reflect"
"regexp" "regexp"
"runtime"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -395,7 +396,9 @@ func (m MatchPath) Match(r *http.Request) bool {
// security risk (cry) if PHP files end up being served // security risk (cry) if PHP files end up being served
// as static files, exposing the source code, instead of // as static files, exposing the source code, instead of
// being matched by *.php to be treated as PHP scripts. // being matched by *.php to be treated as PHP scripts.
reqPath = strings.TrimRight(reqPath, ". ") if runtime.GOOS == "windows" { // issue #5613
reqPath = strings.TrimRight(reqPath, ". ")
}
repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer) repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)

12
modules/caddyhttp/matchers_test.go
View file

@ -21,6 +21,7 @@ import (
"net/http/httptest" "net/http/httptest"
"net/url" "net/url"
"os" "os"
"runtime"
"testing" "testing"
"github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2"
@ -253,11 +254,6 @@ func TestPathMatcher(t *testing.T) {
input: "/FOOOO", input: "/FOOOO",
expect: true, expect: true,
}, },
{
match: MatchPath{"*.php"},
input: "/foo/index.php. .",
expect: true,
},
{ {
match: MatchPath{"/foo/bar.txt"}, match: MatchPath{"/foo/bar.txt"},
input: "/foo/BAR.txt", input: "/foo/BAR.txt",
@ -435,8 +431,10 @@ func TestPathMatcher(t *testing.T) {
func TestPathMatcherWindows(t *testing.T) { func TestPathMatcherWindows(t *testing.T) {
// only Windows has this bug where it will ignore // only Windows has this bug where it will ignore
// trailing dots and spaces in a filename, but we // trailing dots and spaces in a filename
// test for it on all platforms to be more consistent if runtime.GOOS != "windows" {
return
}
req := &http.Request{URL: &url.URL{Path: "/index.php . . .."}} req := &http.Request{URL: &url.URL{Path: "/index.php . . .."}}
repl := caddy.NewReplacer() repl := caddy.NewReplacer()