Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(security): improve sanitization for big numbers support #2572

Merged
merged 1 commit into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/parsers/binary_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ for (const t in Types) {
}

function readCodeFor(field, config, options, fieldNum) {
const supportBigNumbers =
options.supportBigNumbers || config.supportBigNumbers;
const bigNumberStrings = options.bigNumberStrings || config.bigNumberStrings;
const supportBigNumbers = Boolean(
options.supportBigNumbers || config.supportBigNumbers,
);
const bigNumberStrings = Boolean(
options.bigNumberStrings || config.bigNumberStrings,
);
const timezone = options.timezone || config.timezone;
const dateStrings = options.dateStrings || config.dateStrings;
const unsigned = field.flags & FieldFlags.UNSIGNED;
Expand Down
47 changes: 26 additions & 21 deletions lib/parsers/text_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
}

function readCodeFor(type, charset, encodingExpr, config, options) {
const supportBigNumbers =
options.supportBigNumbers || config.supportBigNumbers;
const bigNumberStrings = options.bigNumberStrings || config.bigNumberStrings;
const supportBigNumbers = Boolean(
options.supportBigNumbers || config.supportBigNumbers,
);
const bigNumberStrings = Boolean(
options.bigNumberStrings || config.bigNumberStrings,
);
const timezone = options.timezone || config.timezone;
const dateStrings = options.dateStrings || config.dateStrings;

Expand Down Expand Up @@ -85,22 +88,24 @@
db: field.schema,
table: field.table,
name: field.name,
string: function(encoding = field.encoding) {
string: function (encoding = field.encoding) {
if (field.columnType === Types.JSON && encoding === field.encoding) {
// Since for JSON columns mysql always returns charset 63 (BINARY),
// we have to handle it according to JSON specs and use "utf8",
// see https://github.com/sidorares/node-mysql2/issues/1661
console.warn(`typeCast: JSON column "${field.name}" is interpreted as BINARY by default, recommended to manually set utf8 encoding: \`field.string("utf8")\``);
console.warn(
`typeCast: JSON column "${field.name}" is interpreted as BINARY by default, recommended to manually set utf8 encoding: \`field.string("utf8")\``,
);
}

return _this.packet.readLengthCodedString(encoding);
},
buffer: function() {
buffer: function () {
return _this.packet.readLengthCodedBuffer();
},
geometry: function() {
geometry: function () {
return _this.packet.parseGeometryValue();
}
},
};
}

Expand All @@ -109,9 +114,7 @@
/* eslint-disable no-trailing-spaces */
/* eslint-disable no-spaced-func */
/* eslint-disable no-unexpected-multiline */
parserFn('(function () {')(
'return class TextRow {'
);
parserFn('(function () {')('return class TextRow {');

// constructor method
parserFn('constructor(fields) {');
Expand All @@ -127,22 +130,22 @@

// next method
parserFn('next(packet, fields, options) {');
parserFn("this.packet = packet;");
parserFn('this.packet = packet;');
if (options.rowsAsArray) {
parserFn(`const result = new Array(${fields.length});`);
} else {
parserFn("const result = {};");
parserFn('const result = {};');
}

const resultTables = {};
let resultTablesArray = [];

if (options.nestTables === true) {
for (let i=0; i < fields.length; i++) {
for (let i = 0; i < fields.length; i++) {
resultTables[fields[i].table] = 1;
}
resultTablesArray = Object.keys(resultTables);
for (let i=0; i < resultTablesArray.length; i++) {
for (let i = 0; i < resultTablesArray.length; i++) {
parserFn(`result[${helpers.srcEscape(resultTablesArray[i])}] = {};`);
}
}
Expand All @@ -154,7 +157,7 @@
parserFn(`// ${fieldName}: ${typeNames[fields[i].columnType]}`);
if (typeof options.nestTables === 'string') {
lvalue = `result[${helpers.srcEscape(
fields[i].table + options.nestTables + fields[i].name
fields[i].table + options.nestTables + fields[i].name,
)}]`;
} else if (options.nestTables === true) {
lvalue = `result[${helpers.srcEscape(fields[i].table)}][${fieldName}]`;
Expand All @@ -172,11 +175,13 @@
fields[i].characterSet,
encodingExpr,
config,
options
options,
);
if (typeof options.typeCast === 'function') {
parserFn(`${lvalue} = options.typeCast(this.wrap${i}, function() { return ${readCode} });`);
} else {
parserFn(
`${lvalue} = options.typeCast(this.wrap${i}, function() { return ${readCode} });`,
);
} else {
parserFn(`${lvalue} = ${readCode};`);
}
}
Expand All @@ -193,11 +198,11 @@
if (config.debug) {
helpers.printDebugWithCode(
'Compiled text protocol row parser',
parserFn.toString()
parserFn.toString(),

Check warning on line 201 in lib/parsers/text_parser.js

View check run for this annotation

Codecov / codecov/patch

lib/parsers/text_parser.js#L201

Added line #L201 was not covered by tests
);
}
if (typeof options.typeCast === 'function') {
return parserFn.toFunction({wrap});
return parserFn.toFunction({ wrap });
}
return parserFn.toFunction();
}
Expand Down
66 changes: 66 additions & 0 deletions test/esm/unit/parsers/big-numbers-strings-sanitization.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { describe, test, assert } from 'poku';
import { createConnection, describeOptions } from '../../../common.test.cjs';

const connection = createConnection().promise();

const sql = 'SELECT 9007199254740991+100 AS `total`';

describe('bigNumberStrings Sanitization', describeOptions);

Promise.all([
test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: true,
bigNumberStrings: true,
});

assert.strictEqual(
typeof results[0].total,
'string',
'Valid bigNumberStrings enabled',
);
}),
test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: false,
bigNumberStrings: false,
});

assert.strictEqual(
typeof results[0].total,
'number',
'Valid bigNumberStrings disabled',
);
}),

test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: 'text',
bigNumberStrings: 'text',
});

assert.strictEqual(
typeof results[0].total,
'string',
'bigNumberStrings as a random string should be enabled',
);
}),
test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: '',
bigNumberStrings: '',
});

assert.strictEqual(
typeof results[0].total,
'number',
'bigNumberStrings as an empty string should be disabled',
);
}),
]).then(async () => {
await connection.end();
});
62 changes: 62 additions & 0 deletions test/esm/unit/parsers/support-big-numbers-sanitization.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { describe, test, assert } from 'poku';
import { createConnection, describeOptions } from '../../../common.test.cjs';

const connection = createConnection().promise();

const sql = 'SELECT 9007199254740991+100 AS `total`';

describe('supportBigNumbers Sanitization', describeOptions);

Promise.all([
test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: true,
});

assert.strictEqual(
typeof results[0].total,
'string',
'Valid supportBigNumbers enabled',
);
}),
test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: false,
});

assert.strictEqual(
typeof results[0].total,
'number',
'Valid supportBigNumbers disabled',
);
}),

test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: 'text',
});

assert.strictEqual(
typeof results[0].total,
'string',
'supportBigNumbers as a random string should be enabled',
);
}),
test(async () => {
const [results] = await connection.query({
sql,
supportBigNumbers: '',
});

assert.strictEqual(
typeof results[0].total,
'number',
'supportBigNumbers as an empty string should be disabled',
);
}),
]).then(async () => {
await connection.end();
});
Loading