test(saml): fix test cases

GluuFederation · Nov 22, 2023 · 7ec9342 · 7ec9342
1 parent ac45306
commit 7ec9342
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/config/test.js b/config/test.js
@@ -63,15 +63,15 @@ const passportConfigAuthorizedResponse = {
     displayName: 'saml only 1',
     type: 'saml',
     mapping: 'saml_ldap_profile',
-    passportStrategyId: 'passport-saml',
+    passportStrategyId: '@node-saml/passport-saml',
     enabled: true,
     callbackUrl:
       'https://chris.gluuthree.org/passport/auth/saml' +
       '/saml-only-1/callback',
     requestForEmail: false,
     emailLinkingSafe: false,
     options: {
-      skipRequestCompression: 'True',
+      skipRequestCompression: true,
       authnRequestBinding: 'HTTP-POST',
       identifierFormat:
         'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
@@ -84,13 +84,13 @@ const passportConfigAuthorizedResponse = {
     displayName: 'saml-emailreq',
     type: 'saml',
     mapping: 'saml_ldap_profile',
-    passportStrategyId: 'passport-saml',
+    passportStrategyId: '@node-saml/passport-saml',
     enabled: true,
     callbackUrl: 'https://chris.gluuthree.org/passport/auth/saml/saml-emailreq/callback',
     requestForEmail: true,
     emailLinkingSafe: false,
     options: {
-      skipRequestCompression: 'True',
+      skipRequestCompression: true,
       authnRequestBinding: 'HTTP-POST',
       identifierFormat: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
       cert: 'MIIDlzCCAn8CFBgf85Th/k9LW/WX1Tm2K8L46XFKMA0GCSqGSIb3DQEBCwUAMIGHMQswCQYDVQQGEwJCUjELMAkGA1UECAwCU1AxEjAQBgNVBAcMCVNhbyBQYXVsbzEZMBcGA1UECgwQQ2hyaXMgVGVzdGluZyBuQzEaMBgGA1UEAwwRY2hyaXMuZ2x1dXR3by5vcmcxIDAeBgkqhkiG9w0BCQEWEWNocmlzQHRlc3RpbmcuY29tMB4XDTIwMDYyMzE0NDU1M1oXDTIxMDYyMzE0NDU1M1owgYcxCzAJBgNVBAYTAkJSMQswCQYDVQQIDAJTUDESMBAGA1UEBwwJU2FvIFBhdWxvMRkwFwYDVQQKDBBDaHJpcyBUZXN0aW5nIG5DMRowGAYDVQQDDBFjaHJpcy5nbHV1dHdvLm9yZzEgMB4GCSqGSIb3DQEJARYRY2hyaXNAdGVzdGluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaxbLrWDti7ZLAU4YVxNR6bkjt/HDfczBNF5ULlqttTbP65HgOMAl9eI8Sg+vPN2y7lk7ogQW4bJ3gcBfiBjanU8jrVMntXB8VwhZ8YYThkg1NBb9KPf9sW6FsOz+LDKNxJQeXu7jbKtb7KZvAQiFWCLil6VuKgvmjcDSnRARkSSacqVs7vM/OH9t+zRdeLA2LFEfUIW1GoOi66Tmt6hnVIhIm9I6vJOE+ym0HnyqPUQy6ZEWGbVbJ4Fn9JJmoZ3jJ1v9ZxfKJt2ZCz2HydOWJHXyg2fZwCBVdoJcydtVWQFNVJMEvQUCZNofyiJsCu+rQ033NWyhtrjlYL2fEqRnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABDbtviA7rVkg/8wPRYPgi07jCoR9x7ZnJjMB4xHFgwIKRF7FKapUBOvqzSmYbNm3JotAdq6o9gPD3rEjQh4Sy2fptA64fquY6Fo5paVTL5AECdumv67+ziB5mtYE0iabY+QHcLHpy6kqJvFpaeUeBNypvx6SaZ3BM/9Q5VwEmmuuf+VAnY/7Q/BHVUhUBeNs9G1LOtqLTr56QyOO4ET1NKihAeE8A/R05O7fELlB2HJ4LxhMLfzwQwQIzAg5fxYrZLtjGu524SSL7Xb6BuLIitwZVAYBcXS2Up37NGHdQu9c2uHFQoxk+ZNKO1ZRUl7IE/8c6DjMTRXRpZqqRaUBco=',
@@ -102,13 +102,13 @@ const passportConfigAuthorizedResponse = {
     displayName: 'saml-emaillink',
     type: 'saml',
     mapping: 'saml_ldap_profile',
-    passportStrategyId: 'passport-saml',
+    passportStrategyId: '@node-saml/passport-saml',
     enabled: true,
     callbackUrl: 'https://chris.gluuthree.org/passport/auth/saml/saml-emaillink/callback',
     requestForEmail: false,
     emailLinkingSafe: true,
     options: {
-      skipRequestCompression: 'True',
+      skipRequestCompression: true,
       authnRequestBinding: 'HTTP-POST',
       identifierFormat: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
       cert: 'MIIDlzCCAn8CFBgf85Th/k9LW/WX1Tm2K8L46XFKMA0GCSqGSIb3DQEBCwUAMIGHMQswCQYDVQQGEwJCUjELMAkGA1UECAwCU1AxEjAQBgNVBAcMCVNhbyBQYXVsbzEZMBcGA1UECgwQQ2hyaXMgVGVzdGluZyBuQzEaMBgGA1UEAwwRY2hyaXMuZ2x1dXR3by5vcmcxIDAeBgkqhkiG9w0BCQEWEWNocmlzQHRlc3RpbmcuY29tMB4XDTIwMDYyMzE0NDU1M1oXDTIxMDYyMzE0NDU1M1owgYcxCzAJBgNVBAYTAkJSMQswCQYDVQQIDAJTUDESMBAGA1UEBwwJU2FvIFBhdWxvMRkwFwYDVQQKDBBDaHJpcyBUZXN0aW5nIG5DMRowGAYDVQQDDBFjaHJpcy5nbHV1dHdvLm9yZzEgMB4GCSqGSIb3DQEJARYRY2hyaXNAdGVzdGluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaxbLrWDti7ZLAU4YVxNR6bkjt/HDfczBNF5ULlqttTbP65HgOMAl9eI8Sg+vPN2y7lk7ogQW4bJ3gcBfiBjanU8jrVMntXB8VwhZ8YYThkg1NBb9KPf9sW6FsOz+LDKNxJQeXu7jbKtb7KZvAQiFWCLil6VuKgvmjcDSnRARkSSacqVs7vM/OH9t+zRdeLA2LFEfUIW1GoOi66Tmt6hnVIhIm9I6vJOE+ym0HnyqPUQy6ZEWGbVbJ4Fn9JJmoZ3jJ1v9ZxfKJt2ZCz2HydOWJHXyg2fZwCBVdoJcydtVWQFNVJMEvQUCZNofyiJsCu+rQ033NWyhtrjlYL2fEqRnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABDbtviA7rVkg/8wPRYPgi07jCoR9x7ZnJjMB4xHFgwIKRF7FKapUBOvqzSmYbNm3JotAdq6o9gPD3rEjQh4Sy2fptA64fquY6Fo5paVTL5AECdumv67+ziB5mtYE0iabY+QHcLHpy6kqJvFpaeUeBNypvx6SaZ3BM/9Q5VwEmmuuf+VAnY/7Q/BHVUhUBeNs9G1LOtqLTr56QyOO4ET1NKihAeE8A/R05O7fELlB2HJ4LxhMLfzwQwQIzAg5fxYrZLtjGu524SSL7Xb6BuLIitwZVAYBcXS2Up37NGHdQu9c2uHFQoxk+ZNKO1ZRUl7IE/8c6DjMTRXRpZqqRaUBco=',
@@ -120,13 +120,13 @@ const passportConfigAuthorizedResponse = {
     displayName: 'saml-yidpinitiated',
     type: 'saml',
     mapping: 'saml_ldap_profile',
-    passportStrategyId: 'passport-saml',
+    passportStrategyId: '@node-saml/passport-saml',
     enabled: true,
     callbackUrl: 'https://chris.gluuthree.org/passport/auth/saml/saml-yidpinitiated/callback',
     requestForEmail: false,
     emailLinkingSafe: false,
     options: {
-      skipRequestCompression: 'true',
+      skipRequestCompression: true,
       authnRequestBinding: 'HTTP-POST',
       validateInResponseTo: 'false',
       identifierFormat: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',
@@ -157,15 +157,15 @@ const passportConfigAuthorizedResponse = {
     displayName: 'saml redis',
     type: 'saml',
     mapping: 'saml_ldap_profile',
-    passportStrategyId: 'passport-saml',
+    passportStrategyId: '@node-saml/passport-saml',
     enabled: true,
     callbackUrl:
       'https://chris.gluuthree.org/passport/auth/saml' +
       '/saml-redis-test/callback',
     requestForEmail: false,
     emailLinkingSafe: false,
     options: {
-      skipRequestCompression: 'True',
+      skipRequestCompression: true,
       authnRequestBinding: 'HTTP-POST',
       identifierFormat:
         'urn:oasis:names:tc:SAML:2.0:nameid-format:transient',

diff --git a/server/providers.js b/server/providers.js
@@ -74,6 +74,7 @@ async function setupStrategy (provider) {
       Strategy = Strategy.Strategy
     }
 
+    logger.log2('info', `Adding to list of known strategies ${id} ${Strategy}`)
     logger.log2('verbose', 'Adding to list of known strategies')
     passportStrategies.push({ id, Strategy })
   }

diff --git a/test/cache-provider.test.js b/test/cache-provider.test.js
@@ -20,7 +20,7 @@ describe('cache provider test', () => {
       assert.fail('redis connection should not work')
     })
     client.on('error', actualError => {
-      const expectedError = new Error('Redis connection in broken state: retry aborted.')
+      const expectedError = new Error('Ready check failed: NOAUTH Authentication required.')
       assert.equal(actualError.message, expectedError.message)
     })
   })

diff --git a/test/providers.test.js b/test/providers.test.js
@@ -2,7 +2,7 @@ const chai = require('chai')
 const rewire = require('rewire')
 const providers = rewire('../server/providers.js')
 const config = require('config')
-const PassportSAMLStrategy = require('passport-saml').Strategy
+const PassportSAMLStrategy = require('@node-saml/passport-saml').Strategy
 const helper = require('./helper')
 const fs = require('fs').promises
 const path = require('path')

diff --git a/test/sp-meta.test.js b/test/sp-meta.test.js
@@ -1,6 +1,6 @@
 const chai = require('chai')
 const rewire = require('rewire')
-const PassportSAMLStrategy = require('passport-saml').Strategy
+const PassportSAMLStrategy = require('@node-saml/passport-saml').Strategy
 const rewireSPMeta = rewire('../server/sp-meta')
 const config = require('config')