Merge branch 'main' into improve-login-exp

dukex · web-flow · commit 175634e2f8f5 · 2023-10-30T12:03:41.000-03:00
diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
@@ -539,6 +539,7 @@ def all_srcs(name = "all_srcs"):
             "include/amqqueue.hrl",
             "include/amqqueue_v2.hrl",
             "include/gm_specs.hrl",
+            "include/internal_user.hrl",
             "include/mc.hrl",
             "include/rabbit_global_counters.hrl",
             "include/vhost.hrl",
diff --git a/deps/rabbit/include/internal_user.hrl b/deps/rabbit/include/internal_user.hrl
@@ -0,0 +1,4 @@
+-define(is_internal_user(U),
+        (?is_internal_user_v2(U))).
+
+-define(is_internal_user_v2(U), is_record(U, internal_user, 6)).
diff --git a/deps/rabbit/src/rabbit_db_exchange_m2k_converter.erl b/deps/rabbit/src/rabbit_db_exchange_m2k_converter.erl
@@ -45,7 +45,7 @@ init_copy_to_khepri(StoreId, _MigrationId, Tables) ->
 %% @private
 
 copy_to_khepri(
-  rabbit_exchange = Table, Record,
+  rabbit_exchange = Table, #exchange{} = Record,
   #?MODULE{store_id = StoreId} = State) ->
     Name = Record#exchange.name,
     ?LOG_DEBUG(
diff --git a/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl b/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl
@@ -45,7 +45,7 @@ init_copy_to_khepri(StoreId, _MigrationId, Tables) ->
 %% @private
 
 copy_to_khepri(
-  rabbit_node_maintenance_states = Table, Record,
+  rabbit_node_maintenance_states = Table, #node_maintenance_state{} = Record,
   #?MODULE{store_id = StoreId} = State) ->
     Name = Record#node_maintenance_state.node,
     ?LOG_DEBUG(
diff --git a/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl b/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl
@@ -13,6 +13,7 @@
 -include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
+-include("amqqueue.hrl").
 
 -export([init_copy_to_khepri/3,
          copy_to_khepri/3,
@@ -45,7 +46,7 @@ init_copy_to_khepri(StoreId, _MigrationId, Tables) ->
 %% @private
 
 copy_to_khepri(rabbit_queue = Table, Record,
-               #?MODULE{store_id = StoreId} = State) ->
+               #?MODULE{store_id = StoreId} = State) when ?is_amqqueue(Record) ->
     Name = amqqueue:get_name(Record),
     ?LOG_DEBUG(
        "Mnesia->Khepri data copy: [~0p] key: ~0p",
diff --git a/deps/rabbit/src/rabbit_db_user_m2k_converter.erl b/deps/rabbit/src/rabbit_db_user_m2k_converter.erl
@@ -13,6 +13,7 @@
 -include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
+-include("internal_user.hrl").
 
 -export([init_copy_to_khepri/3,
          copy_to_khepri/3,
@@ -46,7 +47,7 @@ init_copy_to_khepri(StoreId, _MigrationId, Tables) ->
 
 copy_to_khepri(
   rabbit_user = Table, Record,
-  #?MODULE{store_id = StoreId} = State) ->
+  #?MODULE{store_id = StoreId} = State) when ?is_internal_user(Record) ->
     Username = internal_user:get_username(Record),
     ?LOG_DEBUG(
        "Mnesia->Khepri data copy: [~0p] key: ~0p",
@@ -62,7 +63,7 @@ copy_to_khepri(
         Error -> Error
     end;
 copy_to_khepri(
-  rabbit_user_permission = Table, Record,
+  rabbit_user_permission = Table, #user_permission{} = Record,
   #?MODULE{store_id = StoreId} = State) ->
     #user_permission{
        user_vhost = #user_vhost{
@@ -89,7 +90,7 @@ copy_to_khepri(
         Error -> Error
     end;
 copy_to_khepri(
-  rabbit_topic_permission = Table, Record,
+  rabbit_topic_permission = Table, #topic_permission{} = Record,
   #?MODULE{store_id = StoreId} = State) ->
     #topic_permission{
        topic_permission_key =
diff --git a/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl b/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl
@@ -13,6 +13,7 @@
 -include_lib("khepri/include/khepri.hrl").
 -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl").
 -include_lib("rabbit_common/include/rabbit.hrl").
+-include("vhost.hrl").
 
 -export([init_copy_to_khepri/3,
          copy_to_khepri/3,
@@ -46,7 +47,7 @@ init_copy_to_khepri(StoreId, _MigrationId, Tables) ->
 
 copy_to_khepri(
   rabbit_vhost = Table, Record,
-  #?MODULE{store_id = StoreId} = State) ->
+  #?MODULE{store_id = StoreId} = State) when ?is_vhost(Record) ->
     Name = vhost:get_name(Record),
     ?LOG_DEBUG(
        "Mnesia->Khepri data copy: [~0p] key: ~0p",
diff --git a/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl b/deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl
@@ -1581,7 +1581,8 @@ drop_local(QNames, #state{subscriptions = Subs,
                               "qos", _:1/binary >>},
            #{binding_keys := BindingKeys}})
             when Vhost0 =:= Vhost andalso
-                 ClientId0 =:= ClientId ->
+                 ClientId0 =:= ClientId andalso
+                 map_size(BindingKeys) > 0 ->
               rabbit_misc:maps_any(
                 fun(BKey, true) ->
                         TopicFilter = amqp_to_mqtt(BKey),
diff --git a/release-notes/3.11.25.md b/release-notes/3.11.25.md
@@ -0,0 +1,70 @@
+RabbitMQ `3.11.25` is a maintenance release in the `3.11.x` [release series](https://www.rabbitmq.com/versions.html).
+This release series [goes out of community support on Dec 31, 2023](https://rabbitmq.com/versions.html).
+
+Please refer to the upgrade section from [v3.11.0 release notes](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.11.0)
+if upgrading from a version prior to 3.11.0.
+
+This release requires Erlang 25 and supports Erlang versions up to `25.3.x`.
+[RabbitMQ and Erlang/OTP Compatibility Matrix](https://www.rabbitmq.com/which-erlang.html) has more details on
+Erlang version requirements for RabbitMQ.
+
+
+### Minimum Supported Erlang Version
+
+As of 3.11.0, RabbitMQ requires Erlang 25. Nodes **will fail to start** on older Erlang releases.
+
+Erlang 25 as our new baseline means much improved performance on ARM64 architectures, [profiling with flame graphs](https://blog.rabbitmq.com/posts/2022/05/flame-graphs/)
+across all architectures, and the most recent TLS 1.3 implementation available to all RabbitMQ 3.11 users.
+
+
+## Changes Worth Mentioning
+
+Release notes can be found on GitHub at [rabbitmq-server/release-notes](https://github.com/rabbitmq/rabbitmq-server/tree/v3.11.x/release-notes).
+
+
+### Core Server
+
+#### Bug Fixes
+
+ * Avoids a potential exception in the `autoheal` partition handler.
+
+   Contributed by @Ayanda-D.
+
+   GitHub issue: [#9819](https://github.com/rabbitmq/rabbitmq-server/pull/9819)
+
+#### Enhancements
+
+ * `raft.segment_max_entries` is now validated to prevent the value from overflowing its 16-bit segment file field.
+   Maximum supported value is now ``65535.
+
+   GitHub issue: [#9748](https://github.com/rabbitmq/rabbitmq-server/pull/9748)
+
+
+### Shovel Plugin
+
+#### Enhancements
+
+ * Significantly faster Shovel startup in environments where there are many of them (one thousand or more).
+
+   GitHub issue: [#9800](https://github.com/rabbitmq/rabbitmq-server/pull/9800)
+
+
+### AMQP 1.0 Erlang Client
+
+#### Enhancements
+
+ * User-provided credentials are now obfuscated using an one-off key pair generated on node boot.
+   This keeps sensitive client state information from being logged by the runtime exception logger.
+
+   GitHub issue: [#9778](https://github.com/rabbitmq/rabbitmq-server/pull/9778)
+
+
+## Dependency Upgrades
+
+ None in this release.
+
+
+## Source Code Archives
+
+To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-3.11.25.tar.xz`
+instead of the source tarball produced by GitHub.
