@opengis/fastify-table 1.1.9 → 1.1.11

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('onRequest', 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('onRequest', 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/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 $$

package/server/migrations/properties.sql

@@ -1,31 +1,31 @@
-create schema if not exists admin;
-
--- DROP TABLE admin.properties;
-CREATE TABLE IF NOT EXISTS admin.properties();
-ALTER TABLE admin.properties DROP CONSTRAINT IF EXISTS admin_properties_property_id_pkey;
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
-
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_entity text;
-COMMENT ON COLUMN admin.properties.property_entity IS 'Сутність';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_key text;
-COMMENT ON COLUMN admin.properties.property_key IS 'Ключ';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_text text;
-COMMENT ON COLUMN admin.properties.property_text IS 'Текстове значення налаштування';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_int integer;
-COMMENT ON COLUMN admin.properties.property_int IS 'Цілочислове значения';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_json json;
-COMMENT ON COLUMN admin.properties.property_json IS 'Значення налаштування';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS level text;
-COMMENT ON COLUMN admin.properties.level IS 'Рівень (user/system)';
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS object_id text;
-COMMENT ON COLUMN admin.properties.object_id IS 'ID Об''єкту';
-
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS editor_id text;
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
-ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS files json;
-
-ALTER TABLE admin.properties ADD CONSTRAINT admin_properties_property_id_pkey PRIMARY KEY(property_id);
-
+create schema if not exists admin;
+
+-- DROP TABLE admin.properties;
+CREATE TABLE IF NOT EXISTS admin.properties();
+ALTER TABLE admin.properties DROP CONSTRAINT IF EXISTS admin_properties_property_id_pkey;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_id text NOT NULL DEFAULT next_id();
+
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_entity text;
+COMMENT ON COLUMN admin.properties.property_entity IS 'Сутність';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_key text;
+COMMENT ON COLUMN admin.properties.property_key IS 'Ключ';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_text text;
+COMMENT ON COLUMN admin.properties.property_text IS 'Текстове значення налаштування';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_int integer;
+COMMENT ON COLUMN admin.properties.property_int IS 'Цілочислове значения';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS property_json json;
+COMMENT ON COLUMN admin.properties.property_json IS 'Значення налаштування';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS level text;
+COMMENT ON COLUMN admin.properties.level IS 'Рівень (user/system)';
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS object_id text;
+COMMENT ON COLUMN admin.properties.object_id IS 'ID Об''єкту';
+
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS uid text NOT NULL DEFAULT '1'::text;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS editor_id text;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS editor_date timestamp without time zone;
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS cdate timestamp without time zone DEFAULT now();
+ALTER TABLE admin.properties ADD COLUMN IF NOT EXISTS files json;
+
+ALTER TABLE admin.properties ADD CONSTRAINT admin_properties_property_id_pkey PRIMARY KEY(property_id);
+
 COMMENT ON TABLE admin.properties IS 'Налаштування';