scimgateway 4.5.1 → 4.5.4

package/README.md

@@ -321,6 +321,19 @@ Below shows an example of config\plugin-saphana.json
 	            "replaceDomains": []
 	          }
 	        }
+	      },
+	      "publisher": {
+	        "enabled": false,
+	        "entity": {
+	          "undefined": {
+	            "nats": {
+	              "tenant": null,
+	              "subject": null,
+	              "jwt": null,
+	              "secret": null
+	            }
+	          }
+	        }
 	      }
 	    }
 	  },
@@ -1150,6 +1163,36 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v4.5.4  
+
+[Fixed]
+
+- Delete User missing url-decoding of id e.g. using ldap-dn as id
+
+### v4.5.3  
+
+[Fixed]  
+
+- plugin-api configuration file having new credentials for dummy-json testing 
+
+[Improved]  
+
+- Dependencies bump  
+- plugin-loki and plugin-mongodb, minor improvements for handling raw mulitivalue updates when not using default skipTypeConvert=false  
+- endpointMapper supporting comma separated string to be converted to array, e.g.:  
+	SCIM otherMails = "myAlias1@company.com,myAlias2@company.com,myAlias3@company.com"
+  
+  	endpointMapper configuration for endpoint attribute emails of type array:  
+
+	"map": {
+	  "user": {
+	    "emails": {
+	      "mapTo": "otherMails",
+	      "type": "array",
+	      "typeInbound": "string"
+	    },
+		...
+
 ### v4.5.1
 
 [Improved]  

package/config/plugin-api.json

@@ -141,8 +141,8 @@
         "oauth": null,
         "tokenAuth": {
           "tokenUrl": "https://dummyjson.com/auth/login",
-          "username": "jissetts",
-          "password": "ePawWgrnZR8L"
+          "username": "emilys",
+          "password": "emilyspass"
         },
         "bearerAuth": null,
         "basicAuth": null,

package/lib/plugin-ldap.js

@@ -471,6 +471,8 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
     const guid = Buffer.from(id, 'base64').toString('hex')
     base = `<GUID=${guid}>`
   } else base = id // dn
+
+  if (Object.keys(endpointObj).length < 1) return null
   const ldapOptions = {
     operation: 'replace',
     modification: endpointObj

package/lib/plugin-loki.js

@@ -289,8 +289,20 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
       if (!userObj[key] || !Array.isArray(userObj[key])) userObj[key] = []
       // delete
       userObj[key] = userObj[key].filter(el => {
-        if (delArr.findIndex(e => e.value === el.value) >= 0) return false
-        return true
+        const index = delArr.findIndex(e => {
+          let elExist = false
+          for (const k in el) {
+            if (k === 'primary') continue
+            if (el[k] !== e[k]) {
+              elExist = false
+              break
+            }
+            elExist = true
+          }
+          return elExist
+        })
+        if (index >= 0) return false
+        else return true
       })
       // add
       addArr.forEach(el => {
@@ -303,7 +315,18 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
             }
           }
         }
-        userObj[key].push(el)
+        const index = userObj[key].findIndex(e => { // avoid adding existing
+          let elExist = false
+          for (const k in el) {
+            if (el[k] !== e[k]) {
+              elExist = false
+              break
+            }
+            elExist = true
+          }
+          return elExist
+        })
+        if (index < 0) userObj[key].push(el)
       })
     } else if (scimgateway.isMultiValueTypes(key)) { // "type converted object" logic and original blank type having type "undefined"
       if (!attrObj[key]) delete userObj[key] // blank or null

package/lib/plugin-mongodb.js

@@ -375,8 +375,20 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
       if (!userObj[key] || !Array.isArray(userObj[key])) userObj[key] = []
       // delete
       userObj[key] = userObj[key].filter(el => {
-        if (delArr.findIndex(e => e.value === el.value) >= 0) return false
-        return true
+        const index = delArr.findIndex(e => {
+          let elExist = false
+          for (const k in el) {
+            if (k === 'primary') continue
+            if (el[k] !== e[k]) {
+              elExist = false
+              break
+            }
+            elExist = true
+          }
+          return elExist
+        })
+        if (index >= 0) return false
+        else return true
       })
       // add
       addArr.forEach(el => {
@@ -389,7 +401,18 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
             }
           }
         }
-        userObj[key].push(el)
+        const index = userObj[key].findIndex(e => { // avoid adding existing
+          let elExist = false
+          for (const k in el) {
+            if (el[k] !== e[k]) {
+              elExist = false
+              break
+            }
+            elExist = true
+          }
+          return elExist
+        })
+        if (index < 0) userObj[key].push(el)
       })
     } else if (scimgateway.isMultiValueTypes(key)) { // "type converted object" logic and original blank type having type "undefined"
       if (!attrObj[key]) delete userObj[key] // blank or null

package/lib/scimgateway.js

@@ -1353,7 +1353,7 @@ const ScimGateway = function () {
     let u = ctx.request.originalUrl.substr(0, ctx.request.originalUrl.lastIndexOf('/'))
     u = u.substr(u.lastIndexOf('/') + 1) // u = Users, Groups
     const handle = handler[u]
-    const id = ctx.params.id
+    const id = decodeURIComponent(ctx.params.id)
     logger.debug(`${gwName}[${pluginName}] [Delete ${handle.description}] id=${id}`)
 
     try {
@@ -2658,13 +2658,15 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
             else {
               if (dotMap[`${key}.typeInbound`] && dotMap[`${key}.typeInbound`] === 'string') {
                 if (!dotNewObj[newStr]) dotNewObj[newStr] = dotParse[`${key}.${dotArrIndex}`]
-                else dotNewObj[newStr] = `${dotNewObj[newStr]}, ${dotParse[`${key}.${dotArrIndex}`]}`
+                else dotNewObj[newStr] = `${dotParse[`${key}.${dotArrIndex}`]},${dotNewObj[newStr]}`
               } else dotNewObj[`${newStr}.${dotArrIndex}`] = dotParse[`${key}.${dotArrIndex}`]
             }
           } else { // type=array but element is not array
             if (multiValue) dotNewObj[`${newStr}.0.value`] = dotParse[key]
             else dotNewObj[newStr] = dotParse[key]
-            if (!inboundArrCheck.includes(newStr)) inboundArrCheck.push(newStr) // will be checked
+            if (!dotMap[`${key}.typeInbound`] || dotMap[`${key}.typeInbound`] !== 'string') {
+              if (!inboundArrCheck.includes(newStr)) inboundArrCheck.push(newStr) // will be checked
+            }
           }
         } else { // none array
           // let mapTo = mapObj[key].mapTo
@@ -2748,7 +2750,6 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
         if (!dotPath) dotKey = key
         else dotKey = `${dotPath}.${key}`
         if (direction === 'outbound') { // outbound
-          if (obj[key] === '') obj[key] = null
           if (dotMap[`${dotKey}.type`]) {
             const type = dotMap[`${dotKey}.type`].toLowerCase()
             if (type === 'boolean' && obj[key].constructor === String) {
@@ -2757,7 +2758,7 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
             } else if (type === 'array') {
               if (!Array.isArray(obj[key])) {
                 if (!obj[key]) obj[key] = []
-                else obj[key] = [obj[key]]
+                else obj[key] = obj[key].split(',').map(item => item.trim())
               }
             } else if (dotMap.sAMAccountName) { // Active Directory
               if (dotMap[`${dotKey}.mapTo`].startsWith('addresses.') && dotMap[`${dotKey}.mapTo`].endsWith('.country')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "4.5.1",
+  "version": "4.5.4",
   "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",
@@ -32,24 +32,24 @@
   "dependencies": {
     "@godaddy/terminus": "^4.12.1",
     "callsite": "^1.0.0",
-    "dot-object": "^2.1.4",
+    "dot-object": "^2.1.5",
     "fold-to-ascii": "^5.0.1",
     "https-proxy-agent": "^7.0.4",
     "is-in-subnet": "^4.0.1",
     "jsonwebtoken": "^9.0.2",
-    "koa": "^2.15.2",
+    "koa": "^2.15.3",
     "koa-bodyparser": "^4.4.1",
     "koa-router": "^12.0.1",
     "ldapjs": "^3.0.7",
     "lokijs": "^1.5.12",
-    "mongodb": "^6.5.0",
-    "nats": "^2.19.0",
+    "mongodb": "^6.6.2",
+    "nats": "^2.26.0",
     "node-machine-id": "1.1.9",
     "nodemailer": "^6.9.13",
     "passport": "^0.7.0",
     "passport-azure-ad": "^4.3.5",
-    "tedious": "^18.1.0",
-    "winston": "^3.12.0"
+    "tedious": "^18.2.0",
+    "winston": "^3.13.0"
   },
   "devDependencies": {
     "chai": "^4.2.0",