Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions lib/backend/sanitize.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,25 @@ const errorMessage = "special characters are not allowed in resource names, plea
var allowPattern = regexp.MustCompile(`^[0-9A-Za-z@_:.\-/+]*$`)

// denyPattern matches some unallowed combinations
var denyPattern = regexp.MustCompile(`//`)
var denyPatterns = []*regexp.Regexp{
regexp.MustCompile(`//`),
regexp.MustCompile(`(^|/)\.\.?(/|$)`),
}

// isKeySafe checks if the passed in key conforms to whitelist
func isKeySafe(s []byte) bool {
return allowPattern.Match(s) && !denyPattern.Match(s) && utf8.Valid(s)
return allowPattern.Match(s) && !denyPatternsMatch(s) && utf8.Valid(s)
}

// denyPatternsMatch checks if the passed in key conforms to the deny patterns.
func denyPatternsMatch(s []byte) bool {
for _, pattern := range denyPatterns {
if pattern.Match(s) {
return true
}
}

return false
}

// Sanitizer wraps a Backend implementation to make sure all values requested
Expand Down
48 changes: 48 additions & 0 deletions lib/backend/sanitize_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,54 @@ func TestSanitize(t *testing.T) {
inKey: []byte("/namespaces//params"),
assert: require.Error,
},
{
inKey: []byte("/namespaces/.."),
assert: require.Error,
},
{
inKey: []byte("/namespaces/../params"),
assert: require.Error,
},
{
inKey: []byte("/namespaces/..params"),
assert: require.NoError,
},
{
inKey: []byte("/namespaces/."),
assert: require.Error,
},
{
inKey: []byte("/namespaces/./params"),
assert: require.Error,
},
{
inKey: []byte("/namespaces/.params"),
assert: require.NoError,
},
{
inKey: []byte(".."),
assert: require.Error,
},
{
inKey: []byte("..params"),
assert: require.NoError,
},
{
inKey: []byte("../params"),
assert: require.Error,
},
{
inKey: []byte("."),
assert: require.Error,
},
{
inKey: []byte(".params"),
assert: require.NoError,
},
{
inKey: []byte("./params"),
assert: require.Error,
},
{
inKey: RangeEnd([]byte("a-b/c:d/.e_f/01")),
assert: require.NoError,
Expand Down