Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamically load oauth-related libraries (backport #11448) #11518

Merged
merged 5 commits into from
Jun 21, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 21, 2024

Proposed Changes

It addresses one issue raised and two more issues found but not raised:

  • Load oauth javascript dependencies only when they are required #11421
  • the logged in user's name should only be a hyperlink to the user's record when the user is an administrator and it has been authenticated with the internal backend. In other words, if the user was authenticated with oauth or ldap or http, there is no internal record of the user hence the username should not be rendered as a hyperlink.
  • disable browser login dialog-box and instead always redirect the user to the login html page when either the credentials are wrong or user is not authorized or session has expired

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

This is an automatic backport of pull request #11448 done by [Mergify](https://mergify.com).

(cherry picked from commit ccb0059)

# Conflicts:
#	deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl
(cherry picked from commit dc7d410)
instead just indicate if the user is internal or not

(cherry picked from commit f0adf3a)
@mergify mergify bot added the conflicts label Jun 21, 2024
Copy link
Author

mergify bot commented Jun 21, 2024

Cherry-pick of ccb0059 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

@michaelklishin michaelklishin added this to the 3.13.4 milestone Jun 21, 2024
@michaelklishin michaelklishin merged commit e370d0e into v3.13.x Jun 21, 2024
284 of 285 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11448 branch June 21, 2024 15:07
@michaelklishin michaelklishin restored the mergify/bp/v3.13.x/pr-11448 branch June 21, 2024 15:38
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-11448 branch June 21, 2024 15:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants