Skip to content

Commit 3dc5c46

Browse files
Pass Dialyzer
1 parent b0abf88 commit 3dc5c46

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

deps/rabbitmq_amqp1_0/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ rabbitmq_app(
3030
app_description = APP_DESCRIPTION,
3131
app_name = APP_NAME,
3232
beam_files = [":beam_files"],
33+
extra_apps = ["rabbit"],
3334
license_files = [":license_files"],
3435
priv = [":priv"],
3536
deps = [

deps/rabbitmq_ct_client_helpers/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rabbitmq_app(
3333
hdrs = [":public_hdrs"],
3434
app_name = "rabbitmq_ct_client_helpers",
3535
beam_files = [":beam_files"],
36+
extra_apps = ["rabbit_common"],
3637
license_files = [":license_files"],
3738
priv = [":priv"],
3839
deps = [

deps/rabbitmq_ct_helpers/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ rabbitmq_app(
3939
hdrs = [":public_hdrs"],
4040
app_name = "rabbitmq_ct_helpers",
4141
beam_files = [":beam_files"],
42+
extra_apps = ["inet_tcp_proxy"],
4243
license_files = [":license_files"],
4344
priv = [":priv"],
4445
deps = [

deps/rabbitmq_management/src/rabbit_mgmt_util.erl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,9 @@ do_read_complete_body_with_limit(Req0, Acc, BodySizeLimit) ->
750750

751751
with_decode(Keys, ReqData, Context, Fun) ->
752752
case read_complete_body(ReqData) of
753-
{error, Reason} ->
754-
bad_request(Reason, ReqData, Context);
753+
{error, http_body_limit_exceeded, LimitApplied, BytesRead} ->
754+
rabbit_log:warning("HTTP API: request exceeded maximum allowed payload size (limit: ~tp bytes, payload size: ~tp bytes)", [LimitApplied, BytesRead]),
755+
bad_request("Exceeded HTTP request body size limit", ReqData, Context);
755756
{ok, Body, ReqData1} ->
756757
with_decode(Keys, Body, ReqData1, Context, Fun)
757758
end.

deps/rabbitmq_management/src/rabbit_mgmt_wm_definitions.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ all_definitions(ReqData, Context) ->
8686
accept_json(ReqData0, Context) ->
8787
BodySizeLimit = application:get_env(rabbitmq_management, max_http_body_size, ?MANAGEMENT_DEFAULT_HTTP_MAX_BODY_SIZE),
8888
case rabbit_mgmt_util:read_complete_body_with_limit(ReqData0, BodySizeLimit) of
89-
{error, Reason} ->
90-
_ = rabbit_log:warning("HTTP API: uploaded definition file exceeded the maximum request body limit of ~p bytes. "
91-
"Use the 'management.http.max_body_size' key in rabbitmq.conf to increase the limit if necessary", [BodySizeLimit]),
92-
rabbit_mgmt_util:bad_request(Reason, ReqData0, Context);
89+
{error, http_body_limit_exceeded, LimitApplied, BytesRead} ->
90+
_ = rabbit_log:warning("HTTP API: uploaded definition file size (~tp) exceeded the maximum request body limit of ~tp bytes. "
91+
"Use the 'management.http.max_body_size' key in rabbitmq.conf to increase the limit if necessary", [BytesRead, LimitApplied]),
92+
rabbit_mgmt_util:bad_request("Exceeded HTTP request body size limit", ReqData0, Context);
9393
{ok, Body, ReqData} ->
9494
accept(Body, ReqData, Context)
9595
end.

0 commit comments

Comments
 (0)