scimgateway 4.5.4 → 4.5.6

package/README.md

@@ -1163,6 +1163,19 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v4.5.6  
+
+[Improved]
+
+- plugin-ldap preserve multivalue-attribute order on modify. Do not apply to groups/members.
+
+### v4.5.5  
+
+[Fixed]
+
+- PUT /Groups/xxx failed on final group lookup and returned error
+- endpointMapper failed to correctly map customExtensions in certain use cases
+
 ### v4.5.4  
 
 [Fixed]

package/lib/plugin-ldap.js

@@ -1110,7 +1110,15 @@ const doRequest = async (baseEntity, method, base, ldapOptions, ctx) => {
           for (const key in options.modification) {
             const mod = {}
             mod.type = key
-            if (Array.isArray(options.modification[key])) mod.values = options.modification[key]
+            if (Array.isArray(options.modification[key])) {
+              mod.values = options.modification[key]
+              if (mod.values.length > 1) { // delete before replace to keep inbound order
+                changes.push({
+                  operation: 'delete',
+                  modification: {type: key, values: []}
+                })
+              }
+            }
             else {
               if (typeof options.modification[key] === 'string') mod.values = [options.modification[key]]
               else mod.values = [options.modification[key].toString()]

package/lib/scimgateway.js

@@ -1686,7 +1686,8 @@ const ScimGateway = function () {
   this.replaceUsrGrp = replaceUsrGrp
 
   router.put([`/(|scim/)(!${undefined}|Users|Groups|servicePlans)/:id`,
-  `/:baseEntity/(|scim/)(!${undefined}|Users|Groups|servicePlans)/:id`], async (ctx) => {
+    `/:baseEntity/(|scim/)(!${undefined}|Users|Groups|servicePlans)/:id`], async (ctx) => {
+    const originalUrl = ctx.request.originalUrl
     if (config.stream.publisher.enabled) {
       const streamObj = {
         handle: 'replaceUsrGrp',
@@ -1700,7 +1701,7 @@ const ScimGateway = function () {
     } else {
       await replaceUsrGrp(ctx)
     }
-    ctx.request.originalUrl = ctx.params.baseEntity ? `/${ctx.params.baseEntity}/Users/${ctx.params.id}` : `/Users/${ctx.params.id}`
+    ctx.request.originalUrl = originalUrl
     return await getById(ctx)
   })
 
@@ -2542,18 +2543,20 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
           let arrIndex = null
           const arr = key.split('.') // multivalue/array - servicePlan.0.value
           const keyOrg = key
-          if (arr[arr.length - 1] === 'value') {
-            if (!isNaN(arr[arr.length - 2])) { // servicePlan.0.value => servicePlan.0
-              for (let i = 0; i < (arr.length - 2); i++) {
+          if (arr.length > 1 && arr[arr.length - 1] === 'value') {
+            const secondLast = arr.length - 2
+            if (!isNaN(arr[secondLast])) { // servicePlan.0.value => servicePlan.0
+              for (let i = 0; i < (secondLast); i++) {
                 if (i === 0) key = arr[i]
                 else key += `.${arr[i]}`
               }
-              arrIndex = arr[arr.length - 2]
-            } else if (arr[arr.length - 2].slice(-1) === ']' && arr.length - 2 === 0) { // groups[0].value => groups.value
-              const startPos = arr[0].indexOf('[')
+              arrIndex = arr[secondLast]
+            } else if (arr[secondLast].slice(-1) === ']') { // groups[0].value => groups.value
+              const prefix = arr.slice(0, -1).join('.')
+              const startPos = prefix.indexOf('[')
               if (startPos > 0) {
-                key = arr[0].substring(0, startPos) + '.value' // groups.value
-                arrIndex = arr[0].substring(startPos + 1, arr[0].length - 1) // 1
+                key = prefix.substring(0, startPos) + '.value' // groups.value
+                arrIndex = prefix.substring(startPos + 1, prefix.length - 1) // 1
               }
             }
           }
@@ -2643,10 +2646,15 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
           dotArrIndex = keyArr[1]
         }
 
-        if (!dotMap[`${key}.mapTo`]) continue
+        let mapTo = dotMap[`${key}.mapTo`]
+        if (mapTo.startsWith('urn:')) { // dot workaround for none core (e.g. enterprise and custom schema attributes) having dot in key e.g "2.0": urn:ietf:params:scim:schemas:extension:enterprise:2.0:User.department
+          mapTo = mapTo.replace('.', '##') // only first occurence
+          noneCore = true
+        }
+        if (!mapTo) continue
 
         if (dotMap[`${key}.type`] === 'array') {
-          let newStr = dotMap[`${key}.mapTo`]
+          let newStr = mapTo
           if (newStr === 'roles') { // {"mapTo": "roles"} should be {"mapTo": "roles.value"}
             arrUnsupported.push('roles.value')
           }
@@ -2669,23 +2677,11 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
             }
           }
         } else { // none array
-          // let mapTo = mapObj[key].mapTo
-          let mapTo = dotMap[`${key}.mapTo`]
-          if (mapTo.startsWith('urn:')) { // dot workaround for none core (e.g. enterprise and custom schema attributes) having dot in key e.g "2.0": urn:ietf:params:scim:schemas:extension:enterprise:2.0:User.department
-            mapTo = mapTo.replace('.', '##') // only first occurence
-            noneCore = true
-          }
           const arrMapTo = mapTo.split(',').map(item => item.trim()) // supports {"mapTo": "id,userName"}
           for (let i = 0; i < arrMapTo.length; i++) {
             dotNewObj[arrMapTo[i]] = dotParse[key] // {"active": {"mapTo": "accountEnabled"} => str.replace("accountEnabled", "active")
           }
         }
-        // let mapTo = mapObj[key].mapTo
-        let mapTo = dotMap[`${key}.mapTo`]
-        if (mapTo.startsWith('urn:')) {
-          mapTo = mapTo.replace('.', '##')
-          noneCore = true
-        }
         const arr = mapTo.split('.') // addresses.work.postalCode
         if (arr.length > 2 && complexObj[arr[0]]) complexArr.push(arr[0]) // addresses
       }
@@ -2718,7 +2714,7 @@ ScimGateway.prototype.endpointMapper = function endpointMapper (direction, parse
     if (noneCore) { // revert back dot workaround
       const tmpObj = {}
       for (const key in newObj) {
-        if (key.includes('##')) {
+        if (key.startsWith('urn:') && key.includes('##')) {
           const newKey = key.replace('##', '.')
           tmpObj[newKey] = newObj[key]
         } else tmpObj[key] = newObj[key]

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "scimgateway",
-  "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",
-  "license": "MIT",
-  "main": "lib/scimgateway.js",
-  "scripts": {
-    "postinstall": "node lib/postinstall.js",
-    "start": "node index.js",
-    "test": "mocha -R spec ./test"
-  },
-  "bin": {
-    "scimgateway": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/jelhub/scimgateway.git"
-  },
-  "keywords": [
-    "scim",
-    "gateway",
-    "stream",
-    "iga",
-    "provisioning",
-    "entra"
-  ],
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "dependencies": {
-    "@godaddy/terminus": "^4.12.1",
-    "callsite": "^1.0.0",
-    "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.3",
-    "koa-bodyparser": "^4.4.1",
-    "koa-router": "^12.0.1",
-    "ldapjs": "^3.0.7",
-    "lokijs": "^1.5.12",
-    "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.2.0",
-    "winston": "^3.13.0"
-  },
-  "devDependencies": {
-    "chai": "^4.2.0",
-    "mocha": "^9.2.0",
-    "supertest": "^6.3.3"
-  }
-}
+{
+  "name": "scimgateway",
+  "version": "4.5.6",
+  "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",
+  "license": "MIT",
+  "main": "lib/scimgateway.js",
+  "scripts": {
+    "postinstall": "node lib/postinstall.js",
+    "start": "node index.js",
+    "test": "mocha -R spec ./test"
+  },
+  "bin": {
+    "scimgateway": "./index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jelhub/scimgateway.git"
+  },
+  "keywords": [
+    "scim",
+    "gateway",
+    "stream",
+    "iga",
+    "provisioning",
+    "entra"
+  ],
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "dependencies": {
+    "@godaddy/terminus": "^4.12.1",
+    "callsite": "^1.0.0",
+    "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.3",
+    "koa-bodyparser": "^4.4.1",
+    "koa-router": "^12.0.1",
+    "ldapjs": "^3.0.7",
+    "lokijs": "^1.5.12",
+    "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.2.0",
+    "winston": "^3.13.0"
+  },
+  "devDependencies": {
+    "chai": "^4.2.0",
+    "mocha": "^9.2.0",
+    "supertest": "^6.3.3"
+  }
+}