mirror of
https://github.com/Kaelio/ktx.git
synced 2026-06-22 08:38:08 +02:00
fix: read semantic sources safely (#284)
* fix: read semantic sources safely
* test: retarget reindex per-scope error case to a broken manifest
Reading a broken standalone source was made non-fatal in de1f1a8d (it is
surfaced for repair instead of throwing), so the reindex per-scope error
test no longer captured an error. Point it at a corrupt manifest shard,
which is the remaining fatal read failure the per-scope catch must
isolate, and assert the captured error names the offending file.
* fix(sl): decouple semantic-layer file names from warehouse naming rules
The in-file `name:` field is now the sole source identity; the filename is
a derived label that never participates in identity. This removes the
"Unsafe semantic-layer source name" failure class entirely: any warehouse
identifier (Snowflake's uppercase SIGNED_UP, EVENT$LOG, dotted names) can
be read, overlaid, edited, and deleted.
- New `source-files.ts`: one total filename derivation (safe lowercase
names verbatim; otherwise slug + sha256-hash suffix, immune to
case-insensitive-filesystem collisions) and one by-name file resolver.
- Reads resolve by name everywhere; the path-from-name fast path and
`assertSafeSourceName` are gone.
- Writes resolve-then-write: rewrites land on the file that declares the
name (human renames survive); new sources get a derived filename; a
derived path occupied by a different source fails instead of clobbering.
- `readSourceFile` returns null for missing files instead of forcing every
caller to launder IO errors; `deleteSource` distinguishes manifest-backed
sources from not-found instead of silently succeeding.
- `sl_write_source` accepts verbatim warehouse identifiers (snake_case is
now a recommendation for new sources) and rejects sourceName/source.name
mismatches; `sl_edit_source` rejects name-changing edits.
- Ingest projection commits, gate-repair allowlists, and touched-source
derivation use resolved paths / in-file names instead of interpolating
`<connId>/<name>.yaml`.
- Collapsed the five parallel path derivations and duplicated path-token
helpers onto the shared module; dropped dead service methods.
* fix(sl): resolve sources by declared name end-to-end and gate warehouse SQL with the parser-backed validator
- Key broken/renamed semantic-layer files by their recoverable in-file
name (slSourceNameForFile) so mid-edit sources stay reachable under
their real identity in reads, listings, and search
- Derive finalization touched sources from composed-source diffs and
recover deleted files' declared names from the pre-change commit
instead of parsing hash-derived filenames
- Resolve revert/rollback paths against history (listFilesAtCommit) so
human-renamed files are restored where they lived at preHead
- Validate ingest sql_execution through the daemon's sqlglot
validateReadOnly in the connection's dialect, sharing one
driver-to-dialect map (sql-analysis/dialect.ts) across MCP and ingest
- Harden the local read-only SQL backstop: accept leading comments,
reject smuggled second statements, and strip trailing
semicolons/comments before row-limit wrapping
This commit is contained in:
parent
853f39a7c3
commit
f3f893bf01
51 changed files with 1797 additions and 476 deletions
|
|
@ -2,16 +2,133 @@ const MUTATING_SQL =
|
|||
/^\s*(insert|update|delete|merge|alter|drop|create|truncate|grant|revoke|copy|call|do|vacuum|analyze|refresh)\b/i;
|
||||
const READ_SQL = /^\s*(select|with)\b/i;
|
||||
|
||||
// Agents (and the daemon's sqlglot validator, which ignores comments) routinely
|
||||
// emit read-only queries prefixed with `-- ...` or `/* ... */`. Strip leading
|
||||
// comments so the prefix check sees the real statement; otherwise valid SELECT/WITH
|
||||
// SQL is rejected here while the parser-backed validator accepts it.
|
||||
function stripLeadingSqlComments(sql: string): string {
|
||||
let index = 0;
|
||||
while (index < sql.length) {
|
||||
while (/\s/.test(sql[index] ?? '')) {
|
||||
index += 1;
|
||||
}
|
||||
if (sql.startsWith('--', index)) {
|
||||
const end = sql.indexOf('\n', index + 2);
|
||||
index = end === -1 ? sql.length : end + 1;
|
||||
continue;
|
||||
}
|
||||
if (sql.startsWith('/*', index)) {
|
||||
const end = sql.indexOf('*/', index + 2);
|
||||
if (end === -1) {
|
||||
return sql.slice(index);
|
||||
}
|
||||
index = end + 2;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return sql.slice(index);
|
||||
}
|
||||
|
||||
// Lexes past one string literal, quoted identifier, or comment starting at
|
||||
// `index`, using standard-SQL rules ('' and "" escapes; no dialect extensions
|
||||
// such as backslash escapes or dollar quoting). Returns the index after the
|
||||
// token, or `index` unchanged when no quoted/comment token starts there.
|
||||
function skipQuotedOrComment(sql: string, index: number): number {
|
||||
const quote = sql[index];
|
||||
if (quote === "'" || quote === '"') {
|
||||
let i = index + 1;
|
||||
while (i < sql.length) {
|
||||
if (sql[i] === quote) {
|
||||
if (sql[i + 1] === quote) {
|
||||
i += 2;
|
||||
continue;
|
||||
}
|
||||
return i + 1;
|
||||
}
|
||||
i += 1;
|
||||
}
|
||||
return sql.length;
|
||||
}
|
||||
if (sql.startsWith('--', index)) {
|
||||
const end = sql.indexOf('\n', index + 2);
|
||||
return end === -1 ? sql.length : end + 1;
|
||||
}
|
||||
if (sql.startsWith('/*', index)) {
|
||||
const end = sql.indexOf('*/', index + 2);
|
||||
return end === -1 ? sql.length : end + 2;
|
||||
}
|
||||
return index;
|
||||
}
|
||||
|
||||
// Backstop against statement smuggling (`select 1; drop table x`): reject any
|
||||
// semicolon that is followed by real content. Semicolons inside string
|
||||
// literals, quoted identifiers, and comments are fine, as are trailing
|
||||
// semicolons (optionally followed by whitespace and comments). This deliberately
|
||||
// lexes standard SQL only, so dialect-specific escapes can cause a false
|
||||
// reject — never a false accept; the canonical gate is the daemon's
|
||||
// sqlglot-backed validateReadOnly.
|
||||
function assertSingleSqlStatement(sql: string): void {
|
||||
let index = 0;
|
||||
let sawSemicolon = false;
|
||||
while (index < sql.length) {
|
||||
const skipped = skipQuotedOrComment(sql, index);
|
||||
if (skipped > index) {
|
||||
index = skipped;
|
||||
continue;
|
||||
}
|
||||
if (sql[index] === ';') {
|
||||
sawSemicolon = true;
|
||||
} else if (sawSemicolon && !/\s/.test(sql[index])) {
|
||||
throw new Error('Only one SQL statement can be executed.');
|
||||
}
|
||||
index += 1;
|
||||
}
|
||||
}
|
||||
|
||||
export function assertReadOnlySql(sql: string): string {
|
||||
const trimmed = sql.trim();
|
||||
const trimmed = stripLeadingSqlComments(sql).trim();
|
||||
if (!READ_SQL.test(trimmed) || MUTATING_SQL.test(trimmed)) {
|
||||
throw new Error('Only read-only SELECT/WITH queries can be executed locally.');
|
||||
}
|
||||
assertSingleSqlStatement(trimmed);
|
||||
return trimmed;
|
||||
}
|
||||
|
||||
// `assertReadOnlySql` deliberately keeps trailing semicolons, comments, and
|
||||
// whitespace (e.g. `select 1; -- done`) — harmless for direct single-statement
|
||||
// execution. A row-limit subquery wrapper needs a bare expression instead: a
|
||||
// trailing `;` would sit illegally inside the subquery, and a trailing line
|
||||
// comment would comment out the closing paren and limit clause. Lex forward with
|
||||
// the same standard-SQL rules as the single-statement gate and truncate at the
|
||||
// end of the last meaningful token, dropping trailing semicolons, comments, and
|
||||
// whitespace. Characters inside string literals and quoted identifiers stay
|
||||
// meaningful, so a `;` or `--` within a literal is never mistaken for a
|
||||
// terminator (a plain regex cannot make that distinction).
|
||||
export function stripTrailingSqlNoise(sql: string): string {
|
||||
let index = 0;
|
||||
let meaningfulEnd = 0;
|
||||
while (index < sql.length) {
|
||||
if (sql.startsWith('--', index) || sql.startsWith('/*', index)) {
|
||||
index = skipQuotedOrComment(sql, index);
|
||||
continue;
|
||||
}
|
||||
const afterQuoted = skipQuotedOrComment(sql, index);
|
||||
if (afterQuoted > index) {
|
||||
meaningfulEnd = afterQuoted;
|
||||
index = afterQuoted;
|
||||
continue;
|
||||
}
|
||||
if (sql[index] !== ';' && !/\s/.test(sql[index] ?? '')) {
|
||||
meaningfulEnd = index + 1;
|
||||
}
|
||||
index += 1;
|
||||
}
|
||||
return sql.slice(0, meaningfulEnd);
|
||||
}
|
||||
|
||||
export function limitSqlForExecution(sql: string, maxRows: number | undefined): string {
|
||||
const trimmed = assertReadOnlySql(sql).replace(/;+\s*$/, '');
|
||||
const trimmed = stripTrailingSqlNoise(assertReadOnlySql(sql));
|
||||
if (!maxRows) {
|
||||
return trimmed;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue