scimgateway 4.2.12 → 4.2.14

package/README.md

@@ -124,7 +124,7 @@ If internet connection is blocked, we could install on another machine and copy
 
 	node c:\my-scimgateway
 	
-	Start a browser
+	Start a browser (note, Edge do not pop-up logon dialog box when using http)
 
 	http://localhost:8880/ping
 	=> Health check with a "hello" response
@@ -1170,6 +1170,18 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v4.2.14
+  
+[Fixed] 
+
+- PUT now returning 404 instead of 500 when trying to update a user/group that does not exist
+
+### v4.2.13
+  
+[Fixed] 
+
+- `/ping` now excluded from info logs. If we want ping logging, use something else than lowercase e.g., `/Ping` or `/PING` 
+
 ### v4.2.12  
 
 [Added] 

package/lib/scimgateway.js

@@ -317,7 +317,8 @@ const ScimGateway = function () {
 
   const logResult = async (ctx, next) => {
     const started = Date.now()
-    await next() // once all middleware below completes, this continues
+    await next() // once all middleware completes, below continues
+    if (ctx.request.url === '/ping' || ctx.request.url === '/favicon.ico') return
     const ellapsed = (Date.now() - started) + 'ms' // ctx.set('X-ResponseTime', ellapsed)
     const res = {
       statusCode: ctx.response.status,
@@ -328,41 +329,39 @@ const ScimGateway = function () {
     const [authType, authToken] = (ctx.request.header.authorization || '').split(' ') // [0] = 'Basic' or 'Bearer'
     if (authType === 'Basic') [userName] = (Buffer.from(authToken, 'base64').toString() || '').split(':')
     if (!userName && authType === 'Bearer') userName = 'token'
-    if (ctx.request.url !== '/favicon.ico') {
-      if (ctx.response.status < 200 || ctx.response.status > 299) {
-        // 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) {
-          const arrMatches = res.body.detail.match(rePattern)
+    if (ctx.response.status < 200 || ctx.response.status > 299) {
+      // 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) {
+        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) {
+          const arrMatches = res.body.Errors[0].description.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) {
-            const arrMatches = res.body.Errors[0].description.match(rePattern)
-            if (Array.isArray(arrMatches) && arrMatches.length === 3) {
-              pluginStatusCode = parseInt(arrMatches[2])
-            }
-          }
         }
-        if (pluginStatusCode > 0) {
-          ctx.response.status = pluginStatusCode // auto change ctx.response.message
-          res.statusCode = ctx.response.status
-          res.statusMessage = ctx.response.message
-          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
-          }
+      }
+      if (pluginStatusCode > 0) {
+        ctx.response.status = pluginStatusCode // auto change ctx.response.message
+        res.statusCode = ctx.response.status
+        res.statusMessage = ctx.response.message
+        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)
-    }
+      }
+      // 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)
     if (ctx.response.body && typeof ctx.response.body === 'object' && ctx.response.status !== 401) ctx.set('Content-Type', 'application/scim+json; charset=utf-8')
   }
 
@@ -1371,11 +1370,21 @@ const ScimGateway = function () {
         logger.debug(`${gwName}[${pluginName}] calling "${handle.getMethod}" and awaiting result`)
         let res = await this[handle.getMethod](ctx.params.baseEntity, { attribute: 'id', operator: 'eq', value: id }, [], ctx.ctxCopy)
 
-        let currentObj = {}
-        if (res && res.Resources && Array.isArray(res.Resources) && res.Resources.length === 1) currentObj = res.Resources[0]
-        else if (Array.isArray(res) && res.length === 1) currentObj = res[0]
+        let currentObj
+        if (res && res.Resources && Array.isArray(res.Resources)) {
+          if (res.Resources.length === 1) currentObj = res.Resources[0]
+          else currentObj = {}
+        } else if (Array.isArray(res) && res.length === 1) currentObj = res[0]
         else if (res && typeof (res) === 'object' && Object.keys(res).length > 0) currentObj = res
-        else throw Error(`put using method ${handle.getMethod} got unexpected response: ${JSON.stringify(res)}`)
+        else currentObj = {}
+
+        if (typeof (currentObj) !== 'object' || Object.keys(currentObj).length === 0) {
+          ctx.status = 404
+          let err = new Error(`put using method ${handle.getMethod} error: ${handle.description.toLowerCase()} id=${id} does not exist`)
+          err = jsonErr(config.scim.version, pluginName, ctx.status, err)
+          ctx.body = err
+          return
+        }
 
         const clearedObj = clearObjectValues(currentObj)
         delete clearedObj.active

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "4.2.12",
+  "version": "4.2.14",
   "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",