Closed mergify[bot] closed 2 weeks ago
Cherry-pick of ccb0059cd44e5578de9cd602df6dd456813f62a3 has failed:
On branch mergify/bp/v3.13.x/pr-11448
Your branch is up to date with 'origin/v3.13.x'.
You are currently cherry-picking commit ccb0059cd4.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: deps/rabbitmq_management/priv/www/index.html
modified: deps/rabbitmq_management/priv/www/js/global.js
modified: deps/rabbitmq_management/priv/www/js/main.js
modified: deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js
modified: deps/rabbitmq_management/priv/www/js/oidc-oauth/login-callback.html
modified: deps/rabbitmq_management/priv/www/js/oidc-oauth/logout-callback.html
modified: deps/rabbitmq_management/priv/www/js/oidc-oauth/oidc-client-ts.js
modified: deps/rabbitmq_management/selenium/bin/components/devkeycloak
modified: deps/rabbitmq_management/selenium/bin/components/prodkeycloak
modified: deps/rabbitmq_management/selenium/full-suite-management-ui
modified: deps/rabbitmq_management/selenium/package.json
new file: deps/rabbitmq_management/selenium/suites/authnz-mgt/basic-auth-with-mgt-prefix.sh
modified: deps/rabbitmq_management/selenium/test/basic-auth/imports/users.json
modified: deps/rabbitmq_management/selenium/test/basic-auth/rabbitmq.conf
new file: deps/rabbitmq_management/selenium/test/basic-auth/rabbitmq.mgt-prefix.conf
new file: deps/rabbitmq_management/selenium/test/basic-auth/session-expired.js
new file: deps/rabbitmq_management/selenium/test/basic-auth/unauthorized.js
modified: deps/rabbitmq_management/selenium/test/oauth/imports/users.json
new file: deps/rabbitmq_management/selenium/test/oauth/with-basic-auth/unauthorized.js
modified: deps/rabbitmq_management/selenium/test/oauth/with-sp-initiated/unauthorized.js
modified: deps/rabbitmq_management/selenium/test/pageobjects/BasePage.js
modified: deps/rabbitmq_management/selenium/test/pageobjects/LoginPage.js
modified: deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl
modified: deps/rabbitmq_management_agent/src/rabbit_mgmt_format.erl
modified: deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_access_control.erl
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Proposed Changes
It addresses one issue raised and two more issues found but not raised:
Types of Changes
What types of changes does your code introduce to this project? Put an
x
in the boxes that applyThis is an automatic backport of pull request #11448 done by Mergify.