@opengis/fastify-table 2.0.78 → 2.0.80

package/dist/server/plugins/crud/funcs/dataDelete.js

@@ -17,7 +17,7 @@ export default async function dataDelete({ table: table1, tokenData, referer, id
         pg.relkinds = pgClients.client?.relkinds;
         pg.pk = pgClients.client?.pk;
     }
-    const table = pg.pk[table1] ? table1 : table1.replace(/"/g, "");
+    const table = pg.pk?.[table1] ? table1 : table1.replace(/"/g, "");
     if (!table)
         return "table not exist";
     const { pk } = await getMeta({ pg, table });

package/dist/server/plugins/crud/funcs/dataUpsert.d.ts

@@ -0,0 +1,13 @@
+import type { ExtendedPG } from "../../../types/core.js";
+export default function dataUpsert({ id, table: table1, referer, data, pg: pg1, uid, tokenData, update, constraint, }: {
+    id?: string | number;
+    table: string;
+    referer?: string;
+    data: Record<string, any>;
+    pg?: ExtendedPG;
+    uid?: string;
+    tokenData?: Record<string, any>;
+    update?: boolean | string;
+    constraint?: string;
+}): Promise<any>;
+//# sourceMappingURL=dataUpsert.d.ts.map

package/dist/server/plugins/crud/funcs/dataUpsert.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dataUpsert.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpsert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,OAAO,EACP,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,EACH,SAAc,EACd,MAAa,EACb,UAAU,GACX,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,gBA+KA"}

package/dist/server/plugins/crud/funcs/dataUpsert.js

@@ -0,0 +1,148 @@
+import getPG from "../../pg/funcs/getPG.js";
+import getRedis from "../../redis/funcs/getRedis.js";
+import pgClients from "../../pg/pgClients.js";
+import getTemplate from "../../table/funcs/getTemplate.js";
+import config from "../../../../config.js";
+import logChanges from "./utils/logChanges.js";
+import getInsertQuery from "./utils/getInsertQuery.js";
+import logger from "../../logger/getLogger.js";
+import extraData from "../../extra/extraData.js";
+const rclient = getRedis();
+export default async function dataUpsert({ id, table: table1, referer, data, pg: pg1, uid, tokenData = {}, update = true, constraint, }) {
+    const pg = pg1 || getPG({ name: "client" });
+    if (!pg)
+        return null;
+    // pg client single transaction support
+    if (!pg?.pk && config.pg) {
+        pg.options = pgClients.client?.options;
+        pg.tlist = pgClients.client?.tlist;
+        pg.pgType = pgClients.client?.pgType;
+        pg.relkinds = pgClients.client?.relkinds;
+        pg.pk = pgClients.client?.pk;
+    }
+    if (config.trace)
+        console.log("form", tokenData?.form);
+    const table = pg.pk?.[table1] ? table1 : table1.replace(/"/g, "");
+    const { insertQuery, args = [], keys = [], systemColumns = [], } = (await getInsertQuery({
+        pg,
+        table,
+        data,
+        id,
+        uid,
+    })) || {};
+    const updatedAtColumn = systemColumns
+        .map((el) => el[0])
+        .find((colname) => ["editor_date", "updated_at"].includes(colname));
+    const upsert = () => {
+        if (!update || !keys.length) {
+            const p1 = `on conflict(${constraint || pg.pk?.[table]}) do `;
+            const p2 = updatedAtColumn
+                ? `update set ${updatedAtColumn}=now()`
+                : "nothing";
+            return p1 + p2 + "returning *";
+        }
+        return `on conflict(${constraint || pg.pk?.[table]}) do update set  ${typeof update === "string"
+            ? update
+            : keys.map((colname) => `${colname} = EXCLUDED."${colname}"`).join(", ")} ${keys.includes(updatedAtColumn) || !updatedAtColumn
+            ? ""
+            : `,${updatedAtColumn}=now()`} returning *`;
+    };
+    if (!insertQuery || !args.length)
+        return null;
+    const q = [insertQuery.replace("returning *", ""), upsert()]
+        .filter(Boolean)
+        .join(" ");
+    // for transactions
+    const isClient = typeof pg.query === "function" && typeof pg.release === "function";
+    const client = (isClient ? pg : await pg.connect());
+    if (isClient || !client.pk) {
+        client.options = pg.options;
+        client.tlist = pg.tlist;
+        client.pgType = pg.pgType;
+        client.relkinds = pg.relkinds;
+        client.pk = pg.pk;
+    }
+    try {
+        if (!isClient) {
+            await client.query("begin;");
+        }
+        const row = await client.query(q, args).then((el) => el.rows?.[0]);
+        const id1 = row?.[pg.pk?.[table] || ""];
+        if (!id1)
+            return null;
+        await extraData({
+            table,
+            form: tokenData?.form,
+            id: id1,
+            data,
+            uid,
+            row,
+        }, client);
+        // foreign key dataTable (table + parent_id)
+        const formData = tokenData?.form
+            ? (await getTemplate("form", tokenData.form)) || {}
+            : {};
+        const schema = formData?.schema || formData;
+        const parentKeys = Object.keys(schema || {})?.filter((key) => data[key]?.length &&
+            Array.isArray(data[key]) &&
+            schema?.[key]?.table &&
+            schema?.[key]?.parent_id);
+        if (parentKeys?.length) {
+            await Promise.all(parentKeys?.map(async (key) => {
+                const parentKey = schema[key].parent_id;
+                const objId = data[parentKey] || data?.id || row?.[parentKey] || id1;
+                const parentRows = await Promise.all(data[key].map(async (row) => {
+                    Object.assign(row, { [parentKey]: objId });
+                    const parentRes = await getInsertQuery({
+                        pg: client,
+                        table: schema[key].table,
+                        data: row,
+                        uid,
+                    });
+                    if (!parentRes?.insertQuery || !parentRes?.args?.length)
+                        return null;
+                    const { rows = [] } = await client.query(parentRes.insertQuery, parentRes.args);
+                    return rows[0];
+                }));
+                Object.assign(row, { [key]: parentRows.filter(Boolean) });
+            }));
+        }
+        await logChanges({
+            pg: client,
+            table,
+            tokenData,
+            referer,
+            data,
+            id: id1,
+            uid,
+            type: "UPSERT",
+        });
+        if (config.redis) {
+            rclient.incr(`pg:${table}:crud`);
+        }
+        if (!isClient) {
+            await client.query("commit;");
+        }
+        return row;
+    }
+    catch (err) {
+        logger.file("crud/upsert", {
+            error: err.toString(),
+            stack: err.stack,
+            table,
+            id,
+            referer,
+            uid,
+            form: tokenData?.form,
+        });
+        if (!isClient) {
+            await client.query("rollback;");
+        }
+        throw err;
+    }
+    finally {
+        if (!isClient) {
+            client?.release?.();
+        }
+    }
+}

package/dist/server/plugins/crud/funcs/utils/getInsertQuery.d.ts

@@ -8,5 +8,7 @@ export default function getInsertQuery({ pg, table, data, id, uid, }: {
 }): Promise<{
     insertQuery: string;
     args: any[];
+    keys: any[];
+    systemColumns: any;
 } | null>;
 //# sourceMappingURL=getInsertQuery.d.ts.map

package/dist/server/plugins/crud/funcs/utils/getInsertQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInsertQuery.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/crud/funcs/utils/getInsertQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,KAAK,EACL,IAAI,EACJ,EAAE,EACF,GAAG,GACJ,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;;;UA6EA"}
+{"version":3,"file":"getInsertQuery.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/crud/funcs/utils/getInsertQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,KAAK,EACL,IAAI,EACJ,EAAE,EACF,GAAG,GACJ,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;;;;;UA+EA"}

package/dist/server/plugins/crud/funcs/utils/getInsertQuery.js

@@ -56,5 +56,6 @@ export default async function getInsertQuery({ pg, table, data, id, uid, }) {
             ? JSON.stringify(el[1])
             : el[1]),
     ];
-    return { insertQuery, args };
+    const keys = filterData.map((el) => el[0]);
+    return { insertQuery, args, keys, systemColumns };
 }

package/dist/server/plugins/file/uploadMultiPart.d.ts

@@ -9,7 +9,7 @@ interface IFile {
     extension?: string;
     buffer?: Buffer;
     filename?: string;
-    ext?: string;
+    fields?: Record<string, any>;
 }
 export default function uploadMultiPart(req: any, { extensions, raw, subdir, originalFilename, }?: {
     extensions?: string[];

package/dist/server/plugins/file/uploadMultiPart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AAqBA,UAAU,KAAK;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAyCD,wBAA8B,eAAe,CAC3C,GAAG,EAAE,GAAG,EACR,EACE,UAAU,EACV,GAAG,EACH,MAAM,EACN,gBAAwB,GACzB,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,GACL,OAAO,CAAC,KAAK,CAAC,CAwFhB"}
+{"version":3,"file":"uploadMultiPart.d.ts","sourceRoot":"","sources":["../../../../server/plugins/file/uploadMultiPart.ts"],"names":[],"mappings":"AAqBA,UAAU,KAAK;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B;AAyCD,wBAA8B,eAAe,CAC3C,GAAG,EAAE,GAAG,EACR,EACE,UAAU,EACV,GAAG,EACH,MAAM,EACN,gBAAwB,GACzB,GAAE;IACD,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,GACL,OAAO,CAAC,KAAK,CAAC,CAgGhB"}

package/dist/server/plugins/file/uploadMultiPart.js

@@ -66,8 +66,15 @@ export default async function uploadMultiPart(req, { extensions, raw, subdir, or
     if (!fileBuffer?.length) {
         throw new BadRequestError("file buffer is empty");
     }
-    if (raw)
-        return { buffer: fileBuffer, filename: value.filename, ext }; // return buffer for custom upload
+    // return buffer for custom upload
+    if (raw) {
+        return {
+            buffer: fileBuffer,
+            filename: value.filename,
+            extension: ext.substring(1),
+            fields: value.fields,
+        };
+    }
     const dir = subdir != null ? subdir : req.params?.["*"] || "uploads";
     const yearMonthDay = subdir != null ? "" : new Date().toISOString().split("T")[0];
     const dbname = req.pg?.options?.database || req.pg?.database || config.pg?.database; // request / config params / default config params

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -5,7 +5,7 @@ export default async function getMeta(opt, nocache) {
     if (!pg)
         return { error: "pg connection not established", status: 400 };
     const table1 = opt?.table || opt;
-    const table = pg.pk[table1] ? table1 : table1?.replace?.(/"/g, "");
+    const table = pg.pk?.[table1] ? table1 : table1?.replace?.(/"/g, "");
     if (pg?.options?.database && data[pg.options.database]?.[table] && !nocache)
         return data[pg.options.database][table];
     if (!pg?.tlist?.includes(table) &&
@@ -39,7 +39,7 @@ export default async function getMeta(opt, nocache) {
         pk,
         columns: fields,
         geom: geomAttr?.name,
-        view: pg.relkinds?.[table] === "v",
+        view: ["v", "m"].includes(pg.relkinds?.[table]),
     };
     if (!data[pg.options.database]) {
         data[pg.options.database] = {};

package/dist/server/plugins/pg/funcs/getPG.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAYA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OA0C7B;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"getPG.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPG.ts"],"names":[],"mappings":"AAYA,iBAAS,KAAK,CAAC,KAAK,GAAE,GAAQ,OA6C7B;AAED,eAAe,KAAK,CAAC"}

package/dist/server/plugins/pg/funcs/getPG.js

@@ -14,7 +14,7 @@ function getPG(param = {}) {
         dblist.find((el) => el.database === (param?.db || param?.database || param) &&
             el.port === param?.port);
     const { user, password, host, port, db, database, name: origin, statement_timeout: timeout, // explicit
-     } = dbListParams ??
+    connectionTimeoutMillis: connectionTimeout, } = dbListParams ??
         (typeof param === "string" ? getDBParams(param) : param || {});
     const name = origin || db || database || param || "client";
     if (pgClients[name])
@@ -26,6 +26,7 @@ function getPG(param = {}) {
         port: port || config.pg?.port,
         database: db || database || config.pg?.db || config.pg?.database,
         statement_timeout: timeout || config.pg?.statement_timeout || 10000,
+        connectionTimeoutMillis: connectionTimeout || config.pg?.connectionTimeoutMillis || 5000,
     };
     if (!dbConfig.database) {
         return null;

package/dist/server/plugins/pg/funcs/getPGAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPGAsync.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPGAsync.ts"],"names":[],"mappings":"AAYA,iBAAe,UAAU,CAAC,KAAK,EAAE,GAAG,gBAsDnC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"getPGAsync.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getPGAsync.ts"],"names":[],"mappings":"AAYA,iBAAe,UAAU,CAAC,KAAK,EAAE,GAAG,gBAyDnC;AAED,eAAe,UAAU,CAAC"}

package/dist/server/plugins/pg/funcs/getPGAsync.js

@@ -13,7 +13,7 @@ async function getPGAsync(param) {
     const dbListParams = dblist.find((el) => el.key === param?.key) ||
         dblist.find((el) => el.database === (param?.db || param?.database || param));
     const { user, password, host, port, db, database, name: origin, statement_timeout: timeout, // explicit
-     } = dbListParams ??
+    connectionTimeoutMillis: connectionTimeout, } = dbListParams ??
         (typeof param === "string" ? getDBParams(param) : param || {});
     const name = origin || db || database || param || "client";
     if (pgClients[name]?.tlist)
@@ -25,6 +25,7 @@ async function getPGAsync(param) {
         port: port || config.pg?.port,
         database: db || database || config.pg?.db || config.pg?.database,
         statement_timeout: timeout || config.pg?.statement_timeout || 10000,
+        connectionTimeoutMillis: connectionTimeout || config.pg?.connectionTimeoutMillis || 5000,
     };
     if (!dbConfig.database) {
         return null;

package/dist/server/plugins/pg/funcs/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AASpB,iBAAe,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,iBA+LlC;AAGD,eAAe,IAAI,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AASpB,iBAAe,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,iBA2MlC;AAGD,eAAe,IAAI,CAAC"}

package/dist/server/plugins/pg/funcs/init.js

@@ -8,6 +8,13 @@ async function init(client) {
     if (!client?.options?.database) {
         return;
     }
+    try {
+        await client.connect();
+    }
+    catch (err) {
+        console.error("Error connecting to PostgreSQL:", client?.options?.database, err.message);
+        return;
+    }
     const { pgType, pk } = await client
         .query(`SELECT
         (
@@ -52,9 +59,10 @@ async function init(client) {
       FROM
         pg_class
       WHERE
-        relkind IN ('r', 'v')`)
+        relkind IN ('r', 'v', 'm')`)
         .then((d) => d.rows[0].tlist);
-    const { rows = [] } = await client.query(`SELECT
+    const rows = await client
+        .query(`SELECT
       (
         SELECT
           nspname
@@ -67,7 +75,8 @@ async function init(client) {
     FROM
       pg_class
     WHERE
-      relkind IN ('r', 'v')`);
+      relkind IN ('r', 'v', 'm')`)
+        .then((el) => el.rows || []);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});
     async function query(q, args = []) {
         try {

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

@@ -1 +1 @@
-{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSA8K5E"}
+{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSAmL5E"}

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

@@ -77,7 +77,9 @@ export default function checkPolicy(req, reply) {
         return null;
     }
     // ! sql injection
-    const stopWords = block.filter((el) => path.includes(el));
+    const stopWords = block.filter((el) => path.includes(el) ||
+        JSON.stringify(req.body || {}).includes(el) ||
+        JSON.stringify(query || {}).includes(el));
     if (stopWords?.length) {
         logger.file("injection/sql", {
             path,

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,19 @@
+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/routes/crud/controllers/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAe5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;GAsJjE"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAgB5C,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY;;;GAsKjE"}

package/dist/server/routes/crud/controllers/insert.js

@@ -1,4 +1,4 @@
-import { applyHook, getAccess, getTemplate, checkXSS, dataInsert, getToken, config, pgClients, logger, validateData, } from "../../../../utils.js";
+import { applyHook, getAccess, getTemplate, checkXSS, checkSQL, dataInsert, getToken, config, pgClients, logger, validateData, } from "../../../../utils.js";
 export default async function insert(req, reply) {
     const { pg = pgClients.client, user = {}, params = {}, body = {}, headers = {}, } = req || {};
     if (!user) {
@@ -62,7 +62,7 @@ export default async function insert(req, reply) {
     }
     const fieldCheck = validateData({ body, schema });
     if (fieldCheck.error) {
-        logger.file("injection/sql", {
+        logger.file("injection/formdata", {
             table,
             form: form || loadTemplate?.form,
             uid: user?.uid,
@@ -72,6 +72,18 @@ export default async function insert(req, reply) {
             .status(409)
             .send("Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз");
     }
+    const sqlCheck = checkSQL({ body, schema });
+    if (sqlCheck.error) {
+        logger.file("injection/sql", {
+            table,
+            form: form || loadTemplate?.form,
+            uid: user?.uid,
+            ...sqlCheck,
+        });
+        return reply
+            .status(409)
+            .send("Дані містять заборонені sql символи. Приберіть їх та спробуйте ще раз");
+    }
     if (![add, table].includes("admin.users")) {
         Object.assign(body, { uid: user?.uid, editor_id: user?.uid });
     }

package/dist/server/routes/crud/controllers/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAcA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsKxD"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/update.ts"],"names":[],"mappings":"AAeA,wBAA8B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsLxD"}

package/dist/server/routes/crud/controllers/update.js

@@ -1,4 +1,4 @@
-import { pgClients, applyHook, getAccess, getTemplate, checkXSS, dataUpdate, logger, getToken, validateData, } from "../../../../utils.js";
+import { pgClients, applyHook, getAccess, getTemplate, checkXSS, checkSQL, dataUpdate, logger, getToken, validateData, } from "../../../../utils.js";
 import config from "../../../../config.js";
 import insert from "./insert.js";
 export default async function update(req, reply) {
@@ -75,7 +75,7 @@ export default async function update(req, reply) {
     }
     const fieldCheck = validateData({ body, schema });
     if (fieldCheck.error) {
-        logger.file("injection/sql", {
+        logger.file("injection/formdata", {
             table,
             form: form || loadTemplate?.form,
             uid: user?.uid,
@@ -85,6 +85,18 @@ export default async function update(req, reply) {
             .status(409)
             .send("Дані не пройшли валідацію. Приберіть некоректні дані та спробуйте ще раз");
     }
+    const sqlCheck = checkSQL({ body, schema });
+    if (sqlCheck.error) {
+        logger.file("injection/sql", {
+            table,
+            form: form || loadTemplate?.form,
+            uid: user?.uid,
+            ...sqlCheck,
+        });
+        return reply
+            .status(409)
+            .send("Дані містять заборонені sql символи. Приберіть їх та спробуйте ще раз");
+    }
     if (tokenData?.obj) {
         const objData = tokenData.obj?.split("#").reduce((p, el) => ({
             ...p,

package/dist/server/routes/table/controllers/getFormByTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;CACvB,EACD,KAAK,EAAE,YAAY,gBAkKpB"}
+{"version":3,"file":"getFormByTable.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/getFormByTable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAc5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,GAAG,CAAA;KAAE,CAAC;CACvB,EACD,KAAK,EAAE,YAAY,gBAsKpB"}

package/dist/server/routes/table/controllers/getFormByTable.js

@@ -23,10 +23,9 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
     }
     const tokenData = (await getToken({ token: params.name, uid: user?.uid, json: 1 })) || {};
     const table = tokenData?.table || hookData?.table || params.name;
-    const form = tokenData?.form ||
-        hookData?.form ||
-        (await getTemplate("table", table).then((el) => el?.form)) ||
-        {};
+    const loadTable = (await getTemplate("table", table)) || {};
+    const { title = loadTable.ua, description } = loadTable;
+    const form = tokenData?.form || hookData?.form || loadTable.form;
     if (!form) {
         // return reply.status(404).send("form not found");
     }
@@ -52,7 +51,13 @@ export default async function getForm({ pg = pgClients.client, params, user = {}
         }), {});
         Object.assign(loadTemplate, { obj });
     }
-    const res = { mode: "form", time: 0, ...loadTemplate, schema };
+    const res = {
+        mode: "form",
+        time: 0,
+        meta: { title, description },
+        ...loadTemplate,
+        schema,
+    };
     if (user.uid) {
         // form in form addToken
         formatSchema(schema, user, loadTemplate?.obj);

package/dist/utils.d.ts

@@ -34,6 +34,7 @@ export { default as getMenu } from "./server/routes/menu/controllers/getMenu.js"
 export { default as getFilter } from "./server/plugins/table/funcs/getFilter.js";
 export { default as dataInsert } from "./server/plugins/crud/funcs/dataInsert.js";
 export { default as dataUpdate } from "./server/plugins/crud/funcs/dataUpdate.js";
+export { default as dataUpsert } from "./server/plugins/crud/funcs/dataUpsert.js";
 export { default as dataDelete } from "./server/plugins/crud/funcs/dataDelete.js";
 export { default as getInsertQuery } from "./server/plugins/crud/funcs/utils/getInsertQuery.js";
 export { default as getToken } from "./server/plugins/crud/funcs/getToken.js";
@@ -42,6 +43,7 @@ export { default as getOpt } from "./server/plugins/crud/funcs/getOpt.js";
 export { default as setOpt } from "./server/plugins/crud/funcs/setOpt.js";
 export { default as validateData } from "./server/plugins/crud/funcs/validateData.js";
 export { default as checkXSS } from "./server/plugins/policy/funcs/checkXSS.js";
+export { default as checkSQL } from "./server/plugins/policy/funcs/checkSQL.js";
 export { default as addHook } from "./server/plugins/hook/addHook.js";
 export { default as applyHook } from "./server/plugins/hook/applyHook.js";
 export { default as applyHookSync } from "./server/plugins/hook/applyHookSync.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

@@ -42,6 +42,7 @@ export { default as getFilter } from "./server/plugins/table/funcs/getFilter.js"
 // crud
 export { default as dataInsert } from "./server/plugins/crud/funcs/dataInsert.js";
 export { default as dataUpdate } from "./server/plugins/crud/funcs/dataUpdate.js";
+export { default as dataUpsert } from "./server/plugins/crud/funcs/dataUpsert.js";
 export { default as dataDelete } from "./server/plugins/crud/funcs/dataDelete.js";
 export { default as getInsertQuery } from "./server/plugins/crud/funcs/utils/getInsertQuery.js";
 export { default as getToken } from "./server/plugins/crud/funcs/getToken.js";
@@ -51,6 +52,7 @@ export { default as setOpt } from "./server/plugins/crud/funcs/setOpt.js";
 export { default as validateData } from "./server/plugins/crud/funcs/validateData.js";
 // policy
 export { default as checkXSS } from "./server/plugins/policy/funcs/checkXSS.js";
+export { default as checkSQL } from "./server/plugins/policy/funcs/checkSQL.js";
 // hook
 export { default as addHook } from "./server/plugins/hook/addHook.js";
 export { default as applyHook } from "./server/plugins/hook/applyHook.js";

package/package.json

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