Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Path Traversal Attacks on Windows #1698

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 19 additions & 19 deletions strings.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ var (
)

var (
strSlash = []byte("/")
strSlashSlash = []byte("//")
strSlashDotDot = []byte("/..")
strSlashDotSlash = []byte("/./")
strSlashDotDotSlash = []byte("/../")
strBackSlashDotDot = []byte(`\..`)
strBackSlashDotBackSlash = []byte(`\.\`)
strSlashDotDotBackSlash = []byte(`/..\`)
strBackSlashDotDotBackSlash = []byte(`\..\`)
strCRLF = []byte("\r\n")
strHTTP = []byte("http")
strHTTPS = []byte("https")
strHTTP10 = []byte("HTTP/1.0")
strHTTP11 = []byte("HTTP/1.1")
strColon = []byte(":")
strColonSlashSlash = []byte("://")
strColonSpace = []byte(": ")
strCommaSpace = []byte(", ")
strGMT = []byte("GMT")
strSlash = []byte("/")
strSlashSlash = []byte("//")
strSlashDotDot = []byte("/..")
strSlashDotSlash = []byte("/./")
strSlashDotDotSlash = []byte("/../")
//strBackSlashDotDot = []byte(`\..`)
//strBackSlashDotBackSlash = []byte(`\.\`)
//strSlashDotDotBackSlash = []byte(`/..\`)
//strBackSlashDotDotBackSlash = []byte(`\..\`)
strCRLF = []byte("\r\n")
strHTTP = []byte("http")
strHTTPS = []byte("https")
strHTTP10 = []byte("HTTP/1.0")
strHTTP11 = []byte("HTTP/1.1")
strColon = []byte(":")
strColonSlashSlash = []byte("://")
strColonSpace = []byte(": ")
strCommaSpace = []byte(", ")
strGMT = []byte("GMT")

strResponseContinue = []byte("HTTP/1.1 100 Continue\r\n\r\n")

Expand Down
97 changes: 49 additions & 48 deletions uri.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"errors"
"fmt"
"io"
"path/filepath"
"strconv"
"sync"
)
Expand Down Expand Up @@ -574,6 +573,8 @@
dst = dst[:0]
dst = addLeadingSlash(dst, src)
dst = decodeArgAppendNoPlus(dst, src)
// replacing backslash, if you use windows(backslash)
dst = replaceSlashes(dst)

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.18.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.18.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.18.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.18.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.19.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.19.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.19.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.19.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.20.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.20.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.20.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.20.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.21.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.21.x, ubuntu-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.21.x, macos-latest)

undefined: replaceSlashes

Check failure on line 577 in uri.go

View workflow job for this annotation

GitHub Actions / test (1.21.x, macos-latest)

undefined: replaceSlashes

// remove duplicate slashes
b := dst
Expand Down Expand Up @@ -626,61 +627,61 @@
}
b = b[:nn+1]
}

if filepath.Separator == '\\' {
// remove \.\ parts
for {
n := bytes.Index(b, strBackSlashDotBackSlash)
if n < 0 {
break
/*
if filepath.Separator == '\\' {
// remove \.\ parts
for {
n := bytes.Index(b, strBackSlashDotBackSlash)
if n < 0 {
break
}
nn := n + len(strSlashDotSlash) - 1
copy(b[n:], b[nn:])
b = b[:len(b)-nn+n]
}
nn := n + len(strSlashDotSlash) - 1
copy(b[n:], b[nn:])
b = b[:len(b)-nn+n]
}

// remove /foo/..\ parts
for {
n := bytes.Index(b, strSlashDotDotBackSlash)
if n < 0 {
break
}
nn := bytes.LastIndexByte(b[:n], '/')
if nn < 0 {
nn = 0
// remove /foo/..\ parts
for {
n := bytes.Index(b, strSlashDotDotBackSlash)
if n < 0 {
break
}
nn := bytes.LastIndexByte(b[:n], '/')
if nn < 0 {
nn = 0
}
nn++
n += len(strSlashDotDotBackSlash)
copy(b[nn:], b[n:])
b = b[:len(b)-n+nn]
}
nn++
n += len(strSlashDotDotBackSlash)
copy(b[nn:], b[n:])
b = b[:len(b)-n+nn]
}

// remove /foo\..\ parts
for {
n := bytes.Index(b, strBackSlashDotDotBackSlash)
if n < 0 {
break
}
nn := bytes.LastIndexByte(b[:n], '/')
if nn < 0 {
nn = 0
// remove /foo\..\ parts
for {
n := bytes.Index(b, strBackSlashDotDotBackSlash)
if n < 0 {
break
}
nn := bytes.LastIndexByte(b[:n], '/')
if nn < 0 {
nn = 0
}
n += len(strBackSlashDotDotBackSlash) - 1
copy(b[nn:], b[n:])
b = b[:len(b)-n+nn]
}
n += len(strBackSlashDotDotBackSlash) - 1
copy(b[nn:], b[n:])
b = b[:len(b)-n+nn]
}

// remove trailing \foo\..
n := bytes.LastIndex(b, strBackSlashDotDot)
if n >= 0 && n+len(strSlashDotDot) == len(b) {
nn := bytes.LastIndexByte(b[:n], '/')
if nn < 0 {
return append(dst[:0], strSlash...)
// remove trailing \foo\..
n := bytes.LastIndex(b, strBackSlashDotDot)
if n >= 0 && n+len(strSlashDotDot) == len(b) {
nn := bytes.LastIndexByte(b[:n], '/')
if nn < 0 {
return append(dst[:0], strSlash...)
}
b = b[:nn+1]
}
b = b[:nn+1]
}
}

*/
return b
}

Expand Down
56 changes: 56 additions & 0 deletions uri_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,62 @@ func testURIUpdate(t *testing.T, base, update, result string) {
}
}

func TestURIPathNormalize_windows(t *testing.T) {
if runtime.GOOS != "windows" {
t.SkipNow()
}

t.Parallel()

var u URI

testURIPathNormalize(t, &u, "\\aa\\\\bb", "/aa/bb")

// triple slash
testURIPathNormalize(t, &u, "\\x\\\\\\y\\", "/x/y/")

// multi slashes
testURIPathNormalize(t, &u, "\\abc\\\\de\\\\\\fg\\\\\\\\", "/abc/de/fg/")

// encoded slashes
testURIPathNormalize(t, &u, "\\xxxx%2fyyy%2f%2F%2F", "/xxxx/yyy/")

// dotdot
testURIPathNormalize(t, &u, "\\aaa\\..", "/")

// dotdot with trailing slash
testURIPathNormalize(t, &u, "\\xxx\\yyy\\..\\", "/xxx/")

// multi dotdots
testURIPathNormalize(t, &u, "\\aaa\\bbb\\ccc\\..\\..\\ddd", "/aaa/ddd")

// dotdots separated by other data
testURIPathNormalize(t, &u, "\\a\\b\\..\\c\\d\\..\\e\\..", "/a/c/")

// too many dotdots
testURIPathNormalize(t, &u, "\\aaa\\..\\..\\..\\..\\xxx", "/xxx")
testURIPathNormalize(t, &u, "\\..\\..\\..\\..\\..\\..", "/")
testURIPathNormalize(t, &u, "\\..\\..\\..\\..\\..\\..\\", "/")

// encoded dotdots
testURIPathNormalize(t, &u, "\\aaa%2Fbbb%2F%2E.%2Fxxx", "/aaa/xxx")

// double slash with dotdots
testURIPathNormalize(t, &u, "\\aaa\\\\\\\\..\\\\b", "/b")

// fake dotdot
testURIPathNormalize(t, &u, "\\aaa\\..bbb\\ccc\\..", "/aaa/..bbb/")

// single dot
testURIPathNormalize(t, &u, "\\a\\.\\b\\.\\.\\c\\.\\d.html", "/a/b/c/d.html")
testURIPathNormalize(t, &u, ".\\foo\\", "/foo/")
testURIPathNormalize(t, &u, ".\\..\\..\\.\\..\\..\\aaa\\bbb\\..\\..\\..\\.\\.\\..\\", "/")
testURIPathNormalize(t, &u, ".\\a\\.\\..\\.\\..\\b\\.\\foo.html", "/b/foo.html")
testURIPathNormalize(t, &u, `.\a\.\../.\..\b\.\foo.html`, "/b/foo.html")
testURIPathNormalize(t, &u, `.\a\./..\.\..\b\.\foo.html`, "/b/foo.html")
testURIPathNormalize(t, &u, `.\a\./..%5c.\..\b\.\foo.html`, "/b/foo.html")
}

func TestURIPathNormalize(t *testing.T) {
if runtime.GOOS == "windows" {
t.SkipNow()
Expand Down
14 changes: 14 additions & 0 deletions uri_windows.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package fasthttp

import "path/filepath"

func addLeadingSlash(dst, src []byte) []byte {
// zero length 、"C:/" and "a" case
isDisk := len(src) > 2 && src[1] == ':'
Expand All @@ -9,3 +11,15 @@ func addLeadingSlash(dst, src []byte) []byte {

return dst
}

func replaceSlashes(dst []byte) []byte {
// fix: Path Traversal Attacks on Windows
if filepath.Separator == '\\' {
for i := range dst {
if dst[i] == '\\' {
dst[i] = '/'
}
}
}
return dst
}
2 changes: 1 addition & 1 deletion uri_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ func TestURIPathNormalizeIssue86(t *testing.T) {
// see https://github.com/valyala/fasthttp/issues/86
var u URI

testURIPathNormalize(t, &u, `C:\a\b\c\fs.go`, `C:\a\b\c\fs.go`)
testURIPathNormalize(t, &u, `C:\a\b\c\fs.go`, `C:/a/b/c/fs.go`)

testURIPathNormalize(t, &u, `a`, `/a`)

Expand Down