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

[#4824] updated the uploaded filename normalization to take double extensions in consideration

Browse Source
This commit is contained in:
Gani Georgiev
2024-04-24 22:00:18 +03:00
parent 4cfabc61e6
commit ece62ebdf5
39 changed files with 215 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/filesystem/file_test.go
+33 -5
View File
@@ -8,6 +8,7 @@ import (
"os"
"path/filepath"
"regexp"
"strconv"
"testing"
"github.com/labstack/echo/v5"
@@ -35,7 +36,7 @@ func TestNewFileFromPath(t *testing.T) {
if f.OriginalName != originalName {
t.Fatalf("Expected OriginalName %q, got %q", originalName, f.OriginalName)
}
if match, _ := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
if match, err := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
t.Fatalf("Expected Name to match %v, got %q (%v)", normalizedNamePattern, f.Name, err)
}
if f.Size != 73 {
@@ -69,7 +70,7 @@ func TestNewFileFromBytes(t *testing.T) {
if f.OriginalName != originalName {
t.Fatalf("Expected OriginalName %q, got %q", originalName, f.OriginalName)
}
if match, _ := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
if match, err := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
t.Fatalf("Expected Name to match %v, got %q (%v)", normalizedNamePattern, f.Name, err)
}
}
@@ -95,12 +96,12 @@ func TestNewFileFromMultipart(t *testing.T) {
}
originalNamePattern := regexp.QuoteMeta("tmpfile-") + `\w+` + regexp.QuoteMeta(".txt")
if match, _ := regexp.Match(originalNamePattern, []byte(f.OriginalName)); !match {
if match, err := regexp.Match(originalNamePattern, []byte(f.OriginalName)); !match {
t.Fatalf("Expected OriginalName to match %v, got %q (%v)", originalNamePattern, f.OriginalName, err)
}
normalizedNamePattern := regexp.QuoteMeta("tmpfile_") + `\w+\_\w{10}` + regexp.QuoteMeta(".txt")
if match, _ := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
if match, err := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
t.Fatalf("Expected Name to match %v, got %q (%v)", normalizedNamePattern, f.Name, err)
}
@@ -164,7 +165,7 @@ func TestNewFileFromUrlTimeout(t *testing.T) {
if f.OriginalName != originalName {
t.Fatalf("Expected OriginalName %q, got %q", originalName, f.OriginalName)
}
if match, _ := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
if match, err := regexp.Match(normalizedNamePattern, []byte(f.Name)); !match {
t.Fatalf("Expected Name to match %v, got %q (%v)", normalizedNamePattern, f.Name, err)
}
if f.Size != 4 {
@@ -175,3 +176,30 @@ func TestNewFileFromUrlTimeout(t *testing.T) {
}
}
}
func TestFileNameNormalizations(t *testing.T) {
scenarios := []struct {
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
}
for i, s := range scenarios {
t.Run(strconv.Itoa(i)+"_"+s.name, func(t *testing.T) {
f, err := filesystem.NewFileFromBytes([]byte("abc"), s.name)
if err != nil {
t.Fatal(err)
}
if match, err := regexp.Match(s.pattern, []byte(f.Name)); !match {
t.Fatalf("Expected Name to match %v, got %q (%v)", s.pattern, f.Name, err)
}
})
}
}