Merge pull request #3618 from esl/fix-cowboy-static-config

Fix cowboy_static options
esl · Apr 1, 2022 · 237ecb2 · 237ecb2
2 parents 7cbb30d + 44d398c
commit 237ecb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/config/mongoose_config_spec.erl b/src/config/mongoose_config_spec.erl
@@ -434,7 +434,7 @@ http_handler(Key) ->
     ExtraItems = http_handler_items(Key),
     RequiredKeys = case http_handler_required(Key) of
                        all -> all;
-                       [] -> [<<"host">>, <<"path">>]
+                       Keys -> Keys ++ [<<"host">>, <<"path">>]
                    end,
     #section{
        items = ExtraItems#{<<"host">> => #option{type = string,
@@ -474,7 +474,7 @@ http_handler_items(_) ->
     #{}.
 
 http_handler_required(<<"lasse_handler">>) -> all;
-http_handler_required(<<"cowboy_static">>) -> all;
+http_handler_required(<<"cowboy_static">>) -> [<<"type">>, <<"content_path">>];
 http_handler_required(<<"mongoose_api">>) -> all;
 http_handler_required(_) -> [].
 
@@ -1151,9 +1151,12 @@ process_http_handler([item, Type | _], KVs) ->
 process_http_handler_opts(<<"lasse_handler">>, [{module, Module}]) ->
     [Module];
 process_http_handler_opts(<<"cowboy_static">>, Opts) ->
-    {[[{type, Type}], [{app, App}], [{content_path, Path}]], []} =
-        proplists:split(Opts, [type, app, content_path]),
-    {Type, App, Path, [{mimetypes, cow_mimetypes, all}]};
+    case proplists:split(Opts, [type, app, content_path]) of
+        {[[{type, Type}], [{app, App}], [{content_path, Path}]], []} ->
+            {Type, App, Path, [{mimetypes, cow_mimetypes, all}]};
+        {[[{type, Type}], [], [{content_path, Path}]], []} ->
+            {Type, Path, [{mimetypes, cow_mimetypes, all}]}
+    end;
 process_http_handler_opts(<<"mongoose_api_admin">>, Opts) ->
     {[UserOpts, PassOpts], []} = proplists:split(Opts, [username, password]),
     case {UserOpts, PassOpts} of

diff --git a/test/config_parser_SUITE.erl b/test/config_parser_SUITE.erl
@@ -824,6 +824,11 @@ listen_http_handlers_static(_Config) ->
          http_handler_raw(<<"cowboy_static">>, #{<<"type">> => <<"priv_dir">>,
                                                  <<"app">> => <<"cowboy_swagger">>,
                                                  <<"content_path">> => <<"swagger">>})),
+    ?cfg(listener_config(ejabberd_cowboy, #{modules => [{"localhost", "/api", cowboy_static,
+                                                         {file, "swagger", [{mimetypes, cow_mimetypes, all}]}
+                                                        }]}),
+         http_handler_raw(<<"cowboy_static">>, #{<<"type">> => <<"file">>,
+                                                 <<"content_path">> => <<"swagger">>})),
     ?err(http_handler_raw(<<"cowboy_static">>, #{<<"type">> => <<"priv_dir">>,
                                                  <<"app">> => <<"cowboy_swagger">>})).