scimgateway 4.2.10 → 4.2.11

package/README.md

@@ -1169,6 +1169,12 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v4.2.11  
+
+[Added] 
+
+- Plugin can set error statusCode returned by scimgateway through error message. Error message must then contain string `"statusCode":xxx` where xxx is HTTP status code e.g., 401. Plugin using REST will have statusCode automatically included in error message thrown by plugin. This could be useful for auth.PassThrough.
+
 ### v4.2.10  
 
 [Fixed] 

package/lib/scimgateway.js

@@ -318,22 +318,35 @@ const ScimGateway = function () {
     if (!userName && authType === 'Bearer') userName = 'token'
     if (ctx.request.url !== '/favicon.ico') {
       if (ctx.response.status < 200 || ctx.response.status > 299) {
-        let isEndpointAccessDenied = false
+        // statusCode check in logResult method...
+        // "statusCode":xxx in error messages let plugin set error statusCode returned by scimgateway
+        let pluginStatusCode = 0
+        const reJson = '^.*"(statusCode)" *: *([0-9][0-9][0-9]).*'
+        const rePattern = new RegExp(reJson, 'i')
         if (res.body.detail) {
-          if (res.body.detail.includes('\"statusCode\":401')) isEndpointAccessDenied= true // eslint-disable-line
+          const arrMatches = res.body.detail.match(rePattern)
+          if (Array.isArray(arrMatches) && arrMatches.length === 3) {
+            pluginStatusCode = parseInt(arrMatches[2])
+          }
         } else if (res.body.Errors) {
-          if (Array.isArray(res.body.Errors) && res.body.Errors[0].description && res.body.Errors[0].description.includes('\"statusCode\":401')) { // eslint-disable-line
-            isEndpointAccessDenied = true
+          if (Array.isArray(res.body.Errors) && res.body.Errors[0].description && res.body.Errors[0].description) {
+            const arrMatches = res.body.Errors[0].description.match(rePattern)
+            if (Array.isArray(arrMatches) && arrMatches.length === 3) {
+              pluginStatusCode = parseInt(arrMatches[2])
+            }
           }
         }
-        if (isEndpointAccessDenied) { // don't reveal original SCIM error message details related to access denied (e.g. using Auth PassThrough)
-          ctx.response.set('Content-Type', 'application/json; charset=utf-8')
-          ctx.response.status = 401 // ctx.response.message becomes default 'Unauthorized'
-          ctx.response.body = { error: 'Access denied' }
+        if (pluginStatusCode > 0) {
+          ctx.response.status = pluginStatusCode // auto change ctx.response.message
           res.statusCode = ctx.response.status
           res.statusMessage = ctx.response.message
-          res.body = ctx.response.body
+          if (pluginStatusCode === 401 || pluginStatusCode === 403) { // don't reveal original SCIM error message details related to access denied (e.g. using Auth PassThrough)
+            ctx.response.set('Content-Type', 'application/json; charset=utf-8')
+            ctx.response.body = { error: 'Access denied' }
+            res.body = ctx.response.body
+          }
         }
+        // back to logResult...
         logger.error(`${gwName}[${pluginName}] ${ellapsed} ${ctx.request.ipcli} ${userName} ${ctx.request.method} ${ctx.request.href} Inbound = ${JSON.stringify(ctx.request.body)} Outbound = ${JSON.stringify(res)}${(config.log.loglevel.file === 'debug' && ctx.request.url !== '/ping') ? '\n' : ''}`)
       } else logger.info(`${gwName}[${pluginName}] ${ellapsed} ${ctx.request.ipcli} ${userName} ${ctx.request.method} ${ctx.request.href} Inbound = ${JSON.stringify(ctx.request.body)} Outbound = ${JSON.stringify(res)}${(config.log.loglevel.file === 'debug' && ctx.request.url !== '/ping') ? '\n' : ''}`)
       requestCounter += 1 // logged on exit (not win process termination)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "4.2.10",
+  "version": "4.2.11",
   "description": "Using SCIM protocol as a gateway for user provisioning to other endpoints",
   "author": "Jarle Elshaug <jarle.elshaug@gmail.com> (https://elshaug.xyz)",
   "homepage": "https://elshaug.xyz",