Added -callbacks for rabbit_auth_backend.

3 files changed, 49 insertions, 67 deletions

diff --git a/include/rabbit_auth_backend_spec.hrl b/include/rabbit_auth_backend_spec.hrl
deleted file mode 100644
index 61a2e22a..00000000
--- a/include/rabbit_auth_backend_spec.hrl
+++ /dev/null
@@ -1,31 +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 VMware, Inc.
-%% Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
-%%
-
--ifdef(use_specs).
-
--spec(description/0 :: () -> [{atom(), any()}]).
-
--spec(check_user_login/2 :: (rabbit_types:username(), [term()]) ->
-                                 {'ok', rabbit_types:user()} |
-                                 {'refused', string(), [any()]} |
-                                 {'error', any()}).
--spec(check_vhost_access/2 :: (rabbit_types:user(), rabbit_types:vhost()) ->
-                                   boolean() | {'error', any()}).
--spec(check_resource_access/3 :: (rabbit_types:user(),
-                                  rabbit_types:r(atom()),
-                                  rabbit_access_control:permission_atom()) ->
-                                      boolean() | {'error', any()}).
--endif.
diff --git a/src/rabbit_auth_backend.erl b/src/rabbit_auth_backend.erl
index e0e252b8..e89951e7 100644
--- a/src/rabbit_auth_backend.erl
+++ b/src/rabbit_auth_backend.erl
@@ -16,42 +16,57 @@
 
 -module(rabbit_auth_backend).
 
+-ifdef(use_specs).
+
+%% A description proplist as with auth mechanisms,
+%% exchanges. Currently unused.
+-callback description() -> [proplist:property()].
+
+%% Check a user can log in, given a username and a proplist of
+%% authentication information (e.g. [{password, Password}]).
+%%
+%% Possible responses:
+%% {ok, User}
+%%     Authentication succeeded, and here's the user record.
+%% {error, Error}
+%%     Something went wrong. Log and die.
+%% {refused, Msg, Args}
+%%     Client failed authentication. Log and die.
+-callback check_user_login(rabbit_types:username(), [term()]) ->
+    {'ok', rabbit_types:user()} |
+    {'refused', string(), [any()]} |
+    {'error', any()}.
+
+%% Given #user and vhost, can a user log in to a vhost?
+%% Possible responses:
+%% true
+%% false
+%% {error, Error}
+%%     Something went wrong. Log and die.
+-callback check_vhost_access(rabbit_types:user(), rabbit_types:vhost()) ->
+    boolean() | {'error', any()}.
+
+
+%% Given #user, resource and permission, can a user access a resource?
+%%
+%% Possible responses:
+%% true
+%% false
+%% {error, Error}
+%%     Something went wrong. Log and die.
+-callback check_resource_access(rabbit_types:user(),
+                                rabbit_types:r(atom()),
+                                rabbit_access_control:permission_atom()) ->
+    boolean() | {'error', any()}.
+
+-else.
+
 -export([behaviour_info/1]).
 
 behaviour_info(callbacks) ->
-    [
-     %% A description proplist as with auth mechanisms,
-     %% exchanges. Currently unused.
-     {description, 0},
-
-     %% Check a user can log in, given a username and a proplist of
-     %% authentication information (e.g. [{password, Password}]).
-     %%
-     %% Possible responses:
-     %% {ok, User}
-     %%     Authentication succeeded, and here's the user record.
-     %% {error, Error}
-     %%     Something went wrong. Log and die.
-     %% {refused, Msg, Args}
-     %%     Client failed authentication. Log and die.
-     {check_user_login, 2},
-
-     %% Given #user and vhost, can a user log in to a vhost?
-     %% Possible responses:
-     %% true
-     %% false
-     %% {error, Error}
-     %%     Something went wrong. Log and die.
-     {check_vhost_access, 2},
-
-     %% Given #user, resource and permission, can a user access a resource?
-     %%
-     %% Possible responses:
-     %% true
-     %% false
-     %% {error, Error}
-     %%     Something went wrong. Log and die.
-     {check_resource_access, 3}
-    ];
+    [{description, 0}, {check_user_login, 2}, {check_vhost_access, 2},
+     {check_resource_access, 3}];
 behaviour_info(_Other) ->
     undefined.
+
+-endif.
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index 3ef81d32..7b9df81e 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -32,8 +32,6 @@
          vhost_perms_info_keys/0, user_perms_info_keys/0,
          user_vhost_perms_info_keys/0]).
 
--include("rabbit_auth_backend_spec.hrl").
-
 -ifdef(use_specs).
 
 -type(regexp() :: binary()).