@grandlinex/kernel 0.27.1 → 0.28.1

package/dist/KernelModule.js

@@ -23,11 +23,11 @@ class KernelModule extends BaseKernelModule_1.default {
         super('base-mod', kernel);
         this.addAction(new ApiVersionAction_1.default(this), new ApiAuthTestAction_1.default(this), new GetTokenAction_1.default(this));
         this.addService(new core_1.OfflineService(this));
+        const endpoint = new KernelEndpoint_1.default('api', this, this.getKernel().getAppServerPort());
+        this.setPresenter(endpoint);
     }
     initModule() {
         return __awaiter(this, void 0, void 0, function* () {
-            const endpoint = new KernelEndpoint_1.default('api', this, this.getKernel().getAppServerPort());
-            this.setPresenter(endpoint);
             yield this.getKernel().triggerFunction('load');
         });
     }

package/dist/classes/BaseAction.js

@@ -46,12 +46,15 @@ class BaseAction extends core_1.CoreAction {
             }
             const dat = yield cc.bearerTokenValidation(req);
             auth.stop();
-            if (dat) {
+            if (dat && typeof dat !== 'number') {
                 yield this.handler(req, res, next, dat, extension);
             }
             else if (this.mode === ActionMode.DMZ_WITH_USER) {
                 yield this.handler(req, res, next, null, extension);
             }
+            else if (dat) {
+                res.sendStatus(dat);
+            }
             else {
                 res.status(401).send('no no no ...');
             }

package/dist/classes/BaseAuthProvider.d.ts

@@ -1,12 +1,9 @@
+import { JwtPayload } from 'jsonwebtoken';
 import { XRequest } from '../lib/express';
-export interface JwtTokenData {
+export interface JwtToken extends JwtPayload {
     username: string;
     userid: string;
 }
-export interface JwtToken extends JwtTokenData {
-    exp: number;
-    iat: number;
-}
 export type AuthResult = {
     valid: boolean;
     userId: string | null;
@@ -14,10 +11,10 @@ export type AuthResult = {
 export interface IAuthProvider {
     authorizeToken(userid: string, token: string, requestType: string): Promise<AuthResult>;
     validateAccess(token: JwtToken, requestType: string): Promise<boolean>;
-    bearerTokenValidation(req: XRequest): Promise<JwtToken | null>;
+    bearerTokenValidation(req: XRequest): Promise<JwtToken | number>;
 }
 export default abstract class BaseAuthProvider implements IAuthProvider {
     abstract authorizeToken(username: string, token: string, requestType: string): Promise<AuthResult>;
     abstract validateAccess(token: JwtToken, requestType: string): Promise<boolean>;
-    abstract bearerTokenValidation(req: XRequest): Promise<JwtToken | null>;
+    abstract bearerTokenValidation(req: XRequest): Promise<JwtToken | number>;
 }

package/dist/classes/BaseEndpoint.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import express from 'express';
+import express, { Express } from 'express';
 import http from 'http';
 import { CorePresenter, IDataBase } from '@grandlinex/core';
 import { IBaseCache, IBaseClient, IBaseKernelModule, IBasePresenter, IKernel } from '../lib';
@@ -11,6 +11,7 @@ export default abstract class BaseEndpoint<K extends IKernel = IKernel, T extend
     protected httpServer: http.Server;
     protected port: number;
     constructor(chanel: string, module: IBaseKernelModule<any, any, any, any>, port: number);
+    appServerOverride(app: Express): void;
     start(): Promise<boolean>;
     stop(): Promise<boolean>;
     getApp(): express.Express;

package/dist/classes/BaseEndpoint.js

@@ -9,7 +9,10 @@ const http_1 = __importDefault(require("http"));
 const body_parser_1 = require("body-parser");
 const core_1 = require("@grandlinex/core");
 function keepRawBody(req, res, buf, encoding) {
-    if (buf && buf.length) {
+    var _a;
+    if (((_a = req.headers['content-type']) === null || _a === void 0 ? void 0 : _a.startsWith('application/json')) &&
+        buf &&
+        buf.length) {
         try {
             req.rawBody = buf.toString(encoding || 'utf8');
         }
@@ -27,6 +30,10 @@ class BaseEndpoint extends core_1.CorePresenter {
         this.appServer.use((0, body_parser_1.json)({ verify: keepRawBody }));
         this.httpServer = http_1.default.createServer(this.appServer);
     }
+    appServerOverride(app) {
+        this.appServer = app;
+        this.httpServer = http_1.default.createServer(this.appServer);
+    }
     start() {
         return new Promise((resolve) => {
             this.httpServer

package/dist/lib/index.d.ts

@@ -1,21 +1,21 @@
 import { ICoreAction, ICoreBridge, ICoreCache, ICoreCClient, ICoreClient, ICoreElement, ICoreKernel, ICoreKernelModule, ICorePresenter, ICoreService, IDataBase } from '@grandlinex/core';
 import express from 'express';
+import { JwtPayload } from 'jsonwebtoken';
 import { IAuthProvider, JwtToken } from '../classes/BaseAuthProvider';
 import { IExtensionInterface } from '../classes/timing/ExpressServerTiming';
 import { XNextFc, XRequest, XResponse } from './express';
 export type ActionTypes = 'POST' | 'GET' | 'USE' | 'PATCH' | 'DELETE';
 export interface ICClient extends ICoreCClient {
     setAuthProvider(provider: IAuthProvider): boolean;
-    jwtVerifyAccessToken(token: string): Promise<JwtToken | null>;
-    jwtGenerateAccessToken(data: {
-        username: string;
-    }): string;
+    jwtVerifyAccessToken(token: string): Promise<JwtToken | number>;
+    jwtDecodeAccessToken(token: string): JwtPayload | null;
+    jwtGenerateAccessToken(data: JwtToken, expire?: string | number): string;
     apiTokenValidation(username: string, token: string, requestType: string): Promise<{
         valid: boolean;
         userId: string | null;
     }>;
     permissionValidation(token: JwtToken, requestType: string): Promise<boolean>;
-    bearerTokenValidation(req: XRequest): Promise<JwtToken | null>;
+    bearerTokenValidation(req: XRequest): Promise<JwtToken | number>;
 }
 export interface IKernel extends ICoreKernel<ICClient> {
     getAppServerPort(): number;

package/dist/modules/crypto/CryptoClient.d.ts

@@ -1,6 +1,7 @@
+import { JwtPayload } from 'jsonwebtoken';
 import { CoreCryptoClient } from '@grandlinex/core';
 import { ICClient, IKernel } from '../../lib';
-import { IAuthProvider, JwtToken, JwtTokenData } from '../../classes/BaseAuthProvider';
+import { IAuthProvider, JwtToken } from '../../classes/BaseAuthProvider';
 import { XRequest } from '../../lib/express';
 export default class CryptoClient extends CoreCryptoClient implements ICClient {
     protected authProvider: IAuthProvider | null;
@@ -8,12 +9,13 @@ export default class CryptoClient extends CoreCryptoClient implements ICClient {
     protected expiresIn: string;
     constructor(key: string, kernel: IKernel);
     setAuthProvider(provider: IAuthProvider): boolean;
-    jwtVerifyAccessToken(token: string): Promise<JwtToken | null>;
-    jwtGenerateAccessToken(data: JwtTokenData): string;
+    jwtVerifyAccessToken(token: string): Promise<JwtToken | number>;
+    jwtDecodeAccessToken(token: string): JwtPayload | null;
+    jwtGenerateAccessToken(data: JwtToken, expire?: string | number): string;
     apiTokenValidation(username: string, token: string, requestType: string): Promise<{
         valid: boolean;
         userId: string | null;
     }>;
     permissionValidation(token: JwtToken, requestType: string): Promise<boolean>;
-    bearerTokenValidation(req: XRequest): Promise<JwtToken | null>;
+    bearerTokenValidation(req: XRequest): Promise<JwtToken | number>;
 }

package/dist/modules/crypto/CryptoClient.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,11 +31,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const jsonwebtoken_1 = __importStar(require("jsonwebtoken"));
 const core_1 = require("@grandlinex/core");
 class CryptoClient extends core_1.CoreCryptoClient {
     constructor(key, kernel) {
@@ -31,8 +51,11 @@ class CryptoClient extends core_1.CoreCryptoClient {
     jwtVerifyAccessToken(token) {
         return new Promise((resolve) => {
             jsonwebtoken_1.default.verify(token, this.AesKey, (err, user) => {
-                if (err || user === null) {
-                    resolve(null);
+                if (err instanceof jsonwebtoken_1.TokenExpiredError) {
+                    resolve(498);
+                }
+                else if (err || user === null) {
+                    resolve(403);
                 }
                 else {
                     resolve(user);
@@ -40,8 +63,11 @@ class CryptoClient extends core_1.CoreCryptoClient {
             });
         });
     }
-    jwtGenerateAccessToken(data) {
-        return jsonwebtoken_1.default.sign(data, this.AesKey, { expiresIn: this.expiresIn });
+    jwtDecodeAccessToken(token) {
+        return jsonwebtoken_1.default.decode(token, { json: true });
+    }
+    jwtGenerateAccessToken(data, expire) {
+        return jsonwebtoken_1.default.sign(data, this.AesKey, { expiresIn: expire !== null && expire !== void 0 ? expire : this.expiresIn });
     }
     apiTokenValidation(username, token, requestType) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -49,10 +75,12 @@ class CryptoClient extends core_1.CoreCryptoClient {
                 return this.authProvider.authorizeToken(username, token, requestType);
             }
             const store = this.kernel.getConfigStore();
+            const cc = this.kernel.getCryptoClient();
             if (!store.has('SERVER_PASSWORD')) {
                 return { valid: false, userId: null };
             }
-            if (token === store.get('SERVER_PASSWORD') && username === 'admin') {
+            if ((cc === null || cc === void 0 ? void 0 : cc.timeSavePWValidation(token, store.get('SERVER_PASSWORD') || '')) ||
+                (token === store.get('SERVER_PASSWORD') && username === 'admin')) {
                 return {
                     valid: true,
                     userId: 'admin',
@@ -79,14 +107,14 @@ class CryptoClient extends core_1.CoreCryptoClient {
             }
             const authHeader = req.headers.authorization;
             const token = authHeader && authHeader.split(' ')[1];
-            if (token == null) {
-                return null;
+            if (!token) {
+                return 401;
             }
             const tokenData = yield this.jwtVerifyAccessToken(token);
             if (tokenData) {
                 return tokenData;
             }
-            return null;
+            return 403;
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grandlinex/kernel",
-  "version": "0.27.1",
+  "version": "0.28.1",
   "description": "GrandLineX is an out-of-the-box server framework on top of ExpressJs.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@grandlinex/core": "0.27.0",
+    "@grandlinex/core": "0.28.0",
     "axios": "0.27.2",
     "body-parser": "1.20.1",
     "express": "4.18.2",