github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 10:22:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix panic when using URLize

Browse source 
Using URLize on a string like '100%-true' would cause a panic
This commit is contained in:
Mathias Biilmann 2016-07-11 01:06:40 -07:00 committed by Bjørn Erik Pedersen
parent 32d82a4496
commit 330639d2ae
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
helpers/path.go
View file

@ -91,6 +91,19 @@ func MakeTitle(inpath string) string {
return strings.Replace(strings.TrimSpace(inpath), "-", " ", -1) return strings.Replace(strings.TrimSpace(inpath), "-", " ", -1)
} }
// From https://golang.org/src/net/url/url.go
func ishex(c rune) bool {
switch {
case '0' <= c && c <= '9':
return true
case 'a' <= c && c <= 'f':
return true
case 'A' <= c && c <= 'F':
return true
}
return false
}
// UnicodeSanitize sanitizes string to be used in Hugo URL's, allowing only // UnicodeSanitize sanitizes string to be used in Hugo URL's, allowing only
// a predefined set of special Unicode characters. // a predefined set of special Unicode characters.
// If RemovePathAccents configuration flag is enabled, Uniccode accents // If RemovePathAccents configuration flag is enabled, Uniccode accents
@ -99,8 +112,10 @@ func UnicodeSanitize(s string) string {
source := []rune(s) source := []rune(s)
target := make([]rune, 0, len(source)) target := make([]rune, 0, len(source))
for _, r := range source { for i, r := range source {
if unicode.IsLetter(r) || unicode.IsDigit(r) || unicode.IsMark(r) || r == '%' || r == '.' || r == '/' || r == '\\' || r == '_' || r == '-' || r == '#' || r == '+' { if r == '%' && i+2 < len(source) && ishex(source[i+1]) && ishex(source[i+2]) {
target = append(target, r)
} else if unicode.IsLetter(r) || unicode.IsDigit(r) || unicode.IsMark(r) || r == '.' || r == '/' || r == '\\' || r == '_' || r == '-' || r == '#' || r == '+' {
target = append(target, r) target = append(target, r)
} }
} }

1
helpers/url_test.go
View file

@ -31,6 +31,7 @@ func TestURLize(t *testing.T) {
{"foo,bar:foobar", "foobarfoobar"}, {"foo,bar:foobar", "foobarfoobar"},
{"foo/bar.html", "foo/bar.html"}, {"foo/bar.html", "foo/bar.html"},
{"трям/трям", "%D1%82%D1%80%D1%8F%D0%BC/%D1%82%D1%80%D1%8F%D0%BC"}, {"трям/трям", "%D1%82%D1%80%D1%8F%D0%BC/%D1%82%D1%80%D1%8F%D0%BC"},
{"100%-google", "100-google"},
} }
for _, test := range tests { for _, test := range tests {