@opengis/fastify-table 2.5.73 → 2.6.0

package/dist/server/plugins/auth/funcs/jwt.d.ts

@@ -1,7 +1,7 @@
 export declare function scryptHash(code: string): Promise<string>;
 export declare function scryptVerify(stored: string, code: string): Promise<boolean>;
-export declare function sign(uid: string, secret: string, exp?: number, scopes?: string[]): string;
-export declare function verify(token: string, secret: string, scope?: string): {
+export declare function sign(uid: string, secret?: string, exp?: number, scopes?: string[]): string;
+export declare function verify(token: string, secret?: string, scope?: string): {
     valid: boolean;
     error: string;
     payload?: undefined;

package/dist/server/plugins/auth/funcs/jwt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/jwt.ts"],"names":[],"mappings":"AAkBA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,mBAI5C;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,oBAI9D;AAED,wBAAgB,IAAI,CAClB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,GAAG,SAAQ,EACX,MAAM,CAAC,EAAE,MAAM,EAAE,UAuBlB;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;EA+CnE;;AAED,wBAAoB"}
+{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/jwt.ts"],"names":[],"mappings":"AAgBA,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,mBAI5C;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,oBAI9D;AAED,wBAAgB,IAAI,CAClB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,GAAG,SAAQ,EACX,MAAM,CAAC,EAAE,MAAM,EAAE,UA8BlB;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;EAmDpE;;AAED,wBAAoB"}

package/dist/server/plugins/auth/funcs/jwt.js

@@ -2,7 +2,7 @@ import { createHmac, scrypt, randomBytes } from "node:crypto";
 import util from "node:util";
 import config from "../../../../config.js";
 const scryptAsync = util.promisify(scrypt);
-const { jwtSecret = "65450754381cfaf768eeb4bb33326529b48a40ffdb6e15d84dc224dff527166f", } = config.auth || {};
+const { jwtSecret } = config.auth || {};
 const jwtHeader = Buffer.from(JSON.stringify({
     alg: "HS256",
     type: "JWT",
@@ -18,13 +18,18 @@ export async function scryptVerify(stored, code) {
     return keyHex === derived.toString("hex");
 }
 export function sign(uid, secret, exp = 90000, scopes) {
-    if (typeof uid !== "string")
+    if (!secret && !jwtSecret) {
+        throw new Error("environment variable auth.jwtSecret not set");
+    }
+    if (typeof uid !== "string") {
         throw new Error("uid must be a string");
+    }
     if (secret && typeof secret !== "string") {
         throw new Error("secret must be a string");
     }
-    if (typeof exp !== "number")
+    if (typeof exp !== "number") {
         throw new Error("exp must be a number");
+    }
     const jwtPayload = Buffer.from(JSON.stringify({
         uid,
         scopes,
@@ -38,6 +43,9 @@ export function sign(uid, secret, exp = 90000, scopes) {
     return `${jwtEncrypted}.${signature}`;
 }
 export function verify(token, secret, scope) {
+    if (!secret && !jwtSecret) {
+        throw new Error("environment variable auth.jwtSecret not set");
+    }
     if (!token) {
         return { valid: false, error: "not enough params: token" };
     }

package/dist/server/plugins/auth/funcs/verifyPassword.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verifyPassword.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/verifyPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAYpD,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;eA6CA"}
+{"version":3,"file":"verifyPassword.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/auth/funcs/verifyPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWpD,wBAA8B,cAAc,CAAC,EAC3C,EAAE,EACF,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;;;;;;eAuCA"}

package/dist/server/plugins/auth/funcs/verifyPassword.js

@@ -33,12 +33,6 @@ export default async function verifyPassword({ pg, username, password, }) {
     }
     hash = crypt(hash, json.salt);
     if (json.password === hash) {
-        if (username === "admin" && password === "admin") {
-            await pg.query("update admin.users set password=$2 where uid=$1", [
-                json.uid,
-                config.adminPassword || "6Z4gu2mG8R",
-            ]);
-        }
         return { user: json };
     }
     return { message: "Wrong password" };

package/dist/server/plugins/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBAoIxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAYxD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAYtD,wBAAsB,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,iBAiIxE;AAED,iBAAS,MAAM,CAAC,OAAO,EAAE,eAAe,QAmCvC;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/auth/index.js

@@ -6,8 +6,12 @@ import RedisStore from "fastify-session-redis-store";
 import config from "../../../config.js";
 import getRedis from "../redis/funcs/getRedis.js";
 import { ForbiddenError } from "../../../errors.js";
-const fastifyPassport = new Authenticator();
 const { prefix = "/api" } = config;
+const { secret } = config.auth || {};
+if (!secret) {
+    throw new Error("environment variable auth.secret not set");
+}
+const fastifyPassport = new Authenticator();
 export async function onRequest(req, reply) {
     const { hostname, headers, routeOptions } = req;
     const { config: routeConfig, method, handler, url } = routeOptions || {};
@@ -22,10 +26,7 @@ export async function onRequest(req, reply) {
         ? !!req.headers?.uid &&
             (process.env.NODE_ENV === "test" || process.env.VITEST)
         : undefined;
-    const validToken = (req.ip === "193.239.152.181" ||
-        req.ip === "127.0.0.1" ||
-        req.ip?.startsWith?.("192.168.") ||
-        config.debug) &&
+    const validToken = (req.ip === "127.0.0.1" || config.debug) &&
         (debugAuth ||
             (req.headers?.token && config.auth?.tokens?.includes?.(headers.token)));
     if (validToken && !req?.user?.uid) {
@@ -126,7 +127,7 @@ function plugin(fastify) {
         parseOptions: config?.auth?.cookieOptions || { secure: false },
     });
     fastify.register(session, {
-        secret: config?.auth?.secret || "61b820e12858570a4b0633020d4394a17903d9a9",
+        secret: secret,
         cookieName: "session_auth",
         cookie: config?.auth?.cookieOptions || { secure: false },
         store: new RedisStore({

package/dist/server/plugins/logger/checkUserAccess.js

@@ -1,13 +1,13 @@
 import config from "../../../config.js";
 import { ForbiddenError } from "../../../errors.js";
-const { accessToken = "0NWcGQxKRP8AsRxD" } = config.auth || {};
+const { accessToken } = config.auth || {};
 /**
  *
  * @summary check user access to logger interface - per admin user type or user group
  * @returns {Object} message, status
  */
 export default function checkUserAccess({ user, token, }) {
-    if (token && token === accessToken) {
+    if (token && accessToken && token === accessToken) {
         return null;
     }
     // console.log(user);

package/dist/server/plugins/pg/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AAkCA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAwB3B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/pg/index.ts"],"names":[],"mappings":"AA+BA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QAwB3B;AAED,eAAe,MAAM,CAAC"}

package/dist/server/plugins/pg/index.js

@@ -13,10 +13,7 @@ function close() {
 async function getHeadersPG(req) {
     if (!req.headers?.token)
         return null;
-    const validToken = (req.ip === "193.239.152.181" ||
-        req.ip === "127.0.0.1" ||
-        req.ip.startsWith("192.168.") ||
-        config.debug) &&
+    const validToken = (req.ip === "127.0.0.1" || config.debug) &&
         req.headers?.token &&
         config.auth?.tokens?.includes?.(req.headers.token);
     if (validToken && typeof req.headers?.db === "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.5.73",
+  "version": "2.6.0",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -96,4 +96,4 @@
   },
   "author": "Softpro",
   "license": "ISC"
-}
+}