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

stable to default

This commit is contained in:
Simon MacMullen 2013-11-19 16:32:46 +00:00
parent 21e7686421 de5800ca1e
commit b6c09249e6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,9 +319,9 @@ make_will_msg(#mqtt_frame_connect{ will_retain = Retain,
process_login(UserBin, PassBin, #proc_state{ channels = {undefined, undefined},
socket = Sock }) ->
VHost = rabbit_mqtt_util:env(vhost),
{VHost, UsernameBin} = get_vhost_username(UserBin),
case amqp_connection:start(#amqp_params_direct{
username = UserBin,
username = UsernameBin,
password = PassBin,
virtual_host = VHost,
adapter_info = adapter_info(Sock)}) of
@ -338,6 +338,13 @@ process_login(UserBin, PassBin, #proc_state{ channels = {undefined, undefined},
?CONNACK_AUTH
end.
get_vhost_username(UserBin) ->
%% split at the last colon, disallowing colons in username
case re:split(UserBin, ":(?!.*?:)") of
[Vhost, UserName] -> {Vhost, UserName};
[UserBin] -> {rabbit_mqtt_util:env(vhost), UserBin}
end.
creds(User, Pass) ->
DefaultUser = rabbit_mqtt_util:env(default_user),
DefaultPass = rabbit_mqtt_util:env(default_pass),