@opengis/fastify-table 2.5.22 → 2.5.24

package/dist/server/routes/table/functions/getData.js

@@ -1,6 +1,6 @@
 import config from "../../../../config.js";
 import { handlebars, handlebarsSync } from "../../../helpers/index.js";
-import getFilterSQL from "../../../plugins/table/funcs/getFilterSQL/index.js";
+import getFilterSQLParametrized from "../../../plugins/table/funcs/getFilterSQLParametrized/index.js";
 import getAccess from "../../../plugins/crud/funcs/getAccess.js";
 import setToken from "../../../plugins/crud/funcs/setToken.js";
 import getToken from "../../../plugins/crud/funcs/getToken.js";
@@ -20,6 +20,7 @@ import locales from "../controllers/utils/locales.js";
 import conditions from "../controllers/utils/conditions.js";
 import { resources } from "../../../plugins/access/funcs/getResources.js";
 import { BadRequestError, ForbiddenError, NotFoundError, UnauthorizedError, } from "../../../../errors.js";
+import prettify from "./prettify.js";
 const components = {
     "vs-widget-file": "select 'vs-widget-file' as component, count(*) from crm.files where entity_id=$1 and file_status<>3",
     "vs-widget-comments": "select 'vs-widget-comments' as component, count(*) from crm.communications where entity_id=$1",
@@ -37,7 +38,7 @@ const mockReply = {
     },
     send: (txt) => Object.assign(mockReply.response, txt),
 };
-function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, iscalled = false) {
+function getOrder({ queryOrder, queryDesc, defaultOrder, columnList, cols, sqlColumns, iscalled = false, }) {
     if (iscalled && queryOrder) {
         return `order by ${queryOrder}`;
     }
@@ -46,7 +47,11 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, i
     }
     const orderArr = queryOrder.split(/[|]/g).map((el) => el.split(/[-]/));
     const validOrder = orderArr
-        .filter((el) => el[0] && (columnList || "").concat(sqlColumns || "").includes(el[0]))
+        .filter((el) => el[0] &&
+        (columnList || "")
+            .concat(sqlColumns || "")
+            .concat(cols || "")
+            .includes(el[0]))
         .map((el) => `${el[0]} ${queryDesc || el[1] === "desc" ? "desc" : ""}`)
         .join(",");
     return `order by ${validOrder || "true::boolean"} nulls last`;
@@ -121,7 +126,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     else if (checkInline[paramsTable]) {
         loadTable.sql = checkInline[paramsTable];
     }
-    if (query?.sql === "0")
+    if (query?.sql === 0 && process.platform === "win32")
         return loadTable;
     if (!pg) {
         throw Error("empty pg");
@@ -257,7 +262,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         isdefault,
     ].filter(Boolean).length;
     const fData = checkFilter
-        ? await getFilterSQL({
+        ? await getFilterSQLParametrized({
             pg,
             table: loadTable
                 ? tokenData?.table || resources[paramsTable] || paramsTable
@@ -273,42 +278,55 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         })
         : {};
     timeArr.push(Date.now());
+    const args = Array.from(fData.args || []);
+    if (objectId) {
+        args.push(objectId);
+        Object.assign(idx, { id: args.length });
+    }
+    else if (query?.key && loadTable.key) {
+        args.push(query.key);
+        Object.assign(idx, { id: args.length });
+    }
     const keyQuery = query?.key && (loadTable?.key || tokenData?.key) && !objectId
-        ? `${loadTable?.key || tokenData?.key}=$1`
+        ? `${loadTable?.key || tokenData?.key}=$${args.length}`
         : null;
-    const args = (objectId ? [objectId] : null) ||
-        (query?.key && loadTable.key ? [query.key] : []);
-    if (args[0]) {
-        Object.assign(idx, { id: 1 });
-    }
-    const isSingle = !!idx.id;
     const limit = (called
         ? query?.limit || defaultLimit
         : Math.min(maxLimit, +(query?.limit || defaultLimit))) || defaultLimit;
     args.push(limit);
-    Object.assign(idx, { limit: idx.id ? 2 : 1 });
+    Object.assign(idx, { limit: args.length });
     const offset = query?.page && query?.page > 0 && !objectId ? (query?.page - 1) * limit : 0;
     args.push(offset);
-    Object.assign(idx, { offset: idx.id ? 3 : 2 });
-    const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, loadTable?.sqlColumns, !!called);
-    const isSearchable = Array.isArray(loadTable?.meta?.search) &&
-        loadTable.meta.search.length &&
+    Object.assign(idx, { offset: args.length });
+    const order = getOrder({
+        queryOrder: query?.order,
+        queryDesc: query?.desc,
+        defaultOrder: loadTable?.order,
+        columnList,
+        cols,
+        sqlColumns: loadTable?.sqlColumns,
+        iscalled: !!called,
+    });
+    const isSearchable = loadTable?.meta?.search &&
+        typeof loadTable.meta.search === "string" &&
         query?.search &&
-        !isSingle;
+        !idx.id;
     if (isSearchable) {
         args.push(`%${query.search.replace(/%/g, "\\%")}%`);
-        Object.assign(idx, { search: Object.keys(idx).length + 1 });
+        Object.assign(idx, { search: args.length });
     }
     if (meta?.bbox && query?.polyline) {
         args.push(query.polyline);
-        Object.assign(idx, { polyline: Object.keys(idx).length + 1 });
+        Object.assign(idx, {
+            polyline: args.length,
+        });
     }
     if (config.trace)
         console.log(order);
     const search = isSearchable
-        ? `(${loadTable?.meta?.search
-            ?.split(",")
-            ?.map((el) => `${el} ilike $${idx.search}`)
+        ? `(${loadTable.meta.search
+            .split(",")
+            .map((el) => `${el} ilike $${idx.search}`)
             .join(" or ")})`
         : null;
     const queryBbox = query?.bbox
@@ -368,13 +386,13 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
   ${order} limit $${idx.limit}::bigint offset $${idx.offset}::bigint`;
     if (q1.includes("{{uid}}")) {
         args.push(uid || "");
-        Object.assign(idx, { uid: Object.keys(idx).length + 1 });
+        Object.assign(idx, { uid: args.length });
     }
     const q = q1.replace(/'{{uid}}'/g, `$${idx.uid}`);
     if (config.trace)
         console.log(q);
-    if (query?.sql === "1") {
-        return q;
+    if (query?.sql === 1 && process.platform === "win32") {
+        return prettify(q, args);
     }
     const rows = await pg.query(q, args).then((r) => r.rows || []);
     if (!rows.length &&
@@ -409,18 +427,18 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         });
     }
     const idx1 = {};
-    const args1 = [];
+    const args1 = Array.from(fData.args || []);
     if (idx.search) {
         args1.push(args[idx.search - 1]);
-        Object.assign(idx1, { search: Object.keys(idx1).length + 1 });
+        Object.assign(idx1, { search: args1.length });
     }
     if (idx.uid) {
         args1.push(args[idx.uid - 1]);
-        Object.assign(idx1, { uid: Object.keys(idx1).length + 1 });
+        Object.assign(idx1, { uid: args1.length });
     }
     if (idx.polyline) {
         args1.push(args[idx.polyline - 1]);
-        Object.assign(idx1, { polyline: Object.keys(idx1).length + 1 });
+        Object.assign(idx1, { polyline: args1.length });
     }
     const search1 = idx.search
         ? `(${loadTable.meta.search
@@ -464,8 +482,8 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
   where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
         .join(" and ") || "true"} `.replace(/'{{uid}}'/g, `$${idx1.uid}`);
-    if (query?.sql === "2") {
-        return qCount;
+    if (query?.sql === 2 && process.platform === "win32") {
+        return prettify(qCount, args1);
     }
     const counts = keyQuery || objectId
         ? { total: rows.length, filtered: rows.length }

package/dist/server/routes/table/functions/prettify.d.ts

@@ -0,0 +1,2 @@
+export default function prettify(q: string, args: any[]): string;
+//# sourceMappingURL=prettify.d.ts.map

package/dist/server/routes/table/functions/prettify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prettify.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/prettify.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,UAetD"}

package/dist/server/routes/table/functions/prettify.js

@@ -0,0 +1,11 @@
+export default function prettify(q, args) {
+    if (!q)
+        throw new Error("query is empty");
+    if (!args?.length)
+        return q;
+    return q.replace(/\$(\d+)/g, (_, ind) => `${Array.isArray(args[ind - 1])
+        ? `'{${args[ind - 1]}}'`
+        : ["number", "boolean"].includes(typeof args[ind - 1])
+            ? args[ind - 1]
+            : `'${args[ind - 1]}'`}`);
+}

package/dist/utils.d.ts

@@ -26,6 +26,7 @@ export { default as metaFormat } from "./server/plugins/table/funcs/metaFormat/i
 export { default as autoIndex } from "./server/plugins/pg/funcs/autoIndex.js";
 export { default as getSelectVal } from "./server/plugins/table/funcs/metaFormat/getSelectVal.js";
 export { default as getFilterSQL } from "./server/plugins/table/funcs/getFilterSQL/index.js";
+export { default as getFilterSQLParametrized } from "./server/plugins/table/funcs/getFilterSQLParametrized/index.js";
 export { default as getSelect } from "./server/plugins/table/funcs/getSelect.js";
 export { default as getSelectMeta } from "./server/plugins/table/funcs/getSelectMeta.js";
 export { default as gisIRColumn } from "./server/plugins/table/funcs/gisIRColumn.js";

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}

package/dist/utils.js

@@ -34,6 +34,7 @@ export { default as metaFormat } from "./server/plugins/table/funcs/metaFormat/i
 export { default as autoIndex } from "./server/plugins/pg/funcs/autoIndex.js";
 export { default as getSelectVal } from "./server/plugins/table/funcs/metaFormat/getSelectVal.js";
 export { default as getFilterSQL } from "./server/plugins/table/funcs/getFilterSQL/index.js";
+export { default as getFilterSQLParametrized } from "./server/plugins/table/funcs/getFilterSQLParametrized/index.js";
 export { default as getSelect } from "./server/plugins/table/funcs/getSelect.js";
 export { default as getSelectMeta } from "./server/plugins/table/funcs/getSelectMeta.js";
 export { default as gisIRColumn } from "./server/plugins/table/funcs/gisIRColumn.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.5.22",
+  "version": "2.5.24",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/dist/server/plugins/policy/funcs/checkSQL.d.ts

@@ -1,8 +0,0 @@
-export default function checkSQL({ body, schema }: any): {
-    body: any;
-    error?: undefined;
-} | {
-    error: string;
-    body: any;
-};
-//# sourceMappingURL=checkSQL.d.ts.map

package/dist/server/plugins/policy/funcs/checkSQL.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"checkSQL.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkSQL.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAW,EAAE,EAAE,GAAG;;;;;;EA0B1D"}

package/dist/server/plugins/policy/funcs/checkSQL.js

@@ -1,19 +0,0 @@
-import sqlInjection from "../sqlInjection.js";
-export default function checkSQL({ body, schema = {} }) {
-    const data = typeof body === "string" ? body : JSON.stringify(body);
-    const stopWords = sqlInjection.filter((el) => data?.toLowerCase?.()?.includes?.(el));
-    if (!stopWords.length)
-        return { body };
-    const disabledCheckFields = Object.keys(schema || {})?.filter((el) => schema?.[el]?.sqlCheck === false); // exclude specific columns
-    const field = Object.keys(body)?.find((key) => body[key]?.toLowerCase &&
-        !disabledCheckFields.includes(key) &&
-        body[key].toLowerCase().includes(stopWords[0]));
-    if (field) {
-        console.error(stopWords[0], field, body[field]);
-        return {
-            error: `rule: ${stopWords[0]} | attr: ${field} | val: ${body[field]}`,
-            body,
-        };
-    }
-    return { body };
-}

package/dist/server/plugins/policy/sqlInjection.d.ts

@@ -1,3 +0,0 @@
-declare const sqlInjection: string[];
-export default sqlInjection;
-//# sourceMappingURL=sqlInjection.d.ts.map

package/dist/server/plugins/policy/sqlInjection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sqlInjection.d.ts","sourceRoot":"","sources":["../../../../server/plugins/policy/sqlInjection.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,YAAY,UA8BjB,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/server/plugins/policy/sqlInjection.js

@@ -1,33 +0,0 @@
-/* eslint-disable no-script-url */
-const sqlInjection = [
-    '()',
-    '^',
-    '*',
-    'like ',
-    '@variable',
-    '@@variable',
-    'group by ',
-    'union ',
-    'select ',
-    'having ',
-    'as injectx',
-    'where ',
-    'rlike ',
-    'if(',
-    'sleep(',
-    'waitfor delay',
-    'benchmark(',
-    'pg_sleep(',
-    "'\\\"",
-    'randomblob(',
-    'order by ',
-    'union all ',
-    '+or',
-    'or ',
-    'and ',
-    "'' ",
-    '"""  ',
-    '<script',
-    'javascript:',
-];
-export default sqlInjection;

package/dist/server/plugins/table/funcs/getData.d.ts

@@ -1,2 +0,0 @@
-export default function getData({ id, table, pg, headers, filter, state, limit, page, search, user, order, desc, sql, contextQuery, sufix, filterList, }: any, reply: any, called?: any): Promise<any>;
-//# sourceMappingURL=getData.d.ts.map

package/dist/server/plugins/table/funcs/getData.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getData.ts"],"names":[],"mappings":"AAEA,wBAA8B,OAAO,CACnC,EACE,EAAE,EACF,KAAK,EACL,EAAE,EACF,OAAO,EACP,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,MAAM,EACN,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,GAAG,EACH,YAAY,EACZ,KAAK,EACL,UAAU,GACX,EAAE,GAAG,EACN,KAAK,EAAE,GAAG,EACV,MAAM,CAAC,EAAE,GAAG,gBA4Bb"}

package/dist/server/plugins/table/funcs/getData.js

@@ -1,25 +0,0 @@
-import routeData from "../../../routes/table/controllers/tableData.js";
-export default async function getData({ id, table, pg, headers, filter, state, limit, page, search, user, order, desc, sql, contextQuery, sufix, filterList, }, reply, called) {
-    const params = { table, id };
-    const query = {
-        filter,
-        limit,
-        page,
-        search,
-        sql,
-        state,
-        order,
-        desc,
-    };
-    const result = await routeData({
-        pg,
-        headers,
-        params,
-        query,
-        user,
-        contextQuery,
-        sufix,
-        filterList,
-    }, reply, called);
-    return result;
-}