Skip to content
New issue

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

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

Already on GitHub? # to your account

Disconnect MQTT client when its credential expires (backport #11867) (backport #11868) #11869

Merged
merged 3 commits into from
Jul 31, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 31, 2024

Fixes #11854 and #11862

This commit uses the same approach as implemented for AMQP 1.0 and Streams: When a token expires, RabbitMQ will close the connection.


This is an automatic backport of pull request #11867 done by Mergify.
This is an automatic backport of pull request #11868 done by Mergify.

Fixes https://github.com/rabbitmq/rabbitmq-server/discussions/11854
Fixes #11862

This commit uses the same approach as implemented for AMQP 1.0 and
Streams: When a token expires, RabbitMQ will close the connection.

(cherry picked from commit 7fb7833)
(cherry picked from commit 7488332)

# Conflicts:
#	deps/rabbit/src/rabbit_amqp_reader.erl
@mergify mergify bot added the conflicts label Jul 31, 2024
Copy link
Author

mergify bot commented Jul 31, 2024

Cherry-pick of 7488332 has failed:

On branch mergify/bp/v3.13.x/pr-11868
Your branch is up to date with 'origin/v3.13.x'.

You are currently cherry-picking commit 7488332a87.
  (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_auth_backend_oauth2/BUILD.bazel
	modified:   deps/rabbitmq_auth_backend_oauth2/Makefile
	modified:   deps/rabbitmq_auth_backend_oauth2/test/system_SUITE.erl
	modified:   deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl
	modified:   deps/rabbitmq_mqtt/src/rabbit_mqtt_reader.erl
	modified:   deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbit/src/rabbit_amqp_reader.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

@ansd ansd added this to the 3.13.7 milestone Jul 31, 2024
@ansd ansd merged commit bf16ce0 into v3.13.x Jul 31, 2024
188 checks passed
@ansd ansd deleted the mergify/bp/v3.13.x/pr-11868 branch July 31, 2024 08:37
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant