diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce0f1ae965438093529c7862b57d20d732a67b2f..a80690a07afac2b0c71028b7d2064ded9dd037c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,6 @@ variables: cache: paths: - node_modules/ - - ldap_credentials.json stages: - build @@ -38,9 +37,9 @@ tests:mocha: stage: tests script: - npm ci && npm i -g knex - - echo '{"dn":"dn", "passwd":"passwd"}' >> ldap_credentials.json # set up to use ldap, not ldaps - export LDAP_URI=ldap://ldapdev.eleves.polytechnique.fr:389 + - export LDAP_DN=uid=sigma,ou=services,dc=frankiz,dc=net - export TARGET_ENV=staging # in Kubernetes executor, hostname postgres is broken - export DB_HOST=127.0.0.1 diff --git a/src/adminview/admin_router.ts b/src/adminview/admin_router.ts index 16580914cf417cf133b670e32cf120db20c5fabd..8ecc74f5214788865ba0d4a8ec1111c0ff020563 100644 --- a/src/adminview/admin_router.ts +++ b/src/adminview/admin_router.ts @@ -39,7 +39,7 @@ dotenv.config(); let port = process.env.PORT; -const whitelist = process.env.ADMINS; +const whitelist = process.env.ADMINS.split(' '); /** * @function ensureIsAdmin diff --git a/src/ldap/internal/basics.ts b/src/ldap/internal/basics.ts index 60a5740375fec3e99b87f926e30e3a8c5f4f5512..d7924ecdb56b6df2aaab4aca5d9c66ce1955d1f1 100644 --- a/src/ldap/internal/basics.ts +++ b/src/ldap/internal/basics.ts @@ -107,7 +107,7 @@ export class Basics { // Quand la recherche est finie on se déconnecte res.on('end', res2 => { // Si la co avec le LDAP est tombée on relance - if (res2.status == 0) Basics.bind(); + if (res2.status != 0) Basics.bind(); resolve(true); }); }