npm - @nymphjs/server - Versions diffs - 1.0.0-beta.23 → 1.0.0-beta.25 - Mend

@nymphjs/server 1.0.0-beta.23 → 1.0.0-beta.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/testArtifacts.d.ts CHANGED Viewed

@@ -55,4 +55,49 @@ export declare class Employee extends Entity<EmployeeData> {
     static throwErrorStatic(): Promise<any>;
     static inaccessibleMethod(): Promise<any>;
 }
-export default Employee;
+export type RestrictedModelData = {
+    name: string;
+};
+export declare class RestrictedModel extends EntityServer<RestrictedModelData> {
+    static ETYPE: string;
+    static class: string;
+    static restEnabled: boolean;
+    static factory(guid?: string): Promise<RestrictedModel & RestrictedModelData>;
+    static factorySync(guid?: string): RestrictedModel & RestrictedModelData;
+    constructor(guid?: string);
+    $save(): Promise<boolean>;
+    $testMethod(value: string): string;
+    static testStatic(value: number): number;
+}
+export type RestrictedData = {
+    name: string;
+};
+export declare class Restricted extends Entity<RestrictedData> {
+    static class: string;
+    constructor(guid?: string);
+    static factory(guid?: string): Promise<Restricted & RestrictedData>;
+    static factorySync(guid?: string): Restricted & RestrictedData;
+    $testMethod(value: number): Promise<any>;
+    static testStatic(value: number): Promise<any>;
+}
+export type PubSubDisabledModelData = {
+    name: string;
+};
+export declare class PubSubDisabledModel extends EntityServer<PubSubDisabledModelData> {
+    static ETYPE: string;
+    static class: string;
+    static pubSubEnabled: boolean;
+    static factory(guid?: string): Promise<PubSubDisabledModel & PubSubDisabledModelData>;
+    static factorySync(guid?: string): PubSubDisabledModel & PubSubDisabledModelData;
+    constructor(guid?: string);
+    $save(): Promise<boolean>;
+}
+export type PubSubDisabledData = {
+    name: string;
+};
+export declare class PubSubDisabled extends Entity<PubSubDisabledData> {
+    static class: string;
+    constructor(guid?: string);
+    static factory(guid?: string): Promise<PubSubDisabled & PubSubDisabledData>;
+    static factorySync(guid?: string): PubSubDisabled & PubSubDisabledData;
+}

package/dist/testArtifacts.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Employee = exports.BadFunctionCallError = exports.EmployeeModel = void 0;
+exports.PubSubDisabled = exports.PubSubDisabledModel = exports.Restricted = exports.RestrictedModel = exports.Employee = exports.BadFunctionCallError = exports.EmployeeModel = void 0;
 const nymph_1 = require("@nymphjs/nymph");
 const client_1 = require("@nymphjs/client");
 const HttpError_1 = require("./HttpError");
@@ -49,10 +49,10 @@ class EmployeeModel extends nymph_1.Entity {
     }
     async $save() {
         const error = new nymph_1.EntityInvalidDataError('Invalid entity data.');
-        if (this.$data.name == null || this.$data.name == '') {
+        if (this.$data.name == null || this.$data.name === '') {
             error.addField('name');
         }
-        if (this.$data.title == null || this.$data.title == '') {
+        if (this.$data.title == null || this.$data.title === '') {
             error.addField('title');
         }
         if (this.$data.startDate == null) {
@@ -146,5 +146,104 @@ class Employee extends client_1.Entity {
 }
 Employee.class = 'Employee';
 exports.Employee = Employee;
-exports.default = Employee;
+class RestrictedModel extends nymph_1.Entity {
+    static async factory(guid) {
+        return (await super.factory(guid));
+    }
+    static factorySync(guid) {
+        return super.factorySync(guid);
+    }
+    constructor(guid) {
+        super(guid);
+        if (this.guid == null) {
+            this.$data.name = '';
+        }
+    }
+    async $save() {
+        const error = new nymph_1.EntityInvalidDataError('Invalid entity data.');
+        if (this.$data.name == null || this.$data.name === '') {
+            error.addField('name');
+        }
+        if (error.getFields().length) {
+            throw error;
+        }
+        return await super.$save();
+    }
+    $testMethod(value) {
+        return value;
+    }
+    static testStatic(value) {
+        return value;
+    }
+}
+RestrictedModel.ETYPE = 'restricted';
+RestrictedModel.class = 'Restricted';
+RestrictedModel.restEnabled = false;
+exports.RestrictedModel = RestrictedModel;
+class Restricted extends client_1.Entity {
+    constructor(guid) {
+        super(guid);
+        if (guid == null) {
+            this.$data.name = '';
+        }
+    }
+    static async factory(guid) {
+        return (await super.factory(guid));
+    }
+    static factorySync(guid) {
+        return super.factorySync(guid);
+    }
+    $testMethod(value) {
+        return this.$serverCall('$testMethod', [value]);
+    }
+    static testStatic(value) {
+        return this.serverCallStatic('testStatic', [value]);
+    }
+}
+Restricted.class = 'Restricted';
+exports.Restricted = Restricted;
+class PubSubDisabledModel extends nymph_1.Entity {
+    static async factory(guid) {
+        return (await super.factory(guid));
+    }
+    static factorySync(guid) {
+        return super.factorySync(guid);
+    }
+    constructor(guid) {
+        super(guid);
+        if (guid == null) {
+            this.$data.name = '';
+        }
+    }
+    async $save() {
+        const error = new nymph_1.EntityInvalidDataError('Invalid entity data.');
+        if (this.$data.name == null || this.$data.name === '') {
+            error.addField('name');
+        }
+        if (error.getFields().length) {
+            throw error;
+        }
+        return await super.$save();
+    }
+}
+PubSubDisabledModel.ETYPE = 'pubsub_disabled';
+PubSubDisabledModel.class = 'PubSubDisabled';
+PubSubDisabledModel.pubSubEnabled = false;
+exports.PubSubDisabledModel = PubSubDisabledModel;
+class PubSubDisabled extends client_1.Entity {
+    constructor(guid) {
+        super(guid);
+        if (guid == null) {
+            this.$data.name = '';
+        }
+    }
+    static async factory(guid) {
+        return (await super.factory(guid));
+    }
+    static factorySync(guid) {
+        return super.factorySync(guid);
+    }
+}
+PubSubDisabled.class = 'PubSubDisabled';
+exports.PubSubDisabled = PubSubDisabled;
 //# sourceMappingURL=testArtifacts.js.map

package/dist/testArtifacts.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"testArtifacts.js","sourceRoot":"","sources":["../src/testArtifacts.ts"],"names":[],"mappings":";;;AAAA,0CAAgF;AAChF,4CAAyC;AAEzC,2CAAwC;AAsBxC,MAAM,UAAU,GAAG,IAAI,CAAC;AAKxB,MAAa,aAAc,SAAQ,cAA+B;IA6BhE,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,IAAa;QAEb,OAAO,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAsC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAa;QAC9B,OAAO,KAAK,CAAC,WAAW,CAAC,IAAI,CAAsC,CAAC;IACtE,CAAC;IAED,YAAY,IAAa;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QApCJ,0BAAqB,GAAG;YAChC,sBAAsB;YACtB,aAAa;YACb,aAAa;YACb,iBAAiB;YACjB,gCAAgC;SACjC,CAAC;QAEQ,mBAAc,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9B,mBAAc,GAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACxC,mBAAc,GAAI;YAC1B,MAAM;YACN,IAAI;YACJ,OAAO;YACP,YAAY;YACZ,cAAc;YACd,QAAQ;YACR,SAAS;YACT,WAAW;YACX,SAAS;YACT,OAAO;YACP,SAAS;YACT,UAAU;SACX,CAAC;QAeA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;YACrB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,EAAE;gBACf,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAClC;SACF;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAEhB,MAAM,KAAK,GAAG,IAAI,8BAAsB,CAAC,sBAAsB,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,~~IAAI~~,EAAE,EAAE;~~YACpD~~,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SACxB;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,~~IAAI~~,EAAE,EAAE;~~YACtD~~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~~AAuDrB~~,~~kBAAe~~,QAAQ,CAAC"}
1	+ {"version":3,"file":"testArtifacts.js","sourceRoot":"","sources":["../src/testArtifacts.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nymphjs/server",
-  "version": "1.0.0-beta.23",
+  "version": "1.0.0-beta.25",
   "description": "NymphJS - REST Server",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -31,14 +31,14 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/nymph": "^1.0.0-beta.23",
+    "@nymphjs/nymph": "^1.0.0-beta.25",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2"
   },
   "devDependencies": {
-    "@nymphjs/client": "^1.0.0-beta.23",
-    "@nymphjs/client-node": "^1.0.0-beta.23",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.23",
+    "@nymphjs/client": "^1.0.0-beta.25",
+    "@nymphjs/client-node": "^1.0.0-beta.25",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.25",
     "@tsconfig/recommended": "^1.0.2",
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.17",
@@ -47,5 +47,5 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5.0.4"
   },
-  "gitHead": "e993c62b64051f9426eae2f8e629495e50bd97f9"
+  "gitHead": "a2466847d9be48ef3d69182bbc081a6ec24f2a42"
 }

package/src/createServer.ts CHANGED Viewed

@@ -24,6 +24,14 @@ type NymphResponse = Response<any, { nymph: Nymph }>;
 const NOT_FOUND_ERROR = 'Entity is not found.';
+export class ForbiddenClassError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'ForbiddenClassError';
+  }
+}
 /**
  * A REST server middleware creator for Nymph.
  *
@@ -140,6 +148,10 @@ export function createServer(
         let EntityClass;
         try {
           EntityClass = response.locals.nymph.getEntityClass(data[0].class);
+          if (!EntityClass.restEnabled) {
+            httpError(response, 403);
+            return;
+          }
         } catch (e: any) {
           httpError(response, 400, e);
           return;
@@ -147,10 +159,21 @@ export function createServer(
         options.class = EntityClass;
         options.source = 'client';
         options.skipAc = false;
-        selectors = classNamesToEntityConstructors(
-          response.locals.nymph,
-          selectors
-        );
+        try {
+          selectors = classNamesToEntityConstructors(
+            response.locals.nymph,
+            selectors,
+            true
+          );
+        } catch (e: any) {
+          if (e?.message === 'Not accessible.') {
+            httpError(response, 403);
+            return;
+          } else {
+            httpError(response, 500, e);
+            return;
+          }
+        }
         let result:
           | EntityInterface
           | EntityInterface[]
@@ -241,6 +264,7 @@ export function createServer(
         let invalidRequest = false;
         let conflict = false;
         let notfound = false;
+        let forbidden = false;
         let lastException = null;
         for (let entData of data) {
           if (entData.guid) {
@@ -254,6 +278,8 @@ export function createServer(
           } catch (e: any) {
             if (e instanceof EntityConflictError) {
               conflict = true;
+            } else if (e instanceof ForbiddenClassError) {
+              forbidden = true;
             } else if (e.message === NOT_FOUND_ERROR) {
               notfound = true;
             } else if (e instanceof InvalidParametersError) {
@@ -293,6 +319,9 @@ export function createServer(
           } else if (conflict) {
             httpError(response, 409);
             return;
+          } else if (forbidden) {
+            httpError(response, 403);
+            return;
           } else if (notfound) {
             httpError(response, 404);
             return;
@@ -313,92 +342,108 @@ export function createServer(
           httpError(response, 400);
           return;
         }
-        const params = referencesToEntities(
-          [...data.params],
-          response.locals.nymph
-        );
-        if (data.static) {
-          let EntityClass: EntityConstructor;
-          try {
-            EntityClass = response.locals.nymph.getEntityClass(data.class);
-          } catch (e: any) {
-            httpError(response, 400);
-            return;
-          }
-          if (
-            EntityClass.clientEnabledStaticMethods.indexOf(data.method) === -1
-          ) {
-            httpError(response, 403);
-            return;
-          }
-          if (!(data.method in EntityClass)) {
-            httpError(response, 400);
-            return;
-          }
-          // @ts-ignore Dynamic methods make TypeScript sad.
-          const method: Function = EntityClass[data.method];
-          if (typeof method !== 'function') {
-            httpError(response, 400);
-            return;
-          }
-          try {
-            const result = method.call(EntityClass, ...params);
-            let ret = result;
-            if (result instanceof Promise) {
-              ret = await result;
+        try {
+          const params = referencesToEntities(
+            [...data.params],
+            response.locals.nymph
+          );
+          if (data.static) {
+            let EntityClass: EntityConstructor;
+            try {
+              EntityClass = response.locals.nymph.getEntityClass(data.class);
+              if (!EntityClass.restEnabled) {
+                httpError(response, 403);
+                return;
+              }
+            } catch (e: any) {
+              httpError(response, 400);
+              return;
             }
-            response.status(200);
-            response.setHeader('Content-Type', 'application/json');
-            response.send({ return: ret });
-          } catch (e: any) {
-            httpError(response, 500, e);
-            return;
-          }
-        } else {
-          let entity: EntityInterface;
-          try {
-            entity = await loadEntity(data.entity, response.locals.nymph);
-          } catch (e: any) {
-            if (e instanceof EntityConflictError) {
-              httpError(response, 409);
-            } else if (e.message === NOT_FOUND_ERROR) {
-              httpError(response, 404, e);
-            } else if (e instanceof InvalidParametersError) {
-              httpError(response, 400, e);
-            } else {
+            if (
+              EntityClass.clientEnabledStaticMethods.indexOf(data.method) === -1
+            ) {
+              httpError(response, 403);
+              return;
+            }
+            if (!(data.method in EntityClass)) {
+              httpError(response, 400);
+              return;
+            }
+            // @ts-ignore Dynamic methods make TypeScript sad.
+            const method: Function = EntityClass[data.method];
+            if (typeof method !== 'function') {
+              httpError(response, 400);
+              return;
+            }
+            try {
+              const result = method.call(EntityClass, ...params);
+              let ret = result;
+              if (result instanceof Promise) {
+                ret = await result;
+              }
+              response.status(200);
+              response.setHeader('Content-Type', 'application/json');
+              response.send({ return: ret });
+            } catch (e: any) {
               httpError(response, 500, e);
+              return;
+            }
+          } else {
+            let entity: EntityInterface;
+            try {
+              entity = await loadEntity(data.entity, response.locals.nymph);
+            } catch (e: any) {
+              if (e instanceof EntityConflictError) {
+                httpError(response, 409);
+              } else if (e instanceof ForbiddenClassError) {
+                httpError(response, 403);
+              } else if (e.message === NOT_FOUND_ERROR) {
+                httpError(response, 404, e);
+              } else if (e instanceof InvalidParametersError) {
+                httpError(response, 400, e);
+              } else {
+                httpError(response, 500, e);
+              }
+              return;
+            }
+            if (data.entity.guid && !entity.guid) {
+              httpError(response, 400);
+              return;
+            }
+            if (entity.$getClientEnabledMethods().indexOf(data.method) === -1) {
+              httpError(response, 403);
+              return;
+            }
+            if (
+              !(data.method in entity) ||
+              typeof entity[data.method] !== 'function'
+            ) {
+              httpError(response, 400);
+              return;
+            }
+            try {
+              const result = entity[data.method](...params);
+              let ret = result;
+              if (result instanceof Promise) {
+                ret = await result;
+              }
+              response.status(200);
+              response.setHeader('Content-Type', 'application/json');
+              if (data.stateless) {
+                response.send({ return: ret });
+              } else {
+                response.send({ entity: entity, return: ret });
+              }
+            } catch (e: any) {
+              httpError(response, 500, e);
+              return;
             }
-            return;
-          }
-          if (data.entity.guid && !entity.guid) {
-            httpError(response, 400);
-            return;
           }
-          if (entity.$getClientEnabledMethods().indexOf(data.method) === -1) {
+        } catch (e: any) {
+          if (e instanceof ForbiddenClassError) {
             httpError(response, 403);
             return;
-          }
-          if (
-            !(data.method in entity) ||
-            typeof entity[data.method] !== 'function'
-          ) {
-            httpError(response, 400);
-            return;
-          }
-          try {
-            const result = entity[data.method](...params);
-            let ret = result;
-            if (result instanceof Promise) {
-              ret = await result;
-            }
-            response.status(200);
-            response.setHeader('Content-Type', 'application/json');
-            if (data.stateless) {
-              response.send({ return: ret });
-            } else {
-              response.send({ entity: entity, return: ret });
-            }
-          } catch (e: any) {
+          } else {
             httpError(response, 500, e);
             return;
           }
@@ -512,6 +557,7 @@ export function createServer(
       let hadSuccess = false;
       let invalidRequest = false;
       let conflict = false;
+      let forbidden = false;
       let notfound = false;
       let lastException = null;
       for (let entData of data) {
@@ -526,6 +572,8 @@ export function createServer(
         } catch (e: any) {
           if (e instanceof EntityConflictError) {
             conflict = true;
+          } else if (e instanceof ForbiddenClassError) {
+            forbidden = true;
           } else if (e.message === NOT_FOUND_ERROR) {
             notfound = true;
           } else if (e instanceof InvalidParametersError) {
@@ -561,6 +609,8 @@ export function createServer(
       if (!hadSuccess) {
         if (invalidRequest) {
           httpError(response, 400, lastException);
+        } else if (forbidden) {
+          httpError(response, 403);
         } else if (conflict) {
           httpError(response, 409);
         } else if (notfound) {
@@ -605,6 +655,10 @@ export function createServer(
           let EntityClass: EntityConstructor;
           try {
             EntityClass = response.locals.nymph.getEntityClass(entData.class);
+            if (!EntityClass.restEnabled) {
+              httpError(response, 403);
+              return;
+            }
           } catch (e: any) {
             invalidRequest = true;
             failures = true;
@@ -707,6 +761,9 @@ export function createServer(
       );
     }
     let EntityClass = nymph.getEntityClass(entityData.class);
+    if (!EntityClass.restEnabled) {
+      throw new ForbiddenClassError('Not accessible.');
+    }
     let entity: EntityInterface | null;
     if (entityData.guid) {
       entity = await nymph.getEntity(
@@ -743,6 +800,9 @@ export function createServer(
       if (item.length === 3 && item[0] === 'nymph_entity_reference') {
         try {
           const EntityClass = nymph.getEntityClass(item[1]);
+          if (!EntityClass.restEnabled) {
+            throw new ForbiddenClassError('Not accessible.');
+          }
           return EntityClass.factoryReference(item as EntityReference);
         } catch (e: any) {
           return item;

package/src/index.test.ts CHANGED Viewed

@@ -2,12 +2,14 @@ import express from 'express';
 import SQLite3Driver from '@nymphjs/driver-sqlite3';
 import { Nymph as NymphServer } from '@nymphjs/nymph';
 import { Nymph } from '@nymphjs/client-node';
-import { Entity } from '@nymphjs/client';
+import { Entity, HttpError } from '@nymphjs/client';
 import createServer from './index';
 import {
   EmployeeModel as EmployeeModelClass,
   Employee as EmployeeClass,
+  RestrictedModel as RestrictedModelClass,
+  Restricted as RestrictedClass,
 } from './testArtifacts';
 const sqliteConfig = {
@@ -16,6 +18,7 @@ const sqliteConfig = {
 const nymphServer = new NymphServer({}, new SQLite3Driver(sqliteConfig));
 const EmployeeModel = nymphServer.addEntityClass(EmployeeModelClass);
+const RestrictedModel = nymphServer.addEntityClass(RestrictedModelClass);
 const app = express();
 app.use('/test', createServer(nymphServer));
@@ -25,6 +28,7 @@ const nymph = new Nymph({
   restUrl: 'http://localhost:5080/test/',
 });
 const Employee = nymph.addEntityClass(EmployeeClass);
+const Restricted = nymph.addEntityClass(RestrictedClass);
 describe('Nymph REST Server and Client', () => {
   async function createJane() {
@@ -668,6 +672,66 @@ describe('Nymph REST Server and Client', () => {
     expect(first.$is(third)).toEqual(false);
   });
+  it("doesn't allow creation of a restricted entity class", async () => {
+    const attempt = await Restricted.factory();
+    attempt.name = 'Jane Doe';
+    let error = null;
+    try {
+      await attempt.$save();
+    } catch (e: any) {
+      error = e;
+    }
+    expect(error).toBeInstanceOf(HttpError);
+    expect(error.status).toEqual(403);
+  });
+  it("doesn't allow search of a restricted entity class", async () => {
+    let error = null;
+    try {
+      await nymph.getEntity({
+        class: Restricted,
+      });
+    } catch (e: any) {
+      error = e;
+    }
+    expect(error).toBeInstanceOf(HttpError);
+    expect(error.status).toEqual(403);
+  });
+  it("doesn't allow methods of a restricted entity class", async () => {
+    const attempt = await Restricted.factory();
+    attempt.name = 'Jane Doe';
+    let error = null;
+    try {
+      await attempt.$testMethod(1);
+    } catch (e: any) {
+      error = e;
+    }
+    expect(error).toBeInstanceOf(HttpError);
+    expect(error.status).toEqual(403);
+  });
+  it("doesn't allow static methods of a restricted entity class", async () => {
+    let error = null;
+    try {
+      await Restricted.testStatic(1);
+    } catch (e: any) {
+      error = e;
+    }
+    expect(error).toBeInstanceOf(HttpError);
+    expect(error.status).toEqual(403);
+  });
   it('get a new UID', async () => {
     const uidValue = await nymph.newUID('employee');
     expect(typeof uidValue).toEqual('number');