Fix interception and bind issue

Author: alexivsn

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@securenative/sdk",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -53,7 +53,7 @@
     "chai-as-promised": "^7.1.1",
     "codecov": "^3.6.5",
     "fetch-mock": "^9.3.1",
-    "mocha": "^7.1.0",
+    "mocha": "^7.1.1",
     "mocked-env": "^1.3.2",
     "nyc": "^15.0.1",
     "semantic-release": "^17.0.4",

package.json

@@ -48,7 +48,7 @@ if (compareVersions(process.version, config.minSupportedVersion) < 0) {
   secureNative.agent.startAgent().catch(() => { });
 }
 
-const SDK = secureNative.SDK;
+const SDK = secureNative.sdk;
 
 export {
   SDK as secureNative,

src/index.ts

@@ -5,7 +5,6 @@ import SessionManager from './../session-manager';
 import { wrapListener } from '../utils/shimer';
 import { Logger } from '../logger';
 import Hook from 'require-in-the-middle';
-import { wrap } from 'shimmer';
 import ActionsList from './../actions-list';
 import { clientIpFromRequest } from './../utils/utils';
 import { SecureNativeOptions } from '../types/securenative-options';
@@ -14,9 +13,9 @@ import SetType from '../enums/set-type';
 import { v4 } from 'uuid';
 import ApiManager from '../api-manager';
 
-export default class HttpsServerInterceptor extends Interceptor implements IInterceptor {
+export default class HttpServerInterceptor extends Interceptor implements IInterceptor {
   private name = 'https-server';
-  
+
   constructor(private moduleManger: ModuleManager, private apiManager: ApiManager, private options: SecureNativeOptions) {
     super();
   }
@@ -39,62 +38,25 @@ export default class HttpsServerInterceptor extends Interceptor implements IInte
         wrapListener(exports.Server.prototype, 'emit', 'request', (event, req, res) => {
           const snuid = v4();
           SessionManager.setSession(snuid, { req, res });
-
+          if (req.method === 'OPTIONS') {
+            return true;
+          }
           const url = req.url;
           const clientIp = clientIpFromRequest(req);
           const deviceFP = getDeviceFp(req, this.options);
 
-          if (ActionsList.whitelist.has(SetType.IP, clientIp) || ActionsList.whitelist.has(SetType.USER, deviceFP) || ActionsList.whitelist.has(SetType.PATH, url)) {
+          if (
+            ActionsList.whitelist.has(SetType.IP, clientIp) ||
+            ActionsList.whitelist.has(SetType.USER, deviceFP) ||
+            ActionsList.whitelist.has(SetType.PATH, url)
+          ) {
             req.sn_whitelisted = true;
           } else if (ActionsList.blackList.has(SetType.IP, clientIp) || ActionsList.blackList.has(SetType.USER, deviceFP)) {
-            req.sn_finished = true;
-            super.intercept(snuid, 'blockRequest');
-            return false;
+            super.intercept(snuid, 'block');
           }
-
           return true;
         });
 
-        wrap(exports && exports.ServerResponse && exports.ServerResponse.prototype, 'setHeader', function (original) {
-          return function () {
-            if (this.sn_finished) {
-              return;
-            }
-            return original.apply(this, arguments);
-          };
-        });
-
-
-        wrap(exports && exports.ServerResponse && exports.ServerResponse.prototype, 'writeHead', function (original) {
-          return function () {
-            if (this.sn_finished) {
-              return;
-            }
-            return original.apply(this, arguments);
-          };
-        });
-
-        wrap(exports && exports.ServerResponse && exports.ServerResponse.prototype, 'write', (original) => {
-          const intercept = super.intercept.bind(this);
-          return function () {
-            if (this.sn_finished) {
-              return;
-            }
-            intercept(this.sn_uid, 'write');
-            return original.apply(this, arguments);
-          };
-        });
-
-        wrap(exports && exports.ServerResponse && exports.ServerResponse.prototype, 'end', function (original) {
-          return function () {
-            SessionManager.cleanSession(this.req.sn_uid);
-            if (this.sn_finished) {
-              return;
-            }
-            return original.apply(this, arguments);
-          }
-        });
-
         return exports;
       });
     }

src/interceptors/https-server-interceptor.ts

@@ -0,0 +1,15 @@
+import ApiManager from "./api-manager";
+import { EventOptions } from "./types/event-options";
+import VerifyResult from "./types/verify-result";
+
+export class SDKManager {
+  constructor(private apiManager: ApiManager) {}
+
+  public track(opts: EventOptions) {
+    return this.apiManager.track(opts);
+  }
+
+  public async verify(opts: EventOptions): Promise<VerifyResult> {
+    return await this.apiManager.verify(opts);
+  }
+}

src/sdk-manager.ts

@@ -26,8 +26,8 @@ describe('SecureNative', () => {
     expect(secureNative.agent).to.have.property('startAgent');
     expect(secureNative.agent).to.have.property('stopAgent');
 
-    expect(secureNative).to.have.property('SDK');
-    expect(secureNative.SDK).to.have.property('track');
-    expect(secureNative.SDK).to.have.property('verify');
+    expect(secureNative).to.have.property('sdk');
+    expect(secureNative.sdk).to.have.property('track');
+    expect(secureNative.sdk).to.have.property('verify');
   });
 });

src/securenative.spec.ts

@@ -3,28 +3,27 @@ import EventManager from './event-manager';
 import ModuleManager from './module-manager';
 import AgentManager from './agent-manager';
 import ApiManager from './api-manager';
+import { SDKManager } from './sdk-manager';
 
 export default class SecureNative {
+  private sdkManager: SDKManager;
   private agentManager: AgentManager;
   public apiManager: ApiManager;
 
-  constructor(public moduleManager: ModuleManager, eventManager: EventManager, private options: SecureNativeOptions) {
+  constructor(moduleManager: ModuleManager, eventManager: EventManager, options: SecureNativeOptions) {
     if (!moduleManager || !eventManager || !options) {
       throw new Error('Unable to create SecureNative instance, invalid config provided');
     }
-
     this.apiManager = new ApiManager(eventManager, options);
+    this.sdkManager = new SDKManager(this.apiManager);
     this.agentManager = new AgentManager(moduleManager, this.apiManager, eventManager, options);
   }
 
   public get agent(): AgentManager {
     return this.agentManager;
   }
 
-  public get SDK() {
-    return {
-      track: this.apiManager.track,
-      verify: this.apiManager.verify,
-    };
+  public get sdk() {
+    return this.sdkManager;
   }
 }