mirror of
https://github.com/farcasclaudiu/Flowise.git
synced 2026-06-28 13:00:56 +03:00
Bugfix/update nodevm sandbox options, sanitize tablename (#3818)
* update nodevm sandbox options, sanitize tablename * sanitize file name when getFileFromStorage
This commit is contained in:
@@ -19,6 +19,18 @@ export class SqliteSaver extends BaseCheckpointSaver implements MemoryMethods {
|
||||
this.threadId = threadId
|
||||
}
|
||||
|
||||
sanitizeTableName(tableName: string): string {
|
||||
// Trim and normalize case, turn whitespace into underscores
|
||||
tableName = tableName.trim().toLowerCase().replace(/\s+/g, '_')
|
||||
|
||||
// Validate using a regex (alphanumeric and underscores only)
|
||||
if (!/^[a-zA-Z0-9_]+$/.test(tableName)) {
|
||||
throw new Error('Invalid table name')
|
||||
}
|
||||
|
||||
return tableName
|
||||
}
|
||||
|
||||
private async getDataSource(): Promise<DataSource> {
|
||||
const { datasourceOptions } = this.config
|
||||
const dataSource = new DataSource(datasourceOptions)
|
||||
@@ -33,8 +45,9 @@ export class SqliteSaver extends BaseCheckpointSaver implements MemoryMethods {
|
||||
|
||||
try {
|
||||
const queryRunner = dataSource.createQueryRunner()
|
||||
const tableName = this.sanitizeTableName(this.tableName)
|
||||
await queryRunner.manager.query(`
|
||||
CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
CREATE TABLE IF NOT EXISTS ${tableName} (
|
||||
thread_id TEXT NOT NULL,
|
||||
checkpoint_id TEXT NOT NULL,
|
||||
parent_id TEXT,
|
||||
@@ -56,12 +69,13 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
|
||||
const thread_id = config.configurable?.thread_id || this.threadId
|
||||
const checkpoint_id = config.configurable?.checkpoint_id
|
||||
const tableName = this.sanitizeTableName(this.tableName)
|
||||
|
||||
if (checkpoint_id) {
|
||||
try {
|
||||
const queryRunner = dataSource.createQueryRunner()
|
||||
const keys = [thread_id, checkpoint_id]
|
||||
const sql = `SELECT checkpoint, parent_id, metadata FROM ${this.tableName} WHERE thread_id = ? AND checkpoint_id = ?`
|
||||
const sql = `SELECT checkpoint, parent_id, metadata FROM ${tableName} WHERE thread_id = ? AND checkpoint_id = ?`
|
||||
|
||||
const rows = await queryRunner.manager.query(sql, [...keys])
|
||||
await queryRunner.release()
|
||||
@@ -82,8 +96,8 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Error retrieving ${this.tableName}`, error)
|
||||
throw new Error(`Error retrieving ${this.tableName}`)
|
||||
console.error(`Error retrieving ${tableName}`, error)
|
||||
throw new Error(`Error retrieving ${tableName}`)
|
||||
} finally {
|
||||
await dataSource.destroy()
|
||||
}
|
||||
@@ -91,7 +105,7 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
try {
|
||||
const queryRunner = dataSource.createQueryRunner()
|
||||
const keys = [thread_id]
|
||||
const sql = `SELECT thread_id, checkpoint_id, parent_id, checkpoint, metadata FROM ${this.tableName} WHERE thread_id = ? ORDER BY checkpoint_id DESC LIMIT 1`
|
||||
const sql = `SELECT thread_id, checkpoint_id, parent_id, checkpoint, metadata FROM ${tableName} WHERE thread_id = ? ORDER BY checkpoint_id DESC LIMIT 1`
|
||||
|
||||
const rows = await queryRunner.manager.query(sql, [...keys])
|
||||
await queryRunner.release()
|
||||
@@ -117,8 +131,8 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Error retrieving ${this.tableName}`, error)
|
||||
throw new Error(`Error retrieving ${this.tableName}`)
|
||||
console.error(`Error retrieving ${tableName}`, error)
|
||||
throw new Error(`Error retrieving ${tableName}`)
|
||||
} finally {
|
||||
await dataSource.destroy()
|
||||
}
|
||||
@@ -132,7 +146,8 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
|
||||
const queryRunner = dataSource.createQueryRunner()
|
||||
const thread_id = config.configurable?.thread_id || this.threadId
|
||||
let sql = `SELECT thread_id, checkpoint_id, parent_id, checkpoint, metadata FROM ${this.tableName} WHERE thread_id = ? ${
|
||||
const tableName = this.sanitizeTableName(this.tableName)
|
||||
let sql = `SELECT thread_id, checkpoint_id, parent_id, checkpoint, metadata FROM ${tableName} WHERE thread_id = ? ${
|
||||
before ? 'AND checkpoint_id < ?' : ''
|
||||
} ORDER BY checkpoint_id DESC`
|
||||
if (limit) {
|
||||
@@ -167,8 +182,8 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(`Error listing ${this.tableName}`, error)
|
||||
throw new Error(`Error listing ${this.tableName}`)
|
||||
console.error(`Error listing ${tableName}`, error)
|
||||
throw new Error(`Error listing ${tableName}`)
|
||||
} finally {
|
||||
await dataSource.destroy()
|
||||
}
|
||||
@@ -188,8 +203,8 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
this.serde.stringify(checkpoint),
|
||||
this.serde.stringify(metadata)
|
||||
]
|
||||
|
||||
const query = `INSERT OR REPLACE INTO ${this.tableName} (thread_id, checkpoint_id, parent_id, checkpoint, metadata) VALUES (?, ?, ?, ?, ?)`
|
||||
const tableName = this.sanitizeTableName(this.tableName)
|
||||
const query = `INSERT OR REPLACE INTO ${tableName} (thread_id, checkpoint_id, parent_id, checkpoint, metadata) VALUES (?, ?, ?, ?, ?)`
|
||||
|
||||
await queryRunner.manager.query(query, row)
|
||||
await queryRunner.release()
|
||||
@@ -215,8 +230,8 @@ CREATE TABLE IF NOT EXISTS ${this.tableName} (
|
||||
|
||||
const dataSource = await this.getDataSource()
|
||||
await this.setup(dataSource)
|
||||
|
||||
const query = `DELETE FROM "${this.tableName}" WHERE thread_id = ?;`
|
||||
const tableName = this.sanitizeTableName(this.tableName)
|
||||
const query = `DELETE FROM "${tableName}" WHERE thread_id = ?;`
|
||||
|
||||
try {
|
||||
const queryRunner = dataSource.createQueryRunner()
|
||||
|
||||
Reference in New Issue
Block a user