mod_http_upload_quota: Fix process name lookup

Fix mod_http_upload_quota's process name lookup for the case where a
slot is requested by a JID whose domain part is not the virtual host the
mod_http_upload_quota process is running on.

diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
index afba0f09a5cfa4a7d7c5dc098d7977eb677a6a1e..f58d4bc78fe14778139a177a86370243e4e4160a 100644 (file)
--- a/src/mod_http_upload.erl
+++ b/src/mod_http_upload.erl
@@ -584,7 +584,7 @@ create_slot(#state{service_url = undefined,
     UserStr = make_user_string(JID, JIDinURL),
     UserDir = <<DocRoot/binary, $/, UserStr/binary>>,
     case ejabberd_hooks:run_fold(http_upload_slot_request, ServerHost, allow,
-                                [JID, UserDir, Size, Lang]) of
+                                [ServerHost, JID, UserDir, Size, Lang]) of
        allow ->
            RandStr = p1_rand:get_alphanum_string(SecretLength),
            FileStr = make_file_string(File),

diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl
index 529c792919eff27cc67783bccf26f1e4292e9ed0..f27c0222ea2e4246c2b4aa902136a0f7b4dc6a43 100644 (file)
--- a/src/mod_http_upload_quota.erl
+++ b/src/mod_http_upload_quota.erl
@@ -49,7 +49,7 @@
         code_change/3]).
 
 %% ejabberd_hooks callback.
--export([handle_slot_request/5]).
+-export([handle_slot_request/6]).
 
 -include("jid.hrl").
 -include("logger.hrl").
@@ -229,14 +229,13 @@ code_change(_OldVsn, #state{server_host = ServerHost} = State, _Extra) ->
 %%--------------------------------------------------------------------
 %% ejabberd_hooks callback.
 %%--------------------------------------------------------------------
--spec handle_slot_request(allow | deny, jid(), binary(),
+-spec handle_slot_request(allow | deny, binary(), jid(), binary(),
                          non_neg_integer(), binary()) -> allow | deny.
-handle_slot_request(allow, #jid{lserver = ServerHost} = JID, Path, Size,
-                   _Lang) ->
+handle_slot_request(allow, ServerHost, JID, Path, Size, _Lang) ->
     Proc = mod_http_upload:get_proc_name(ServerHost, ?MODULE),
     gen_server:cast(Proc, {handle_slot_request, JID, Path, Size}),
     allow;
-handle_slot_request(Acc, _JID, _Path, _Size, _Lang) -> Acc.
+handle_slot_request(Acc, _ServerHost, _JID, _Path, _Size, _Lang) -> Acc.
 
 %%--------------------------------------------------------------------
 %% Internal functions.