fix(memory): sanitize FTS5 queries to prevent crashes on hyphenated tokens (#14024)#39663
Open
dusterbloom wants to merge 1 commit into
Open
fix(memory): sanitize FTS5 queries to prevent crashes on hyphenated tokens (#14024)#39663dusterbloom wants to merge 1 commit into
dusterbloom wants to merge 1 commit into
Conversation
…okens (NousResearch#14024) Hyphenated tokens (pve-01, lxc-103) in FTS5 MATCH queries caused 'no such column' errors because the unicode61 tokenizer treats hyphens as column-filter operators. Fix: _sanitize_fts_query() splits on hyphens/punctuation and double-quotes each token. Three-tier fallback: quoted AND -> quoted AND retry -> OR. Also handles special FTS5 operators, SQL injection, wildcards, and edge cases like empty queries. Closes NousResearch#14024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #14024
Hyphenated tokens (pve-01, lxc-103) in FTS5 MATCH queries caused 'no such column' errors because the unicode61 tokenizer treats hyphens as column-filter operators.
Fix:
_sanitize_fts_query()splits on hyphens/punctuation and double-quotes each token. Three-tier fallback: quoted AND → quoted AND retry → OR. Also handles special FTS5 operators, SQL injection, wildcards, and edge cases.Tests: 27 tests (6 sanitization + 21 parametrized fuzz: SQL injection, null bytes, emoji, FTS5 operators, hyphens, IPs, paths, emails, etc.)
This was originally part of #23221 — split into focused single-fix PRs for easier review.