soajs.controller 4.0.50 → 4.0.52
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.
- package/mw/mt/index.js +11 -5
- package/mw/mt/utils.js +1 -0
- package/package.json +4 -4
package/mw/mt/index.js
CHANGED
|
@@ -143,11 +143,12 @@ module.exports = (configuration) => {
|
|
|
143
143
|
}
|
|
144
144
|
|
|
145
145
|
serviceCheckArray.push(utils.uracCheck);
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
146
|
+
if (!url_keyACL) {
|
|
147
|
+
serviceCheckArray.push(utils.aclUrackCheck);
|
|
148
|
+
|
|
149
|
+
serviceCheckArray.push(utils.serviceCheck);
|
|
150
|
+
serviceCheckArray.push(utils.apiCheck);
|
|
151
|
+
}
|
|
151
152
|
async.waterfall(serviceCheckArray, (err, data) => {
|
|
152
153
|
|
|
153
154
|
//if this is controller route: /key/permission/get, ignore async waterfall response
|
|
@@ -159,6 +160,11 @@ module.exports = (configuration) => {
|
|
|
159
160
|
//doesn't work if you are not logged in
|
|
160
161
|
return next(158);
|
|
161
162
|
} else {
|
|
163
|
+
if (err) {
|
|
164
|
+
if (typeof err === "number") {
|
|
165
|
+
return next(err);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
162
168
|
req.soajs.log.debug("Detected return get key permission request, bypassing MT ACL checks...");
|
|
163
169
|
return next();
|
|
164
170
|
}
|
package/mw/mt/utils.js
CHANGED
|
@@ -591,6 +591,7 @@ let utils = {
|
|
|
591
591
|
obj.req.soajs.uracDriver.init((error) => {
|
|
592
592
|
if (error) {
|
|
593
593
|
obj.req.soajs.log.error(error.message);
|
|
594
|
+
return cb (146);
|
|
594
595
|
}
|
|
595
596
|
let userServiceConf = obj.req.soajs.uracDriver.getConfig();
|
|
596
597
|
userServiceConf = userServiceConf || {};
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "soajs.controller",
|
|
3
3
|
"description": "soajs multi tenant API gateway",
|
|
4
|
-
"version": "4.0.
|
|
4
|
+
"version": "4.0.52",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "soajs team",
|
|
7
7
|
"email": "team@soajs.org"
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"test": "grunt test"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"async": "3.2.
|
|
21
|
+
"async": "3.2.4",
|
|
22
22
|
"connect": "3.7.0",
|
|
23
23
|
"http-proxy": "1.18.1",
|
|
24
24
|
"jsonwebtoken": "8.5.1",
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
"path-to-regexp": "6.2.0",
|
|
31
31
|
"request": "2.88.2",
|
|
32
32
|
"soajs.core.libs": "1.2.0",
|
|
33
|
-
"soajs.core.modules": "5.0.
|
|
34
|
-
"soajs.urac.driver": "3.0.
|
|
33
|
+
"soajs.core.modules": "5.0.24",
|
|
34
|
+
"soajs.urac.driver": "3.0.26",
|
|
35
35
|
"useragent": "2.3.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|