Build has been canceled!

1212

Committed 18 Nov 2025 12:37PM UTC coverage: 33.784% (+0.003%) from 33.781%

Build # 1212

Build Type

push

github

Committed by

badlop

Commit Message

mod_conversejs: Improve link to conversejs in WebAdmin (#4495)

Until now, the WebAdmin menu included a link to the first request handler
with mod_conversejs that the admin configured in ejabberd.yml
That link included the authentication credentials hashed as URI arguments
if using HTTPS. Then process/2 extracted those arguments and passed them
as autologin options to Converse.

From now, mod_conversejs automatically adds a request_handler nested in
webadmin subpath. The webadmin menu links to that converse URI; this allows
to access the HTTP auth credentials, no need to explicitly pass them.
process/2 extracts this HTTP auth and passes autologin options to Converse.
Now scram password storage is supported too.

This minimum configuration allows WebAdmin to access Converse:

listen:
  -
    port: 5443
    module: ejabberd_http
    tls: true
    request_handlers:
      /admin: ejabberd_web_admin
      /ws: ejabberd_http_ws
modules:
  mod_conversejs:
    conversejs_resources: "/home/conversejs/12.0.0/dist"

Run Details

0 of 12 new or added lines in 1 file covered. (0.0%)

11290 existing lines in 174 files now uncovered.

15515 of 45924 relevant lines covered (33.78%)

1277.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

67.63

/src/mod_privacy_sql.erl

%%%-------------------------------------------------------------------
%%% File    : mod_privacy_sql.erl
%%% Author  : Evgeny Khramtsov <ekhramtsov@process-one.net>
%%% Created : 14 Apr 2016 by Evgeny Khramtsov <ekhramtsov@process-one.net>
%%%
%%%
%%% ejabberd, Copyright (C) 2002-2025   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_privacy_sql).


-behaviour(mod_privacy).

%% API
-export([init/2, set_default/3, unset_default/2, set_lists/1,
         set_list/4, get_lists/2, get_list/3, remove_lists/2,
         remove_list/3, import/1, export/1]).

-export([item_to_raw/1, raw_to_item/1]).

-export([sql_schemas/0]).

-include_lib("xmpp/include/xmpp.hrl").
-include("mod_privacy.hrl").
-include("logger.hrl").
-include("ejabberd_sql_pt.hrl").

%%%===================================================================
%%% API
%%%===================================================================
init(Host, _Opts) ->
    ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
    ok.

sql_schemas() ->
    [#sql_schema{
        version = 1,
        tables =
            [#sql_table{
                name = <<"privacy_default_list">>,
                columns =
                    [#sql_column{name = <<"username">>, type = text},
                     #sql_column{name = <<"server_host">>, type = text},
                     #sql_column{name = <<"name">>, type = text}],
                indices = [#sql_index{
                              columns = [<<"server_host">>, <<"username">>],
                              unique = true}]},
             #sql_table{
                name = <<"privacy_list">>,
                columns =
                    [#sql_column{name = <<"username">>, type = text},
                     #sql_column{name = <<"server_host">>, type = text},
                     #sql_column{name = <<"name">>, type = text},
                     #sql_column{name = <<"id">>, type = bigserial},
                     #sql_column{name = <<"created_at">>, type = timestamp,
                                 default = true}],
                indices = [#sql_index{
                              columns = [<<"id">>],
                              unique = true},
                           #sql_index{
                              columns = [<<"server_host">>, <<"username">>,
                                         <<"name">>],
                              unique = true}]},
             #sql_table{
                name = <<"privacy_list_data">>,
                columns =
                    [#sql_column{name = <<"id">>, type = bigint,
                                 opts = [#sql_references{
                                            table = <<"privacy_list">>,
                                            column = <<"id">>}]},
                     #sql_column{name = <<"t">>, type = {char, 1}},
                     #sql_column{name = <<"value">>, type = text},
                     #sql_column{name = <<"action">>, type = {char, 1}},
                     #sql_column{name = <<"ord">>, type = numeric},
                     #sql_column{name = <<"match_all">>, type = boolean},
                     #sql_column{name = <<"match_iq">>, type = boolean},
                     #sql_column{name = <<"match_message">>, type = boolean},
                     #sql_column{name = <<"match_presence_in">>, type = boolean},
                     #sql_column{name = <<"match_presence_out">>, type = boolean}],
                indices = [#sql_index{columns = [<<"id">>]}]}]}].

unset_default(LUser, LServer) ->
    case unset_default_privacy_list(LUser, LServer) of
        ok ->
            ok;
        _Err ->
            {error, db_failure}
    end.

set_default(LUser, LServer, Name) ->
    F = fun () ->
                case get_privacy_list_names_t(LUser, LServer) of
                    {selected, []} ->
                        {error, notfound};
                    {selected, Names} ->
                        case lists:member({Name}, Names) of
                            true ->
                                set_default_privacy_list(LUser, LServer, Name);
                            false ->
                                {error, notfound}
                        end
                end
        end,
    transaction(LServer, F).

remove_list(LUser, LServer, Name) ->
    F = fun () ->
                case get_default_privacy_list_t(LUser, LServer) of
                    {selected, []} ->
                        remove_privacy_list_t(LUser, LServer, Name);
                    {selected, [{Default}]} ->
                        if Name == Default ->
                                {error, conflict};
                           true ->
                                remove_privacy_list_t(LUser, LServer, Name)
                        end
                end
        end,
    transaction(LServer, F).

set_lists(#privacy{us = {LUser, LServer},
                   default = Default,
                   lists = Lists}) ->
    F = fun() ->
                lists:foreach(
                  fun({Name, List}) ->
                          add_privacy_list(LUser, LServer, Name),
                          {selected, [{I}]} =
                              get_privacy_list_id_t(LUser, LServer, Name),
                          RItems = lists:map(fun item_to_raw/1, List),
                          set_privacy_list(I, RItems),
                          if is_binary(Default) ->
                                  set_default_privacy_list(
                                    LUser, LServer, Default);
                             true ->
                                  ok
                          end
                  end, Lists)
        end,
    transaction(LServer, F).

set_list(LUser, LServer, Name, List) ->
    RItems = lists:map(fun item_to_raw/1, List),
    F = fun() ->
        {ID, New} = case get_privacy_list_id_t(LUser, LServer, Name) of
                        {selected, []} ->
                            add_privacy_list(LUser, LServer, Name),
                            {selected, [{I}]} =
                            get_privacy_list_id_t(LUser, LServer, Name),
                            {I, true};
                        {selected, [{I}]} -> {I, false}
                    end,
        case New of
            false ->
                set_privacy_list(ID, RItems);
            _ ->
                set_privacy_list_new(ID, RItems)
        end
        end,
    transaction(LServer, F).

get_list(LUser, LServer, default) ->
    case get_default_privacy_list(LUser, LServer) of
        {selected, []} ->
            error;
        {selected, [{Default}]} ->
            get_list(LUser, LServer, Default);
        _Err ->
            {error, db_failure}
    end;
get_list(LUser, LServer, Name) ->
    case get_privacy_list_data(LUser, LServer, Name) of
        {selected, []} ->
            error;
        {selected, RItems} ->
            {ok, {Name, lists:flatmap(fun raw_to_item/1, RItems)}};
        _Err ->
            {error, db_failure}
    end.

get_lists(LUser, LServer) ->
    case get_default_privacy_list(LUser, LServer) of
        {selected, Selected} ->
            Default = case Selected of
                          [] -> none;
                          [{DefName}] -> DefName
                      end,
            case get_privacy_list_names(LUser, LServer) of
                {selected, Names} ->
                    case lists:foldl(
                           fun(_, {error, _} = Err) ->
                                   Err;
                              ({Name}, Acc) ->
                                   case get_privacy_list_data(LUser, LServer, Name) of
                                       {selected, RItems} ->
                                           Items = lists:flatmap(
                                                     fun raw_to_item/1,
                                                     RItems),
                                           [{Name, Items}|Acc];
                                       _Err ->
                                           {error, db_failure}
                                   end
                           end, [], Names) of
                        {error, Reason} ->
                            {error, Reason};
                        Lists ->
                            {ok, #privacy{default = Default,
                                          us = {LUser, LServer},
                                          lists = Lists}}
                    end;
                _Err ->
                    {error, db_failure}
            end;
        _Err ->
            {error, db_failure}
    end.

remove_lists(LUser, LServer) ->
    case del_privacy_lists(LUser, LServer) of
        ok ->
            ok;
        _Err ->
            {error, db_failure}
    end.

export(Server) ->
    SqlType = ejabberd_option:sql_type(Server),
    case catch ejabberd_sql:sql_query(jid:nameprep(Server),
                                 [<<"select id from privacy_list order by "
                                    "id desc limit 1;">>]) of
        {selected, [<<"id">>], [[I]]} ->
            put(id, binary_to_integer(I));
        _ ->
            put(id, 0)
    end,
    [{privacy,
      fun(Host, #privacy{us = {LUser, LServer}, lists = Lists,
                         default = Default})
            when LServer == Host ->
              if Default /= none ->
                      [?SQL("delete from privacy_default_list where"
                            " username=%(LUser)s and %(LServer)H;"),
                       ?SQL_INSERT(
                          "privacy_default_list",
                          ["username=%(LUser)s",
                           "server_host=%(LServer)s",
                           "name=%(Default)s"])];
                 true ->
                      []
              end ++
                  lists:flatmap(
                    fun({Name, List}) ->
                            RItems = lists:map(fun item_to_raw/1, List),
                            ID = get_id(),
                            [?SQL("delete from privacy_list where"
                                  " username=%(LUser)s and %(LServer)H and"
                                  " name=%(Name)s;"),
                             ?SQL_INSERT(
                                "privacy_list",
                                ["username=%(LUser)s",
                                 "server_host=%(LServer)s",
                                 "name=%(Name)s",
                                 "id=%(ID)d"]),
                             ?SQL("delete from privacy_list_data where"
                                  " id=%(ID)d;")] ++
                            case SqlType of
                                pgsql ->
                                [?SQL("insert into privacy_list_data(id, t, "
                                      "value, action, ord, match_all, match_iq, "
                                      "match_message, match_presence_in, "
                                      "match_presence_out) "
                                      "values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
                                      " %(Order)d, CAST(%(MatchAll)b as boolean), CAST(%(MatchIQ)b as boolean),"
                                      " CAST(%(MatchMessage)b as boolean), CAST(%(MatchPresenceIn)b as boolean),"
                                      " CAST(%(MatchPresenceOut)b as boolean));")
                                 || {SType, SValue, SAction, Order,
                                     MatchAll, MatchIQ,
                                     MatchMessage, MatchPresenceIn,
                                     MatchPresenceOut} <- RItems];
                                _ ->
                                [?SQL("insert into privacy_list_data(id, t, "
                                      "value, action, ord, match_all, match_iq, "
                                      "match_message, match_presence_in, "
                                      "match_presence_out) "
                                      "values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
                                      " %(Order)d, %(MatchAll)b, %(MatchIQ)b,"
                                      " %(MatchMessage)b, %(MatchPresenceIn)b,"
                                      " %(MatchPresenceOut)b);")
                                 || {SType, SValue, SAction, Order,
                                     MatchAll, MatchIQ,
                                     MatchMessage, MatchPresenceIn,
                                     MatchPresenceOut} <- RItems]
                            end
                    end,
                    Lists);
         (_Host, _R) ->
              []
      end}].

get_id() ->
    ID = get(id),
    put(id, ID + 1),
    ID + 1.

import(_) ->
    ok.

%%%===================================================================
%%% Internal functions
%%%===================================================================
transaction(LServer, F) ->
    case ejabberd_sql:sql_transaction(LServer, F) of
        {atomic, Res} -> Res;
        {aborted, _Reason} -> {error, db_failure}
    end.

raw_to_item({SType, SValue, SAction, Order, MatchAll,
             MatchIQ, MatchMessage, MatchPresenceIn,
             MatchPresenceOut} = Row) ->
    try
        {Type, Value} = case SType of
                            <<"n">> -> {none, none};
                            <<"j">> ->
                                JID = jid:decode(SValue),
                                {jid, jid:tolower(JID)};
                            <<"g">> -> {group, SValue};
                            <<"s">> ->
                                case SValue of
                                    <<"none">> -> {subscription, none};
                                    <<"both">> -> {subscription, both};
                                    <<"from">> -> {subscription, from};
                                    <<"to">> -> {subscription, to}
                                end
                        end,
        Action = case SAction of
                     <<"a">> -> allow;
                     <<"d">> -> deny
                 end,
        [#listitem{type = Type, value = Value, action = Action,
                   order = Order, match_all = MatchAll, match_iq = MatchIQ,
                   match_message = MatchMessage,
                   match_presence_in = MatchPresenceIn,
                   match_presence_out = MatchPresenceOut}]
    catch _:_ ->
            ?WARNING_MSG("Failed to parse row: ~p", [Row]),
            []
    end.

item_to_raw(#listitem{type = Type, value = Value,
                      action = Action, order = Order, match_all = MatchAll,
                      match_iq = MatchIQ, match_message = MatchMessage,
                      match_presence_in = MatchPresenceIn,
                      match_presence_out = MatchPresenceOut}) ->
    {SType, SValue} = case Type of
                        none -> {<<"n">>, <<"">>};
                        jid -> {<<"j">>, jid:encode(Value)};
                        group -> {<<"g">>, Value};
                        subscription ->
                            case Value of
                              none -> {<<"s">>, <<"none">>};
                              both -> {<<"s">>, <<"both">>};
                              from -> {<<"s">>, <<"from">>};
                              to -> {<<"s">>, <<"to">>}
                            end
                      end,
    SAction = case Action of
                allow -> <<"a">>;
                deny -> <<"d">>
              end,
    {SType, SValue, SAction, Order, MatchAll, MatchIQ,
     MatchMessage, MatchPresenceIn, MatchPresenceOut}.

get_default_privacy_list(LUser, LServer) ->
    ejabberd_sql:sql_query(
      LServer,
      ?SQL("select @(name)s from privacy_default_list "
           "where username=%(LUser)s and %(LServer)H")).

get_default_privacy_list_t(LUser, LServer) ->
    ejabberd_sql:sql_query_t(
      ?SQL("select @(name)s from privacy_default_list "
           "where username=%(LUser)s and %(LServer)H")).

get_privacy_list_names(LUser, LServer) ->
    ejabberd_sql:sql_query(
      LServer,
      ?SQL("select @(name)s from privacy_list"
           " where username=%(LUser)s and %(LServer)H")).

get_privacy_list_names_t(LUser, LServer) ->
    ejabberd_sql:sql_query_t(
      ?SQL("select @(name)s from privacy_list"
           " where username=%(LUser)s and %(LServer)H")).

get_privacy_list_id_t(LUser, LServer, Name) ->
    ejabberd_sql:sql_query_t(
      ?SQL("select @(id)d from privacy_list"
           " where username=%(LUser)s and %(LServer)H and name=%(Name)s")).

get_privacy_list_data(LUser, LServer, Name) ->
    ejabberd_sql:sql_query(
      LServer,
      ?SQL("select @(t)s, @(value)s, @(action)s, @(ord)d, @(match_all)b, "
           "@(match_iq)b, @(match_message)b, @(match_presence_in)b, "
           "@(match_presence_out)b from privacy_list_data "
           "where id ="
           " (select id from privacy_list"
           " where username=%(LUser)s and %(LServer)H and name=%(Name)s) "
           "order by ord")).

set_default_privacy_list(LUser, LServer, Name) ->
    ?SQL_UPSERT_T(
       "privacy_default_list",
       ["!username=%(LUser)s",
        "!server_host=%(LServer)s",
        "name=%(Name)s"]).

unset_default_privacy_list(LUser, LServer) ->
    case ejabberd_sql:sql_query(
           LServer,
           ?SQL("delete from privacy_default_list"
                " where username=%(LUser)s and %(LServer)H")) of
        {updated, _} -> ok;
        Err -> Err
    end.

remove_privacy_list_t(LUser, LServer, Name) ->
    case ejabberd_sql:sql_query_t(
           ?SQL("delete from privacy_list where"
                " username=%(LUser)s and %(LServer)H and name=%(Name)s")) of
        {updated, 0} -> {error, notfound};
        {updated, _} -> ok;
        Err -> Err
    end.

add_privacy_list(LUser, LServer, Name) ->
    ejabberd_sql:sql_query_t(
      ?SQL_INSERT(
         "privacy_list",
         ["username=%(LUser)s",
          "server_host=%(LServer)s",
          "name=%(Name)s"])).

set_privacy_list_new(ID, RItems) ->
    lists:foreach(
        fun({SType, SValue, SAction, Order, MatchAll, MatchIQ,
             MatchMessage, MatchPresenceIn, MatchPresenceOut}) ->
            ejabberd_sql:sql_query_t(
                ?SQL("insert into privacy_list_data(id, t, "
                     "value, action, ord, match_all, match_iq, "
                     "match_message, match_presence_in, match_presence_out) "
                     "values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
                     " %(Order)d, %(MatchAll)b, %(MatchIQ)b,"
                     " %(MatchMessage)b, %(MatchPresenceIn)b,"
                     " %(MatchPresenceOut)b)"))
        end,
        RItems).

calculate_difference(List1, List2) ->
    Set1 = gb_sets:from_list(List1),
    Set2 = gb_sets:from_list(List2),
    {gb_sets:to_list(gb_sets:subtract(Set1, Set2)),
     gb_sets:to_list(gb_sets:subtract(Set2, Set1))}.

set_privacy_list(ID, RItems) ->
    case ejabberd_sql:sql_query_t(
        ?SQL("select @(t)s, @(value)s, @(action)s, @(ord)d, @(match_all)b, "
             "@(match_iq)b, @(match_message)b, @(match_presence_in)b, "
             "@(match_presence_out)b from privacy_list_data "
             "where id=%(ID)d")) of
        {selected, ExistingItems} ->
            {ToAdd2, ToDelete2} = calculate_difference(RItems, ExistingItems),
            ToAdd3 = if
                         ToDelete2 /= [] ->
                             ejabberd_sql:sql_query_t(
                                 ?SQL("delete from privacy_list_data where id=%(ID)d")),
                             RItems;
                         true ->
                             ToAdd2
                     end,
            lists:foreach(
                fun({SType, SValue, SAction, Order, MatchAll, MatchIQ,
                     MatchMessage, MatchPresenceIn, MatchPresenceOut}) ->
                    ejabberd_sql:sql_query_t(
                        ?SQL("insert into privacy_list_data(id, t, "
                             "value, action, ord, match_all, match_iq, "
                             "match_message, match_presence_in, match_presence_out) "
                             "values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
                             " %(Order)d, %(MatchAll)b, %(MatchIQ)b,"
                             " %(MatchMessage)b, %(MatchPresenceIn)b,"
                             " %(MatchPresenceOut)b)"))
                end,
                ToAdd3);
        Err ->
            Err
    end.

del_privacy_lists(LUser, LServer) ->
    case ejabberd_sql:sql_query(
           LServer,
           ?SQL("delete from privacy_list where username=%(LUser)s and %(LServer)H")) of
        {updated, _} ->
            case ejabberd_sql:sql_query(
                   LServer,
                   ?SQL("delete from privacy_default_list "
                        "where username=%(LUser)s and %(LServer)H")) of
                {updated, _} -> ok;
                Err -> Err
            end;
        Err ->
            Err
    end.

1	%%%-------------------------------------------------------------------
2	%%% File : mod_privacy_sql.erl
3	%%% Author : Evgeny Khramtsov <ekhramtsov@process-one.net>
4	%%% Created : 14 Apr 2016 by Evgeny Khramtsov <ekhramtsov@process-one.net>
5	%%%
6	%%%
7	%%% ejabberd, Copyright (C) 2002-2025 ProcessOne
8	%%%
9	%%% This program is free software; you can redistribute it and/or
10	%%% modify it under the terms of the GNU General Public License as
11	%%% published by the Free Software Foundation; either version 2 of the
12	%%% License, or (at your option) any later version.
13	%%%
14	%%% This program is distributed in the hope that it will be useful,
15	%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
16	%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17	%%% General Public License for more details.
18	%%%
19	%%% You should have received a copy of the GNU General Public License along
20	%%% with this program; if not, write to the Free Software Foundation, Inc.,
21	%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
22	%%%
23	%%%----------------------------------------------------------------------
24
25	-module(mod_privacy_sql).
26
27
28	-behaviour(mod_privacy).
29
30	%% API
31	-export([init/2, set_default/3, unset_default/2, set_lists/1,
32	set_list/4, get_lists/2, get_list/3, remove_lists/2,
33	remove_list/3, import/1, export/1]).
34
35	-export([item_to_raw/1, raw_to_item/1]).
36
37	-export([sql_schemas/0]).
38
39	-include_lib("xmpp/include/xmpp.hrl").
40	-include("mod_privacy.hrl").
41	-include("logger.hrl").
42	-include("ejabberd_sql_pt.hrl").
43
44	%%%===================================================================
45	%%% API
46	%%%===================================================================
47	init(Host, _Opts) ->
UNCOV 48	ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),	7✔
UNCOV 49	ok.	7✔
50
51	sql_schemas() ->
UNCOV 52	[#sql_schema{	7✔
53	version = 1,
54	tables =
55	[#sql_table{
56	name = <<"privacy_default_list">>,
57	columns =
58	[#sql_column{name = <<"username">>, type = text},
59	#sql_column{name = <<"server_host">>, type = text},
60	#sql_column{name = <<"name">>, type = text}],
61	indices = [#sql_index{
62	columns = [<<"server_host">>, <<"username">>],
63	unique = true}]},
64	#sql_table{
65	name = <<"privacy_list">>,
66	columns =
67	[#sql_column{name = <<"username">>, type = text},
68	#sql_column{name = <<"server_host">>, type = text},
69	#sql_column{name = <<"name">>, type = text},
70	#sql_column{name = <<"id">>, type = bigserial},
71	#sql_column{name = <<"created_at">>, type = timestamp,
72	default = true}],
73	indices = [#sql_index{
74	columns = [<<"id">>],
75	unique = true},
76	#sql_index{
77	columns = [<<"server_host">>, <<"username">>,
78	<<"name">>],
79	unique = true}]},
80	#sql_table{
81	name = <<"privacy_list_data">>,
82	columns =
83	[#sql_column{name = <<"id">>, type = bigint,
84	opts = [#sql_references{
85	table = <<"privacy_list">>,
86	column = <<"id">>}]},
87	#sql_column{name = <<"t">>, type = {char, 1}},
88	#sql_column{name = <<"value">>, type = text},
89	#sql_column{name = <<"action">>, type = {char, 1}},
90	#sql_column{name = <<"ord">>, type = numeric},
91	#sql_column{name = <<"match_all">>, type = boolean},
92	#sql_column{name = <<"match_iq">>, type = boolean},
93	#sql_column{name = <<"match_message">>, type = boolean},
94	#sql_column{name = <<"match_presence_in">>, type = boolean},
95	#sql_column{name = <<"match_presence_out">>, type = boolean}],
96	indices = [#sql_index{columns = [<<"id">>]}]}]}].
97
98	unset_default(LUser, LServer) ->
UNCOV 99	case unset_default_privacy_list(LUser, LServer) of	7✔
100	ok ->
UNCOV 101	ok;	7✔
102	_Err ->
103	{error, db_failure}	×
104	end.
105
106	set_default(LUser, LServer, Name) ->
UNCOV 107	F = fun () ->	63✔
UNCOV 108	case get_privacy_list_names_t(LUser, LServer) of	63✔
109	{selected, []} ->
UNCOV 110	{error, notfound};	7✔
111	{selected, Names} ->
UNCOV 112	case lists:member({Name}, Names) of	56✔
113	true ->
UNCOV 114	set_default_privacy_list(LUser, LServer, Name);	56✔
115	false ->
116	{error, notfound}	×
117	end
118	end
119	end,
UNCOV 120	transaction(LServer, F).	63✔
121
122	remove_list(LUser, LServer, Name) ->
UNCOV 123	F = fun () ->	21✔
UNCOV 124	case get_default_privacy_list_t(LUser, LServer) of	21✔
125	{selected, []} ->
UNCOV 126	remove_privacy_list_t(LUser, LServer, Name);	14✔
127	{selected, [{Default}]} ->
UNCOV 128	if Name == Default ->	7✔
UNCOV 129	{error, conflict};	7✔
130	true ->
131	remove_privacy_list_t(LUser, LServer, Name)	×
132	end
133	end
134	end,
UNCOV 135	transaction(LServer, F).	21✔
136
137	set_lists(#privacy{us = {LUser, LServer},
138	default = Default,
139	lists = Lists}) ->
140	F = fun() ->	×
141	lists:foreach(	×
142	fun({Name, List}) ->
143	add_privacy_list(LUser, LServer, Name),	×
144	{selected, [{I}]} =	×
145	get_privacy_list_id_t(LUser, LServer, Name),
146	RItems = lists:map(fun item_to_raw/1, List),	×
147	set_privacy_list(I, RItems),	×
148	if is_binary(Default) ->	×
149	set_default_privacy_list(	×
150	LUser, LServer, Default);
151	true ->
152	ok	×
153	end
154	end, Lists)
155	end,
156	transaction(LServer, F).	×
157
158	set_list(LUser, LServer, Name, List) ->
UNCOV 159	RItems = lists:map(fun item_to_raw/1, List),	539✔
UNCOV 160	F = fun() ->	539✔
UNCOV 161	{ID, New} = case get_privacy_list_id_t(LUser, LServer, Name) of	539✔
162	{selected, []} ->
UNCOV 163	add_privacy_list(LUser, LServer, Name),	518✔
UNCOV 164	{selected, [{I}]} =	518✔
165	get_privacy_list_id_t(LUser, LServer, Name),
UNCOV 166	{I, true};	518✔
UNCOV 167	{selected, [{I}]} -> {I, false}	21✔
168	end,
UNCOV 169	case New of	539✔
170	false ->
UNCOV 171	set_privacy_list(ID, RItems);	21✔
172	_ ->
UNCOV 173	set_privacy_list_new(ID, RItems)	518✔
174	end
175	end,
UNCOV 176	transaction(LServer, F).	539✔
177
178	get_list(LUser, LServer, default) ->
UNCOV 179	case get_default_privacy_list(LUser, LServer) of	539✔
180	{selected, []} ->
UNCOV 181	error;	462✔
182	{selected, [{Default}]} ->
UNCOV 183	get_list(LUser, LServer, Default);	77✔
184	_Err ->
185	{error, db_failure}	×
186	end;
187	get_list(LUser, LServer, Name) ->
UNCOV 188	case get_privacy_list_data(LUser, LServer, Name) of	546✔
189	{selected, []} ->
UNCOV 190	error;	35✔
191	{selected, RItems} ->
UNCOV 192	{ok, {Name, lists:flatmap(fun raw_to_item/1, RItems)}};	511✔
193	_Err ->
194	{error, db_failure}	×
195	end.
196
197	get_lists(LUser, LServer) ->
UNCOV 198	case get_default_privacy_list(LUser, LServer) of	294✔
199	{selected, Selected} ->
UNCOV 200	Default = case Selected of	294✔
UNCOV 201	[] -> none;	238✔
UNCOV 202	[{DefName}] -> DefName	56✔
203	end,
UNCOV 204	case get_privacy_list_names(LUser, LServer) of	294✔
205	{selected, Names} ->
UNCOV 206	case lists:foldl(	294✔
207	fun(_, {error, _} = Err) ->
208	Err;	×
209	({Name}, Acc) ->
UNCOV 210	case get_privacy_list_data(LUser, LServer, Name) of	518✔
211	{selected, RItems} ->
UNCOV 212	Items = lists:flatmap(	518✔
213	fun raw_to_item/1,
214	RItems),
UNCOV 215	[{Name, Items}\|Acc];	518✔
216	_Err ->
217	{error, db_failure}	×
218	end
219	end, [], Names) of
220	{error, Reason} ->
221	{error, Reason};	×
222	Lists ->
UNCOV 223	{ok, #privacy{default = Default,	294✔
224	us = {LUser, LServer},
225	lists = Lists}}
226	end;
227	_Err ->
228	{error, db_failure}	×
229	end;
230	_Err ->
231	{error, db_failure}	×
232	end.
233
234	remove_lists(LUser, LServer) ->
UNCOV 235	case del_privacy_lists(LUser, LServer) of	280✔
236	ok ->
UNCOV 237	ok;	280✔
238	_Err ->
239	{error, db_failure}	×
240	end.
241
242	export(Server) ->
243	SqlType = ejabberd_option:sql_type(Server),	×
244	case catch ejabberd_sql:sql_query(jid:nameprep(Server),	×
245	[<<"select id from privacy_list order by "
246	"id desc limit 1;">>]) of
247	{selected, [<<"id">>], [[I]]} ->
248	put(id, binary_to_integer(I));	×
249	_ ->
250	put(id, 0)	×
251	end,
252	[{privacy,	×
253	fun(Host, #privacy{us = {LUser, LServer}, lists = Lists,
254	default = Default})
255	when LServer == Host ->
256	if Default /= none ->
257	[?SQL("delete from privacy_default_list where"	×
258	" username=%(LUser)s and %(LServer)H;"),
259	?SQL_INSERT(	×
260	"privacy_default_list",
261	["username=%(LUser)s",
262	"server_host=%(LServer)s",
263	"name=%(Default)s"])];
264	true ->
265	[]	×
266	end ++	×
267	lists:flatmap(
268	fun({Name, List}) ->
269	RItems = lists:map(fun item_to_raw/1, List),	×
270	ID = get_id(),	×
271	[?SQL("delete from privacy_list where"	×
272	" username=%(LUser)s and %(LServer)H and"
273	" name=%(Name)s;"),
274	?SQL_INSERT(	×
275	"privacy_list",
276	["username=%(LUser)s",
277	"server_host=%(LServer)s",
278	"name=%(Name)s",
279	"id=%(ID)d"]),
280	?SQL("delete from privacy_list_data where"	×
281	" id=%(ID)d;")] ++	×
282	case SqlType of
283	pgsql ->
284	[?SQL("insert into privacy_list_data(id, t, "	×
285	"value, action, ord, match_all, match_iq, "
286	"match_message, match_presence_in, "
287	"match_presence_out) "
288	"values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
289	" %(Order)d, CAST(%(MatchAll)b as boolean), CAST(%(MatchIQ)b as boolean),"
290	" CAST(%(MatchMessage)b as boolean), CAST(%(MatchPresenceIn)b as boolean),"
291	" CAST(%(MatchPresenceOut)b as boolean));")
292	\|\| {SType, SValue, SAction, Order,
293	MatchAll, MatchIQ,
294	MatchMessage, MatchPresenceIn,
295	MatchPresenceOut} <- RItems];	×
296	_ ->
297	[?SQL("insert into privacy_list_data(id, t, "	×
298	"value, action, ord, match_all, match_iq, "
299	"match_message, match_presence_in, "
300	"match_presence_out) "
301	"values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
302	" %(Order)d, %(MatchAll)b, %(MatchIQ)b,"
303	" %(MatchMessage)b, %(MatchPresenceIn)b,"
304	" %(MatchPresenceOut)b);")
305	\|\| {SType, SValue, SAction, Order,
306	MatchAll, MatchIQ,
307	MatchMessage, MatchPresenceIn,
308	MatchPresenceOut} <- RItems]	×
309	end
310	end,
311	Lists);
312	(_Host, _R) ->
313	[]	×
314	end}].
315
316	get_id() ->
317	ID = get(id),	×
318	put(id, ID + 1),	×
319	ID + 1.	×
320
321	import(_) ->
322	ok.	×
323
324	%%%===================================================================
325	%%% Internal functions
326	%%%===================================================================
327	transaction(LServer, F) ->
UNCOV 328	case ejabberd_sql:sql_transaction(LServer, F) of	623✔
UNCOV 329	{atomic, Res} -> Res;	623✔
330	{aborted, _Reason} -> {error, db_failure}	×
331	end.
332
333	raw_to_item({SType, SValue, SAction, Order, MatchAll,
334	MatchIQ, MatchMessage, MatchPresenceIn,
335	MatchPresenceOut} = Row) ->
UNCOV 336	try	1,099✔
UNCOV 337	{Type, Value} = case SType of	1,099✔
UNCOV 338	<<"n">> -> {none, none};	217✔
339	<<"j">> ->
UNCOV 340	JID = jid:decode(SValue),	392✔
UNCOV 341	{jid, jid:tolower(JID)};	392✔
UNCOV 342	<<"g">> -> {group, SValue};	98✔
343	<<"s">> ->
UNCOV 344	case SValue of	392✔
UNCOV 345	<<"none">> -> {subscription, none};	98✔
UNCOV 346	<<"both">> -> {subscription, both};	98✔
UNCOV 347	<<"from">> -> {subscription, from};	98✔
UNCOV 348	<<"to">> -> {subscription, to}	98✔
349	end
350	end,
UNCOV 351	Action = case SAction of	1,099✔
UNCOV 352	<<"a">> -> allow;	28✔
UNCOV 353	<<"d">> -> deny	1,071✔
354	end,
UNCOV 355	[#listitem{type = Type, value = Value, action = Action,	1,099✔
356	order = Order, match_all = MatchAll, match_iq = MatchIQ,
357	match_message = MatchMessage,
358	match_presence_in = MatchPresenceIn,
359	match_presence_out = MatchPresenceOut}]
360	catch _:_ ->
361	?WARNING_MSG("Failed to parse row: ~p", [Row]),	×
362	[]	×
363	end.
364
365	item_to_raw(#listitem{type = Type, value = Value,
366	action = Action, order = Order, match_all = MatchAll,
367	match_iq = MatchIQ, match_message = MatchMessage,
368	match_presence_in = MatchPresenceIn,
369	match_presence_out = MatchPresenceOut}) ->
UNCOV 370	{SType, SValue} = case Type of	567✔
UNCOV 371	none -> {<<"n">>, <<"">>};	112✔
UNCOV 372	jid -> {<<"j">>, jid:encode(Value)};	210✔
UNCOV 373	group -> {<<"g">>, Value};	49✔
374	subscription ->
UNCOV 375	case Value of	196✔
UNCOV 376	none -> {<<"s">>, <<"none">>};	49✔
UNCOV 377	both -> {<<"s">>, <<"both">>};	49✔
UNCOV 378	from -> {<<"s">>, <<"from">>};	49✔
UNCOV 379	to -> {<<"s">>, <<"to">>}	49✔
380	end
381	end,
UNCOV 382	SAction = case Action of	567✔
UNCOV 383	allow -> <<"a">>;	14✔
UNCOV 384	deny -> <<"d">>	553✔
385	end,
UNCOV 386	{SType, SValue, SAction, Order, MatchAll, MatchIQ,	567✔
387	MatchMessage, MatchPresenceIn, MatchPresenceOut}.
388
389	get_default_privacy_list(LUser, LServer) ->
UNCOV 390	ejabberd_sql:sql_query(	833✔
391	LServer,
UNCOV 392	?SQL("select @(name)s from privacy_default_list "	833✔
393	"where username=%(LUser)s and %(LServer)H")).
394
395	get_default_privacy_list_t(LUser, LServer) ->
UNCOV 396	ejabberd_sql:sql_query_t(	21✔
UNCOV 397	?SQL("select @(name)s from privacy_default_list "	21✔
398	"where username=%(LUser)s and %(LServer)H")).
399
400	get_privacy_list_names(LUser, LServer) ->
UNCOV 401	ejabberd_sql:sql_query(	294✔
402	LServer,
UNCOV 403	?SQL("select @(name)s from privacy_list"	294✔
404	" where username=%(LUser)s and %(LServer)H")).
405
406	get_privacy_list_names_t(LUser, LServer) ->
UNCOV 407	ejabberd_sql:sql_query_t(	63✔
UNCOV 408	?SQL("select @(name)s from privacy_list"	63✔
409	" where username=%(LUser)s and %(LServer)H")).
410
411	get_privacy_list_id_t(LUser, LServer, Name) ->
UNCOV 412	ejabberd_sql:sql_query_t(	1,057✔
UNCOV 413	?SQL("select @(id)d from privacy_list"	1,057✔
414	" where username=%(LUser)s and %(LServer)H and name=%(Name)s")).
415
416	get_privacy_list_data(LUser, LServer, Name) ->
UNCOV 417	ejabberd_sql:sql_query(	1,064✔
418	LServer,
UNCOV 419	?SQL("select @(t)s, @(value)s, @(action)s, @(ord)d, @(match_all)b, "	1,064✔
420	"@(match_iq)b, @(match_message)b, @(match_presence_in)b, "
421	"@(match_presence_out)b from privacy_list_data "
422	"where id ="
423	" (select id from privacy_list"
424	" where username=%(LUser)s and %(LServer)H and name=%(Name)s) "
425	"order by ord")).
426
427	set_default_privacy_list(LUser, LServer, Name) ->
UNCOV 428	?SQL_UPSERT_T(	56✔
429	"privacy_default_list",
430	["!username=%(LUser)s",
431	"!server_host=%(LServer)s",
432	"name=%(Name)s"]).
433
434	unset_default_privacy_list(LUser, LServer) ->
UNCOV 435	case ejabberd_sql:sql_query(	7✔
436	LServer,
UNCOV 437	?SQL("delete from privacy_default_list"	7✔
438	" where username=%(LUser)s and %(LServer)H")) of
UNCOV 439	{updated, _} -> ok;	7✔
440	Err -> Err	×
441	end.
442
443	remove_privacy_list_t(LUser, LServer, Name) ->
UNCOV 444	case ejabberd_sql:sql_query_t(	14✔
UNCOV 445	?SQL("delete from privacy_list where"	14✔
446	" username=%(LUser)s and %(LServer)H and name=%(Name)s")) of
UNCOV 447	{updated, 0} -> {error, notfound};	7✔
UNCOV 448	{updated, _} -> ok;	7✔
449	Err -> Err	×
450	end.
451
452	add_privacy_list(LUser, LServer, Name) ->
UNCOV 453	ejabberd_sql:sql_query_t(	518✔
UNCOV 454	?SQL_INSERT(	518✔
455	"privacy_list",
456	["username=%(LUser)s",
457	"server_host=%(LServer)s",
458	"name=%(Name)s"])).
459
460	set_privacy_list_new(ID, RItems) ->
UNCOV 461	lists:foreach(	518✔
462	fun({SType, SValue, SAction, Order, MatchAll, MatchIQ,
463	MatchMessage, MatchPresenceIn, MatchPresenceOut}) ->
UNCOV 464	ejabberd_sql:sql_query_t(	567✔
UNCOV 465	?SQL("insert into privacy_list_data(id, t, "	733✔
466	"value, action, ord, match_all, match_iq, "
467	"match_message, match_presence_in, match_presence_out) "
468	"values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
469	" %(Order)d, %(MatchAll)b, %(MatchIQ)b,"
470	" %(MatchMessage)b, %(MatchPresenceIn)b,"
471	" %(MatchPresenceOut)b)"))
472	end,
473	RItems).
474
475	calculate_difference(List1, List2) ->
UNCOV 476	Set1 = gb_sets:from_list(List1),	21✔
UNCOV 477	Set2 = gb_sets:from_list(List2),	21✔
UNCOV 478	{gb_sets:to_list(gb_sets:subtract(Set1, Set2)),	21✔
479	gb_sets:to_list(gb_sets:subtract(Set2, Set1))}.
480
481	set_privacy_list(ID, RItems) ->
UNCOV 482	case ejabberd_sql:sql_query_t(	21✔
UNCOV 483	?SQL("select @(t)s, @(value)s, @(action)s, @(ord)d, @(match_all)b, "	31✔
484	"@(match_iq)b, @(match_message)b, @(match_presence_in)b, "
485	"@(match_presence_out)b from privacy_list_data "
486	"where id=%(ID)d")) of
487	{selected, ExistingItems} ->
UNCOV 488	{ToAdd2, ToDelete2} = calculate_difference(RItems, ExistingItems),	21✔
UNCOV 489	ToAdd3 = if	21✔
490	ToDelete2 /= [] ->
UNCOV 491	ejabberd_sql:sql_query_t(	21✔
UNCOV 492	?SQL("delete from privacy_list_data where id=%(ID)d")),	31✔
UNCOV 493	RItems;	21✔
494	true ->
495	ToAdd2	×
496	end,
UNCOV 497	lists:foreach(	21✔
498	fun({SType, SValue, SAction, Order, MatchAll, MatchIQ,
499	MatchMessage, MatchPresenceIn, MatchPresenceOut}) ->
500	ejabberd_sql:sql_query_t(	×
501	?SQL("insert into privacy_list_data(id, t, "	×
502	"value, action, ord, match_all, match_iq, "
503	"match_message, match_presence_in, match_presence_out) "
504	"values (%(ID)d, %(SType)s, %(SValue)s, %(SAction)s,"
505	" %(Order)d, %(MatchAll)b, %(MatchIQ)b,"
506	" %(MatchMessage)b, %(MatchPresenceIn)b,"
507	" %(MatchPresenceOut)b)"))
508	end,
509	ToAdd3);
510	Err ->
511	Err	×
512	end.
513
514	del_privacy_lists(LUser, LServer) ->
UNCOV 515	case ejabberd_sql:sql_query(	280✔
516	LServer,
UNCOV 517	?SQL("delete from privacy_list where username=%(LUser)s and %(LServer)H")) of	280✔
518	{updated, _} ->
UNCOV 519	case ejabberd_sql:sql_query(	280✔
520	LServer,
UNCOV 521	?SQL("delete from privacy_default_list "	280✔
522	"where username=%(LUser)s and %(LServer)H")) of
UNCOV 523	{updated, _} -> ok;	280✔
524	Err -> Err	×
525	end;
526	Err ->
527	Err	×
528	end.

processone / ejabberd / 1212

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous