Login failed
'); } return false; } - + check_version() hide_popup_warn() replace_content('outer', format('layout', {})) var user_login_session_timeout = parseInt(user.login_session_timeout) @@ -1845,3 +1843,12 @@ function get_chart_range_type(arg) { console.log('[WARNING]: range type not found for arg: ' + arg); return 'basic'; } + +function check_version() { + let curVersion = sync_get('/version') + let storedVersion = get_pref('version') + if (!storedVersion || storedVersion != curVersion) { + store_pref('version', curVersion) + location.reload() + } +} diff --git a/deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js b/deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js index 6ebc53a6ed01..ef5e20f44812 100644 --- a/deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js +++ b/deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js @@ -301,18 +301,26 @@ export function oauth_completeLogin() { export function oauth_initiateLogout() { if (oauth.sp_initiated) { - mgr.metadataService.getEndSessionEndpoint().then(endpoint => { - if (endpoint == undefined) { - // Logout only from management UI - mgr.removeUser().then(res => { - clear_auth() - oauth_redirectToLogin() + return mgr.getUser().then(user => { + if (user != null) { + mgr.metadataService.getEndSessionEndpoint().then(endpoint => { + if (endpoint == undefined) { + // Logout only from management UI + mgr.removeUser().then(res => { + clear_auth() + oauth_redirectToLogin() + }) + }else { + // OpenId Connect RP-Initiated Logout + mgr.signoutRedirect() + } }) }else { - // OpenId Connect RP-Initiated Logout - mgr.signoutRedirect() + clear_auth() + go_to_home() } }) + } else { go_to_authority() } @@ -381,8 +389,7 @@ export function hasAnyResourceServerReady(oauth, onReadyCallback) { return group; }, {}) let warnings = [] - for(var url in groupByProviderURL){ - console.log(url + ': ' + groupByProviderURL[url]); + for(var url in groupByProviderURL){ const notReadyResources = groupByProviderURL[url].filter((oauthserver) => notReadyServers.includes(oauthserver.oauth_provider_url)) const notCompliantResources = groupByProviderURL[url].filter((oauthserver) => notCompliantServers.includes(oauthserver.oauth_provider_url)) if (notReadyResources.length == 1) { @@ -396,7 +403,6 @@ export function hasAnyResourceServerReady(oauth, onReadyCallback) { warnings.push(warningMessageOAuthResources(url, notCompliantResources, " not compliant")) } } - console.log("warnings:" + warnings) oauth.declared_resource_servers_count = oauth.resource_servers.length oauth.resource_servers = oauth.resource_servers.filter((resource) => !notReadyServers.includes(resource.oauth_provider_url) && !notCompliantServers.includes(resource.oauth_provider_url)) diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_dispatcher.erl b/deps/rabbitmq_management/src/rabbit_mgmt_dispatcher.erl index 726a4291cf0f..c0bf84ce23b7 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_dispatcher.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_dispatcher.erl @@ -207,5 +207,6 @@ dispatcher() -> {"/auth/attempts/:node/source", rabbit_mgmt_wm_auth_attempts, [by_source]}, {"/login", rabbit_mgmt_wm_login, []}, {"/config/effective", rabbit_mgmt_wm_environment, []}, - {"/auth/hash_password/:password", rabbit_mgmt_wm_hash_password, []} + {"/auth/hash_password/:password", rabbit_mgmt_wm_hash_password, []}, + {"/version", rabbit_mgmt_wm_version, []} ]. diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_headers.erl b/deps/rabbitmq_management/src/rabbit_mgmt_headers.erl index b4d348d74d55..573f1ef77684 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_headers.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_headers.erl @@ -55,14 +55,18 @@ set_common_permission_headers(ReqData0, EndpointModule) -> lists:foldl(fun(Fun, ReqData) -> Fun(ReqData, EndpointModule) end, ReqData0, - [fun set_csp_headers/2, + [fun set_etag_based_cache_headers/2, + fun set_csp_headers/2, fun set_hsts_headers/2, fun set_cors_headers/2, fun set_content_type_options_header/2, fun set_xss_protection_header/2, fun set_frame_options_header/2]). +set_etag_based_cache_headers(ReqData0, _Module) -> + cowboy_req:set_resp_header(<<"cache-control">>, <<"public, max-age=0, must-revalidate">>, ReqData0). + set_no_cache_headers(ReqData0, _Module) -> - ReqData1 = cowboy_req:set_resp_header(<<"cache-control">>, <<"no-cache, no-store, must-revalidate">>, ReqData0), + ReqData1 = cowboy_req:set_resp_header(<<"cache-control">>, <<"no-cache, no-store, max-age=0, must-revalidate">>, ReqData0), ReqData2 = cowboy_req:set_resp_header(<<"pragma">>, <<"no-cache">>, ReqData1), cowboy_req:set_resp_header(<<"expires">>, rabbit_data_coercion:to_binary(0), ReqData2). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_version.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_version.erl new file mode 100644 index 000000000000..1b322ab6ba81 --- /dev/null +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_version.erl @@ -0,0 +1,38 @@ +%% This Source Code Form is subject to the terms of the Mozilla Public +%% License, v. 2.0. If a copy of the MPL was not distributed with this +%% file, You can obtain one at https://mozilla.org/MPL/2.0/. +%% +%% Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries. All rights reserved. +%% + +-module(rabbit_mgmt_wm_version). + +-export([init/2]). +-export([to_json/2, content_types_provided/2]). +-export([variances/2]). + +-include_lib("rabbit_common/include/rabbit.hrl"). +-include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). + +%%-------------------------------------------------------------------- + +init(Req, _State) -> + {cowboy_rest, rabbit_mgmt_headers:set_no_cache_headers( + rabbit_mgmt_headers:set_common_permission_headers(Req, ?MODULE), ?MODULE), + #context{}}. + +variances(Req, Context) -> + {[<<"accept-encoding">>, <<"origin">>], Req, Context}. + +content_types_provided(ReqData, Context) -> + {rabbit_mgmt_util:responder_map(to_json), ReqData, Context}. + +to_json(ReqData, Context) -> + Version = case rabbit:product_info() of + #{product_version := Value} -> Value; + #{product_base_version := Base} -> Base + end, + rabbit_mgmt_util:reply(list_to_binary(Version), ReqData, Context). + +%%-------------------------------------------------------------------- + diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl index d7a1dadadadc..c2230064247b 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl @@ -56,7 +56,7 @@ all() -> ]. groups() -> - [ + [ {all_tests_with_prefix, [], some_tests() ++ all_tests()}, {all_tests_without_prefix, [], some_tests()}, %% We have several groups because their interference is @@ -104,7 +104,6 @@ definitions_group4_tests() -> definitions_vhost_test ]. - all_tests() -> [ cli_redirect_test, api_redirect_test, @@ -201,8 +200,9 @@ all_tests() -> [ disabled_qq_replica_opers_test, qq_status_test, list_deprecated_features_test, - list_used_deprecated_features_test, - cluster_and_node_tags_test + list_used_deprecated_features_test, + cluster_and_node_tags_test, + version_test ]. %% ------------------------------------------------------------------- @@ -3749,6 +3749,13 @@ oauth_test(Config) -> %% cleanup rpc(Config, application, unset_env, [rabbitmq_management, oauth_enabled]). +version_test(Config) -> + ActualVersion = http_get(Config, "/version"), + ct:log("ActualVersion : ~p", [ActualVersion]), + ExpectedVersion = rpc(Config, rabbit, base_product_version, []), + ct:log("ExpectedVersion : ~p", [ExpectedVersion]), + ?assertEqual(ExpectedVersion, binary_to_list(ActualVersion)). + login_test(Config) -> http_put(Config, "/users/myuser", [{password, <<"myuser">>}, {tags, <<"management">>}], {group, '2xx'}), diff --git a/selenium/README.md b/selenium/README.md index 131c0a370648..c64a16403d29 100644 --- a/selenium/README.md +++ b/selenium/README.md @@ -62,6 +62,9 @@ not see any browser interaction, everything happens in the background, i.e. rabb **The interactive mode** - This mode is convenient when we are still working on RabbitMQ source code and/or in the selenium tests. In this mode, you run RabbitMQ and tests directly from source to speed things up. The components, such as, UAA or keycloak, run in docker. +**IMPORTANT** - If you intend to switch between version of RabbitMQ, make sure +you run `./clean.sh` to clear any state left from the last test run. + ## Run tests in headless-mode diff --git a/selenium/bin/components/keycloak b/selenium/bin/components/keycloak index d6470262f194..aa0d6a38a39a 100644 --- a/selenium/bin/components/keycloak +++ b/selenium/bin/components/keycloak @@ -39,7 +39,7 @@ start_keycloak() { --publish 8443:8443 \ --env KEYCLOAK_ADMIN=admin \ --env KEYCLOAK_ADMIN_PASSWORD=admin \ - --mount type=bind,source=${MOUNT_KEYCLOAK_CONF_DIR},target=/opt/keycloak/data/import/ \ + -v ${MOUNT_KEYCLOAK_CONF_DIR}:/opt/keycloak/data/import/ \ ${KEYCLOAK_DOCKER_IMAGE} start-dev --import-realm \ --https-certificate-file=/opt/keycloak/data/import/server_keycloak_certificate.pem \ --https-certificate-key-file=/opt/keycloak/data/import/server_keycloak_key.pem diff --git a/selenium/bin/suite_template b/selenium/bin/suite_template index faad7cbb8031..0b80d419908a 100644 --- a/selenium/bin/suite_template +++ b/selenium/bin/suite_template @@ -475,7 +475,7 @@ teardown_local_others() { if [[ $REQUIRED_COMPONENTS == "" ]]; then print "There are no other components" else - teardown_components + teardown_components true fi } test_local() { @@ -528,13 +528,18 @@ start_components() { } teardown_components() { - begin "Tear down ..." + skip_rabbitmq=${1:-false} + + begin "Tear down ... " for i in "${REQUIRED_COMPONENTS[@]}" do - local component="$i" - stop="stop_$i" - type "$stop" &>/dev/null && $stop || kill_container_if_exist "$component" - print "Tear down $component" + if [[ $i != "rabbitmq" || ($i == "rabbitmq" && $skip_rabbitmq == false) ]] + then + local component="$i" + stop="stop_$i" + type "$stop" &>/dev/null && $stop || kill_container_if_exist "$component" + print "Tear down $component" + fi done end "Finished teardown" } diff --git a/selenium/clean.sh b/selenium/clean.sh new file mode 100755 index 000000000000..a113a5978bc7 --- /dev/null +++ b/selenium/clean.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +rm -r $TMPDIR/rabbitmq-test-instances diff --git a/selenium/suites/authnz-mgt/oauth-and-basic-auth.sh b/selenium/suites/authnz-mgt/oauth-and-basic-auth.sh index 07aa42fb0443..ea31d4bbd279 100755 --- a/selenium/suites/authnz-mgt/oauth-and-basic-auth.sh +++ b/selenium/suites/authnz-mgt/oauth-and-basic-auth.sh @@ -4,7 +4,7 @@ SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" TEST_CASES_PATH=/oauth/with-basic-auth TEST_CONFIG_PATH=/oauth -PROFILES="keycloak jwks keycloak-oauth-provider enable-basic-auth tls" +PROFILES="keycloak keycloak-oauth-provider keycloak-mgt-oauth-provider tls enable-basic-auth" source $SCRIPT/../../bin/suite_template $@ runWith keycloak diff --git a/selenium/test/basic-auth/unauthorized.js b/selenium/test/basic-auth/unauthorized.js index 2399817f5733..ceae65d8b172 100644 --- a/selenium/test/basic-auth/unauthorized.js +++ b/selenium/test/basic-auth/unauthorized.js @@ -19,9 +19,8 @@ describe('An user without management tag', function () { overview = new OverviewPage(driver) captureScreen = captureScreensFor(driver, __filename) - assert.ok(!await login.isPopupWarningDisplayed()) - await login.login('rabbit_no_management', 'rabbit_no_management') - await !overview.isLoaded() + //assert.ok(!await login.isPopupWarningDisplayed()) + await login.login('rabbit_no_management', 'guest') }) it('cannot log in into the management ui', async function () { @@ -35,7 +34,7 @@ describe('An user without management tag', function () { it('should get popup warning dialog', async function(){ assert.ok(login.isPopupWarningDisplayed()) - assert.equal('Not_Authorized', await login.getPopupWarning()) + assert.equal('Not management user', await login.getPopupWarning()) }) describe("After clicking on popup warning dialog button", function() { diff --git a/selenium/test/mgt-only/imports/users.json b/selenium/test/mgt-only/imports/users.json index b17df9ea0c68..372649127156 100644 --- a/selenium/test/mgt-only/imports/users.json +++ b/selenium/test/mgt-only/imports/users.json @@ -49,6 +49,9 @@ "vhosts": [ { "name": "/" + }, + { + "name": "other" } ], "permissions": [ @@ -59,6 +62,13 @@ "write": ".*", "read": ".*" }, + { + "user": "guest", + "vhost": "other", + "configure": ".*", + "write": ".*", + "read": ".*" + }, { "user": "management", "vhost": "/", diff --git a/selenium/test/multi-oauth/certs/ca_certificate.pem b/selenium/test/multi-oauth/certs/ca_certificate.pem deleted file mode 100644 index cd37bea304f5..000000000000 --- a/selenium/test/multi-oauth/certs/ca_certificate.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDezCCAmOgAwIBAgIJAOA06nrAwraBMA0GCSqGSIb3DQEBCwUAMEwxOzA5BgNV -BAMMMlRMU0dlblNlbGZTaWduZWR0Um9vdENBIDIwMjMtMTEtMTZUMTI6MjQ6NDcu -Mjg5MDkzMQ0wCwYDVQQHDAQkJCQkMB4XDTIzMTExNjExMjQ0N1oXDTMzMTExMzEx -MjQ0N1owTDE7MDkGA1UEAwwyVExTR2VuU2VsZlNpZ25lZHRSb290Q0EgMjAyMy0x -MS0xNlQxMjoyNDo0Ny4yODkwOTMxDTALBgNVBAcMBCQkJCQwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDWJrvvUvpkiAhvIiciuTbFHRMC7VdOXdIM3y3I -Vt56Voj3dkCVitFcvTc+pkuqoQUaWRTc5M+875CaQSRIDfVyFTIGTyVXv6cZRcoz -0gcmYvopIJ4Wi5/xG9Qp8uJMtr+UBJ57ez6Urau/L3zETAVZA+y1bTylAlh4tjMH -I24bvyy4yNQbPtG4y5F9x484fn3H4x7lf6O/Xulcvy8vL1kyc/EgrF4fpjogwj58 -eQ5HLwbAlMRRxXxXX2U5tXlrv475WItp/1mhZ+j2yCMKB4tJ8tXbtpgou0JDtlN0 -8Jwm3+d5a6PxqynmgRAXStZ4Fda93Pa3FJfw1u63JrmOprG9AgMBAAGjYDBeMA8G -A1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBS2Icxjr1ucGCIx -ikeSG9igJf558jAfBgNVHSMEGDAWgBS2Icxjr1ucGCIxikeSG9igJf558jANBgkq -hkiG9w0BAQsFAAOCAQEAR0iG00uE2GnoWtaXEHYJTdvBBcStBB8qnRk19Qu/b8qd -HAhRGb31IiuYzNJxLxhOtXWQMKvsKPAKpPXP3c5XVAf2O156GoXEPkKQktF738Pp -rRlrQPqU9Qpm84rMC54EB7coxEs7HMx4do/kNaVPdqq++JIEAcWOEVKfudN+8TMR -XyUJT54jBacsTpAZNfY6boJmuQ+G6tkpQvlHOU6388IFuLPkYRO7h7CHVbDsMEXD -Ptg3PCK97nCVgs4xfQGR7nT2pawfEUQVMon/XShtXY0RIKpynwrgICHDdvMXRXlG -a4haA7sz8Wyroy6Ub5+X3s4YRumSQrhiwRzqU+f75A== ------END CERTIFICATE----- diff --git a/selenium/test/multi-oauth/certs/server_rabbitmq_certificate.pem b/selenium/test/multi-oauth/certs/server_rabbitmq_certificate.pem deleted file mode 100644 index ef57ff61a411..000000000000 --- a/selenium/test/multi-oauth/certs/server_rabbitmq_certificate.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDxDCCAqygAwIBAgIBDTANBgkqhkiG9w0BAQsFADBMMTswOQYDVQQDDDJUTFNH -ZW5TZWxmU2lnbmVkdFJvb3RDQSAyMDIzLTExLTE2VDEyOjI0OjQ3LjI4OTA5MzEN -MAsGA1UEBwwEJCQkJDAeFw0yNDAyMDkwODE3MDFaFw0zNDAyMDYwODE3MDFaMCQx -ETAPBgNVBAMMCHJhYmJpdG1xMQ8wDQYDVQQKDAZzZXJ2ZXIwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQCjxmYRJeYfOnQ91ZSIZsjznnPiy0yukFnapF7Y -iIXxFCygEnw/hwqSG7ddkvDjNlc6P+K4rEEBmER87mEl0YqvAZ9/C6K4OANJFuD7 -kQYH3Uyt+aXJfeyByAjr8HM/jSHDZm5DpysVlSBMkJGg4sV9h38i0aT27+J0a4xm -Yb9pH+bbWKn4QflvOQi7IcyZ+PcB54/vCDZRtlypkT/6EuqTXqRHH9wGlYaos+Jo -XMQDWykYtN2160E1gUwW1OhdRlDHj21Tej9fYObRjb326au4e3ivTPqKYLYsSz0Y -dcRoM6SjvwGiAC131n2XeHyKTQrMeKOb+TTVHzJZG7iUM5iBAgMBAAGjgdgwgdUw -CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG -AQUFBwMCMCkGA1UdEQQiMCCCCHJhYmJpdG1xgglsb2NhbGhvc3SCCWxvY2FsaG9z -dDAdBgNVHQ4EFgQUs9vJtNmoNWybsVgMmeRqcPGXRckwHwYDVR0jBBgwFoAUtiHM -Y69bnBgiMYpHkhvYoCX+efIwMQYDVR0fBCowKDAmoCSgIoYgaHR0cDovL2NybC1z -ZXJ2ZXI6ODAwMC9iYXNpYy5jcmwwDQYJKoZIhvcNAQELBQADggEBAHxsmfxpoGZg -AlLu+Y62TQxqp2i+PqLJHuGBdB/93NV3S3P3tlDaqHwYt0mveS7ej+JXhw9wvSZz -jmejWePL08FXD9KPggRP4/SsG6Adf/5+vcofYR23I7D4y9hsrDqZezCurWZ4LY4X -dYmIQcI6IwgcjffWhsyt3CEbU+yVg6jrjVWv5sVPi3xZUu/dwpTdrdNzeUIFM8vf -H3BS8EcLwtaNR4snLJlFIhuDfDv7Ewi1FsmM4zkSe/aHboUNDduI2poRW/EPtbdM -zD1pVXNh1Q9hkqFCD7l4Vua+JVsA7PWD7yr73pm2ak6GfgjA7Enj0a6KbAfAXLMr -otRknmbKCUU= ------END CERTIFICATE----- diff --git a/selenium/test/multi-oauth/certs/server_rabbitmq_key.pem b/selenium/test/multi-oauth/certs/server_rabbitmq_key.pem deleted file mode 100644 index f5df03f73df8..000000000000 --- a/selenium/test/multi-oauth/certs/server_rabbitmq_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjxmYRJeYfOnQ9 -1ZSIZsjznnPiy0yukFnapF7YiIXxFCygEnw/hwqSG7ddkvDjNlc6P+K4rEEBmER8 -7mEl0YqvAZ9/C6K4OANJFuD7kQYH3Uyt+aXJfeyByAjr8HM/jSHDZm5DpysVlSBM -kJGg4sV9h38i0aT27+J0a4xmYb9pH+bbWKn4QflvOQi7IcyZ+PcB54/vCDZRtlyp -kT/6EuqTXqRHH9wGlYaos+JoXMQDWykYtN2160E1gUwW1OhdRlDHj21Tej9fYObR -jb326au4e3ivTPqKYLYsSz0YdcRoM6SjvwGiAC131n2XeHyKTQrMeKOb+TTVHzJZ -G7iUM5iBAgMBAAECggEAOdYOpW+k3NJfypZqZeEmhiIm+qig4+TGVphFhmJwKrrd -J4pfpm+iJAb1sm3588N0+nUlM+Jg8pc7WIM2e4yMVVFVaiBJzpS5VE5oFW8Zmh1k -vuuyyH1X0F08CVZY3NCSY9cAiZO3e1+2kFNdmlt7MuFu3HT8tNfyOPriEiXi2tSA -qmgUmMql305wYwjIp+mTP8X7YKKdIdCXwPC2E1Kj5SseEc9NYvHdmeJ3nZCVATbS -h8aP7HB5GpsDMHbnnFzOqPfxIPxYkJ4JqE0iGpw+SMYbIGLVkMEGodpWjBwZiaaI -EMeJJk3Qs/QvVLDxhSsFXsaLGLgYN0rItYX9dUyroQKBgQDOOLKJ9OPcm3sAWo9e -byRYegDPPM06Es5s0hF0Pr0u6X8F7fDnpS74XVMlWxZzvXWgZQNwC2nYaGfNpK5t -E2FxIC0S69W4m1L6sp2sTRLSJo5NiZc4kNVjGvnmgIrNqMhJK8pLOh5xx6/kAbpo -/lydhtXWP0omw5imFkh3bGQuZwKBgQDLTsCu01OCNuQs0Y9hgW/iHzRpX1aHvp8X -u8v/AtOS3z5a3WptrLah/HHM5B/4Hh9dW4uljuR0zTsk8dFD8lQ/mdxbXjPGEcN6 -QNe1Md2nV0xAZsW1Xp1iFDomS5xSn+qWDmR0EAXvs0hHMQnX1k7+dp2mK1whRwdM -z4mv0cZg1wKBgDnuzaFZ7aVs/GoGBt7FpFVCuPV/JDxbSihh/0tD0MvcBrY4uQOq -cP6O4SvOYglTwTa1CfkxC6Qi+H5Z9DJqTmaEXoVBQYIiCHarNQZRhKcK89EuhQ/8 -CCZWTrwFgnjyIIoFxkfJ5QGb0nrgTWjvhD8wwOP2VbN8IWcPPX5nMeGjAoGBAL7b -y59T3E2d4k8A3C2ZKcOJr9ZMHhuJJClPr45SxPRYh10eB0+2mC0xpFPIxQpUnPUz -f8GIh4fvMtrX+LBkyhp7ApbztH75Jh2ayeXcTk1OctLyqCBAFleAzaYtzS7z2XHN -SRh8AlaoY+4RZ0AsfDP+frkEc5T57Sx6mLNpp2Y5AoGAXG5BGedrCMa44Ugpux41 -saTIlaXUOObxdsGTLMOy1Ppb9LW5yk4kS8ObP3SksjUUZrRUO/BagLukgcaS038/ -AbNDU5lMCmMfwxPN2lulERhaIA1BeVgmOwJYY7nqXkL5Yibu0OXnvvbCkt0eLnp2 -ATZBECwIxNuB9pixRmDhXsM= ------END PRIVATE KEY----- diff --git a/selenium/test/multi-oauth/devkeycloak/ca_certificate.pem b/selenium/test/multi-oauth/devkeycloak/ca_certificate.pem deleted file mode 100644 index cd37bea304f5..000000000000 --- a/selenium/test/multi-oauth/devkeycloak/ca_certificate.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDezCCAmOgAwIBAgIJAOA06nrAwraBMA0GCSqGSIb3DQEBCwUAMEwxOzA5BgNV -BAMMMlRMU0dlblNlbGZTaWduZWR0Um9vdENBIDIwMjMtMTEtMTZUMTI6MjQ6NDcu -Mjg5MDkzMQ0wCwYDVQQHDAQkJCQkMB4XDTIzMTExNjExMjQ0N1oXDTMzMTExMzEx -MjQ0N1owTDE7MDkGA1UEAwwyVExTR2VuU2VsZlNpZ25lZHRSb290Q0EgMjAyMy0x -MS0xNlQxMjoyNDo0Ny4yODkwOTMxDTALBgNVBAcMBCQkJCQwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDWJrvvUvpkiAhvIiciuTbFHRMC7VdOXdIM3y3I -Vt56Voj3dkCVitFcvTc+pkuqoQUaWRTc5M+875CaQSRIDfVyFTIGTyVXv6cZRcoz -0gcmYvopIJ4Wi5/xG9Qp8uJMtr+UBJ57ez6Urau/L3zETAVZA+y1bTylAlh4tjMH -I24bvyy4yNQbPtG4y5F9x484fn3H4x7lf6O/Xulcvy8vL1kyc/EgrF4fpjogwj58 -eQ5HLwbAlMRRxXxXX2U5tXlrv475WItp/1mhZ+j2yCMKB4tJ8tXbtpgou0JDtlN0 -8Jwm3+d5a6PxqynmgRAXStZ4Fda93Pa3FJfw1u63JrmOprG9AgMBAAGjYDBeMA8G -A1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBS2Icxjr1ucGCIx -ikeSG9igJf558jAfBgNVHSMEGDAWgBS2Icxjr1ucGCIxikeSG9igJf558jANBgkq -hkiG9w0BAQsFAAOCAQEAR0iG00uE2GnoWtaXEHYJTdvBBcStBB8qnRk19Qu/b8qd -HAhRGb31IiuYzNJxLxhOtXWQMKvsKPAKpPXP3c5XVAf2O156GoXEPkKQktF738Pp -rRlrQPqU9Qpm84rMC54EB7coxEs7HMx4do/kNaVPdqq++JIEAcWOEVKfudN+8TMR -XyUJT54jBacsTpAZNfY6boJmuQ+G6tkpQvlHOU6388IFuLPkYRO7h7CHVbDsMEXD -Ptg3PCK97nCVgs4xfQGR7nT2pawfEUQVMon/XShtXY0RIKpynwrgICHDdvMXRXlG -a4haA7sz8Wyroy6Ub5+X3s4YRumSQrhiwRzqU+f75A== ------END CERTIFICATE----- diff --git a/selenium/test/multi-oauth/devkeycloak/server_devkeycloak.p12 b/selenium/test/multi-oauth/devkeycloak/server_devkeycloak.p12 deleted file mode 100644 index 015ebc99a18b..000000000000 Binary files a/selenium/test/multi-oauth/devkeycloak/server_devkeycloak.p12 and /dev/null differ diff --git a/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_certificate.pem b/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_certificate.pem deleted file mode 100644 index 7c11ae263701..000000000000 --- a/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_certificate.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDzDCCArSgAwIBAgIBCzANBgkqhkiG9w0BAQsFADBMMTswOQYDVQQDDDJUTFNH -ZW5TZWxmU2lnbmVkdFJvb3RDQSAyMDIzLTExLTE2VDEyOjI0OjQ3LjI4OTA5MzEN -MAsGA1UEBwwEJCQkJDAeFw0yNDAxMTMxMTU4MzRaFw0zNDAxMTAxMTU4MzRaMCcx -FDASBgNVBAMMC2RldmtleWNsb2FrMQ8wDQYDVQQKDAZzZXJ2ZXIwggEiMA0GCSqG -SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCt5/wvIdHr5FJvIWNiwoaict0G/pkHnUYs -VIHjLjeR59q5qAojrKRqs32D9eeKqikHv/xTp9dpOa8qwpho11bSs/HgnXZKie1F -fQG/8arfipHkODn10VoNtZ0Revu5on9h67kkgyjCk4WKG34o7ye4qacJhOAGV8LU -HJXyA1kPFCtZzvcobYwbpPENpV7MWfxqa9gIV6IZln7EttzcraDfsYIr44uLbfeC -2BcvJZP+JFXmTBZz0fbMfLsv6z5KF0pH4XKInINan9ajGLnE5SbvqMLHQ4KANwMP -Q8OLtU4is6wNAgAQmCYphmdd5k3m2fwXN+YeMohBGjdKz/cxnx7LAgMBAAGjgd0w -gdowCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG -CCsGAQUFBwMCMC4GA1UdEQQnMCWCC2RldmtleWNsb2FrggtkZXZrZXljbG9ha4IJ -bG9jYWxob3N0MB0GA1UdDgQWBBTaLvUjHU7ggs6aF7YUycglgDeQCjAfBgNVHSME -GDAWgBS2Icxjr1ucGCIxikeSG9igJf558jAxBgNVHR8EKjAoMCagJKAihiBodHRw -Oi8vY3JsLXNlcnZlcjo4MDAwL2Jhc2ljLmNybDANBgkqhkiG9w0BAQsFAAOCAQEA -i1wni0pi4RY1Txu3Lef5vd9FzUqKYBi2bcrMVliAmmCjKriwSP0/zd9LgoyC57/3 -WUZ3cLMSdmMc8go1QPEBmkwjtkw0HACN+XXOmocRimewmBhCQ5Lh90xuFJlk7snN -FbwQmohE6w+DvQAy8vseHS6WKeVsMCSPtQk2ID9/DEhSndQDJeYDpjrwUOn2B+Kf -WbHLryT//sk6xMq4++ljQEld1NU1z8bo1a5D2juH9724KlzZcE70nJOaCGLPdamt -e+p0kw7xlQH67+R1IaYgDNand62P7b+KZZML0B88QUC166ZeablncyFca5SMCYlS -z6HFKTiVN19ZgqC084RQOw== ------END CERTIFICATE----- diff --git a/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_key.pem b/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_key.pem deleted file mode 100644 index 9c2f3b11fda8..000000000000 --- a/selenium/test/multi-oauth/devkeycloak/server_devkeycloak_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCt5/wvIdHr5FJv -IWNiwoaict0G/pkHnUYsVIHjLjeR59q5qAojrKRqs32D9eeKqikHv/xTp9dpOa8q -wpho11bSs/HgnXZKie1FfQG/8arfipHkODn10VoNtZ0Revu5on9h67kkgyjCk4WK -G34o7ye4qacJhOAGV8LUHJXyA1kPFCtZzvcobYwbpPENpV7MWfxqa9gIV6IZln7E -ttzcraDfsYIr44uLbfeC2BcvJZP+JFXmTBZz0fbMfLsv6z5KF0pH4XKInINan9aj -GLnE5SbvqMLHQ4KANwMPQ8OLtU4is6wNAgAQmCYphmdd5k3m2fwXN+YeMohBGjdK -z/cxnx7LAgMBAAECggEAUJtrx8jsTWOqVfpq37b8wsVs77YI5n+erCOLhOrCNS37 -svxRntGB8Dc8IXNUnHBczkvNwFTWwt5K9A34qPfPNaDUp2E1GD2wLfpQWlDA/BZ1 -owvwyaD9FcetgxG3JgdM9e1WBreIqA/K4QX3Ry/7AFwaoY3mbOo20yxg0Cl/GT5j -DtI+RpNvA480yQWTjJBE3bk9S/9k38bAtRT9C6ArQqhkasXxBbuZiyb5GOvBZ3iN -hhMvgXrj2g038jbElWlo/uSLcsRadPnLAvXXROKrqLMnKTkv3BnqmPXQXdP0eNet -XoXAxbb8FbYtTxHceiyfwTOqtvUv+07wh8tiZDiUKQKBgQDg0QPFm2hqpMWPhsal -fwtVa7QMsF6MVaLB2eb3onZoQxZpWOXyeA7hfJz4iGiObM12EF98k+9G3Mg88gEI -RV+ENE7XI/YZcfQQsT4JNtR9CS0xDihSrmr80ndFburMT3oucpw/76AOs38Oof1q -cs3VLCYAIMHm6SHm1ylTN3bQvQKBgQDGBzPerVMnwntLPie1gAIYDIvlSim81nhm -Aa2jCIAgtogTXJ/WCtznvAxhDUsBG5Mn4oaS38oaBXSlnp0Vuz9ibZCMPxc2hADU -1GSpXl/xv9yC2HHjMeWWWPoF9Qtpo9x1XipkxYIeJYTulqaPXTd6YGSdQ7NENTuX -f0o5Sgy6JwKBgQCYKT+5To8kpvNESn9G4i8EmMobUIAd0ZRASkCGWQJ1XPrdQJsa -OmIwAcyodoL16vRBNaG7StFHkAVDIrTKKVIVw+Wcva1C2ZrMdXo8eEznd/+LVT67 -f2vQRI8PgpwOvrg+mbnhmEknyht0BvXjR2LDJodtzL4QkLguanCA72hOrQKBgBQw -w88eaO4S3DNNwQq2ZIBDNzhHmX3ReDEeVq/avAWZ1sHynbFbJi7Sc4iprE4Om7Bj -Xkk3XAnPKJeCVo3Sq6HDfgtum1VJnDQW+7RxFOM3JqqImwQJIFl19PgKhgFdXarx -0Oy5XozoUmdpIM5ZOMDXdyq5rltz+gF2TwEMVcPdAoGAVAr+aCEmFmvo1B+VoUYg -wMef7vU8CmSVXWFN9G+7vsJ5xbk6D1VLQf8+hTO2VvOjWfjMqxPuOT5Bz6lsKNh6 -wgzXljUx0ZB/9c6rXCf06IT+CvFWWr2j1hgaCSmDQ6x/FV0H6tV4oSIAztEuJfGk -Hl/FLnRCHMe1OqG/Gh/WjTQ= ------END PRIVATE KEY----- diff --git a/selenium/test/multi-oauth/prodkeycloak/ca_certificate.pem b/selenium/test/multi-oauth/prodkeycloak/ca_certificate.pem deleted file mode 100644 index cd37bea304f5..000000000000 --- a/selenium/test/multi-oauth/prodkeycloak/ca_certificate.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDezCCAmOgAwIBAgIJAOA06nrAwraBMA0GCSqGSIb3DQEBCwUAMEwxOzA5BgNV -BAMMMlRMU0dlblNlbGZTaWduZWR0Um9vdENBIDIwMjMtMTEtMTZUMTI6MjQ6NDcu -Mjg5MDkzMQ0wCwYDVQQHDAQkJCQkMB4XDTIzMTExNjExMjQ0N1oXDTMzMTExMzEx -MjQ0N1owTDE7MDkGA1UEAwwyVExTR2VuU2VsZlNpZ25lZHRSb290Q0EgMjAyMy0x -MS0xNlQxMjoyNDo0Ny4yODkwOTMxDTALBgNVBAcMBCQkJCQwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDWJrvvUvpkiAhvIiciuTbFHRMC7VdOXdIM3y3I -Vt56Voj3dkCVitFcvTc+pkuqoQUaWRTc5M+875CaQSRIDfVyFTIGTyVXv6cZRcoz -0gcmYvopIJ4Wi5/xG9Qp8uJMtr+UBJ57ez6Urau/L3zETAVZA+y1bTylAlh4tjMH -I24bvyy4yNQbPtG4y5F9x484fn3H4x7lf6O/Xulcvy8vL1kyc/EgrF4fpjogwj58 -eQ5HLwbAlMRRxXxXX2U5tXlrv475WItp/1mhZ+j2yCMKB4tJ8tXbtpgou0JDtlN0 -8Jwm3+d5a6PxqynmgRAXStZ4Fda93Pa3FJfw1u63JrmOprG9AgMBAAGjYDBeMA8G -A1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBS2Icxjr1ucGCIx -ikeSG9igJf558jAfBgNVHSMEGDAWgBS2Icxjr1ucGCIxikeSG9igJf558jANBgkq -hkiG9w0BAQsFAAOCAQEAR0iG00uE2GnoWtaXEHYJTdvBBcStBB8qnRk19Qu/b8qd -HAhRGb31IiuYzNJxLxhOtXWQMKvsKPAKpPXP3c5XVAf2O156GoXEPkKQktF738Pp -rRlrQPqU9Qpm84rMC54EB7coxEs7HMx4do/kNaVPdqq++JIEAcWOEVKfudN+8TMR -XyUJT54jBacsTpAZNfY6boJmuQ+G6tkpQvlHOU6388IFuLPkYRO7h7CHVbDsMEXD -Ptg3PCK97nCVgs4xfQGR7nT2pawfEUQVMon/XShtXY0RIKpynwrgICHDdvMXRXlG -a4haA7sz8Wyroy6Ub5+X3s4YRumSQrhiwRzqU+f75A== ------END CERTIFICATE----- diff --git a/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak.p12 b/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak.p12 deleted file mode 100644 index 4e363100e505..000000000000 Binary files a/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak.p12 and /dev/null differ diff --git a/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_certificate.pem b/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_certificate.pem deleted file mode 100644 index f155d4123327..000000000000 --- a/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_certificate.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDzzCCAregAwIBAgIBDDANBgkqhkiG9w0BAQsFADBMMTswOQYDVQQDDDJUTFNH -ZW5TZWxmU2lnbmVkdFJvb3RDQSAyMDIzLTExLTE2VDEyOjI0OjQ3LjI4OTA5MzEN -MAsGA1UEBwwEJCQkJDAeFw0yNDAxMTMxMTU4NDNaFw0zNDAxMTAxMTU4NDNaMCgx -FTATBgNVBAMMDHByb2RrZXljbG9hazEPMA0GA1UECgwGc2VydmVyMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyRzkMDxZj7DP52nc4voOCz07tfpam9Qp -JbqJFwCb9SQkL/feGA86+IuzRJW9N3RozM5jeIa+yV7Obf+km4FYxPP6SffEEeM9 -SEqMAz1BNfUxGvo4XI6TmJ2u7YK0haVPDRSIGNmJO1tZgceOU0WeUkpNaNh4yF+f -3AQEEtd78ywdR/NHnx6wFCEtlPkSIoBLUX0/lF78YLkDZRBCRasUWP3m3/StUYzx -6V7LtBfiUhSd2W6AvxUo8NLRu70wNUyVuwwUthEj8AxeyX1SH3UybA/OT68c64NH -gZauVdDbz7cBVJCJU2fGUO8+Rq/dS7lwRymee/nZ5iqg2cfCEIsehwIDAQABo4Hf -MIHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB -BggrBgEFBQcDAjAwBgNVHREEKTAnggxwcm9ka2V5Y2xvYWuCDHByb2RrZXljbG9h -a4IJbG9jYWxob3N0MB0GA1UdDgQWBBRHLuo22l4IoKXLxGFVjbG7bi6oJzAfBgNV -HSMEGDAWgBS2Icxjr1ucGCIxikeSG9igJf558jAxBgNVHR8EKjAoMCagJKAihiBo -dHRwOi8vY3JsLXNlcnZlcjo4MDAwL2Jhc2ljLmNybDANBgkqhkiG9w0BAQsFAAOC -AQEAnawpUvXok9AVLD2JSnFT3hzc5sRkMMuLLR9nskGpmp594mgMKebVOMh7x/OT -2/pO8RnqTyA5AB3DJPb+1bDBtFmcWaktOLOuYOw7GXvNRzTIRmW0i65l7cgnHOdU -U3JW/D/FozY02w5nVh14NDhgHs0BsDOJXUmogsmlvKFfeKiaB8vIz6wdLlA2eg6L -AQZNjiACNbzzd2C3duSDD6BhoImN0j7QsksPtwDwujAIFZcjlz7J11KRniDbecjq -cCc/gU/Ms8q8aahK84fG9UcPZJe6MtFY0B9AmiEmq2ImFlWWHUh33eSwIr37jywN -+8bxzT1vgTTqskv+wMbM+mQa2w== ------END CERTIFICATE----- diff --git a/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_key.pem b/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_key.pem deleted file mode 100644 index b2cf9e44c515..000000000000 --- a/selenium/test/multi-oauth/prodkeycloak/server_prodkeycloak_key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJHOQwPFmPsM/n -adzi+g4LPTu1+lqb1CkluokXAJv1JCQv994YDzr4i7NElb03dGjMzmN4hr7JXs5t -/6SbgVjE8/pJ98QR4z1ISowDPUE19TEa+jhcjpOYna7tgrSFpU8NFIgY2Yk7W1mB -x45TRZ5SSk1o2HjIX5/cBAQS13vzLB1H80efHrAUIS2U+RIigEtRfT+UXvxguQNl -EEJFqxRY/ebf9K1RjPHpXsu0F+JSFJ3ZboC/FSjw0tG7vTA1TJW7DBS2ESPwDF7J -fVIfdTJsD85Prxzrg0eBlq5V0NvPtwFUkIlTZ8ZQ7z5Gr91LuXBHKZ57+dnmKqDZ -x8IQix6HAgMBAAECggEBAJ0IvzDe3rvxPtWedsiQogiqnoZA3yFQL3TzS3o3ko9+ -0fbWn4e/1LcgNjF2jpHPhsls2oTRCgYozh1cAUcfX5YiP6wkF+gzvLVG6D7bRKEC -PH6pJPs4pQ0FCwMQDS9R3gEDqCVnLt23PZO1o29oK/BrbjhQ1zb2W9erFxczROih -hHMpLucuY/X55/6QrbyosNqjXCTpoR98Bk6xnvMyuXuIwCgQCT6HD8yvKH3+gG06 -LOQ3t9jy+JIiiwX7l/JNJPYZr+ElXlZa4DGO15/91qcDZbBIsmGJsZHlaglojjUn -utyrqnai1jInZPMGvlZfuLkAuOPtJKMZdXoS8LzlcXkCgYEA+ukTVtlxYHtGb84I -xR2YQ7Zn1pYJj6Sc01wQuo+oHpFuOpi/VUGrsnKN9W1bxL7T8TJC0Rjffz7mfuGs -5YoWFOplVju0sG1KtpQ2qBKAaMiGsPoa4L2VbZnlyzQj1rDa0RYwW+zNnbGfipdg -jqfsjknvGA/aaLgbkMv0ZH5GJyMCgYEAzTE6P3EcZheU+swDUwpoOYkVRCH39xy5 -roX0VLwpU7ARUqgmBj22Z1dnh9WM1+9Rc+LYFOtY1C1IWfPy/x/edJel5hHW+8EF -80kYp3Hv6CfYWlVDDxbmzpN8lHnYKigR/eKVq32jSMoQ4NTduwBb3NkMHHQG3cft -885zPFrLU00CgYEAx7sLmwICn4PiIRQIpSiW0af85rOOrtqhwBo0ct3yPUsVTO3U -uQBKtgU8fdbsyyQAwKp6x8od90PR5cSthhcy1rlzq35hqmOFqus2yvnXYBHoLi8Z -gDdKIPH2G5jIwpkLxo78NeC+GL6ROpif009XHjk6a5QLD3sm7k98nxZpr7MCgYBD -Oj27S3PifxdwlCcCrgY305IEIJz9eYvcgkbq/DsOEEGcszrCELYSZbCl8HGUzfQB -4/Cn6fPQkIWD80lKDUb1LDpOhsnI8hThALHzKoFPrr5T2lt+NiKoy+mlO8Z3CWnb -pMEkzqUQ1CNzhkqfWh6+3N369IjLYRW1K47V12mGgQKBgCXyTridJ0HZRuspKOo0 -SGQONUEELIs9jOyqZqt3/0vhhkD9rpyEL+J1dr+pKTAFTw3G0bC8A2FlykCnD2Ph -rMUucItj6svLLPIN8GzLxI2c1h5lwbPpVDyVIkcZCqbJ9V0vLzP+JmIsDscQG3xw -SyfaSuozFOSzgIg/ZZNEGT9P ------END PRIVATE KEY----- diff --git a/selenium/test/oauth/with-basic-auth-idp-down/happy-login.js b/selenium/test/oauth/with-basic-auth-idp-down/happy-login.js index 73d1ccd4a650..3a7d2baafb06 100644 --- a/selenium/test/oauth/with-basic-auth-idp-down/happy-login.js +++ b/selenium/test/oauth/with-basic-auth-idp-down/happy-login.js @@ -1,32 +1,30 @@ const { By, Key, until, Builder } = require('selenium-webdriver') require('chromedriver') const assert = require('assert') -const { buildDriver, goToHome, captureScreensFor, teardown, idpLoginPage } = require('../../utils') +const { buildDriver, goToHome, captureScreensFor, teardown, delay } = require('../../utils') const SSOHomePage = require('../../pageobjects/SSOHomePage') const OverviewPage = require('../../pageobjects/OverviewPage') describe('When basic authentication is enabled but UAA is down', function () { let homePage - let idpLogin let overview let captureScreen before(async function () { driver = buildDriver() await goToHome(driver) - homePage = new SSOHomePage(driver) - idpLogin = idpLoginPage(driver) + homePage = new SSOHomePage(driver) overview = new OverviewPage(driver) captureScreen = captureScreensFor(driver, __filename) }) it('can log in with Basic Auth', async function () { await homePage.toggleBasicAuthSection() + assert.ok(await homePage.isLoginButtonVisible) await homePage.basicAuthLogin('guest', 'guest') - if (!await overview.isLoaded()) { - throw new Error('Failed to login') - } + await overview.isLoaded() + assert.equal(await overview.getUser(), 'User guest') await overview.logout() }) diff --git a/selenium/test/pageobjects/BasePage.js b/selenium/test/pageobjects/BasePage.js index 2f00a5e67d71..e4a6da0fb81c 100644 --- a/selenium/test/pageobjects/BasePage.js +++ b/selenium/test/pageobjects/BasePage.js @@ -1,4 +1,4 @@ -const { By, Key, until, Builder, Select } = require('selenium-webdriver') +const { By, Key, until, Builder, Select, WebDriverError, NoSuchSessionError } = require('selenium-webdriver') const MENU_TABS = By.css('div#menu ul#tabs') const USER = By.css('li#logout') @@ -184,7 +184,9 @@ module.exports = class BasePage { 'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] seconds locating ' + locator, this.polling) }catch(error) { - console.error("Failed to locate element " + locator) + if (!error.name.includes("NoSuchSessionError")) { + console.error("Failed waitForLocated " + locator + " due to " + error) + } throw error } } @@ -194,8 +196,10 @@ module.exports = class BasePage { return this.driver.wait(until.elementIsVisible(element), this.timeout, 'Timed out after [timeout=' + this.timeout + ';polling=' + this.polling + '] awaiting till visible ' + element, this.polling) - }catch(error) { - console.error("Failed to find visible element " + element) + }catch(error) { + if (!error.name.includes("NoSuchSessionError")) { + console.error("Failed to find visible element " + element + " due to " + error) + } throw error } } @@ -206,7 +210,9 @@ module.exports = class BasePage { try { return this.waitForVisible(await this.waitForLocated(locator)) }catch(error) { - console.error("Failed to waitForDisplayed for locator " + locator) + if (!error.name.includes("NoSuchSessionError")) { + console.error("Failed to waitForDisplayed " + locator + " due to " + error) + } throw error } } diff --git a/selenium/test/pageobjects/SSOHomePage.js b/selenium/test/pageobjects/SSOHomePage.js index 4bb074a52597..38ef6f3af3c2 100644 --- a/selenium/test/pageobjects/SSOHomePage.js +++ b/selenium/test/pageobjects/SSOHomePage.js @@ -87,8 +87,11 @@ module.exports = class SSOHomePage extends BasePage { async basicAuthLogin (username, password) { await this.isLoaded() + await this.waitForDisplayed(BASIC_AUTH_LOGIN_USERNAME) await this.sendKeys(BASIC_AUTH_LOGIN_USERNAME, username) + await this.waitForDisplayed(BASIC_AUTH_LOGIN_PASSWORD) await this.sendKeys(BASIC_AUTH_LOGIN_PASSWORD, password) + await this.waitForDisplayed(BASIC_AUTH_LOGIN_FORM) return this.submit(BASIC_AUTH_LOGIN_FORM) }