]> granicus.if.org Git - ejabberd/commitdiff
Delete mod_configure2
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 4 Aug 2016 13:45:33 +0000 (16:45 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Thu, 4 Aug 2016 13:45:33 +0000 (16:45 +0300)
The module doesn't work properly for many years and nobody reported
this, which means nobody is using it. Also, mod_configure does
the same (and more) in a standard compliant way (XEP-0133).

src/mod_configure2.erl [deleted file]

diff --git a/src/mod_configure2.erl b/src/mod_configure2.erl
deleted file mode 100644 (file)
index 85b7740..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-%%%----------------------------------------------------------------------
-%%% File    : mod_configure2.erl
-%%% Author  : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose : Support for online configuration of ejabberd
-%%% Created : 26 Oct 2003 by Alexey Shchepin <alexey@process-one.net>
-%%%
-%%%
-%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
-%%%
-%%% This program is free software; you can redistribute it and/or
-%%% modify it under the terms of the GNU General Public License as
-%%% published by the Free Software Foundation; either version 2 of the
-%%% License, or (at your option) any later version.
-%%%
-%%% This program is distributed in the hope that it will be useful,
-%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%%% General Public License for more details.
-%%%
-%%% You should have received a copy of the GNU General Public License along
-%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%%
-%%%----------------------------------------------------------------------
-
--module(mod_configure2).
-
--behaviour(ejabberd_config).
-
--author('alexey@process-one.net').
-
--behaviour(gen_mod).
-
--export([start/2, stop/1, process_local_iq/3,
-        mod_opt_type/1, opt_type/1, depends/2]).
-
--include("ejabberd.hrl").
--include("logger.hrl").
-
--include("jlib.hrl").
-
--define(NS_ECONFIGURE,
-       <<"http://ejabberd.jabberstudio.org/protocol/con"
-         "figure">>).
-
-start(Host, Opts) ->
-    IQDisc = gen_mod:get_opt(iqdisc, Opts, fun gen_iq_handler:check_type/1,
-                             one_queue),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host,
-                                 ?NS_ECONFIGURE, ?MODULE, process_local_iq,
-                                 IQDisc),
-    ok.
-
-stop(Host) ->
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host,
-                                    ?NS_ECONFIGURE).
-
-process_local_iq(From, To,
-                #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->
-    case acl:match_rule(To#jid.lserver, configure, From) of
-      deny ->
-         Txt = <<"Denied by ACL">>,
-         IQ#iq{type = error, sub_el = [SubEl, ?ERRT_NOT_ALLOWED(Lang, Txt)]};
-      allow ->
-         case Type of
-           set ->
-               Txt = <<"Value 'set' of 'type' attribute is not allowed">>,
-               IQ#iq{type = error,
-                     sub_el = [SubEl, ?ERRT_FEATURE_NOT_IMPLEMENTED(Lang, Txt)]};
-           %%case fxml:get_tag_attr_s("type", SubEl) of
-           %%    "cancel" ->
-           %%        IQ#iq{type = result,
-           %%             sub_el = [{xmlelement, "query",
-           %%                        [{"xmlns", XMLNS}], []}]};
-           %%    "submit" ->
-           %%        XData = jlib:parse_xdata_submit(SubEl),
-           %%        case XData of
-           %%          invalid ->
-           %%              IQ#iq{type = error,
-           %%                    sub_el = [SubEl, ?ERR_BAD_REQUEST]};
-           %%          _ ->
-           %%              Node =
-           %%                  string:tokens(
-           %%                    fxml:get_tag_attr_s("node", SubEl),
-           %%                    "/"),
-           %%              case set_form(Node, Lang, XData) of
-           %%                  {result, Res} ->
-           %%                      IQ#iq{type = result,
-           %%                            sub_el = [{xmlelement, "query",
-           %%                                       [{"xmlns", XMLNS}],
-           %%                                       Res
-           %%                                      }]};
-           %%                  {error, Error} ->
-           %%                      IQ#iq{type = error,
-           %%                            sub_el = [SubEl, Error]}
-           %%              end
-           %%        end;
-           %%    _ ->
-           %%        IQ#iq{type = error,
-           %%             sub_el = [SubEl, ?ERR_NOT_ALLOWED]}
-           %%end;
-           get ->
-               case process_get(SubEl, Lang) of
-                 {result, Res} -> IQ#iq{type = result, sub_el = [Res]};
-                 {error, Error} ->
-                     IQ#iq{type = error, sub_el = [SubEl, Error]}
-               end
-         end
-    end.
-
-process_get(#xmlel{name = <<"info">>}, _Lang) ->
-    S2SConns = ejabberd_s2s:dirty_get_connections(),
-    TConns = lists:usort([element(2, C) || C <- S2SConns]),
-    Attrs = [{<<"registered-users">>,
-             iolist_to_binary(integer_to_list(mnesia:table_info(passwd,
-                                                                size)))},
-            {<<"online-users">>,
-             iolist_to_binary(integer_to_list(mnesia:table_info(presence,
-                                                                size)))},
-            {<<"running-nodes">>,
-             iolist_to_binary(integer_to_list(length(mnesia:system_info(running_db_nodes))))},
-            {<<"stopped-nodes">>,
-             iolist_to_binary(integer_to_list(length(lists:usort(mnesia:system_info(db_nodes)
-                                                                    ++
-                                                                    mnesia:system_info(extra_db_nodes))
-                                                        --
-                                                        mnesia:system_info(running_db_nodes))))},
-            {<<"outgoing-s2s-servers">>,
-             iolist_to_binary(integer_to_list(length(TConns)))}],
-    {result,
-     #xmlel{name = <<"info">>,
-           attrs = [{<<"xmlns">>, ?NS_ECONFIGURE} | Attrs],
-           children = []}};
-process_get(#xmlel{name = <<"welcome-message">>,
-                  attrs = Attrs}, _Lang) ->
-    {Subj, Body} = ejabberd_config:get_option(
-                     welcome_message,
-                     fun({Subj, Body}) ->
-                             {iolist_to_binary(Subj),
-                              iolist_to_binary(Body)}
-                     end,
-                     {<<"">>, <<"">>}),
-    {result,
-     #xmlel{name = <<"welcome-message">>, attrs = Attrs,
-           children =
-               [#xmlel{name = <<"subject">>, attrs = [],
-                       children = [{xmlcdata, Subj}]},
-                #xmlel{name = <<"body">>, attrs = [],
-                       children = [{xmlcdata, Body}]}]}};
-process_get(#xmlel{name = <<"registration-watchers">>,
-                  attrs = Attrs}, _Lang) ->
-    SubEls = ejabberd_config:get_option(
-               registration_watchers,
-               fun(JIDs) when is_list(JIDs) ->
-                       lists:map(
-                         fun(J) ->
-                                 #xmlel{name = <<"jid">>, attrs = [],
-                                        children = [{xmlcdata,
-                                                     iolist_to_binary(J)}]}
-                         end, JIDs)
-               end, []),
-    {result,
-     #xmlel{name = <<"registration_watchers">>,
-           attrs = Attrs, children = SubEls}};
-process_get(#xmlel{name = <<"acls">>, attrs = Attrs}, _Lang) ->
-    Str = iolist_to_binary(io_lib:format("~p.",
-                                        [ets:tab2list(acl)])),
-    {result,
-     #xmlel{name = <<"acls">>, attrs = Attrs,
-           children = [{xmlcdata, Str}]}};
-process_get(#xmlel{name = <<"access">>,
-                  attrs = Attrs}, _Lang) ->
-    Str = iolist_to_binary(io_lib:format("~p.",
-                                        [ets:select(local_config,
-                                                    [{{local_config, {access, '$1'},
-                                                       '$2'},
-                                                      [],
-                                                      [{{access, '$1',
-                                                         '$2'}}]}])])),
-    {result,
-     #xmlel{name = <<"access">>, attrs = Attrs,
-           children = [{xmlcdata, Str}]}};
-process_get(#xmlel{name = <<"last">>, attrs = Attrs}, Lang) ->
-    case catch mnesia:dirty_select(last_activity,
-                                  [{{last_activity, '_', '$1', '_'}, [],
-                                    ['$1']}])
-       of
-      {'EXIT', _Reason} ->
-         Txt = <<"Database failure">>,
-         {error, ?ERRT_INTERNAL_SERVER_ERROR(Lang, Txt)};
-      Vals ->
-         TimeStamp = p1_time_compat:system_time(seconds),
-         Str = list_to_binary(
-                  [[jlib:integer_to_binary(TimeStamp - V),
-                    <<" ">>] || V <- Vals]),
-         {result,
-          #xmlel{name = <<"last">>, attrs = Attrs,
-                 children = [{xmlcdata, Str}]}}
-    end;
-%%process_get({xmlelement, Name, Attrs, SubEls}) ->
-%%    {result, };
-process_get(_, _) -> {error, ?ERR_BAD_REQUEST}.
-
-depends(_Host, _Opts) ->
-    [].
-
-mod_opt_type(iqdisc) -> fun gen_iq_handler:check_type/1;
-mod_opt_type(_) -> [iqdisc].
-
-opt_type(registration_watchers) ->
-    fun (JIDs) when is_list(JIDs) ->
-           lists:map(fun (J) ->
-                             #xmlel{name = <<"jid">>, attrs = [],
-                                    children =
-                                        [{xmlcdata, iolist_to_binary(J)}]}
-                     end,
-                     JIDs)
-    end;
-opt_type(welcome_message) ->
-    fun ({Subj, Body}) ->
-           {iolist_to_binary(Subj), iolist_to_binary(Body)}
-    end;
-opt_type(_) -> [registration_watchers, welcome_message].