mirror of
https://github.com/BaaRai/ARTEX.git
synced 2026-11-18 22:20:56 +08:00
Merge pull request #322 from Dev-next-gen/fix/finding-filename-utf8
fix(report): keep finding zip names on a rune boundary
This commit is contained in:
+1
-1
@@ -136,7 +136,7 @@ func FindingFilename(f *db.DBFinding) string {
|
||||
// Defensive: strip one more path layer to rule out zip slip.
|
||||
name = path.Base(name)
|
||||
if len(name) > 120 {
|
||||
name = name[:120]
|
||||
name = strings.ToValidUTF8(name[:120], "")
|
||||
}
|
||||
return name + ".md"
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/Autumn-27/artex/agent"
|
||||
"github.com/Autumn-27/artex/db"
|
||||
@@ -480,3 +481,19 @@ func TestFindingTrafficUTF8SegmentsAndInheritedWrites(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindingsZipLongNonASCIINameStaysUTF8(t *testing.T) {
|
||||
f := &db.DBFinding{ID: 7, Severity: "high", Name: strings.Repeat("跨站脚本", 12)}
|
||||
var buf bytes.Buffer
|
||||
if err := writeFindingsEvidenceZip(&buf, []*db.DBFinding{f}, t.TempDir(), time.Now()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
archive, err := zip.NewReader(bytes.NewReader(buf.Bytes()), int64(buf.Len()))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
entry := archive.File[0]
|
||||
if entry.NonUTF8 || !utf8.ValidString(entry.Name) || !strings.HasPrefix(entry.Name, "high_跨站脚本") || !strings.HasSuffix(entry.Name, ".md") {
|
||||
t.Fatalf("entry name %q (NonUTF8=%v)", entry.Name, entry.NonUTF8)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user