1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-06 17:41:00 +00:00

fix(storage): ensure strings are truncated to fit tsvector size limit and remain valid UTF-8

This commit is contained in:
Frédéric Guillot 2025-07-20 13:34:50 -07:00
parent f02213a168
commit 703f113fbd
2 changed files with 127 additions and 12 deletions

View file

@ -16,8 +16,6 @@ import (
"github.com/lib/pq"
)
const truncationLen = 500000
// CountAllEntries returns the number of entries for each status in the database.
func (s *Storage) CountAllEntries() map[string]int64 {
rows, err := s.db.Query(`SELECT status, count(*) FROM entries GROUP BY status`)
@ -88,8 +86,8 @@ func (s *Storage) UpdateEntryTitleAndContent(entry *model.Entry) error {
entry.Title,
entry.Content,
entry.ReadingTime,
truncateString(entry.Title),
truncateString(entry.Content),
truncateStringForTSVectorField(entry.Title),
truncateStringForTSVectorField(entry.Content),
entry.ID,
entry.UserID); err != nil {
return fmt.Errorf(`store: unable to update entry #%d: %v`, entry.ID, err)
@ -148,8 +146,8 @@ func (s *Storage) createEntry(tx *sql.Tx, entry *model.Entry) error {
entry.UserID,
entry.FeedID,
entry.ReadingTime,
truncateString(entry.Title),
truncateString(entry.Content),
truncateStringForTSVectorField(entry.Title),
truncateStringForTSVectorField(entry.Content),
pq.Array(entry.Tags),
).Scan(
&entry.ID,
@ -203,8 +201,8 @@ func (s *Storage) updateEntry(tx *sql.Tx, entry *model.Entry) error {
entry.Content,
entry.Author,
entry.ReadingTime,
truncateString(entry.Title),
truncateString(entry.Content),
truncateStringForTSVectorField(entry.Title),
truncateStringForTSVectorField(entry.Content),
entry.UserID,
entry.FeedID,
entry.Hash,
@ -640,9 +638,30 @@ func (s *Storage) UnshareEntry(userID int64, entryID int64) (err error) {
return
}
func truncateString(s string) string {
if len(s) > truncationLen {
return s[:truncationLen]
// truncateStringForTSVectorField truncates a string to fit within the maximum size for a TSVector field in PostgreSQL.
func truncateStringForTSVectorField(s string) string {
// The length of a tsvector (lexemes + positions) must be less than 1 megabyte.
const maxTSVectorSize = 1024 * 1024
if len(s) < maxTSVectorSize {
return s
}
return s
// Truncate to fit under the limit, ensuring we don't break UTF-8 characters
truncated := s[:maxTSVectorSize-1]
// Walk backwards to find the last complete UTF-8 character
for i := len(truncated) - 1; i >= 0; i-- {
if (truncated[i] & 0x80) == 0 {
// ASCII character, we can stop here
return truncated[:i+1]
}
if (truncated[i] & 0xC0) == 0xC0 {
// Start of a multi-byte UTF-8 character
return truncated[:i]
}
}
// Fallback: return empty string if we can't find a valid UTF-8 boundary
return ""
}

View file

@ -0,0 +1,96 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package storage
import (
"strings"
"testing"
)
func TestTruncateStringForTSVectorField(t *testing.T) {
// Test case 1: Short Chinese text should not be truncated
shortText := "这是一个简短的中文测试文本"
result := truncateStringForTSVectorField(shortText)
if result != shortText {
t.Errorf("Short text should not be truncated, got %s", result)
}
// Test case 2: Long Chinese text should be truncated to stay under 1MB
// Generate a long Chinese string that would exceed 1MB
const megabyte = 1024 * 1024
chineseChar := "汉"
longText := strings.Repeat(chineseChar, megabyte/len(chineseChar)+1000) // Ensure it exceeds 1MB
result = truncateStringForTSVectorField(longText)
// Verify the result is under 1MB
if len(result) >= megabyte {
t.Errorf("Truncated text should be under 1MB, got %d bytes", len(result))
}
// Verify the result is still valid UTF-8 and doesn't cut in the middle of a character
if !strings.HasPrefix(longText, result) {
t.Error("Truncated text should be a prefix of original text")
}
// Test case 3: Text exactly at limit should not be truncated
limitText := strings.Repeat("a", megabyte-1)
result = truncateStringForTSVectorField(limitText)
if result != limitText {
t.Error("Text under limit should not be truncated")
}
// Test case 4: Mixed Chinese and ASCII text
mixedText := strings.Repeat("测试Test汉字", megabyte/20) // Create large mixed text
result = truncateStringForTSVectorField(mixedText)
if len(result) >= megabyte {
t.Errorf("Mixed text should be truncated under 1MB, got %d bytes", len(result))
}
// Verify no broken UTF-8 sequences
if !strings.HasPrefix(mixedText, result) {
t.Error("Truncated mixed text should be a valid prefix")
}
// Test case 5: Large text ending with ASCII characters
asciiSuffix := strings.Repeat("a", megabyte-100) + strings.Repeat("测试", 50) + "abcdef"
result = truncateStringForTSVectorField(asciiSuffix)
if len(result) >= megabyte {
t.Errorf("ASCII suffix text should be truncated under 1MB, got %d bytes", len(result))
}
// Should end with ASCII character
if !strings.HasPrefix(asciiSuffix, result) {
t.Error("Truncated ASCII suffix text should be a valid prefix")
}
// Test case 6: Large ASCII text to cover ASCII branch in UTF-8 detection
largeAscii := strings.Repeat("abcdefghijklmnopqrstuvwxyz", megabyte/26+1000)
result = truncateStringForTSVectorField(largeAscii)
if len(result) >= megabyte {
t.Errorf("Large ASCII text should be truncated under 1MB, got %d bytes", len(result))
}
// Should be a prefix
if !strings.HasPrefix(largeAscii, result) {
t.Error("Truncated ASCII text should be a valid prefix")
}
// Test case 7: Edge case - string that would trigger the fallback
// Create a pathological case: all continuation bytes without start bytes
// This should trigger the fallback because there are no valid UTF-8 boundaries
invalidBytes := make([]byte, megabyte)
for i := range invalidBytes {
invalidBytes[i] = 0x80 // Continuation byte without start byte
}
result = truncateStringForTSVectorField(string(invalidBytes))
// Should return empty string as fallback
if result != "" {
t.Errorf("Invalid UTF-8 continuation bytes should return empty string, got %d bytes", len(result))
}
}