Merge pull request #33 from onixjs/development

Release 1.0.0-alpha.21.1 🐜
onixjs · May 1, 2018 · 92abf2a · 92abf2a
2 parents 5daa7b3 + dfc49e4
commit 92abf2a
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onixjs/core",
-  "version": "1.0.0-alpha.22",
+  "version": "1.0.0-alpha.22.1",
   "description": "An Enterprise Grade NodeJS Platform that implements Industry Standards and Patterns in order to provide Connectivity, Stability, High-Availability and High-Performance.",
   "main": "dist/src/index.js",
   "scripts": {

diff --git a/src/core/app.server.ts b/src/core/app.server.ts
@@ -169,7 +169,7 @@ export class AppServer {
       case OperationType.ONIX_REMOTE_CALL_PROCEDURE:
         // Register Stream Request
         if (operation.message.request.metadata.stream) {
-          this.streamer.register(operation, chunk => {
+          await this.streamer.register(operation, chunk => {
             if (process.send)
               process.send({
                 uuid: operation.uuid,

diff --git a/src/core/call.responser.ts b/src/core/call.responser.ts
@@ -44,6 +44,7 @@ export class CallResponser {
       }
       // Declare executable endpoint method and hooks references
       let scope,
+        systemcall: boolean = false,
         method: Function | null = null,
         mainHook: Function = () => null,
         slaveHook: Function | null = null,
@@ -54,6 +55,7 @@ export class CallResponser {
         scope = this.factory.app;
         method = this.factory.app[segments[1]];
         mainHook = this.lifecycle.onAppMethodCall;
+        systemcall = true;
       }
       // Module level call (System only, not exposed)
       if (segments.length > 2) {
@@ -90,7 +92,10 @@ export class CallResponser {
         return;
       }
       // Verify the call request matches the ACL Rules
-      if (GroupMatch.verify(method.name, operation, config)) {
+      if (
+        (await GroupMatch.verify(method.name, operation, config)) ||
+        systemcall
+      ) {
         // Execute main hook, might be app/system or module level.
         const result = await mainHook(
           (name: string) => this.factory.scopes[segments[1]].get(name),

diff --git a/src/core/call.streamer.ts b/src/core/call.streamer.ts
@@ -23,7 +23,7 @@ export class CallStreamer {
    * @description This method will register an incoming call in order
    * to send back an answer.
    */
-  register(operation: IAppOperation, handler) {
+  async register(operation: IAppOperation, handler) {
     // Get segments from rpc endpoint
     let scope,
       method: Function | null = null,
@@ -73,7 +73,7 @@ export class CallStreamer {
     }
 
     // Verify the call request matches the ACL Rules
-    if (GroupMatch.verify(method.name, operation, config)) {
+    if (await GroupMatch.verify(method.name, operation, config)) {
       // Default handler
       const def = data => data;
       // Execute main hook, might be app/system or module level.

diff --git a/src/index.ts b/src/index.ts
@@ -40,7 +40,7 @@ export class OnixJS {
    * @description Current Onix Version.
    */
   get version(): string {
-    return '1.0.0-alpha.22';
+    return '1.0.0-alpha.22.1';
   }
   /**
    * @property router

diff --git a/test/onixjs.core.unit.ts b/test/onixjs.core.unit.ts
@@ -177,9 +177,45 @@ test('Core: CallResponser invalid call.', async t => {
     'OnixJS Error: RPC Call is invalid "something.really.weird.to.call.which.is.invalid"',
   );
 });
+// Test CallResponser not authorized call
+test('Core: CallResponser not authorized call.', async t => {
+  @Component({})
+  class MyComponent {
+    @RPC()
+    testRPC() {
+      return 'ALO WORLD';
+    }
+    @Stream()
+    testSTREAM() {}
+  }
+  @Module({
+    models: [],
+    renderers: [],
+    services: [],
+    components: [MyComponent],
+  })
+  class MyModule {}
+  class MyApp extends Application {}
+  const factory: AppFactory = new AppFactory(MyApp);
+  factory.config = {network: {disabled: true}, modules: [MyModule]};
+  factory.notifier = new AppNotifier();
+  await factory.setup();
+  const responser: CallResponser = new CallResponser(factory);
+  const result = await responser.process({
+    uuid: Utils.uuid(),
+    type: OperationType.ONIX_REMOTE_CALL_PROCEDURE,
+    message: {
+      rpc: 'MyApp.MyModule.MyComponent.testRPC',
+      request: <IRequest>{},
+    },
+  });
+  t.is(result.code, 401);
+});
 // Test CallResponser valid call
 test('Core: CallResponser valid call.', async t => {
-  @Component({})
+  @Component({
+    acl: [AllowEveryone],
+  })
   class MyComponent {
     @RPC()
     testRPC() {
@@ -250,6 +286,7 @@ test('Core: CallResponser invalid call.', async t => {
 // Test CallResponser Hooks
 test('Core: CallResponser Hooks.', async t => {
   @Component({
+    acl: [AllowEveryone],
     lifecycle: async function(app, metadata, method) {
       const methodResult = await method();
       return methodResult;
@@ -290,9 +327,10 @@ test('Core: CallResponser Hooks.', async t => {
   t.is(result.text, 'Hello Responser');
 });
 
-// Test CallResponser Hooks
-test('Core: CallResponser Hooks.', async t => {
+// Test CallStreamer Valid
+test('Core: CallStreamer Valid.', async t => {
   @Component({
+    acl: [AllowEveryone],
     lifecycle: async function(app, metadata, method) {
       const methodResult = await method();
       return methodResult;
@@ -319,7 +357,7 @@ test('Core: CallResponser Hooks.', async t => {
   factory.notifier = new AppNotifier();
   await factory.setup();
   const streamer: CallStreamer = new CallStreamer(factory);
-  streamer.register(
+  await streamer.register(
     {
       uuid: Utils.uuid(),
       type: OperationType.ONIX_REMOTE_CALL_PROCEDURE,
@@ -339,6 +377,55 @@ test('Core: CallResponser Hooks.', async t => {
   );
 });
 
+// Test CallStreamer Not Authorized
+test('Core: CallStreamer Not Authorized.', async t => {
+  @Component({
+    lifecycle: async function(app, metadata, method) {
+      const methodResult = await method();
+      return methodResult;
+    },
+  })
+  class MyComponent {
+    @Stream()
+    test(stream) {
+      return stream({
+        text: 'Hello Streamer',
+      });
+    }
+  }
+  @Module({
+    models: [],
+    renderers: [],
+    services: [],
+    components: [MyComponent],
+  })
+  class MyModule {}
+  class MyApp extends Application {}
+  const factory: AppFactory = new AppFactory(MyApp);
+  factory.config = {network: {disabled: true}, modules: [MyModule]};
+  factory.notifier = new AppNotifier();
+  await factory.setup();
+  const streamer: CallStreamer = new CallStreamer(factory);
+  await streamer.register(
+    {
+      uuid: Utils.uuid(),
+      type: OperationType.ONIX_REMOTE_CALL_PROCEDURE,
+      message: {
+        rpc: 'MyApp.MyModule.MyComponent.test',
+        request: <IRequest>{
+          metadata: {stream: true},
+          payload: {},
+        },
+      },
+    },
+    result => {
+      if (result) {
+        t.is(result.code, 401);
+      }
+    },
+  );
+});
+
 // Test CallStreamer invalid call
 test('Core: CallStreamer invalid call.', async t => {
   class MyComponent {}
@@ -355,7 +442,7 @@ test('Core: CallStreamer invalid call.', async t => {
   factory.notifier = new AppNotifier();
   await factory.setup();
   const streamer: CallStreamer = new CallStreamer(factory);
-  streamer.register(
+  await streamer.register(
     {
       uuid: Utils.uuid(),
       type: OperationType.ONIX_REMOTE_CALL_PROCEDURE,