From a2b1b193425eba85765cdbd7bf16a693c74a3661 Mon Sep 17 00:00:00 2001 From: Gani Georgiev Date: Fri, 22 Aug 2025 21:20:30 +0300 Subject: [PATCH] updated random generator tests --- core/syscall_wasm.go | 1 + tools/security/random_by_regex_test.go | 6 ++-- tools/security/random_test.go | 41 ++++++++++++++------------ 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/core/syscall_wasm.go b/core/syscall_wasm.go index cf4d9a4c..75c5a051 100644 --- a/core/syscall_wasm.go +++ b/core/syscall_wasm.go @@ -4,6 +4,7 @@ package core import "errors" +// https://github.com/pocketbase/pocketbase/pull/7116 func execve(argv0 string, argv []string, envv []string) error { return errors.ErrUnsupported } diff --git a/tools/security/random_by_regex_test.go b/tools/security/random_by_regex_test.go index ac7cef76..86d8c769 100644 --- a/tools/security/random_by_regex_test.go +++ b/tools/security/random_by_regex_test.go @@ -23,13 +23,13 @@ func TestRandomStringByRegex(t *testing.T) { {`\d+`, []syntax.Flags{syntax.POSIX}, true}, {`\d+`, nil, false}, {`\d*`, nil, false}, - {`\d{1,10}`, nil, false}, - {`\d{3}`, nil, false}, + {`\d{1,20}`, nil, false}, + {`\d{5}`, nil, false}, {`\d{0,}-abc`, nil, false}, {`[a-zA-Z_]*`, nil, false}, {`[^a-zA-Z]{5,30}`, nil, false}, {`\w+_abc`, nil, false}, - {`[2-9]{5}-\w+`, nil, false}, + {`[2-9]{10}-\w+`, nil, false}, {`(a|b|c)`, nil, false}, } diff --git a/tools/security/random_test.go b/tools/security/random_test.go index 5560f9d6..d9177792 100644 --- a/tools/security/random_test.go +++ b/tools/security/random_test.go @@ -1,6 +1,7 @@ package security_test import ( + "fmt" "regexp" "testing" @@ -36,29 +37,31 @@ func testRandomStringWithAlphabet(t *testing.T, randomFunc func(n int, alphabet } for i, s := range scenarios { - generated := make([]string, 0, 1000) - length := 10 + t.Run(fmt.Sprintf("%d_%q", i, s.alphabet), func(t *testing.T) { + generated := make([]string, 0, 1000) + length := 10 - for j := 0; j < 1000; j++ { - result := randomFunc(length, s.alphabet) + for j := 0; j < 1000; j++ { + result := randomFunc(length, s.alphabet) - if len(result) != length { - t.Fatalf("(%d:%d) Expected the length of the string to be %d, got %d", i, j, length, len(result)) - } - - reg := regexp.MustCompile(s.expectPattern) - if match := reg.MatchString(result); !match { - t.Fatalf("(%d:%d) The generated string should have only %s characters, got %q", i, j, s.expectPattern, result) - } - - for _, str := range generated { - if str == result { - t.Fatalf("(%d:%d) Repeating random string - found %q in %q", i, j, result, generated) + if len(result) != length { + t.Fatalf("(%d) Expected the length of the string to be %d, got %d", j, length, len(result)) } - } - generated = append(generated, result) - } + reg := regexp.MustCompile(s.expectPattern) + if match := reg.MatchString(result); !match { + t.Fatalf("(%d) The generated string should have only %s characters, got %q", j, s.expectPattern, result) + } + + for _, str := range generated { + if str == result { + t.Fatalf("(%d) Repeating random string - found %q in %q", j, result, generated) + } + } + + generated = append(generated, result) + } + }) } }