Skip to content

Address Sequelize replacements and sanitizations #593

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.

Sign up for GitHub

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

Merged
tariqksoliman merged 2 commits into from
Oct 15, 2024
Merged

Address Sequelize replacements and sanitizations #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03ac18c
Use replacements
tariqksoliman Oct 15, 2024
d0f9b59
Fix bad table var mappings
tariqksoliman Oct 15, 2024
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
43 changes: 30 additions & 13 deletions API/Backend/Datasets/routes/datasets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@ function get(req, res, next) {
Datasets.findOne({ where: { name: queries[i].dataset } })
.then((result) => {
if (result) {
const column = queries[i].column
.replace(/[`~!@#$%^&*|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "")
.replace(/[^ -~]+/g, "");
const column = queries[i].column;
sequelize
.query(
"SELECT * FROM " +
result.dataValues.table +
Utils.forceAlphaNumUnder(result.dataValues.table) +
' WHERE "' +
column +
Utils.forceAlphaNumUnder(column) +
'"=:search ORDER BY id ASC LIMIT 100',
{
replacements: {
Expand Down Expand Up @@ -175,7 +173,7 @@ router.post("/search", function (req, res, next) {
sequelize
.query(
"SELECT properties, ST_AsGeoJSON(geom) FROM " +
table +
Utils.forceAlphaNumUnder(table) +
" WHERE properties ->> :key = :value;",
{
replacements: {
Expand Down Expand Up @@ -240,7 +238,9 @@ router.get("/download", function (req, res, next) {
let table = result.dataValues.table;

sequelize
.query("SELECT * FROM " + table)
.query("SELECT * FROM " + Utils.forceAlphaNumUnder(table), {
replacements: {},
})
.then(([results]) => {
res.send({
status: "success",
Expand Down Expand Up @@ -343,7 +343,7 @@ router.post("/upload", function (req, res, next) {
if (fields.upsert === "true") {
let condition = "";
fields.header.forEach((elm) => {
elm = elm.replace(/[`~!@#$%^&*|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "");
elm = Utils.forceAlphaNumUnder(elm);
condition +=
' AND ( a."' +
elm +
Expand All @@ -359,12 +359,15 @@ router.post("/upload", function (req, res, next) {
sequelize
.query(
"DELETE FROM " +
tableName +
Utils.forceAlphaNumUnder(tableName) +
" a USING " +
tableName +
Utils.forceAlphaNumUnder(tableName) +
" b " +
"WHERE b.id < a.id" +
condition
condition,
{
replacements: {},
}
)
.then(() => {
res.send({
Expand Down Expand Up @@ -461,7 +464,14 @@ router.post("/upload", function (req, res, next) {
tableObj = result.tableObj;
} else {
sequelize
.query("TRUNCATE TABLE " + result.table + " RESTART IDENTITY")
.query(
"TRUNCATE TABLE " +
Utils.forceAlphaNumUnder(result.table) +
" RESTART IDENTITY",
{
replacements: {},
}
)
.then(() => {
tableObj = result.tableObj;
})
Expand Down Expand Up @@ -514,7 +524,14 @@ router.post("/recreate", function (req, res, next) {

if (req.body.mode == "full") {
sequelize
.query("TRUNCATE TABLE " + result.table + " RESTART IDENTITY")
.query(
"TRUNCATE TABLE " +
Utils.forceAlphaNumUnder(result.table) +
" RESTART IDENTITY",
{
replacements: {},
}
)
.then(() => {
populateDatasetTable(
result.tableObj,
Expand Down
Loading
⚡