WIP Change AMQP header durable to true by default

AMQP 3.2.1 defines durable=false to be the default. However, the same section also mentions: > If the header section is omitted the receiver MUST assume the appropriate > default values (or the meaning implied by no value being set) for the > fields within the header unless other target or node specific defaults > have otherwise been set. We want RabbitMQ to be secure by default, hence in RabbitMQ we set durable=true to be the default.
rabbitmq · Apr 22, 2024 · 73d697a · 73d697a
1 parent 5bc8ef2
commit 73d697a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/deps/rabbit/src/mc_amqp.erl b/deps/rabbit/src/mc_amqp.erl
@@ -146,11 +146,11 @@ get_property(durable, Msg) ->
             Durable;
         _ ->
             %% fallback in case the source protocol was old AMQP 0.9.1
-            case message_annotation(<<"x-basic-delivery-mode">>, Msg, 2) of
-                {ubyte, 2} ->
-                    true;
+            case message_annotation(<<"x-basic-delivery-mode">>, Msg, undefined) of
+                {ubyte, 1} ->
+                    false;
                 _ ->
-                    false
+                    true
             end
     end;
 get_property(timestamp, Msg) ->
@@ -195,7 +195,8 @@ protocol_state(Msg0 = #msg_body_decoded{header = Header0,
     FirstAcquirer = first_acquirer(Anns),
     Header = case Header0 of
                  undefined ->
-                     #'v1_0.header'{first_acquirer = FirstAcquirer};
+                     #'v1_0.header'{durable = true,
+                                    first_acquirer = FirstAcquirer};
                  #'v1_0.header'{} ->
                      Header0#'v1_0.header'{first_acquirer = FirstAcquirer}
              end,
@@ -211,7 +212,8 @@ protocol_state(#msg_body_encoded{header = Header0,
     FirstAcquirer = first_acquirer(Anns),
     Header = case Header0 of
                  undefined ->
-                     #'v1_0.header'{first_acquirer = FirstAcquirer};
+                     #'v1_0.header'{durable = true,
+                                    first_acquirer = FirstAcquirer};
                  #'v1_0.header'{} ->
                      Header0#'v1_0.header'{first_acquirer = FirstAcquirer}
              end,

diff --git a/deps/rabbitmq_mqtt/src/mc_mqtt.erl b/deps/rabbitmq_mqtt/src/mc_mqtt.erl
@@ -74,10 +74,10 @@ convert_from(mc_amqp, Sections, Env) ->
               amqp_encode(Val, Acc)
       end, {undefined, [], undefined, [], [], undefined}, Sections),
     Qos = case Header of
-              #'v1_0.header'{durable = true} ->
-                  ?QOS_1;
+              #'v1_0.header'{durable = false} ->
+                  ?QOS_0;
               _ ->
-                  ?QOS_0
+                  ?QOS_1
           end,
     Props0 = case AmqpProps of
                  #'v1_0.properties'{reply_to = {utf8, Address}} ->