From a53bf7d89e01e98dcdc62b5357a0404d5489c9a1 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 7 Nov 2023 15:14:49 -0500 Subject: [PATCH] 18874: Use test auth instead of adding real accounts on test host. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- .../cypress/integration/login.spec.js | 19 ++++++------------- services/workbench2/tools/arvados_config.yml | 6 +++++- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/services/workbench2/cypress/integration/login.spec.js b/services/workbench2/cypress/integration/login.spec.js index 2c539e4902..79f73670a3 100644 --- a/services/workbench2/cypress/integration/login.spec.js +++ b/services/workbench2/cypress/integration/login.spec.js @@ -27,17 +27,10 @@ describe('Login tests', function() { .as('inactiveUser').then(function() { inactiveUser = this.inactiveUser; } - ); - randomUser.username = `randomuser${Math.floor(Math.random() * 999999)}`; - randomUser.password = { - crypt: 'zpAReoZzPnwmQ', - clear: 'topsecret', - }; - cy.exec(`useradd ${randomUser.username} -p ${randomUser.password.crypt}`); - }) - - after(function() { - cy.exec(`userdel ${randomUser.username}`); + ); + // Username/password match Login.Test section of arvados_config.yml + randomUser.username = 'randomuser1234'; + randomUser.password = 'topsecret'; }) beforeEach(function() { @@ -128,14 +121,14 @@ describe('Login tests', function() { cy.get('#username').type(randomUser.username); cy.get('#password').type('wrong password'); cy.get("button span:contains('Log in')").click(); - cy.get('p#password-helper-text').should('contain', 'PAM: Authentication failure'); + cy.get('p#password-helper-text').should('contain', 'authentication failed'); cy.url().should('not.contain', '/projects/'); }) it('successfully authenticates using the login form', function() { cy.visit('/'); cy.get('#username').type(randomUser.username); - cy.get('#password').type(randomUser.password.clear); + cy.get('#password').type(randomUser.password); cy.get("button span:contains('Log in')").click(); cy.url().should('contain', '/projects/'); cy.get('div#root').should('contain', 'Arvados Workbench (zzzzz)'); diff --git a/services/workbench2/tools/arvados_config.yml b/services/workbench2/tools/arvados_config.yml index 1ef77b86ce..ba41c51b63 100644 --- a/services/workbench2/tools/arvados_config.yml +++ b/services/workbench2/tools/arvados_config.yml @@ -18,8 +18,12 @@ Clusters: original_owner_uuid: {Function: original_owner, Protected: true} Login: TrustPrivateNetworks: true - PAM: + Test: Enable: true + Users: + randomuser1234: + Email: randomuser1234@example.invalid + Password: topsecret StorageClasses: default: Default: true -- 2.30.2