colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Gani Georgiev 2024-04-24 23:34:44 +03:00
parent 4902b72247 2b82c36bdd
commit 7675d2e07b
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/filesystem/file.go
View File

@ -177,6 +177,10 @@ func normalizeName(fr FileReader, name string) string {
// try to detect the extension from the file content
cleanExt, _ = detectExtension(fr)
}
if extLength := len(cleanExt); extLength > 20 {
// keep only the last 20 characters (it is multibyte safe after the regex replace)
cleanExt = "." + cleanExt[extLength-20:]
}
// name
// ---

16
tools/filesystem/file_test.go
View File

@ -9,6 +9,7 @@ import (
"path/filepath"
"regexp"
"strconv"
"strings"
"testing"
"github.com/labstack/echo/v5"
@ -182,13 +183,14 @@ func TestFileNameNormalizations(t *testing.T) {
name string
pattern string
}{
{"", `^\w{10}_\w{10}.txt$`},
{".png", `^\w{10}_\w{10}.png$`},
{".tar.gz", `^\w{10}_\w{10}.tar.gz$`},
{"a.tar.gz", `^a\w{10}_\w{10}.tar.gz$`},
{"a.b.c.d.tar.gz", `^a_b_c_d_\w{10}.tar.gz$`},
{"abcd", `^abcd_\w{10}.txt$`},
{"a b! c d . 456", `^a_b_c_d_\w{10}.456$`}, // normalize spaces
{"", `^\w{10}_\w{10}\.txt$`},
{".png", `^\w{10}_\w{10}\.png$`},
{".tar.gz", `^\w{10}_\w{10}\.tar\.gz$`},
{"a.tar.gz", `^a\w{10}_\w{10}\.tar\.gz$`},
{"a.b.c.d.tar.gz", `^a_b_c_d_\w{10}\.tar\.gz$`},
{"abcd", `^abcd_\w{10}\.txt$`},
{"a b! c d . 456", `^a_b_c_d_\w{10}\.456$`}, // normalize spaces
{strings.Repeat("a", 101) + "." + strings.Repeat("b", 21), `^a{100}_\w{10}\.b{20}$`}, // name and extension length trim
}
for i, s := range scenarios {