root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #13916 from rabbitmq/otp28-fixes
Trigger a 4.2.x alpha release build / trigger_alpha_build (push) Waiting to run Details
Test (make) / Build and Xref (1.17, 26) (push) Waiting to run Details
Test (make) / Build and Xref (1.17, 27) (push) Waiting to run Details
Test (make) / Test (1.17, 27, khepri) (push) Waiting to run Details
Test (make) / Test (1.17, 27, mnesia) (push) Waiting to run Details
Test (make) / Test mixed clusters (1.17, 27, khepri) (push) Waiting to run Details
Test (make) / Test mixed clusters (1.17, 27, mnesia) (push) Waiting to run Details
Test (make) / Type check (1.17, 27) (push) Waiting to run Details
Test Authentication/Authorization backends via mutiple messaging protocols / selenium (chrome, 1.17.3, 27.3) (push) Has been cancelled Details
Test Authentication/Authorization backends via mutiple messaging protocols / summary-selenium (push) Has been cancelled Details 

OTP28: re:split change; street-address macro
This commit is contained in:
Michael Klishin 2025-05-19 16:18:40 +04:00 committed by GitHub
parent 4b714f4f7c 9fefcc4827
commit 4f1076d89c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit_common/src/rabbit_cert_info.erl vendored
View File

@ -145,7 +145,7 @@ format_rdn(#'AttributeTypeAndValue'{type = T, value = V}) ->
{?'id-at-pseudonym' , "PSEUDONYM"}, {?'id-at-pseudonym' , "PSEUDONYM"},
{?'id-domainComponent' , "DC"}, {?'id-domainComponent' , "DC"},
{?'id-emailAddress' , "EMAILADDRESS"}, {?'id-emailAddress' , "EMAILADDRESS"},
{?'street-address' , "STREET"}, {17 , "STREET"}, %% macro was removed in OTP28
{{0,9,2342,19200300,100,1,1} , "UID"}], %% Not in public_key.hrl {{0,9,2342,19200300,100,1,1} , "UID"}], %% Not in public_key.hrl
case proplists:lookup(T, Fmts) of case proplists:lookup(T, Fmts) of
{_, Fmt} -> {_, Fmt} ->

2
deps/rabbitmq_auth_backend_oauth2/Makefile vendored
View File

@ -8,7 +8,7 @@ export BUILD_WITHOUT_QUIC
LOCAL_DEPS = inets public_key LOCAL_DEPS = inets public_key
BUILD_DEPS = rabbit_common rabbitmq_cli BUILD_DEPS = rabbit_common rabbitmq_cli
DEPS = rabbit cowlib jose base64url oauth2_client DEPS = rabbit cowlib jose base64url oauth2_client
TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_web_mqtt emqtt rabbitmq_amqp_client TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt rabbitmq_web_mqtt emqtt rabbitmq_amqp_client
PLT_APPS += rabbitmq_cli PLT_APPS += rabbitmq_cli

6
deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl vendored
View File

@ -1226,7 +1226,8 @@ vhost_in_username(UserBin) ->
%% split at the last colon, disallowing colons in username %% split at the last colon, disallowing colons in username
case re:split(UserBin, ":(?!.*?:)") of case re:split(UserBin, ":(?!.*?:)") of
[_, _] -> true; [_, _] -> true;
[UserBin] -> false [UserBin] -> false;
[] -> false
end end
end. end.
@ -1238,7 +1239,8 @@ get_vhost_username(UserBin) ->
%% split at the last colon, disallowing colons in username %% split at the last colon, disallowing colons in username
case re:split(UserBin, ":(?!.*?:)") of case re:split(UserBin, ":(?!.*?:)") of
[Vhost, UserName] -> {Vhost, UserName}; [Vhost, UserName] -> {Vhost, UserName};
[UserBin] -> Default [UserBin] -> Default;
[] -> Default
end end
end. end.