soajs.controller 4.2.42 → 4.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.42",
+  "version": "4.3.0",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -21,24 +21,24 @@
     "async": "3.2.6",
     "connect": "3.7.0",
     "http-proxy": "1.18.1",
-    "jsonwebtoken": "9.0.2",
+    "jsonwebtoken": "9.0.3",
     "kubernetes-client": "9.0.0",
-    "lodash": "4.17.21",
+    "lodash": "4.17.23",
     "merge": "2.1.1",
     "netmask": "2.0.2",
     "oauth2-server": "2.4.1",
     "path-to-regexp": "8.3.0",
-    "soajs.core.libs": "1.2.1",
-    "soajs.core.modules": "5.2.17",
-    "soajs.urac.driver": "3.2.14",
+    "soajs.core.libs": "1.2.2",
+    "soajs.core.modules": "5.2.18",
+    "soajs.urac.driver": "3.2.15",
     "useragent": "2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "7.28.5",
-    "@babel/plugin-transform-runtime": "7.28.5",
-    "@babel/preset-env": "7.28.5",
-    "@babel/runtime": "7.28.4",
-    "express": "4.21.1",
+    "@babel/core": "7.29.0",
+    "@babel/plugin-transform-runtime": "7.29.0",
+    "@babel/preset-env": "7.29.0",
+    "@babel/runtime": "7.28.6",
+    "express": "5.2.1",
     "grunt": "1.6.1",
     "grunt-babel": "8.0.0",
     "grunt-contrib-clean": "2.0.1",
@@ -50,8 +50,8 @@
     "grunt-jsdoc": "2.4.1",
     "grunt-mocha-test": "0.13.3",
     "mocha": "11.7.5",
-    "nock": "14.0.10",
+    "nock": "14.0.11",
     "request": "2.88.2",
-    "sinon": "21.0.0"
+    "sinon": "21.0.1"
   }
 }

package/test/unit/mw/key/index.js

@@ -134,4 +134,154 @@ describe("Unit test for: mw - key", function () {
             done();
         });
     });
+
+    describe("Network Package Override", function () {
+        let networkKeyObj = {
+            "key": "a139786a6e6d18e48b4987e83789430b",
+            "tenant": {"id": "10d2cb5fc04ce51e06000001", "code": "DBTN", "locked": true},
+            "application": {
+                "product": "AVAPP",
+                "package": "AVAPP_EXMPL",
+                "appId": "5c0e74ba9acc3c5a84a5125a",
+                "acl": null,
+                "acl_all_env": null
+            },
+            "device": null,
+            "env": "dev",
+            "geo": null,
+            "config": {
+                "gateway": {
+                    "networkPackages": {
+                        "mw": {
+                            "AVAPP": {
+                                "default": "AVAPP_DEFAU",
+                                "users": {
+                                    "AVAPP_EXMPL": "AVAPP_ALTRN"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+
+        let networkReq = {
+            "get": () => {
+                return key;
+            },
+            "soajs": {
+                "controller": {"serviceParams": {}},
+                "registry": {
+                    "serviceConfig": {
+                        "key": {
+                            algorithm: "aes256",
+                            password: "soajs key lal massa"
+                        }
+                    },
+                    "custom": {
+                        "gateway": {
+                            "value": {
+                                "lastSeen": {
+                                    "network": "mw"
+                                }
+                            }
+                        }
+                    }
+                },
+                "log": {
+                    "error": (err) => {
+                        console.log(err);
+                    },
+                    "debug": (msg) => {
+                        console.log(msg);
+                    }
+                }
+            }
+        };
+
+        it("Call MW with network package override - should replace package with default", function (done) {
+            let networkProvision = {
+                "getExternalKeyData": (key, keyConfig, cb) => {
+                    return cb(null, JSON.parse(JSON.stringify(networkKeyObj)));
+                },
+                "getPackageData": (pack, cb) => {
+                    // Verify the package was overridden
+                    if (pack === "AVAPP_DEFAU") {
+                        return cb(null, {"acl": {}, "_TTL": 604800000});
+                    }
+                    return cb(new Error("Expected package AVAPP_DEFAU but got " + pack));
+                }
+            };
+            let mw_use = mw({"provision": networkProvision, "regEnvironment": "dev"});
+            mw_use(networkReq, res, (err) => {
+                if (err) {
+                    done(new Error("Unexpected error: " + err));
+                } else {
+                    done();
+                }
+            });
+        });
+
+        it("Call MW without network in registry - should NOT replace package", function (done) {
+            let reqNoNetwork = JSON.parse(JSON.stringify(networkReq));
+            reqNoNetwork.soajs.registry.custom = {};
+            reqNoNetwork.get = () => key;
+            reqNoNetwork.soajs.log = {
+                "error": (err) => { console.log(err); },
+                "debug": (msg) => { console.log(msg); }
+            };
+
+            let networkProvision = {
+                "getExternalKeyData": (key, keyConfig, cb) => {
+                    return cb(null, JSON.parse(JSON.stringify(networkKeyObj)));
+                },
+                "getPackageData": (pack, cb) => {
+                    // Verify the package was NOT overridden
+                    if (pack === "AVAPP_EXMPL") {
+                        return cb(null, {"acl": {}, "_TTL": 604800000});
+                    }
+                    return cb(new Error("Expected package AVAPP_EXMPL but got " + pack));
+                }
+            };
+            let mw_use = mw({"provision": networkProvision, "regEnvironment": "dev"});
+            mw_use(reqNoNetwork, res, (err) => {
+                if (err) {
+                    done(new Error("Unexpected error: " + err));
+                } else {
+                    done();
+                }
+            });
+        });
+
+        it("Call MW with different network - should NOT replace package", function (done) {
+            let reqDiffNetwork = JSON.parse(JSON.stringify(networkReq));
+            reqDiffNetwork.soajs.registry.custom.gateway.value.lastSeen.network = "other";
+            reqDiffNetwork.get = () => key;
+            reqDiffNetwork.soajs.log = {
+                "error": (err) => { console.log(err); },
+                "debug": (msg) => { console.log(msg); }
+            };
+
+            let networkProvision = {
+                "getExternalKeyData": (key, keyConfig, cb) => {
+                    return cb(null, JSON.parse(JSON.stringify(networkKeyObj)));
+                },
+                "getPackageData": (pack, cb) => {
+                    // Verify the package was NOT overridden (different network)
+                    if (pack === "AVAPP_EXMPL") {
+                        return cb(null, {"acl": {}, "_TTL": 604800000});
+                    }
+                    return cb(new Error("Expected package AVAPP_EXMPL but got " + pack));
+                }
+            };
+            let mw_use = mw({"provision": networkProvision, "regEnvironment": "dev"});
+            mw_use(reqDiffNetwork, res, (err) => {
+                if (err) {
+                    done(new Error("Unexpected error: " + err));
+                } else {
+                    done();
+                }
+            });
+        });
+    });
 });

package/test/unit/mw/mt/urac.js

@@ -78,17 +78,17 @@ describe("Unit test for: mw - mt URAC", () => {
 		oauth.bearerToken = require('../../../data/sample/bearerToken.json');
 		soajs.tenant.application.product = "DSBRD";
 		let uracDriver = new UracDriver({"soajs": soajs, "oauth": oauth});
-		
+
 		let provisionStub;
-		
+
 		before((done) => {
 			const coreModules = require("soajs.core.modules");
 			let provision = coreModules.provision;
-			
+
 			provisionStub = sinon.stub(provision, 'getPackagesData').callsFake((code, cb) => {
 				return cb(null, []);
 			});
-			
+
 			done();
 		});
 		after((done) => {
@@ -154,4 +154,157 @@ describe("Unit test for: mw - mt URAC", () => {
 			done();
 		});
 	});
+
+	describe("Network Package Override test for: mw - mt URAC", () => {
+		let networkSoajs = {
+			tenant: {
+				application: {
+					product: "AVAPP"
+				},
+				key: {
+					iKey: "1111"
+				}
+			},
+			registry: {
+				custom: {
+					gateway: {
+						value: {
+							lastSeen: {
+								network: "mw"
+							}
+						}
+					}
+				}
+			},
+			controller: {
+				serviceParams: {
+					keyObj: {
+						config: {
+							gateway: {
+								networkPackages: {
+									"mw": {
+										"AVAPP": {
+											"default": "AVAPP_DEFAU",
+											"users": {
+												"AVAPP_EXMPL": "AVAPP_ALTRN"
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			},
+			log: {
+				debug: (msg) => {
+					console.log(msg);
+				}
+			}
+		};
+
+		let networkOauth = {
+			type: 2,
+			bearerToken: {
+				user: {
+					"_id": "user123",
+					"username": "testuser",
+					"firstName": "Test",
+					"lastName": "User",
+					"email": "test@example.com",
+					"groups": ["testgroup"],
+					"config": {},
+					"tenant": {"id": "tenant123", "code": "TEST"},
+					"groupsConfig": {
+						"allowedPackages": {
+							"AVAPP": ["AVAPP_EXMPL"]
+						}
+					},
+					"loginMode": "oauth",
+					"id": "user123"
+				}
+			}
+		};
+
+		let provisionStub;
+		let receivedPackages = null;
+
+		before((done) => {
+			const coreModules = require("soajs.core.modules");
+			let provision = coreModules.provision;
+
+			provisionStub = sinon.stub(provision, 'getPackagesData').callsFake((packages, cb) => {
+				receivedPackages = packages;
+				return cb(null, []);
+			});
+
+			done();
+		});
+
+		after((done) => {
+			if (provisionStub) {
+				provisionStub.restore();
+			}
+			done();
+		});
+
+		it("test resolveACL with user network package override - should replace package", (done) => {
+			receivedPackages = null;
+			let uracDriver = new UracDriver({"soajs": networkSoajs, "oauth": networkOauth});
+
+			uracDriver.init((error, uracProfile) => {
+				// Verify getPackagesData was called with the overridden package
+				assert.ok(receivedPackages, "getPackagesData should have been called");
+				assert.deepStrictEqual(receivedPackages, ["AVAPP_ALTRN"], "Package should be overridden from AVAPP_EXMPL to AVAPP_ALTRN");
+				done();
+			});
+		});
+
+		it("test resolveACL without network - should NOT replace package", (done) => {
+			receivedPackages = null;
+			let soajsNoNetwork = JSON.parse(JSON.stringify(networkSoajs));
+			soajsNoNetwork.registry.custom = {};
+			soajsNoNetwork.log = {debug: (msg) => console.log(msg)};
+
+			let uracDriver = new UracDriver({"soajs": soajsNoNetwork, "oauth": networkOauth});
+
+			uracDriver.init((error, uracProfile) => {
+				// Verify getPackagesData was called with the original package
+				assert.ok(receivedPackages, "getPackagesData should have been called");
+				assert.deepStrictEqual(receivedPackages, ["AVAPP_EXMPL"], "Package should NOT be overridden");
+				done();
+			});
+		});
+
+		it("test resolveACL with different network - should NOT replace package", (done) => {
+			receivedPackages = null;
+			let soajsDiffNetwork = JSON.parse(JSON.stringify(networkSoajs));
+			soajsDiffNetwork.registry.custom.gateway.value.lastSeen.network = "other";
+			soajsDiffNetwork.log = {debug: (msg) => console.log(msg)};
+
+			let uracDriver = new UracDriver({"soajs": soajsDiffNetwork, "oauth": networkOauth});
+
+			uracDriver.init((error, uracProfile) => {
+				// Verify getPackagesData was called with the original package (different network)
+				assert.ok(receivedPackages, "getPackagesData should have been called");
+				assert.deepStrictEqual(receivedPackages, ["AVAPP_EXMPL"], "Package should NOT be overridden for different network");
+				done();
+			});
+		});
+
+		it("test resolveACL with no user mapping for package - should NOT replace package", (done) => {
+			receivedPackages = null;
+			let oauthDiffPackage = JSON.parse(JSON.stringify(networkOauth));
+			oauthDiffPackage.bearerToken.user.groupsConfig.allowedPackages.AVAPP = ["AVAPP_OTHER"];
+
+			let uracDriver = new UracDriver({"soajs": networkSoajs, "oauth": oauthDiffPackage});
+
+			uracDriver.init((error, uracProfile) => {
+				// Verify getPackagesData was called with original package (no mapping exists)
+				assert.ok(receivedPackages, "getPackagesData should have been called");
+				assert.deepStrictEqual(receivedPackages, ["AVAPP_OTHER"], "Package should NOT be overridden when no mapping exists");
+				done();
+			});
+		});
+	});
 });

package/.travis.yml

@@ -1,72 +0,0 @@
-dist: focal
-language: node_js
-node_js: 20
-
-jobs:
-  include:
-
-  - stage: install, check code style and coverage
-    if: tag IS blank
-    services:
-    - mongodb
-    addons:
-      hosts:
-      - localhost
-    before_script:
-    - npm install -g grunt-cli
-    - sleep 10
-    script:
-    - grunt
-    - if [ "$TRAVIS_BRANCH" != "master" ]; then grunt test; fi
-    - if [ "$TRAVIS_BRANCH" = "master" ]; then grunt coverage; fi
-
-  # - stage: Publish to npm
-  #   if: branch =~ /(release)/
-  #   script:
-  #   - echo "PUBLISH npm"
-  #   deploy:
-  #     skip_cleanup: true
-  #     provider: npm
-  #     email: $NPM_EMAIL
-  #     api_key: $NPM_TOKEN
-  #     on:
-  #       all_branches: true
-  #       condition: $TRAVIS_BRANCH =~ ^(release)*
-
-  - stage: Publish to docker registry
-    if: branch =~ /(release)/
-    script:
-    - echo "PUBLISH docker"
-    - export PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -Fn '{ print $2 }' | sed 's/[n:",]//g' | tr -d '[[:space:]]')
-    - export MAJOR_VERSION=$(echo ${PACKAGE_VERSION} | awk -F. '{ print $1 }')
-    - echo Package version ${PACKAGE_VERSION}
-    - echo Major version ${MAJOR_VERSION}
-
-    - git config --local user.name ${GIT_USER}
-    - git config --local user.email ${GIT_EMAIL}
-    - git tag ${PACKAGE_VERSION}
-
-    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-    - docker build -t soajsorg/gateway . --platform linux/amd64 
-
-    - docker images
-
-    - docker tag soajsorg/gateway:latest soajsorg/gateway:${PACKAGE_VERSION}
-    - docker tag soajsorg/gateway:latest soajsorg/gateway:${MAJOR_VERSION}.x
-
-    - docker push soajsorg/gateway
-    - docker push soajsorg/gateway:${PACKAGE_VERSION}
-    - docker push soajsorg/gateway:${MAJOR_VERSION}.x
-    before_deploy:
-      - yes | gem update --system --force
-      - gem install bundler
-      - gem install faraday-net_http -v '3.3.0'
-      - gem install uri
-      - gem install logger
-    deploy:
-      on:
-        all_branches: true
-      provider: releases
-      api_key: ${GIT_TOKEN}
-      skip_cleanup: true