mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* π fix: normalize Unicode filenames in import attachment lookup Fix import failures for files with Japanese dakuten/handakuten characters (e.g., γ¬, γ, γΉ) on macOS. macOS stores filenames in NFD (decomposed) form while Linux/Windows use NFC (composed) form. This mismatch caused attachment lookup failures when zip filenames and JSONL paths used different normalization forms. Changes: - Add NormalizeFilename utility function using golang.org/x/text/unicode/norm - Normalize filenames when building attachment maps from zip files - Normalize paths when looking up attachments in maps - Apply fixes to both server (import.go) and mmctl (validate.go) * avoid duplicating normalizeFilename * add coverage for Korean filenames --------- Co-authored-by: Jesse Hallam <[email protected]> Co-authored-by: Mattermost Build <[email protected]> Co-authored-by: Hanzo Dev <[email protected]>
125 lines
3.3 KiB
Go
125 lines
3.3 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package utils
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestNormalizeFilename(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
input string
|
|
expected string
|
|
}{
|
|
{
|
|
name: "ASCII only",
|
|
input: "test.jpg",
|
|
expected: "test.jpg",
|
|
},
|
|
{
|
|
name: "Japanese katakana dakuten NFC",
|
|
input: "\u30AC", // γ¬ (NFC)
|
|
expected: "\u30AC",
|
|
},
|
|
{
|
|
name: "Japanese katakana dakuten NFD",
|
|
input: "\u30AB\u3099", // γ« + combining dakuten β γ¬
|
|
expected: "\u30AC",
|
|
},
|
|
{
|
|
name: "Japanese katakana handakuten NFC",
|
|
input: "\u30D1", // γ (NFC)
|
|
expected: "\u30D1",
|
|
},
|
|
{
|
|
name: "Japanese katakana handakuten NFD",
|
|
input: "\u30CF\u309A", // γ + combining handakuten β γ
|
|
expected: "\u30D1",
|
|
},
|
|
{
|
|
name: "Japanese hiragana dakuten NFC",
|
|
input: "\u3079", // γΉ (NFC)
|
|
expected: "\u3079",
|
|
},
|
|
{
|
|
name: "Japanese hiragana dakuten NFD",
|
|
input: "\u3078\u3099", // γΈ + combining dakuten β γΉ
|
|
expected: "\u3079",
|
|
},
|
|
{
|
|
name: "Mixed path with NFD",
|
|
input: "data/\u30AB\u3099test.jpg", // data/γ«γtest.jpg
|
|
expected: "data/\u30ACtest.jpg", // data/γ¬test.jpg
|
|
},
|
|
{
|
|
name: "Complex Japanese filename NFD",
|
|
input: "\u304B\u3099\u304D\u3099\u3050", // γ + γ + γ (NFD: γγγγγγ)
|
|
expected: "\u304C\u304E\u3050", // γγγ (NFC)
|
|
},
|
|
{
|
|
name: "Path with multiple NFD characters",
|
|
input: "data/\u30D5\u309A\u30ED\u30B7\u3099\u30A7\u30AF\u30C8.png", // data/γγγΈγ§γ―γ.png (NFD)
|
|
expected: "data/\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8.png", // data/γγγΈγ§γ―γ.png (NFC)
|
|
},
|
|
{
|
|
name: "Empty string",
|
|
input: "",
|
|
expected: "",
|
|
},
|
|
{
|
|
name: "Already NFC normalized",
|
|
input: "γγ‘γ€γ«ε.txt",
|
|
expected: "γγ‘γ€γ«ε.txt",
|
|
},
|
|
{
|
|
name: "Korean Hangul NFC",
|
|
input: "\uAC00", // κ° (NFC precomposed)
|
|
expected: "\uAC00",
|
|
},
|
|
{
|
|
name: "Korean Hangul NFD",
|
|
input: "\u1100\u1161", // α + α
‘ (NFD Jamo) β κ°
|
|
expected: "\uAC00",
|
|
},
|
|
{
|
|
name: "Korean word NFD",
|
|
input: "\u1112\u1161\u11AB\u1100\u1173\u11AF", // νκΈ (NFD Jamo: αα
‘α«αα
³α―)
|
|
expected: "\uD55C\uAE00", // νκΈ (NFC)
|
|
},
|
|
{
|
|
name: "Korean filename with path NFD",
|
|
input: "data/\u1111\u1161\u110B\u1175\u11AF.txt", // νμΌ (NFD) + .txt
|
|
expected: "data/\uD30C\uC77C.txt", // νμΌ.txt (NFC)
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
result := NormalizeFilename(tt.input)
|
|
assert.Equal(t, tt.expected, result)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNormalizeFilenameIdempotent(t *testing.T) {
|
|
// NFC normalization should be idempotent
|
|
inputs := []string{
|
|
"test.jpg",
|
|
"\u30AC", // γ¬ (NFC)
|
|
"\u30AB\u3099", // γ« + combining dakuten (NFD)
|
|
"data/γγΉγ.jpg",
|
|
"\uD55C\uAE00", // νκΈ (NFC)
|
|
"\u1112\u1161\u11AB\u1100\u1173\u11AF", // νκΈ (NFD Jamo)
|
|
"",
|
|
}
|
|
|
|
for _, input := range inputs {
|
|
first := NormalizeFilename(input)
|
|
second := NormalizeFilename(first)
|
|
assert.Equal(t, first, second, "NormalizeFilename should be idempotent for input: %q", input)
|
|
}
|
|
}
|