diff --git a/mod_http_upload/README.txt b/mod_http_upload/README.txt
index dd2c3f5..23115c1 100644
--- a/mod_http_upload/README.txt
+++ b/mod_http_upload/README.txt
@@ -84,6 +84,13 @@ The configurable mod_http_upload options are:
mod_http_upload. Otherwise, a SHA-1 hash of the user's bare JID is
included instead.
+- thumbnail: (default: 'true')
+
+ This option specifies whether ejabberd should create thumbnails of
+ uploaded images. If a thumbnail is created, a element that
+ contains the download and some metadata is returned with the PUT
+ response.
+
- file_mode (default: 'undefined')
This option defines the permission bits of uploaded files. The bits are
@@ -108,7 +115,7 @@ The configurable mod_http_upload options are:
This option specifies the initial part of the PUT URLs used for file
uploads. The keyword @HOST@ is replaced with the virtual host name.
- NOTE: Different virtual hosts cannot use the same PUT URL domain.
+ NOTE: Different virtual hosts cannot use the same PUT URL.
- get_url (default: $put_url)
@@ -118,6 +125,9 @@ The configurable mod_http_upload options are:
files served by a proper HTTP server such as Nginx or Apache. The keyword
@HOST@ is replaced with the virtual host name.
+ NOTE: If GET requests are handled by mod_http_upload, the 'get_url' must
+ match the 'put_url'.
+
- service_url (default: 'undefined')
If a 'service_url' is specified, HTTP upload slot requests are forwarded
diff --git a/mod_http_upload/src/mod_http_upload.erl b/mod_http_upload/src/mod_http_upload.erl
index ab76b62..37ddb18 100644
--- a/mod_http_upload/src/mod_http_upload.erl
+++ b/mod_http_upload/src/mod_http_upload.erl
@@ -25,7 +25,6 @@
{<<".bz2">>, <<"application/x-bzip2">>},
{<<".gif">>, <<"image/gif">>},
{<<".gz">>, <<"application/x-gzip">>},
- {<<".html">>, <<"text/html">>},
{<<".jpeg">>, <<"image/jpeg">>},
{<<".jpg">>, <<"image/jpeg">>},
{<<".mp3">>, <<"audio/mpeg">>},
@@ -90,10 +89,17 @@
put_url :: binary(),
get_url :: binary(),
service_url :: binary() | undefined,
+ thumbnail :: boolean(),
slots = dict:new() :: term()}). % dict:dict() requires Erlang 17.
+-record(media_info,
+ {type :: binary(),
+ height :: integer(),
+ width :: integer()}).
+
-type state() :: #state{}.
--type slot() :: [binary()].
+-type slot() :: [binary(), ...].
+-type media_info() :: #media_info{}.
%%--------------------------------------------------------------------
%% gen_mod/supervisor callbacks.
@@ -111,12 +117,13 @@ start(ServerHost, Opts) ->
case gen_mod:get_opt(rm_on_unregister, Opts,
fun(B) when is_boolean(B) -> B end,
true) of
- true ->
- ejabberd_hooks:add(remove_user, ServerHost, ?MODULE,
- remove_user, 50),
- ejabberd_hooks:add(anonymous_purge_hook, ServerHost, ?MODULE,
- remove_user, 50);
- false -> ok
+ true ->
+ ejabberd_hooks:add(remove_user, ServerHost, ?MODULE,
+ remove_user, 50),
+ ejabberd_hooks:add(anonymous_purge_hook, ServerHost, ?MODULE,
+ remove_user, 50);
+ false ->
+ ok
end,
Proc = get_proc_name(ServerHost, ?PROCNAME),
Spec = {Proc,
@@ -133,16 +140,17 @@ stop(ServerHost) ->
case gen_mod:get_module_opt(ServerHost, ?MODULE, rm_on_unregister,
fun(B) when is_boolean(B) -> B end,
true) of
- true ->
- ejabberd_hooks:delete(remove_user, ServerHost, ?MODULE,
- remove_user, 50),
- ejabberd_hooks:delete(anonymous_purge_hook, ServerHost, ?MODULE,
- remove_user, 50);
- false -> ok
+ true ->
+ ejabberd_hooks:delete(remove_user, ServerHost, ?MODULE,
+ remove_user, 50),
+ ejabberd_hooks:delete(anonymous_purge_hook, ServerHost, ?MODULE,
+ remove_user, 50);
+ false ->
+ ok
end,
Proc = get_proc_name(ServerHost, ?PROCNAME),
- ok = supervisor:terminate_child(ejabberd_sup, Proc),
- ok = supervisor:delete_child(ejabberd_sup, Proc).
+ supervisor:terminate_child(ejabberd_sup, Proc),
+ supervisor:delete_child(ejabberd_sup, Proc).
-spec mod_opt_type(atom()) -> fun((term()) -> term()) | [atom()].
@@ -188,10 +196,12 @@ mod_opt_type(custom_headers) ->
end;
mod_opt_type(rm_on_unregister) ->
fun(B) when is_boolean(B) -> B end;
+mod_opt_type(thumbnail) ->
+ fun(B) when is_boolean(B) -> B end;
mod_opt_type(_) ->
[host, name, access, max_size, secret_length, jid_in_url, file_mode,
dir_mode, docroot, put_url, get_url, service_url, custom_headers,
- rm_on_unregister].
+ rm_on_unregister, thumbnail].
%%--------------------------------------------------------------------
%% gen_server callbacks.
@@ -242,29 +252,45 @@ init({ServerHost, Opts}) ->
fun(<<"http://", _/binary>> = URL) -> URL;
(<<"https://", _/binary>> = URL) -> URL
end),
+ Thumbnail = gen_mod:get_opt(thumbnail, Opts,
+ fun(B) when is_boolean(B) -> B end,
+ true),
case ServiceURL of
- undefined ->
- ok;
- <<"http://", _/binary>> ->
- application:start(inets);
- <<"https://", _/binary>> ->
- application:start(inets),
- application:start(crypto),
- application:start(asn1),
- application:start(public_key),
- application:start(ssl)
+ undefined ->
+ ok;
+ <<"http://", _/binary>> ->
+ application:start(inets);
+ <<"https://", _/binary>> ->
+ application:start(inets),
+ application:start(crypto),
+ application:start(asn1),
+ application:start(public_key),
+ application:start(ssl)
end,
case DirMode of
- undefined ->
- ok;
- Mode ->
- file:change_mode(DocRoot, Mode)
+ undefined ->
+ ok;
+ Mode ->
+ file:change_mode(DocRoot, Mode)
+ end,
+ case Thumbnail of
+ true ->
+ case string:str(os:cmd("identify"), "Magick") of
+ 0 ->
+ ?ERROR_MSG("Cannot find 'identify' command, please install "
+ "ImageMagick or disable thumbnail creation", []);
+ _ ->
+ ok
+ end;
+ false ->
+ ok
end,
ejabberd_router:register_route(Host),
{ok, #state{server_host = ServerHost, host = Host, name = Name,
access = Access, max_size = MaxSize,
secret_length = SecretLength, jid_in_url = JIDinURL,
file_mode = FileMode, dir_mode = DirMode,
+ thumbnail = Thumbnail,
docroot = expand_home(str:strip(DocRoot, right, $/)),
put_url = expand_host(str:strip(PutURL, right, $/), ServerHost),
get_url = expand_host(str:strip(GetURL, right, $/), ServerHost),
@@ -278,15 +304,18 @@ init({ServerHost, Opts}) ->
handle_call({use_slot, Slot}, _From, #state{file_mode = FileMode,
dir_mode = DirMode,
+ get_url = GetPrefix,
+ thumbnail = Thumbnail,
docroot = DocRoot} = State) ->
case get_slot(Slot, State) of
- {ok, {Size, Timer}} ->
- timer:cancel(Timer),
- NewState = del_slot(Slot, State),
- Path = str:join([DocRoot | Slot], <<$/>>),
- {reply, {ok, Size, Path, FileMode, DirMode}, NewState};
- error ->
- {reply, {error, <<"Invalid slot">>}, State}
+ {ok, {Size, Timer}} ->
+ timer:cancel(Timer),
+ NewState = del_slot(Slot, State),
+ Path = str:join([DocRoot | Slot], <<$/>>),
+ {reply, {ok, Size, Path, FileMode, DirMode, GetPrefix, Thumbnail},
+ NewState};
+ error ->
+ {reply, {error, <<"Invalid slot">>}, State}
end;
handle_call(get_docroot, _From, #state{docroot = DocRoot} = State) ->
{reply, {ok, DocRoot}, State};
@@ -305,12 +334,12 @@ handle_cast(Request, State) ->
handle_info({route, From, To, #xmlel{name = <<"iq">>} = Stanza}, State) ->
Request = jlib:iq_query_info(Stanza),
{Reply, NewState} = case process_iq(From, Request, State) of
- R when is_record(R, iq) ->
- {R, State};
- {R, S} ->
- {R, S};
- not_request ->
- {none, State}
+ R when is_record(R, iq) ->
+ {R, State};
+ {R, S} ->
+ {R, S};
+ not_request ->
+ {none, State}
end,
if Reply /= none ->
ejabberd_router:route(To, From, jlib:iq_to_xml(Reply));
@@ -345,77 +374,88 @@ code_change(_OldVsn, #state{server_host = ServerHost} = State, _Extra) ->
-spec process([binary()], #request{})
-> {pos_integer(), [{binary(), binary()}], binary()}.
-process(LocalPath, #request{method = 'PUT', host = Host, ip = IP,
- data = Data}) ->
- Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
- case catch gen_server:call(Proc, {use_slot, LocalPath}) of
- {ok, Size, Path, FileMode, DirMode} when byte_size(Data) == Size ->
- ?DEBUG("Storing file from ~s for ~s: ~s",
- [?ADDR_TO_STR(IP), Host, Path]),
- case store_file(Path, Data, FileMode, DirMode) of
- ok ->
- http_response(Host, 201);
- {error, Error} ->
- ?ERROR_MSG("Cannot store file ~s from ~s for ~s: ~p",
- [Path, ?ADDR_TO_STR(IP), Host, Error]),
- http_response(Host, 500)
- end;
- {ok, Size, Path} ->
- ?INFO_MSG("Rejecting file ~s from ~s for ~s: Size is ~B, not ~B",
- [Path, ?ADDR_TO_STR(IP), Host, byte_size(Data), Size]),
- http_response(Host, 413);
- {error, Error} ->
- ?INFO_MSG("Rejecting file from ~s for ~s: ~p",
- [?ADDR_TO_STR(IP), Host, Error]),
- http_response(Host, 403);
- Error ->
- ?ERROR_MSG("Cannot handle PUT request from ~s for ~s: ~p",
- [?ADDR_TO_STR(IP), Host, Error]),
- http_response(Host, 500)
- end;
process(LocalPath, #request{method = Method, host = Host, ip = IP})
+ when length(LocalPath) < 3,
+ Method == 'PUT' orelse
+ Method == 'GET' orelse
+ Method == 'HEAD' ->
+ ?DEBUG("Rejecting ~s request from ~s for ~s: Too few path components",
+ [Method, ?ADDR_TO_STR(IP), Host]),
+ http_response(Host, 404);
+process(_LocalPath, #request{method = 'PUT', host = Host, ip = IP,
+ data = Data} = Request) ->
+ {Proc, Slot} = parse_http_request(Request),
+ case catch gen_server:call(Proc, {use_slot, Slot}) of
+ {ok, Size, Path, FileMode, DirMode, GetPrefix, Thumbnail}
+ when byte_size(Data) == Size ->
+ ?DEBUG("Storing file from ~s for ~s: ~s",
+ [?ADDR_TO_STR(IP), Host, Path]),
+ case store_file(Path, Data, FileMode, DirMode,
+ GetPrefix, Slot, Thumbnail) of
+ ok ->
+ http_response(Host, 201);
+ {ok, Headers, OutData} ->
+ http_response(Host, 201, Headers, OutData);
+ {error, Error} ->
+ ?ERROR_MSG("Cannot store file ~s from ~s for ~s: ~p",
+ [Path, ?ADDR_TO_STR(IP), Host, ?FORMAT(Error)]),
+ http_response(Host, 500)
+ end;
+ {ok, Size, Path, _FileMode, _DirMode, _GetPrefix, _Thumbnail} ->
+ ?INFO_MSG("Rejecting file ~s from ~s for ~s: Size is ~B, not ~B",
+ [Path, ?ADDR_TO_STR(IP), Host, byte_size(Data), Size]),
+ http_response(Host, 413);
+ {error, Error} ->
+ ?INFO_MSG("Rejecting file from ~s for ~s: ~p",
+ [?ADDR_TO_STR(IP), Host, Error]),
+ http_response(Host, 403);
+ Error ->
+ ?ERROR_MSG("Cannot handle PUT request from ~s for ~s: ~p",
+ [?ADDR_TO_STR(IP), Host, Error]),
+ http_response(Host, 500)
+ end;
+process(_LocalPath, #request{method = Method, host = Host, ip = IP} = Request)
when Method == 'GET';
Method == 'HEAD' ->
- Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
+ {Proc, [_UserDir, _RandDir, FileName] = Slot} = parse_http_request(Request),
case catch gen_server:call(Proc, get_docroot) of
- {ok, DocRoot} ->
- Path = str:join([DocRoot | LocalPath], <<$/>>),
- case file:read_file(Path) of
- {ok, Data} ->
- ?INFO_MSG("Serving ~s to ~s", [Path, ?ADDR_TO_STR(IP)]),
- FileName = lists:last(LocalPath),
- ContentType = guess_content_type(FileName),
- Headers1 = case ContentType of
- <<"image/", _SubType/binary>> -> [];
- <<"text/", _SubType/binary>> -> [];
- _ ->
- [{<<"Content-Disposition">>,
- <<"attachment; filename=",
- $", FileName/binary, $">>}]
- end,
- Headers2 = [{<<"Content-Type">>, ContentType} | Headers1],
- http_response(Host, 200, Headers2, Data);
- {error, eacces} ->
- ?INFO_MSG("Cannot serve ~s to ~s: Permission denied",
- [Path, ?ADDR_TO_STR(IP)]),
- http_response(Host, 403);
- {error, enoent} ->
- ?INFO_MSG("Cannot serve ~s to ~s: No such file or directory",
- [Path, ?ADDR_TO_STR(IP)]),
- http_response(Host, 404);
- {error, eisdir} ->
- ?INFO_MSG("Cannot serve ~s to ~s: Is a directory",
- [Path, ?ADDR_TO_STR(IP)]),
- http_response(Host, 404);
- {error, Error} ->
- ?INFO_MSG("Cannot serve ~s to ~s: ~s",
- [Path, ?ADDR_TO_STR(IP), ?FORMAT(Error)]),
- http_response(Host, 500)
- end;
- Error ->
- ?ERROR_MSG("Cannot handle ~s request from ~s for ~s: ~p",
- [Method, ?ADDR_TO_STR(IP), Host, Error]),
- http_response(Host, 500)
+ {ok, DocRoot} ->
+ Path = str:join([DocRoot | Slot], <<$/>>),
+ case file:read_file(Path) of
+ {ok, Data} ->
+ ?INFO_MSG("Serving ~s to ~s", [Path, ?ADDR_TO_STR(IP)]),
+ ContentType = guess_content_type(FileName),
+ Headers1 = case ContentType of
+ <<"image/", _SubType/binary>> -> [];
+ <<"text/", _SubType/binary>> -> [];
+ _ ->
+ [{<<"Content-Disposition">>,
+ <<"attachment; filename=",
+ $", FileName/binary, $">>}]
+ end,
+ Headers2 = [{<<"Content-Type">>, ContentType} | Headers1],
+ http_response(Host, 200, Headers2, Data);
+ {error, eacces} ->
+ ?INFO_MSG("Cannot serve ~s to ~s: Permission denied",
+ [Path, ?ADDR_TO_STR(IP)]),
+ http_response(Host, 403);
+ {error, enoent} ->
+ ?INFO_MSG("Cannot serve ~s to ~s: No such file",
+ [Path, ?ADDR_TO_STR(IP)]),
+ http_response(Host, 404);
+ {error, eisdir} ->
+ ?INFO_MSG("Cannot serve ~s to ~s: Is a directory",
+ [Path, ?ADDR_TO_STR(IP)]),
+ http_response(Host, 404);
+ {error, Error} ->
+ ?INFO_MSG("Cannot serve ~s to ~s: ~s",
+ [Path, ?ADDR_TO_STR(IP), ?FORMAT(Error)]),
+ http_response(Host, 500)
+ end;
+ Error ->
+ ?ERROR_MSG("Cannot handle ~s request from ~s for ~s: ~p",
+ [Method, ?ADDR_TO_STR(IP), Host, Error]),
+ http_response(Host, 500)
end;
process(_LocalPath, #request{method = 'OPTIONS', host = Host, ip = IP}) ->
?DEBUG("Responding to OPTIONS request from ~s for ~s",
@@ -439,10 +479,10 @@ get_proc_name(ServerHost, ModuleName) ->
(_) -> <<"http://@HOST@">>
end,
<<"http://@HOST@">>),
- [_, ProcHost | _] = binary:split(expand_host(PutURL, ServerHost),
- [<<"http://">>, <<"https://">>,
- <<":">>, <<"/">>], [global]),
- gen_mod:get_module_proc(ProcHost, ModuleName).
+ {ok, {_Scheme, _UserInfo, Host, _Port, Path, _Query}} =
+ http_uri:parse(binary_to_list(expand_host(PutURL, ServerHost))),
+ ProcPrefix = list_to_binary(string:strip(Host ++ Path, right, $/)),
+ gen_mod:get_module_proc(ProcPrefix, ModuleName).
-spec expand_home(binary()) -> binary().
@@ -475,31 +515,33 @@ process_iq(From,
when XMLNS == ?NS_HTTP_UPLOAD;
XMLNS == ?NS_HTTP_UPLOAD_OLD ->
case acl:match_rule(ServerHost, Access, From) of
- allow ->
- case parse_request(SubEl, Lang) of
- {ok, File, Size, ContentType} ->
- case create_slot(State, From, File, Size, ContentType, Lang) of
- {ok, Slot} ->
- {ok, Timer} = timer:send_after(?SLOT_TIMEOUT,
- {slot_timed_out, Slot}),
- NewState = add_slot(Slot, Size, Timer, State),
- SlotEl = slot_el(Slot, State, XMLNS),
- {IQ#iq{type = result, sub_el = [SlotEl]}, NewState};
- {ok, PutURL, GetURL} ->
- SlotEl = slot_el(PutURL, GetURL, XMLNS),
- IQ#iq{type = result, sub_el = [SlotEl]};
- {error, Error} ->
- IQ#iq{type = error, sub_el = [SubEl, Error]}
- end;
- {error, Error} ->
- ?DEBUG("Cannot parse request from ~s",
- [jlib:jid_to_string(From)]),
- IQ#iq{type = error, sub_el = [SubEl, Error]}
- end;
- deny ->
- ?DEBUG("Denying HTTP upload slot request from ~s",
- [jlib:jid_to_string(From)]),
- IQ#iq{type = error, sub_el = [SubEl, ?ERR_FORBIDDEN]}
+ allow ->
+ case parse_request(SubEl, Lang) of
+ {ok, File, Size, ContentType} ->
+ case create_slot(State, From, File, Size, ContentType,
+ Lang) of
+ {ok, Slot} ->
+ {ok, Timer} = timer:send_after(?SLOT_TIMEOUT,
+ {slot_timed_out,
+ Slot}),
+ NewState = add_slot(Slot, Size, Timer, State),
+ SlotEl = slot_el(Slot, State, XMLNS),
+ {IQ#iq{type = result, sub_el = [SlotEl]}, NewState};
+ {ok, PutURL, GetURL} ->
+ SlotEl = slot_el(PutURL, GetURL, XMLNS),
+ IQ#iq{type = result, sub_el = [SlotEl]};
+ {error, Error} ->
+ IQ#iq{type = error, sub_el = [SubEl, Error]}
+ end;
+ {error, Error} ->
+ ?DEBUG("Cannot parse request from ~s",
+ [jlib:jid_to_string(From)]),
+ IQ#iq{type = error, sub_el = [SubEl, Error]}
+ end;
+ deny ->
+ ?DEBUG("Denying HTTP upload slot request from ~s",
+ [jlib:jid_to_string(From)]),
+ IQ#iq{type = error, sub_el = [SubEl, ?ERR_FORBIDDEN]}
end;
process_iq(_From, #iq{sub_el = SubEl} = IQ, _State) ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
@@ -513,25 +555,25 @@ process_iq(_From, invalid, _State) ->
parse_request(#xmlel{name = <<"request">>, attrs = Attrs} = Request, Lang) ->
case xml:get_attr(<<"xmlns">>, Attrs) of
- {value, XMLNS} when XMLNS == ?NS_HTTP_UPLOAD;
- XMLNS == ?NS_HTTP_UPLOAD_OLD ->
- case {xml:get_subtag_cdata(Request, <<"filename">>),
- xml:get_subtag_cdata(Request, <<"size">>),
- xml:get_subtag_cdata(Request, <<"content-type">>)} of
- {File, SizeStr, ContentType} when byte_size(File) > 0 ->
- case catch jlib:binary_to_integer(SizeStr) of
- Size when is_integer(Size), Size > 0 ->
- {ok, File, Size, yield_content_type(ContentType)};
- _ ->
- Text = <<"Please specify file size.">>,
- {error, ?ERRT_BAD_REQUEST(Lang, Text)}
- end;
- _ ->
- Text = <<"Please specify file name.">>,
- {error, ?ERRT_BAD_REQUEST(Lang, Text)}
- end;
- _ ->
- {error, ?ERR_BAD_REQUEST}
+ {value, XMLNS} when XMLNS == ?NS_HTTP_UPLOAD;
+ XMLNS == ?NS_HTTP_UPLOAD_OLD ->
+ case {xml:get_subtag_cdata(Request, <<"filename">>),
+ xml:get_subtag_cdata(Request, <<"size">>),
+ xml:get_subtag_cdata(Request, <<"content-type">>)} of
+ {File, SizeStr, ContentType} when byte_size(File) > 0 ->
+ case catch jlib:binary_to_integer(SizeStr) of
+ Size when is_integer(Size), Size > 0 ->
+ {ok, File, Size, yield_content_type(ContentType)};
+ _ ->
+ Text = <<"Please specify file size.">>,
+ {error, ?ERRT_BAD_REQUEST(Lang, Text)}
+ end;
+ _ ->
+ Text = <<"Please specify file name.">>,
+ {error, ?ERRT_BAD_REQUEST(Lang, Text)}
+ end;
+ _ ->
+ {error, ?ERR_BAD_REQUEST}
end;
parse_request(_El, _Lang) -> {error, ?ERR_BAD_REQUEST}.
@@ -556,16 +598,16 @@ create_slot(#state{service_url = undefined,
UserDir = <>,
case ejabberd_hooks:run_fold(http_upload_slot_request, ServerHost, allow,
[JID, UserDir, Size, Lang]) of
- allow ->
- RandStr = make_rand_string(SecretLength),
- FileStr = make_file_string(File),
- ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
- [jlib:jid_to_string(JID), File]),
- {ok, [UserStr, RandStr, FileStr]};
- deny ->
- {error, ?ERR_SERVICE_UNAVAILABLE};
- #xmlel{} = Error ->
- {error, Error}
+ allow ->
+ RandStr = make_rand_string(SecretLength),
+ FileStr = make_file_string(File),
+ ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
+ [jlib:jid_to_string(JID), File]),
+ {ok, [UserStr, RandStr, FileStr]};
+ deny ->
+ {error, ?ERR_SERVICE_UNAVAILABLE};
+ #xmlel{} = Error ->
+ {error, Error}
end;
create_slot(#state{service_url = ServiceURL},
#jid{luser = U, lserver = S} = JID, File, Size, ContentType,
@@ -579,37 +621,38 @@ create_slot(#state{service_url = ServiceURL},
"&size=" ++ ?URL_ENC(SizeStr) ++
"&content_type=" ++ ?URL_ENC(ContentType),
case httpc:request(get, {GetRequest, []}, HttpOptions, Options) of
- {ok, {Code, Body}} when Code >= 200, Code =< 299 ->
- case binary:split(Body, <<$\n>>, [global, trim]) of
- [<<"http", _/binary>> = PutURL, <<"http", _/binary>> = GetURL] ->
- ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
- [jlib:jid_to_string(JID), File]),
- {ok, PutURL, GetURL};
- Lines ->
- ?ERROR_MSG("Cannot parse data received for ~s from <~s>: ~p",
- [jlib:jid_to_string(JID), ServiceURL, Lines]),
- {error, ?ERR_SERVICE_UNAVAILABLE}
- end;
- {ok, {402, _Body}} ->
- ?INFO_MSG("Got status code 402 for ~s from <~s>",
- [jlib:jid_to_string(JID), ServiceURL]),
- {error, ?ERR_RESOURCE_CONSTRAINT};
- {ok, {403, _Body}} ->
- ?INFO_MSG("Got status code 403 for ~s from <~s>",
- [jlib:jid_to_string(JID), ServiceURL]),
- {error, ?ERR_NOT_ALLOWED};
- {ok, {413, _Body}} ->
- ?INFO_MSG("Got status code 413 for ~s from <~s>",
- [jlib:jid_to_string(JID), ServiceURL]),
- {error, ?ERR_NOT_ACCEPTABLE};
- {ok, {Code, _Body}} ->
- ?ERROR_MSG("Got unexpected status code for ~s from <~s>: ~B",
- [jlib:jid_to_string(JID), ServiceURL, Code]),
- {error, ?ERR_SERVICE_UNAVAILABLE};
- {error, Reason} ->
- ?ERROR_MSG("Error requesting upload slot for ~s from <~s>: ~p",
- [jlib:jid_to_string(JID), ServiceURL, Reason]),
- {error, ?ERR_SERVICE_UNAVAILABLE}
+ {ok, {Code, Body}} when Code >= 200, Code =< 299 ->
+ case binary:split(Body, <<$\n>>, [global, trim]) of
+ [<<"http", _/binary>> = PutURL,
+ <<"http", _/binary>> = GetURL] ->
+ ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
+ [jlib:jid_to_string(JID), File]),
+ {ok, PutURL, GetURL};
+ Lines ->
+ ?ERROR_MSG("Can't parse data received for ~s from <~s>: ~p",
+ [jlib:jid_to_string(JID), ServiceURL, Lines]),
+ {error, ?ERR_SERVICE_UNAVAILABLE}
+ end;
+ {ok, {402, _Body}} ->
+ ?INFO_MSG("Got status code 402 for ~s from <~s>",
+ [jlib:jid_to_string(JID), ServiceURL]),
+ {error, ?ERR_RESOURCE_CONSTRAINT};
+ {ok, {403, _Body}} ->
+ ?INFO_MSG("Got status code 403 for ~s from <~s>",
+ [jlib:jid_to_string(JID), ServiceURL]),
+ {error, ?ERR_NOT_ALLOWED};
+ {ok, {413, _Body}} ->
+ ?INFO_MSG("Got status code 413 for ~s from <~s>",
+ [jlib:jid_to_string(JID), ServiceURL]),
+ {error, ?ERR_NOT_ACCEPTABLE};
+ {ok, {Code, _Body}} ->
+ ?ERROR_MSG("Got unexpected status code for ~s from <~s>: ~B",
+ [jlib:jid_to_string(JID), ServiceURL, Code]),
+ {error, ?ERR_SERVICE_UNAVAILABLE};
+ {error, Reason} ->
+ ?ERROR_MSG("Error requesting upload slot for ~s from <~s>: ~p",
+ [jlib:jid_to_string(JID), ServiceURL, Reason]),
+ {error, ?ERR_SERVICE_UNAVAILABLE}
end.
-spec add_slot(slot(), pos_integer(), timer:tref(), state()) -> state().
@@ -701,12 +744,59 @@ iq_disco_info(Lang, Name) ->
%% HTTP request handling.
--spec store_file(file:filename_all(), binary(),
+-spec parse_http_request(#request{}) -> {atom(), slot()}.
+
+parse_http_request(#request{host = Host, path = Path}) ->
+ PrefixLength = length(Path) - 3,
+ {ProcURL, Slot} = if PrefixLength > 0 ->
+ Prefix = lists:sublist(Path, PrefixLength),
+ {str:join([Host | Prefix], $/),
+ lists:nthtail(PrefixLength, Path)};
+ true ->
+ {Host, Path}
+ end,
+ {gen_mod:get_module_proc(ProcURL, ?PROCNAME), Slot}.
+
+-spec store_file(binary(), binary(),
integer() | undefined,
- integer() | undefined)
+ integer() | undefined,
+ binary(), slot(), boolean())
+ -> ok | {ok, [{binary(), binary()}], binary()} | {error, term()}.
+
+store_file(Path, Data, FileMode, DirMode, GetPrefix, Slot, Thumbnail) ->
+ case do_store_file(Path, Data, FileMode, DirMode) of
+ ok when Thumbnail ->
+ case identify(Path) of
+ {ok, MediaInfo} ->
+ case convert(Path, MediaInfo) of
+ {ok, OutPath} ->
+ [UserDir, RandDir | _] = Slot,
+ FileName = filename:basename(OutPath),
+ URL = str:join([GetPrefix, UserDir,
+ RandDir, FileName], <<$/>>),
+ ThumbEl = thumb_el(OutPath, URL),
+ {ok,
+ [{<<"Content-Type">>,
+ <<"text/xml; charset=utf-8">>}],
+ xml:element_to_binary(ThumbEl)};
+ pass ->
+ ok
+ end;
+ pass ->
+ ok
+ end;
+ ok ->
+ ok;
+ Err ->
+ Err
+ end.
+
+-spec do_store_file(file:filename_all(), binary(),
+ integer() | undefined,
+ integer() | undefined)
-> ok | {error, term()}.
-store_file(Path, Data, FileMode, DirMode) ->
+do_store_file(Path, Data, FileMode, DirMode) ->
try
ok = filelib:ensure_dir(Path),
{ok, Io} = file:open(Path, [write, exclusive, raw]),
@@ -727,10 +817,10 @@ store_file(Path, Data, FileMode, DirMode) ->
end,
ok = Ok % Raise an exception if file:write/2 failed.
catch
- _:{badmatch, {error, Error}} ->
- {error, ?FORMAT(Error)};
- _:Error ->
- {error, Error}
+ _:{badmatch, {error, Error}} ->
+ {error, Error};
+ _:Error ->
+ {error, Error}
end.
-spec guess_content_type(binary()) -> binary().
@@ -768,11 +858,11 @@ http_response(Host, Code, ExtraHeaders, Body) ->
end,
[]),
Headers = case proplists:is_defined(<<"Content-Type">>, ExtraHeaders) of
- true ->
- [ServerHeader | ExtraHeaders];
- false ->
- [ServerHeader, {<<"Content-Type">>, <<"text/plain">>} |
- ExtraHeaders]
+ true ->
+ [ServerHeader | ExtraHeaders];
+ false ->
+ [ServerHeader, {<<"Content-Type">>, <<"text/plain">>} |
+ ExtraHeaders]
end ++ CustomHeaders,
{Code, Headers, Body}.
@@ -786,6 +876,70 @@ code_to_message(413) -> <<"File size doesn't match requested size.">>;
code_to_message(500) -> <<"Internal server error.">>;
code_to_message(_Code) -> <<"">>.
+%%--------------------------------------------------------------------
+%% Image manipulation stuff.
+%%--------------------------------------------------------------------
+
+-spec identify(binary()) -> {ok, media_info()} | pass.
+
+identify(Path) ->
+ Cmd = io_lib:format("identify -format 'ok %m %h %w' ~s", [Path]),
+ Res = string:strip(os:cmd(Cmd), right, $\n),
+ case string:tokens(Res, " ") of
+ ["ok", T, H, W] ->
+ {ok, #media_info{type = list_to_binary(string:to_lower(T)),
+ height = list_to_integer(H),
+ width = list_to_integer(W)}};
+ _ ->
+ ?DEBUG("Cannot identify type of ~s: ~s", [Path, Res]),
+ pass
+ end.
+
+-spec convert(binary(), media_info()) -> {ok, binary()} | pass.
+
+convert(Path, #media_info{type = T, width = W, height = H}) ->
+ if W * H >= 25000000 ->
+ ?DEBUG("The image ~s is more than 25 Mpix", [Path]),
+ pass;
+ W =< 300, H =< 300 ->
+ {ok, Path};
+ T == <<"gif">>; T == <<"jpeg">>; T == <<"png">>; T == <<"webp">> ->
+ Dir = filename:dirname(Path),
+ FileName = <<(randoms:get_string())/binary, $., T/binary>>,
+ OutPath = filename:join(Dir, FileName),
+ Cmd = io_lib:format("convert -resize 300 ~s ~s", [Path, OutPath]),
+ case os:cmd(Cmd) of
+ "" ->
+ {ok, OutPath};
+ Err ->
+ ?ERROR_MSG("Failed to convert ~s to ~s: ~s",
+ [Path, OutPath, string:strip(Err, right, $\n)]),
+ pass
+ end;
+ true ->
+ ?DEBUG("Won't call 'convert' for unknown type ~s", [T]),
+ pass
+ end.
+
+-spec thumb_el(binary(), binary()) -> xmlel().
+
+thumb_el(Path, URI) ->
+ ContentType = guess_content_type(Path),
+ case identify(Path) of
+ {ok, #media_info{height = H, width = W}} ->
+ #xmlel{name = <<"thumbnail">>,
+ attrs = [{<<"xmlns">>, ?NS_THUMBS_1},
+ {<<"media-type">>, ContentType},
+ {<<"uri">>, URI},
+ {<<"height">>, jlib:integer_to_binary(H)},
+ {<<"width">>, jlib:integer_to_binary(W)}]};
+ pass ->
+ #xmlel{name = <<"thumbnail">>,
+ attrs = [{<<"xmlns">>, ?NS_THUMBS_1},
+ {<<"uri">>, URI},
+ {<<"media-type">>, ContentType}]}
+ end.
+
%%--------------------------------------------------------------------
%% Remove user.
%%--------------------------------------------------------------------
@@ -811,7 +965,7 @@ remove_user(User, Server) ->
?DEBUG("Found no HTTP upload directory of ~s@~s", [User, Server]);
{error, Error} ->
?ERROR_MSG("Cannot remove HTTP upload directory of ~s@~s: ~p",
- [User, Server, Error])
+ [User, Server, ?FORMAT(Error)])
end,
ok.
@@ -824,16 +978,16 @@ del_tree(Dir) ->
{ok, Entries} = file:list_dir(Dir),
lists:foreach(fun(Path) ->
case filelib:is_dir(Path) of
- true ->
- ok = del_tree(Path);
- false ->
- ok = file:delete(Path)
+ true ->
+ ok = del_tree(Path);
+ false ->
+ ok = file:delete(Path)
end
end, [Dir ++ "/" ++ Entry || Entry <- Entries]),
ok = file:del_dir(Dir)
catch
- _:{badmatch, {error, Error}} ->
- {error, ?FORMAT(Error)};
- _:Error ->
- {error, Error}
+ _:{badmatch, {error, Error}} ->
+ {error, Error};
+ _:Error ->
+ {error, Error}
end.
diff --git a/mod_http_upload/src/mod_http_upload_quota.erl b/mod_http_upload/src/mod_http_upload_quota.erl
index 1b7828a..a232e30 100644
--- a/mod_http_upload/src/mod_http_upload_quota.erl
+++ b/mod_http_upload/src/mod_http_upload_quota.erl
@@ -75,8 +75,8 @@ start(ServerHost, Opts) ->
stop(ServerHost) ->
Proc = mod_http_upload:get_proc_name(ServerHost, ?PROCNAME),
- ok = supervisor:terminate_child(ejabberd_sup, Proc),
- ok = supervisor:delete_child(ejabberd_sup, Proc).
+ supervisor:terminate_child(ejabberd_sup, Proc),
+ supervisor:delete_child(ejabberd_sup, Proc).
-spec mod_opt_type(atom()) -> fun((term()) -> term()) | [atom()].
@@ -143,47 +143,52 @@ handle_cast({handle_slot_request, #jid{user = U, server = S} = JID, Path, Size},
access_hard_quota = AccessHardQuota,
disk_usage = DiskUsage} = State) ->
HardQuota = case acl:match_rule(ServerHost, AccessHardQuota, JID) of
- Hard when is_integer(Hard), Hard > 0 ->
- Hard * 1024 * 1024;
- _ ->
- 0
+ Hard when is_integer(Hard), Hard > 0 ->
+ Hard * 1024 * 1024;
+ _ ->
+ 0
end,
SoftQuota = case acl:match_rule(ServerHost, AccessSoftQuota, JID) of
- Soft when is_integer(Soft), Soft > 0 ->
- Soft * 1024 * 1024;
- _ ->
- 0
+ Soft when is_integer(Soft), Soft > 0 ->
+ Soft * 1024 * 1024;
+ _ ->
+ 0
end,
OldSize = case dict:find({U, S}, DiskUsage) of
- {ok, Value} ->
- Value;
- error ->
- undefined
+ {ok, Value} ->
+ Value;
+ error ->
+ undefined
end,
NewSize = case {HardQuota, SoftQuota} of
- {0, 0} ->
- ?DEBUG("No quota specified for ~s",
- [jlib:jid_to_string(JID)]),
- Size;
- {0, _} ->
+ {0, 0} ->
+ ?DEBUG("No quota specified for ~s",
+ [jlib:jid_to_string(JID)]),
+ undefined;
+ {0, _} ->
?WARNING_MSG("No hard quota specified for ~s",
[jlib:jid_to_string(JID)]),
enforce_quota(Path, Size, OldSize, SoftQuota, SoftQuota);
- {_, 0} ->
+ {_, 0} ->
?WARNING_MSG("No soft quota specified for ~s",
[jlib:jid_to_string(JID)]),
enforce_quota(Path, Size, OldSize, HardQuota, HardQuota);
- _ when SoftQuota > HardQuota ->
+ _ when SoftQuota > HardQuota ->
?WARNING_MSG("Bad quota for ~s (soft: ~p, hard: ~p)",
[jlib:jid_to_string(JID),
SoftQuota, HardQuota]),
enforce_quota(Path, Size, OldSize, SoftQuota, SoftQuota);
- _ ->
+ _ ->
?DEBUG("Enforcing quota for ~s",
[jlib:jid_to_string(JID)]),
enforce_quota(Path, Size, OldSize, SoftQuota, HardQuota)
end,
- {noreply, State#state{disk_usage = dict:store({U, S}, NewSize, DiskUsage)}};
+ NewDiskUsage = if is_integer(NewSize) ->
+ dict:store({U, S}, NewSize, DiskUsage);
+ true ->
+ DiskUsage
+ end,
+ {noreply, State#state{disk_usage = NewDiskUsage}};
handle_cast(Request, State) ->
?ERROR_MSG("Got unexpected request: ~p", [Request]),
{noreply, State}.
@@ -196,17 +201,19 @@ handle_info(sweep, #state{server_host = ServerHost,
when is_integer(MaxDays), MaxDays > 0 ->
?DEBUG("Got 'sweep' message for ~s", [ServerHost]),
case file:list_dir(DocRoot) of
- {ok, Entries} ->
- BackThen = secs_since_epoch() - (MaxDays * 86400),
- DocRootS = binary_to_list(DocRoot),
- PathNames = lists:map(fun(Entry) -> DocRootS ++ "/" ++ Entry end,
- Entries),
- UserDirs = lists:filter(fun filelib:is_dir/1, PathNames),
- lists:foreach(fun(UserDir) -> delete_old_files(UserDir, BackThen) end,
- UserDirs);
- {error, Error} ->
- ?ERROR_MSG("Cannot open document root ~s: ~s",
- [DocRoot, ?FORMAT(Error)])
+ {ok, Entries} ->
+ BackThen = secs_since_epoch() - (MaxDays * 86400),
+ DocRootS = binary_to_list(DocRoot),
+ PathNames = lists:map(fun(Entry) ->
+ DocRootS ++ "/" ++ Entry
+ end, Entries),
+ UserDirs = lists:filter(fun filelib:is_dir/1, PathNames),
+ lists:foreach(fun(UserDir) ->
+ delete_old_files(UserDir, BackThen)
+ end, UserDirs);
+ {error, Error} ->
+ ?ERROR_MSG("Cannot open document root ~s: ~s",
+ [DocRoot, ?FORMAT(Error)])
end,
{noreply, State};
handle_info(Info, State) ->
@@ -276,14 +283,14 @@ enforce_quota(UserDir, SlotSize, _OldSize, MinSize, MaxSize) ->
-spec delete_old_files(file:filename_all(), integer()) -> ok.
-delete_old_files(UserDir, Timestamp) ->
+delete_old_files(UserDir, CutOff) ->
FileInfo = gather_file_info(UserDir),
- case [Path || {Path, _Size, Time} <- FileInfo, Time < Timestamp] of
- [] ->
- ok;
- OldFiles ->
- lists:foreach(fun(File) -> del_file_and_dir(File) end, OldFiles),
- file:del_dir(UserDir) % In case it's empty, now.
+ case [Path || {Path, _Size, Time} <- FileInfo, Time < CutOff] of
+ [] ->
+ ok;
+ OldFiles ->
+ lists:foreach(fun(File) -> del_file_and_dir(File) end, OldFiles),
+ file:del_dir(UserDir) % In case it's empty, now.
end.
-spec gather_file_info(file:filename_all())
@@ -293,49 +300,50 @@ gather_file_info(Dir) when is_binary(Dir) ->
gather_file_info(binary_to_list(Dir));
gather_file_info(Dir) ->
case file:list_dir(Dir) of
- {ok, Entries} ->
- lists:foldl(fun(Entry, Acc) ->
- Path = Dir ++ "/" ++ Entry,
- case file:read_file_info(Path, [{time, posix}]) of
- {ok, #file_info{type = directory}} ->
- gather_file_info(Path) ++ Acc;
- {ok, #file_info{type = regular,
- mtime = Time,
- size = Size}} ->
- [{Path, Size, Time} | Acc];
- {ok, _Info} ->
- ?DEBUG("Won't stat(2) non-regular file ~s",
- [Path]),
- Acc;
- {error, Error} ->
- ?ERROR_MSG("Cannot stat(2) ~s: ~s",
- [Path, ?FORMAT(Error)]),
- Acc
- end
- end, [], Entries);
- {error, enoent} ->
- ?DEBUG("Directory ~s doesn't exist", [Dir]),
- [];
- {error, Error} ->
- ?ERROR_MSG("Cannot open directory ~s: ~s", [Dir, ?FORMAT(Error)]),
- []
+ {ok, Entries} ->
+ lists:foldl(fun(Entry, Acc) ->
+ Path = Dir ++ "/" ++ Entry,
+ case file:read_file_info(Path,
+ [{time, posix}]) of
+ {ok, #file_info{type = directory}} ->
+ gather_file_info(Path) ++ Acc;
+ {ok, #file_info{type = regular,
+ mtime = Time,
+ size = Size}} ->
+ [{Path, Size, Time} | Acc];
+ {ok, _Info} ->
+ ?DEBUG("Won't stat(2) non-regular file ~s",
+ [Path]),
+ Acc;
+ {error, Error} ->
+ ?ERROR_MSG("Cannot stat(2) ~s: ~s",
+ [Path, ?FORMAT(Error)]),
+ Acc
+ end
+ end, [], Entries);
+ {error, enoent} ->
+ ?DEBUG("Directory ~s doesn't exist", [Dir]),
+ [];
+ {error, Error} ->
+ ?ERROR_MSG("Cannot open directory ~s: ~s", [Dir, ?FORMAT(Error)]),
+ []
end.
-spec del_file_and_dir(file:name_all()) -> ok.
del_file_and_dir(File) ->
case file:delete(File) of
- ok ->
- ?INFO_MSG("Removed ~s", [File]),
- Dir = filename:dirname(File),
- case file:del_dir(Dir) of
- ok ->
- ?DEBUG("Removed ~s", [Dir]);
- {error, Error} ->
- ?INFO_MSG("Cannot remove ~s: ~s", [Dir, ?FORMAT(Error)])
- end;
- {error, Error} ->
- ?WARNING_MSG("Cannot remove ~s: ~s", [File, ?FORMAT(Error)])
+ ok ->
+ ?INFO_MSG("Removed ~s", [File]),
+ Dir = filename:dirname(File),
+ case file:del_dir(Dir) of
+ ok ->
+ ?DEBUG("Removed ~s", [Dir]);
+ {error, Error} ->
+ ?DEBUG("Cannot remove ~s: ~s", [Dir, ?FORMAT(Error)])
+ end;
+ {error, Error} ->
+ ?WARNING_MSG("Cannot remove ~s: ~s", [File, ?FORMAT(Error)])
end.
-spec secs_since_epoch() -> non_neg_integer().