dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-30 01:03:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance binary data handling by converting hex strings to base64 in filter parser and updating MongoDB driver for BinData support

Browse Source
This commit is contained in:
Stela Augustinova
2025-11-11 14:39:43 +01:00
parent dfeb910ac9
commit 94b35e3d5f
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/filterparser/src/parseFilter.ts
View File

@@ -2,7 +2,7 @@ import P from 'parsimmon';
import moment from 'moment'; import moment from 'moment';
import { Condition } from 'dbgate-sqltree'; import { Condition } from 'dbgate-sqltree';
import { interpretEscapes, token, word, whitespace } from './common'; import { interpretEscapes, token, word, whitespace } from './common';
import { hexStringToArray, parseNumberSafe } from 'dbgate-tools'; import { hexToBase64, parseNumberSafe } from 'dbgate-tools';
import { FilterBehaviour, TransformType } from 'dbgate-types'; import { FilterBehaviour, TransformType } from 'dbgate-types';
const binaryCondition = const binaryCondition =
@@ -385,10 +385,7 @@ const createParser = (filterBehaviour: FilterBehaviour) => {
hexstring: () => hexstring: () =>
token(P.regexp(/0x(([0-9a-fA-F][0-9a-fA-F])+)/, 1)) token(P.regexp(/0x(([0-9a-fA-F][0-9a-fA-F])+)/, 1))
.map(x => ({ .map(x => ({ $binary: { base64: hexToBase64(x) } }))
type: 'Buffer',
data: hexStringToArray(x),
}))
.desc('hex string'), .desc('hex string'),
noQuotedString: () => P.regexp(/[^\s^,^'^"]+/).desc('string unquoted'), noQuotedString: () => P.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),

1
packages/tools/src/filterBehaviours.ts
View File

@@ -47,6 +47,7 @@ export const mongoFilterBehaviour: FilterBehaviour = {
allowStringToken: true, allowStringToken: true,
allowNumberDualTesting: true, allowNumberDualTesting: true,
allowObjectIdTesting: true, allowObjectIdTesting: true,
allowHexString: true,
}; };
export const evalFilterBehaviour: FilterBehaviour = { export const evalFilterBehaviour: FilterBehaviour = {

16
plugins/dbgate-plugin-mongo/src/backend/driver.js
View File

@@ -51,6 +51,10 @@ function findArrayResult(resValue) {
return null; return null;
} }
function BinData(_subType, base64) {
return Buffer.from(base64, 'base64');
}
async function getScriptableDb(dbhan) { async function getScriptableDb(dbhan) {
const db = dbhan.getDatabase(); const db = dbhan.getDatabase();
db.getCollection = (name) => db.collection(name); db.getCollection = (name) => db.collection(name);
@@ -156,9 +160,9 @@ const driver = {
// return printable; // return printable;
// } // }
let func; let func;
func = eval(`(db,ObjectId) => ${sql}`); func = eval(`(db,ObjectId,BinData) => ${sql}`);
const db = await getScriptableDb(dbhan); const db = await getScriptableDb(dbhan);
const res = func(db, ObjectId.createFromHexString); const res = func(db, ObjectId.createFromHexString, BinData);
if (isPromise(res)) await res; if (isPromise(res)) await res;
}, },
async operation(dbhan, operation, options) { async operation(dbhan, operation, options) {
@@ -285,7 +289,7 @@ const driver = {
} else { } else {
let func; let func;
try { try {
func = eval(`(db,ObjectId) => ${sql}`); func = eval(`(db,ObjectId,BinData) => ${sql}`);
} catch (err) { } catch (err) {
options.info({ options.info({
message: 'Error compiling expression: ' + err.message, message: 'Error compiling expression: ' + err.message,
@@ -299,7 +303,7 @@ const driver = {
let exprValue; let exprValue;
try { try {
exprValue = func(db, ObjectId.createFromHexString); exprValue = func(db, ObjectId.createFromHexString, BinData);
} catch (err) { } catch (err) {
options.info({ options.info({
message: 'Error evaluating expression: ' + err.message, message: 'Error evaluating expression: ' + err.message,
@@ -411,9 +415,9 @@ const driver = {
// highWaterMark: 100, // highWaterMark: 100,
// }); // });
func = eval(`(db,ObjectId) => ${sql}`); func = eval(`(db,ObjectId,BinData) => ${sql}`);
const db = await getScriptableDb(dbhan); const db = await getScriptableDb(dbhan);
exprValue = func(db, ObjectId.createFromHexString); exprValue = func(db, ObjectId.createFromHexString, BinData);
const pass = new stream.PassThrough({ const pass = new stream.PassThrough({
objectMode: true, objectMode: true,

8
plugins/dbgate-plugin-mongo/src/frontend/driver.js
View File

@@ -15,7 +15,10 @@ function mongoReplacer(key, value) {
function jsonStringifyWithObjectId(obj) { function jsonStringifyWithObjectId(obj) {
return JSON.stringify(obj, mongoReplacer, 2) return JSON.stringify(obj, mongoReplacer, 2)
.replace(/\{\s*\"\$oid\"\s*\:\s*\"([0-9a-f]+)\"\s*\}/g, (m, id) => `ObjectId("${id}")`) .replace(/\{\s*\"\$oid\"\s*\:\s*\"([0-9a-f]+)\"\s*\}/g, (m, id) => `ObjectId("${id}")`)
.replace(/\{\s*\"\$bigint\"\s*\:\s*\"([0-9]+)\"\s*\}/g, (m, num) => `${num}n`); .replace(/\{\s*\"\$bigint\"\s*\:\s*\"([0-9]+)\"\s*\}/g, (m, num) => `${num}n`)
.replace(/\{\s*"\$binary"\s*:\s*\{\s*"base64"\s*:\s*"([^"]+)"(?:\s*,\s*"subType"\s*:\s*"([0-9a-fA-F]{2})")?\s*\}\s*\}/g, (m, base64, subType) => {
return `BinData(${parseInt(subType || "00", 16)}, "${base64}")`;
});
} }
/** @type {import('dbgate-types').SqlDialect} */ /** @type {import('dbgate-types').SqlDialect} */
@@ -129,7 +132,7 @@ const driver = {
getCollectionExportQueryScript(collection, condition, sort) { getCollectionExportQueryScript(collection, condition, sort) {
return `db.getCollection('${collection}') return `db.getCollection('${collection}')
.find(${JSON.stringify(convertToMongoCondition(condition) || {})}) .find(${jsonStringifyWithObjectId(convertToMongoCondition(condition) || {})})
.sort(${JSON.stringify(convertToMongoSort(sort) || {})})`; .sort(${JSON.stringify(convertToMongoSort(sort) || {})})`;
}, },
getCollectionExportQueryJson(collection, condition, sort) { getCollectionExportQueryJson(collection, condition, sort) {
@@ -148,6 +151,7 @@ const driver = {
parseJsonObject: true, parseJsonObject: true,
parseObjectIdAsDollar: true, parseObjectIdAsDollar: true,
parseDateAsDollar: true, parseDateAsDollar: true,
parseHexAsBuffer: true,
explicitDataType: true, explicitDataType: true,
supportNumberType: true, supportNumberType: true,