@opengis/fastify-table 1.1.51 → 1.1.53

package/pg/funcs/getPG.js

@@ -1,30 +1,30 @@
-import pg from 'pg';
-import config from '../../config.js';
-import pgClients from '../pgClients.js';
-import init from './init.js';
-
-function getPG(param) {
-  const {
-    user, password, host, port, db, database, name: origin, funcs,
-  } = param || {};
-  // if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
-  const name = origin || db || database || param || 'client';
-  if (pgClients[name]) return pgClients[name];
-
-  const dbConfig = {
-    user: user || config.pg?.user,
-    password: password || config.pg?.password,
-    host: host || config.pg?.host,
-    port: port || config.pg?.port,
-    database: db || database || config.pg?.db || config.pg?.database,
-  };
-
-  pgClients[name] = new pg.Pool(dbConfig);
-  pgClients[name].init = async () => {
-    await init(pgClients[name]);
-  };
-  init(pgClients[name]);
-  return pgClients[name];
-}
-
-export default getPG;
+import pg from 'pg';
+import config from '../../config.js';
+import pgClients from '../pgClients.js';
+import init from './init.js';
+
+function getPG(param) {
+  const {
+    user, password, host, port, db, database, name: origin, funcs,
+  } = param || {};
+  // if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
+  const name = origin || db || database || param || 'client';
+  if (pgClients[name]) return pgClients[name];
+
+  const dbConfig = {
+    user: user || config.pg?.user,
+    password: password || config.pg?.password,
+    host: host || config.pg?.host,
+    port: port || config.pg?.port,
+    database: db || database || config.pg?.db || config.pg?.database,
+  };
+
+  pgClients[name] = new pg.Pool(dbConfig);
+  pgClients[name].init = async () => {
+    await init(pgClients[name]);
+  };
+  init(pgClients[name]);
+  return pgClients[name];
+}
+
+export default getPG;

package/pg/pgClients.js

@@ -1,20 +1,20 @@
-import pg from 'pg';
-import config from '../config.js';
-import init from './funcs/init.js';
-
-const pgClients = {};
-if (config.pg) {
-  const client = new pg.Pool({
-    host: config.pg?.host || '127.0.0.1',
-    port: config.pg?.port || 5432,
-    database: config.pg?.database || 'postgres',
-    user: config.pg?.user || 'postgres',
-    password: config.pg?.password || 'postgres',
-  });
-  client.init = async () => {
-    await init(client);
-  };
-  client.init();
-  pgClients.client = client;
-}
-export default pgClients;
+import pg from 'pg';
+import config from '../config.js';
+import init from './funcs/init.js';
+
+const pgClients = {};
+if (config.pg) {
+  const client = new pg.Pool({
+    host: config.pg?.host || '127.0.0.1',
+    port: config.pg?.port || 5432,
+    database: config.pg?.database || 'postgres',
+    user: config.pg?.user || 'postgres',
+    password: config.pg?.password || 'postgres',
+  });
+  client.init = async () => {
+    await init(client);
+  };
+  client.init();
+  pgClients.client = client;
+}
+export default pgClients;

package/policy/funcs/checkPolicy.js

@@ -1,92 +1,92 @@
-import block from './sqlInjection.js';
-
-/**
- * Middleware func
- *
- * @type function
- * @alias checkPolicy
- * @summary Функція дозволяє налаштувати доступ до сайту або API для адмін. та публічної частини веб-ресурсу
- * @param {String} path - назва апі
- * @returns {object|null} Returns object
- */
-
-export default function checkPolicy(req) {
-  const {
-    originalUrl: path, hostname, query, params, headers: hs, log, sid = 35, funcs = {},
-  } = req;
-  const user = req.user || req.session?.passport?.user;
-
-  const { config } = funcs;
-  const isUser = config.debug || !!user;
-
-  const isServer = process.argv[2];
-  const { policy = [] } = req.routeOptions?.config || {};
-
-  /*= == 0.Check superadmin access  === */
-  if (policy.includes('superadmin') && user?.user_type !== 'superadmin') {
-    log.warn('api/superadmin', {
-      path, params, query, body: JSON.stringify(req?.body || {}).substring(30), message: 'access restricted: 0',
-    });
-    return { message: 'access restricted: 0', status: 403 };
-  }
-
-  /*= == 1.File injection  === */
-  if (JSON.stringify(params || {})?.includes('../') || JSON.stringify(query || {})?.includes('../') || path?.includes('../')) {
-    log.warn('injection/file', {
-      path, params, query, message: 'access restricted: 1',
-    });
-    return { message: 'access restricted: 1', status: 403 };
-  }
-
-  /* === 1.1 File  === */
-  const allowExtPublic = ['.png', '.jpg', '.svg'];
-  const ext = path.toLowerCase().substr(-4);
-  if (path.includes('files/') && allowExtPublic.includes(ext)) return null;
-
-  /* === 2.SQL Injection policy: no-sql === */
-  if (!policy.includes('no-sql')) {
-    // skip polyline param - data filter (geometry bounds)
-    const stopWords = block.filter((el) => path.replace(query.polyline, '').includes(el));
-    if (stopWords?.length) {
-      log.warn('injection/sql', { stopWords, message: 'access restricted: 2', path });
-      return { message: 'access restricted: 2', status: 403 };
-    }
-  }
-  /* policy: skip if not API */
-  const isApi = ['/files/', '/api/format/', '/api', '/api-user/', '/logger', '/file/'].filter((el) => path.includes(el)).length;
-  if (!isApi) {
-    return null;
-  }
-
-  /* === policy: public === */
-  if (policy.includes('public')) {
-    return null;
-  }
-
-  /* === 3. policy: user === */
-  if (!user && policy.includes('user') && false) {
-    log.warn('policy/user', { message: 'access restricted: 3', path });
-    return { message: 'access restricted: 3', status: 403 };
-  }
-
-  /* === 4. policy: referer === */
-  if (!hs?.referer?.includes?.(hostname) && policy.includes('referer') && !config.local && !config.debug) {
-    log.warn('policy/referer', { message: 'access restricted: 4', uid: user?.uid });
-    return { message: 'access restricted: 4', status: 403 };
-  }
-
-  /* === 5. policy: site auth === */
-  if (!policy.includes('site') && sid === 1 && isUser && !config.local && !config.debug) {
-    log.warn('policy/site', { message: 'access restricted: 5', path, uid: user?.uid });
-    return { message: 'access restricted: 5', status: 403 };
-  }
-
-  /* === 6. base policy: block api, except login  === */
-  if (sid === 35 && !isUser && isServer && !config.local && !config.debug
-    && !path.startsWith(`${config.prefix || '/api'}/login`)) {
-    log.warn('policy/api', { message: 'access restricted: 6', path, uid: user?.uid });
-    return { message: 'access restricted: 6', status: 403 };
-  }
-
-  return null;
-}
+import block from './sqlInjection.js';
+
+/**
+ * Middleware func
+ *
+ * @type function
+ * @alias checkPolicy
+ * @summary Функція дозволяє налаштувати доступ до сайту або API для адмін. та публічної частини веб-ресурсу
+ * @param {String} path - назва апі
+ * @returns {object|null} Returns object
+ */
+
+export default function checkPolicy(req) {
+  const {
+    originalUrl: path, hostname, query, params, headers: hs, log, sid = 35, funcs = {},
+  } = req;
+  const user = req.user || req.session?.passport?.user;
+
+  const { config } = funcs;
+  const isUser = config.debug || !!user;
+
+  const isServer = process.argv[2];
+  const { policy = [] } = req.routeOptions?.config || {};
+
+  /*= == 0.Check superadmin access  === */
+  if (policy.includes('superadmin') && user?.user_type !== 'superadmin') {
+    log.warn('api/superadmin', {
+      path, params, query, body: JSON.stringify(req?.body || {}).substring(30), message: 'access restricted: 0',
+    });
+    return { message: 'access restricted: 0', status: 403 };
+  }
+
+  /*= == 1.File injection  === */
+  if (JSON.stringify(params || {})?.includes('../') || JSON.stringify(query || {})?.includes('../') || path?.includes('../')) {
+    log.warn('injection/file', {
+      path, params, query, message: 'access restricted: 1',
+    });
+    return { message: 'access restricted: 1', status: 403 };
+  }
+
+  /* === 1.1 File  === */
+  const allowExtPublic = ['.png', '.jpg', '.svg'];
+  const ext = path.toLowerCase().substr(-4);
+  if (path.includes('files/') && allowExtPublic.includes(ext)) return null;
+
+  /* === 2.SQL Injection policy: no-sql === */
+  if (!policy.includes('no-sql')) {
+    // skip polyline param - data filter (geometry bounds)
+    const stopWords = block.filter((el) => path.replace(query.polyline, '').includes(el));
+    if (stopWords?.length) {
+      log.warn('injection/sql', { stopWords, message: 'access restricted: 2', path });
+      return { message: 'access restricted: 2', status: 403 };
+    }
+  }
+  /* policy: skip if not API */
+  const isApi = ['/files/', '/api/format/', '/api', '/api-user/', '/logger', '/file/'].filter((el) => path.includes(el)).length;
+  if (!isApi) {
+    return null;
+  }
+
+  /* === policy: public === */
+  if (policy.includes('public')) {
+    return null;
+  }
+
+  /* === 3. policy: user === */
+  if (!user && policy.includes('user') && false) {
+    log.warn('policy/user', { message: 'access restricted: 3', path });
+    return { message: 'access restricted: 3', status: 403 };
+  }
+
+  /* === 4. policy: referer === */
+  if (!hs?.referer?.includes?.(hostname) && policy.includes('referer') && !config.local && !config.debug) {
+    log.warn('policy/referer', { message: 'access restricted: 4', uid: user?.uid });
+    return { message: 'access restricted: 4', status: 403 };
+  }
+
+  /* === 5. policy: site auth === */
+  if (!policy.includes('site') && sid === 1 && isUser && !config.local && !config.debug) {
+    log.warn('policy/site', { message: 'access restricted: 5', path, uid: user?.uid });
+    return { message: 'access restricted: 5', status: 403 };
+  }
+
+  /* === 6. base policy: block api, except login  === */
+  if (sid === 35 && !isUser && isServer && !config.local && !config.debug
+    && !path.startsWith(`${config.prefix || '/api'}/login`)) {
+    log.warn('policy/api', { message: 'access restricted: 6', path, uid: user?.uid });
+    return { message: 'access restricted: 6', status: 403 };
+  }
+
+  return null;
+}

package/policy/funcs/sqlInjection.js

@@ -1,33 +1,33 @@
-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;
+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/policy/index.js

@@ -1,14 +1,14 @@
-// import fp from 'fastify-plugin';
-
-import checkPolicy from './funcs/checkPolicy.js';
-
-async function plugin(fastify) {
-  fastify.addHook('preParsing', async (request, reply) => {
-    const hookData = checkPolicy(request);
-    if (hookData?.status && hookData?.message) {
-      return reply.status(hookData?.status).send(hookData.message);
-    }
-  });
-}
-
-export default plugin;
+// import fp from 'fastify-plugin';
+
+import checkPolicy from './funcs/checkPolicy.js';
+
+async function plugin(fastify) {
+  fastify.addHook('preParsing', async (request, reply) => {
+    const hookData = checkPolicy(request);
+    if (hookData?.status && hookData?.message) {
+      return reply.status(hookData?.status).send(hookData.message);
+    }
+  });
+}
+
+export default plugin;

package/redis/client.js

@@ -1,8 +1,8 @@
-import redisClients from './funcs/redisClients.js';
-import getRedis from './funcs/getRedis.js';
-
-if (!redisClients[0]) {
-  getRedis({ db: 0 });
-}
-
-export default redisClients[0];
+import redisClients from './funcs/redisClients.js';
+import getRedis from './funcs/getRedis.js';
+
+if (!redisClients[0]) {
+  getRedis({ db: 0 });
+}
+
+export default redisClients[0];

package/redis/funcs/getRedis.js

@@ -1,23 +1,23 @@
-import Redis from 'ioredis';
-import config from '../../config.js';
-import redisClients from './redisClients.js';
-
-function getRedis({ db } = { db: 0 }) {
-  if (!config.redis) return null;
-  if (redisClients[db]) return redisClients[db];
-
-  const redisConfig = {
-    db,
-    keyPrefix: `${config.db}:`,
-    host: config.redis?.host || '127.0.0.1',
-    port: config.redis?.port || 6379, // Redis port
-    family: 4, // 4 (IPv4) or 6 (IPv6)
-    closeClient: true,
-  };
-
-  redisClients[db] = new Redis(redisConfig);
-
-  return redisClients[db];
-}
-
-export default getRedis;
+import Redis from 'ioredis';
+import config from '../../config.js';
+import redisClients from './redisClients.js';
+
+function getRedis({ db } = { db: 0 }) {
+  if (!config.redis) return null;
+  if (redisClients[db]) return redisClients[db];
+
+  const redisConfig = {
+    db,
+    keyPrefix: `${config.db}:`,
+    host: config.redis?.host || '127.0.0.1',
+    port: config.redis?.port || 6379, // Redis port
+    family: 4, // 4 (IPv4) or 6 (IPv6)
+    closeClient: true,
+  };
+
+  redisClients[db] = new Redis(redisConfig);
+
+  return redisClients[db];
+}
+
+export default getRedis;

package/redis/funcs/redisClients.js

@@ -1,2 +1,2 @@
-const redisClients = {};
-export default redisClients;
+const redisClients = {};
+export default redisClients;

package/redis/index.js

@@ -1,19 +1,19 @@
-// import client from './client.js';
-import getRedis from './funcs/getRedis.js';
-// import client from './funcs/redisClients.js';
-
-function close(fastify) {
-  fastify.rclient.quit();
-  // fastify.rclient2.quit();
-}
-
-async function plugin(fastify) {
-  const client = getRedis({ db: 0, funcs: fastify });
-  client.getJSON = client.get;
-  fastify.decorate('rclient', client);
-  fastify.decorate('getRedis', getRedis);
-  // fastify.decorate('rclient2', client2);
-  fastify.addHook('onClose', close);
-}
-
-export default plugin;
+// import client from './client.js';
+import getRedis from './funcs/getRedis.js';
+// import client from './funcs/redisClients.js';
+
+function close(fastify) {
+  fastify.rclient.quit();
+  // fastify.rclient2.quit();
+}
+
+async function plugin(fastify) {
+  const client = getRedis({ db: 0, funcs: fastify });
+  client.getJSON = client.get;
+  fastify.decorate('rclient', client);
+  fastify.decorate('getRedis', getRedis);
+  // fastify.decorate('rclient2', client2);
+  fastify.addHook('onClose', close);
+}
+
+export default plugin;

package/server/migrations/0.sql

@@ -1,78 +1,78 @@
--- fix error if function exists and return type not text i.e bigint
-
-do $$
-
-declare
-m record;
-_pk text;
-_tables json;
-_returnType text;
-
-begin
-
-select format_type(p.prorettype, null) as return_type
-from pg_proc p
-where p.proname = 'next_id'
-and p.pronamespace = 'public'::regnamespace into _returnType;
-
-if (_returnType != 'text') then
-	raise notice 'default reassign start: % -> text', _returnType;
-
-	CREATE EXTENSION if not exists "uuid-ossp";
-
-	SELECT json_object_agg(a.attrelid::regclass, a.attname)
-	FROM   pg_catalog.pg_attribute    a
-	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
-	AND    a.attnum   > 0               -- no system columns
-	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'drop default: %,%', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
-	end loop;
-
-	DROP FUNCTION IF EXISTS next_id();
-
-	CREATE EXTENSION if not exists "uuid-ossp";
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    return replace(uuid_generate_v4()::text, '-', '');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'reassign default: %, %', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
-	end loop;
-
-	raise notice 'reassign default finish: %', _tables;
-	
-else 
-	raise notice 'skip default reassign';
-
-		CREATE EXTENSION if not exists "uuid-ossp";
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    return replace(uuid_generate_v4()::text, '-', '');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-end if;
-
-end $$
+-- fix error if function exists and return type not text i.e bigint
+
+do $$
+
+declare
+m record;
+_pk text;
+_tables json;
+_returnType text;
+
+begin
+
+select format_type(p.prorettype, null) as return_type
+from pg_proc p
+where p.proname = 'next_id'
+and p.pronamespace = 'public'::regnamespace into _returnType;
+
+if (_returnType != 'text') then
+	raise notice 'default reassign start: % -> text', _returnType;
+
+	CREATE EXTENSION if not exists "uuid-ossp";
+
+	SELECT json_object_agg(a.attrelid::regclass, a.attname)
+	FROM   pg_catalog.pg_attribute    a
+	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
+	AND    a.attnum   > 0               -- no system columns
+	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'drop default: %,%', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
+	end loop;
+
+	DROP FUNCTION IF EXISTS next_id();
+
+	CREATE EXTENSION if not exists "uuid-ossp";
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    return replace(uuid_generate_v4()::text, '-', '');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'reassign default: %, %', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
+	end loop;
+
+	raise notice 'reassign default finish: %', _tables;
+	
+else 
+	raise notice 'skip default reassign';
+
+		CREATE EXTENSION if not exists "uuid-ossp";
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    return replace(uuid_generate_v4()::text, '-', '');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+end if;
+
+end $$