pkg/validator: fix regexp mistake

The main problem - kernel file path may contain "-". Let's allow it.

Side problems:
1. Two -- are better to be blocked. It may be used as an SQL comment.
2. Some regexp engines consider "-" as a range. Let's move it to the end.

2 files changed, 13 insertions, 7 deletions

diff --git a/pkg/validator/validator.go b/pkg/validator/validator.go
index d4192f7b6..9aebc8150 100644
--- a/pkg/validator/validator.go
+++ b/pkg/validator/validator.go
@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
+	"strings"
 
 	"github.com/google/syzkaller/pkg/auth"
 	"github.com/google/syzkaller/pkg/coveragedb"
@@ -51,9 +52,9 @@ var (
 	EmptyStr       = makeStrLenFunc("not empty", 0)
 	AlphaNumeric   = makeStrReFunc("not an alphanum", "^[a-zA-Z0-9]*$")
 	CommitHash     = makeCombinedStrFunc("not a hash", AlphaNumeric, makeStrLenFunc("len is not 40", 40))
-	KernelFilePath = makeStrReFunc("not a kernel file path", "^[./-_a-zA-Z0-9]*$")
-	NamespaceName  = makeStrReFunc("not a namespace name", "^[a-zA-Z0-9-_.]{4,32}$")
-	DashClientName = makeStrReFunc("not a dashboard client name", "^[a-zA-Z0-9-_.]{4,100}$")
+	KernelFilePath = makeStrReFunc("not a kernel file path", "^[./_a-zA-Z0-9-]*$")
+	NamespaceName  = makeStrReFunc("not a namespace name", "^[a-zA-Z0-9_.-]{4,32}$")
+	DashClientName = makeStrReFunc("not a dashboard client name", "^[a-zA-Z0-9_.-]{4,100}$")
 	DashClientKey  = makeStrReFunc("not a dashboard client key",
 		"^([a-zA-Z0-9]{16,128})|("+regexp.QuoteMeta(auth.OauthMagic)+".*)$")
 	TimePeriodType = makeStrReFunc(fmt.Sprintf("bad time period, use (%s|%s|%s)",
@@ -63,13 +64,17 @@ var (
 
 type strValidationFunc func(string, ...string) Result
 
+func looksDangerous(s string) bool {
+	return strings.Contains(s, "--")
+}
+
 func makeStrReFunc(errStr, reStr string) strValidationFunc {
 	matchRe := regexp.MustCompile(reStr)
 	return func(s string, objName ...string) Result {
 		if s == "" {
 			return Result{false, wrapError(errStr + ": can't be empty")}
 		}
-		if !matchRe.MatchString(s) {
+		if looksDangerous(s) || !matchRe.MatchString(s) {
 			return Result{false, wrapError(errStr, objName...)}
 		}
 		return ResultOk
diff --git a/pkg/validator/validator_test.go b/pkg/validator/validator_test.go
index 6397081e4..9aa08e2d0 100644
--- a/pkg/validator/validator_test.go
+++ b/pkg/validator/validator_test.go
@@ -58,12 +58,13 @@ func TestIsDashboardClientKey(t *testing.T) {
 // nolint: dupl
 func TestIsKernelFilePath(t *testing.T) {
 	assert.True(t, validator.KernelFilePath("io_uring/advise.c").Ok)
-	assert.False(t, validator.KernelFilePath("io-uring/advise.c").Ok)
+	assert.True(t, validator.KernelFilePath("io-uring/advise.c").Ok)
+	assert.False(t, validator.KernelFilePath("io--uring/advise.c").Ok)
 	assert.False(t, validator.KernelFilePath("").Ok)
 
-	assert.Equal(t, "not a kernel file path", validator.KernelFilePath("io-uring").Err.Error())
+	assert.Equal(t, "not a kernel file path", validator.KernelFilePath("io--uring").Err.Error())
 	assert.Equal(t, "kernelPath: not a kernel file path",
-		validator.KernelFilePath("io-uring", "kernelPath").Err.Error())
+		validator.KernelFilePath("io--uring", "kernelPath").Err.Error())
 }
 
 var badResult = validator.Result{false, errors.New("sample error")}