Merge branch 'master' into rabbitmq-server-550

4 files changed, 25 insertions, 174 deletions

diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index 5bffdfade3..d7705d8e7b 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -25,7 +25,7 @@
 
 -export([add_user/2, delete_user/1, lookup_user/1,
          change_password/2, clear_password/1,
-         hash_password/2, change_password_hash/2,
+         hash_password/2, change_password_hash/2, change_password_hash/3,
          set_tags/2, set_permissions/5, clear_permissions/2]).
 -export([user_info_keys/0, perms_info_keys/0,
          user_perms_info_keys/0, vhost_perms_info_keys/0,
@@ -211,8 +211,11 @@ lookup_user(Username) ->
 
 change_password(Username, Password) ->
     rabbit_log:info("Changing password for '~s'~n", [Username]),
+    HashingAlgorithm = rabbit_password:hashing_mod(),
     R = change_password_hash(Username,
-        hash_password(rabbit_password:hashing_mod(), Password)),
+                             hash_password(rabbit_password:hashing_mod(),
+                                           Password),
+                             HashingAlgorithm),
     rabbit_event:notify(user_password_changed, [{name, Username}]),
     R.
 
@@ -226,9 +229,14 @@ hash_password(HashingMod, Cleartext) ->
     rabbit_password:hash(HashingMod, Cleartext).
 
 change_password_hash(Username, PasswordHash) ->
+    change_password_hash(Username, PasswordHash, rabbit_password:hashing_mod()).
+
+
+change_password_hash(Username, PasswordHash, HashingAlgorithm) ->
     update_user(Username, fun(User) ->
                                   User#internal_user{
-                                    password_hash = PasswordHash }
+                                    password_hash     = PasswordHash,
+                                    hashing_algorithm = HashingAlgorithm }
                           end).
 
 set_tags(Username, Tags) ->
@@ -267,7 +275,7 @@ set_permissions(Username, VHostPath, ConfigurePerm, WritePerm, ReadPerm) ->
                                                 read      = ReadPerm}},
                              write)
             end)),
-    rabbit_event:notify(permission_created, [{user,      Username}, 
+    rabbit_event:notify(permission_created, [{user,      Username},
                                              {vhost,     VHostPath},
                                              {configure, ConfigurePerm},
                                              {write,     WritePerm},
diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl
index 047fce853f..7aa369b6ca 100644
--- a/src/rabbit_channel_sup.erl
+++ b/src/rabbit_channel_sup.erl
@@ -53,6 +53,8 @@
 
 -endif.
 
+-define(FAIR_WAIT, 70000).
+
 %%----------------------------------------------------------------------------
 
 start_link({tcp, Sock, Channel, FrameMax, ReaderPid, ConnName, Protocol, User,
@@ -69,7 +71,7 @@ start_link({tcp, Sock, Channel, FrameMax, ReaderPid, ConnName, Protocol, User,
                      [Channel, ReaderPid, WriterPid, ReaderPid, ConnName,
                       Protocol, User, VHost, Capabilities, Collector,
                       LimiterPid]},
-           intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}),
+           intrinsic, ?FAIR_WAIT, worker, [rabbit_channel]}),
     {ok, AState} = rabbit_command_assembler:init(Protocol),
     {ok, SupPid, {ChannelPid, AState}};
 start_link({direct, Channel, ClientChannelPid, ConnPid, ConnName, Protocol,
@@ -84,7 +86,7 @@ start_link({direct, Channel, ClientChannelPid, ConnPid, ConnName, Protocol,
                      [Channel, ClientChannelPid, ClientChannelPid, ConnPid,
                       ConnName, Protocol, User, VHost, Capabilities, Collector,
                       LimiterPid]},
-           intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}),
+           intrinsic, ?FAIR_WAIT, worker, [rabbit_channel]}),
     {ok, SupPid, {ChannelPid, none}}.
 
 %%----------------------------------------------------------------------------
@@ -95,8 +97,8 @@ init(Type) ->
 child_specs({tcp, Sock, Channel, FrameMax, ReaderPid, Protocol, Identity}) ->
     [{writer, {rabbit_writer, start_link,
                [Sock, Channel, FrameMax, Protocol, ReaderPid, Identity, true]},
-      intrinsic, ?MAX_WAIT, worker, [rabbit_writer]}
+      intrinsic, ?FAIR_WAIT, worker, [rabbit_writer]}
      | child_specs({direct, Identity})];
 child_specs({direct, Identity}) ->
     [{limiter, {rabbit_limiter, start_link, [Identity]},
-      transient, ?MAX_WAIT, worker, [rabbit_limiter]}].
+      transient, ?FAIR_WAIT, worker, [rabbit_limiter]}].
diff --git a/src/rabbit_mirror_queue_mode.erl b/src/rabbit_mirror_queue_mode.erl
index 5bb243746a..e83b4c8425 100644
--- a/src/rabbit_mirror_queue_mode.erl
+++ b/src/rabbit_mirror_queue_mode.erl
@@ -16,6 +16,10 @@
 
 -module(rabbit_mirror_queue_mode).
 
+-behaviour(rabbit_registry_class).
+
+-export([added_to_rabbit_registry/2, removed_from_rabbit_registry/1]).
+
 -ifdef(use_specs).
 
 -type(master() :: node()).
@@ -55,3 +59,6 @@ behaviour_info(_Other) ->
     undefined.
 
 -endif.
+
+added_to_rabbit_registry(_Type, _ModuleName) -> ok.
+removed_from_rabbit_registry(_Type) -> ok.
diff --git a/src/rabbit_registry.erl b/src/rabbit_registry.erl
deleted file mode 100644
index db61c958ec..0000000000
--- a/src/rabbit_registry.erl
+++ /dev/null
@@ -1,166 +0,0 @@
-%% The contents of this file are subject to the Mozilla Public License
-%% Version 1.1 (the "License"); you may not use this file except in
-%% compliance with the License. You may obtain a copy of the License
-%% at http://www.mozilla.org/MPL/
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and
-%% limitations under the License.
-%%
-%% The Original Code is RabbitMQ.
-%%
-%% The Initial Developer of the Original Code is GoPivotal, Inc.
-%% Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
-%%
-
--module(rabbit_registry).
-
--behaviour(gen_server).
-
--export([start_link/0]).
-
--export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
-         code_change/3]).
-
--export([register/3, unregister/2,
-         binary_to_type/1, lookup_module/2, lookup_all/1]).
-
--define(SERVER, ?MODULE).
--define(ETS_NAME, ?MODULE).
-
--ifdef(use_specs).
-
--spec(start_link/0 :: () -> rabbit_types:ok_pid_or_error()).
--spec(register/3 :: (atom(), binary(), atom()) -> 'ok').
--spec(unregister/2 :: (atom(), binary()) -> 'ok').
--spec(binary_to_type/1 ::
-        (binary()) -> atom() | rabbit_types:error('not_found')).
--spec(lookup_module/2 ::
-        (atom(), atom()) -> rabbit_types:ok_or_error2(atom(), 'not_found')).
--spec(lookup_all/1 :: (atom()) -> [{atom(), atom()}]).
-
--endif.
-
-%%---------------------------------------------------------------------------
-
-start_link() ->
-    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
-
-%%---------------------------------------------------------------------------
-
-register(Class, TypeName, ModuleName) ->
-    gen_server:call(?SERVER, {register, Class, TypeName, ModuleName}, infinity).
-
-unregister(Class, TypeName) ->
-    gen_server:call(?SERVER, {unregister, Class, TypeName}, infinity).
-
-%% This is used with user-supplied arguments (e.g., on exchange
-%% declare), so we restrict it to existing atoms only.  This means it
-%% can throw a badarg, indicating that the type cannot have been
-%% registered.
-binary_to_type(TypeBin) when is_binary(TypeBin) ->
-    case catch list_to_existing_atom(binary_to_list(TypeBin)) of
-        {'EXIT', {badarg, _}} -> {error, not_found};
-        TypeAtom              -> TypeAtom
-    end.
-
-lookup_module(Class, T) when is_atom(T) ->
-    case ets:lookup(?ETS_NAME, {Class, T}) of
-        [{_, Module}] ->
-            {ok, Module};
-        [] ->
-            {error, not_found}
-    end.
-
-lookup_all(Class) ->
-    [{K, V} || [K, V] <- ets:match(?ETS_NAME, {{Class, '$1'}, '$2'})].
-
-%%---------------------------------------------------------------------------
-
-internal_binary_to_type(TypeBin) when is_binary(TypeBin) ->
-    list_to_atom(binary_to_list(TypeBin)).
-
-internal_register(Class, TypeName, ModuleName)
-  when is_atom(Class), is_binary(TypeName), is_atom(ModuleName) ->
-    ok = sanity_check_module(class_module(Class), ModuleName),
-    RegArg = {{Class, internal_binary_to_type(TypeName)}, ModuleName},
-    true = ets:insert(?ETS_NAME, RegArg),
-    conditional_register(RegArg),
-    ok.
-
-internal_unregister(Class, TypeName) ->
-    UnregArg = {Class, internal_binary_to_type(TypeName)},
-    conditional_unregister(UnregArg),
-    true = ets:delete(?ETS_NAME, UnregArg),
-    ok.
-
-%% register exchange decorator route callback only when implemented,
-%% in order to avoid unnecessary decorator calls on the fast
-%% publishing path
-conditional_register({{exchange_decorator, Type}, ModuleName}) ->
-    case erlang:function_exported(ModuleName, route, 2) of
-        true  -> true = ets:insert(?ETS_NAME,
-                                   {{exchange_decorator_route, Type},
-                                    ModuleName});
-        false -> ok
-    end;
-conditional_register(_) ->
-    ok.
-
-conditional_unregister({exchange_decorator, Type}) ->
-    true = ets:delete(?ETS_NAME, {exchange_decorator_route, Type}),
-    ok;
-conditional_unregister(_) ->
-    ok.
-
-sanity_check_module(ClassModule, Module) ->
-    case catch lists:member(ClassModule,
-                            lists:flatten(
-                              [Bs || {Attr, Bs} <-
-                                         Module:module_info(attributes),
-                                     Attr =:= behavior orelse
-                                         Attr =:= behaviour])) of
-        {'EXIT', {undef, _}}  -> {error, not_module};
-        false                 -> {error, {not_type, ClassModule}};
-        true                  -> ok
-    end.
-
-class_module(exchange)            -> rabbit_exchange_type;
-class_module(auth_mechanism)      -> rabbit_auth_mechanism;
-class_module(runtime_parameter)   -> rabbit_runtime_parameter;
-class_module(exchange_decorator)  -> rabbit_exchange_decorator;
-class_module(queue_decorator)     -> rabbit_queue_decorator;
-class_module(policy_validator)    -> rabbit_policy_validator;
-class_module(ha_mode)             -> rabbit_mirror_queue_mode;
-class_module(channel_interceptor) -> rabbit_channel_interceptor;
-class_module(queue_master_locator)-> rabbit_queue_master_locator.
-
-%%---------------------------------------------------------------------------
-
-init([]) ->
-    ?ETS_NAME = ets:new(?ETS_NAME, [protected, set, named_table]),
-    {ok, none}.
-
-handle_call({register, Class, TypeName, ModuleName}, _From, State) ->
-    ok = internal_register(Class, TypeName, ModuleName),
-    {reply, ok, State};
-
-handle_call({unregister, Class, TypeName}, _From, State) ->
-    ok = internal_unregister(Class, TypeName),
-    {reply, ok, State};
-
-handle_call(Request, _From, State) ->
-    {stop, {unhandled_call, Request}, State}.
-
-handle_cast(Request, State) ->
-    {stop, {unhandled_cast, Request}, State}.
-
-handle_info(Message, State) ->
-    {stop, {unhandled_info, Message}, State}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.