2004-12-19 21:47:35 +01:00
|
|
|
%%%----------------------------------------------------------------------
|
|
|
|
%%% File : mod_roster_odbc.erl
|
2007-12-24 13:58:05 +01:00
|
|
|
%%% Author : Alexey Shchepin <alexey@process-one.net>
|
2004-12-19 21:47:35 +01:00
|
|
|
%%% Purpose : Roster management
|
2007-12-24 13:58:05 +01:00
|
|
|
%%% Created : 15 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
|
|
|
|
%%%
|
|
|
|
%%%
|
2010-01-12 17:15:16 +01:00
|
|
|
%%% ejabberd, Copyright (C) 2002-2010 ProcessOne
|
2007-12-24 13:58:05 +01:00
|
|
|
%%%
|
|
|
|
%%% 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.
|
2008-10-08 14:02:30 +02:00
|
|
|
%%%
|
2007-12-24 13:58:05 +01:00
|
|
|
%%% 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., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
%%% 02111-1307 USA
|
|
|
|
%%%
|
2004-12-19 21:47:35 +01:00
|
|
|
%%%----------------------------------------------------------------------
|
|
|
|
|
2009-08-06 23:07:18 +02:00
|
|
|
%%% @doc Roster management (Mnesia storage).
|
|
|
|
%%%
|
|
|
|
%%% Includes support for XEP-0237: Roster Versioning.
|
|
|
|
%%% The roster versioning follows an all-or-nothing strategy:
|
|
|
|
%%% - If the version supplied by the client is the latest, return an empty response.
|
|
|
|
%%% - If not, return the entire new roster (with updated version string).
|
|
|
|
%%% Roster version is a hash digest of the entire roster.
|
|
|
|
%%% No additional data is stored in DB.
|
|
|
|
|
2004-12-19 21:47:35 +01:00
|
|
|
-module(mod_roster_odbc).
|
2007-12-24 13:58:05 +01:00
|
|
|
-author('alexey@process-one.net').
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
-behaviour(gen_mod).
|
|
|
|
|
2005-06-20 05:18:13 +02:00
|
|
|
-export([start/2, stop/1,
|
2004-12-19 21:47:35 +01:00
|
|
|
process_iq/3,
|
|
|
|
process_local_iq/3,
|
2005-07-13 05:24:13 +02:00
|
|
|
get_user_roster/2,
|
|
|
|
get_subscription_lists/3,
|
2006-05-23 22:19:37 +02:00
|
|
|
get_in_pending_subscriptions/3,
|
|
|
|
in_subscription/6,
|
2005-07-13 05:24:13 +02:00
|
|
|
out_subscription/4,
|
|
|
|
set_items/3,
|
|
|
|
remove_user/2,
|
2007-08-24 18:15:05 +02:00
|
|
|
get_jid_info/4,
|
|
|
|
webadmin_page/3,
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
webadmin_user/4,
|
2009-08-06 23:07:18 +02:00
|
|
|
get_versioning_feature/2,
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
roster_versioning_enabled/1]).
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
-include_lib("exmpp/include/exmpp.hrl").
|
|
|
|
|
2004-12-19 21:47:35 +01:00
|
|
|
-include("ejabberd.hrl").
|
2006-02-12 19:40:03 +01:00
|
|
|
-include("mod_roster.hrl").
|
2008-07-17 17:33:50 +02:00
|
|
|
-include("web/ejabberd_http.hrl").
|
|
|
|
-include("web/ejabberd_web_admin.hrl").
|
2007-08-24 18:15:05 +02:00
|
|
|
|
2005-06-20 05:18:13 +02:00
|
|
|
start(Host, Opts) ->
|
2009-01-03 16:15:38 +01:00
|
|
|
HostB = list_to_binary(Host),
|
2004-12-19 21:47:35 +01:00
|
|
|
IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(roster_get, HostB,
|
2005-07-13 05:24:13 +02:00
|
|
|
?MODULE, get_user_roster, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(roster_in_subscription, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, in_subscription, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(roster_out_subscription, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, out_subscription, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(roster_get_subscription_lists, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, get_subscription_lists, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(roster_get_jid_info, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, get_jid_info, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(remove_user, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, remove_user, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(anonymous_purge_hook, HostB,
|
2007-05-12 18:28:34 +02:00
|
|
|
?MODULE, remove_user, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(resend_subscription_requests_hook, HostB,
|
2006-05-23 22:19:37 +02:00
|
|
|
?MODULE, get_in_pending_subscriptions, 50),
|
2009-08-06 23:07:18 +02:00
|
|
|
ejabberd_hooks:add(roster_get_versioning_feature, HostB,
|
|
|
|
?MODULE, get_versioning_feature, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(webadmin_page_host, HostB,
|
2007-08-24 18:15:05 +02:00
|
|
|
?MODULE, webadmin_page, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:add(webadmin_user, HostB,
|
2007-08-24 18:15:05 +02:00
|
|
|
?MODULE, webadmin_user, 50),
|
2009-01-10 17:10:12 +01:00
|
|
|
gen_iq_handler:add_iq_handler(ejabberd_sm, HostB, ?NS_ROSTER,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, process_iq, IQDisc).
|
|
|
|
|
2005-06-20 05:18:13 +02:00
|
|
|
stop(Host) ->
|
2009-01-03 16:15:38 +01:00
|
|
|
HostB = list_to_binary(Host),
|
|
|
|
ejabberd_hooks:delete(roster_get, HostB,
|
2005-07-13 05:24:13 +02:00
|
|
|
?MODULE, get_user_roster, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(roster_in_subscription, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, in_subscription, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(roster_out_subscription, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, out_subscription, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(roster_get_subscription_lists, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, get_subscription_lists, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(roster_get_jid_info, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, get_jid_info, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(remove_user, HostB,
|
2004-12-19 21:47:35 +01:00
|
|
|
?MODULE, remove_user, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(anonymous_purge_hook, HostB,
|
2007-05-12 18:28:34 +02:00
|
|
|
?MODULE, remove_user, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(resend_subscription_requests_hook, HostB,
|
2006-05-23 22:19:37 +02:00
|
|
|
?MODULE, get_in_pending_subscriptions, 50),
|
2009-08-06 23:07:18 +02:00
|
|
|
ejabberd_hooks:delete(roster_get_versioning_feature, HostB,
|
|
|
|
?MODULE, get_versioning_feature, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(webadmin_page_host, HostB,
|
2007-08-24 18:15:05 +02:00
|
|
|
?MODULE, webadmin_page, 50),
|
2009-01-03 16:15:38 +01:00
|
|
|
ejabberd_hooks:delete(webadmin_user, HostB,
|
2007-08-24 18:15:05 +02:00
|
|
|
?MODULE, webadmin_user, 50),
|
2009-01-10 17:10:12 +01:00
|
|
|
gen_iq_handler:remove_iq_handler(ejabberd_sm, HostB, ?NS_ROSTER).
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
process_iq(From, To, IQ_Rec) ->
|
2009-06-01 18:38:28 +02:00
|
|
|
LServer = exmpp_jid:prep_domain_as_list(From),
|
2006-02-12 19:40:03 +01:00
|
|
|
case lists:member(LServer, ?MYHOSTS) of
|
|
|
|
true ->
|
2008-09-18 16:55:03 +02:00
|
|
|
process_local_iq(From, To, IQ_Rec);
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_iq:error(IQ_Rec, 'item-not-found')
|
2004-12-19 21:47:35 +01:00
|
|
|
end.
|
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
process_local_iq(From, To, #iq{type = get} = IQ_Rec) ->
|
|
|
|
process_iq_get(From, To, IQ_Rec);
|
|
|
|
process_local_iq(From, To, #iq{type = set} = IQ_Rec) ->
|
|
|
|
process_iq_set(From, To, IQ_Rec).
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
roster_hash(Items) ->
|
|
|
|
sha:sha(term_to_binary(
|
|
|
|
lists:sort(
|
|
|
|
[R#roster{groups = lists:sort(Grs)} ||
|
|
|
|
R = #roster{groups = Grs} <- Items]))).
|
|
|
|
|
2009-08-17 19:17:34 +02:00
|
|
|
%% @spec (Host::binary()) -> true | false
|
2009-08-06 23:07:18 +02:00
|
|
|
roster_versioning_enabled(Host) ->
|
|
|
|
gen_mod:get_module_opt(binary_to_list(Host), ?MODULE, versioning, false).
|
|
|
|
|
2009-08-17 19:17:34 +02:00
|
|
|
%% @spec (Host::binary()) -> true | false
|
2009-08-06 23:07:18 +02:00
|
|
|
roster_version_on_db(Host) ->
|
|
|
|
gen_mod:get_module_opt(binary_to_list(Host), ?MODULE, store_current_id, false).
|
|
|
|
|
|
|
|
%% Returns a list that may contain an xmlelement with the XEP-237 feature if it's enabled.
|
|
|
|
get_versioning_feature(Acc, Host) ->
|
|
|
|
case roster_versioning_enabled(Host) of
|
|
|
|
true ->
|
2010-02-16 17:33:30 +01:00
|
|
|
Feature = exmpp_xml:element(?NS_ROSTER_VER_s, 'ver', [],
|
|
|
|
[exmpp_xml:element(?NS_ROSTER_VER_s, 'optional')]),
|
2009-08-06 23:07:18 +02:00
|
|
|
[Feature | Acc];
|
|
|
|
false -> []
|
|
|
|
end.
|
|
|
|
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
roster_version(LServer ,LUser) ->
|
|
|
|
US = {LUser, LServer},
|
|
|
|
case roster_version_on_db(LServer) of
|
|
|
|
true ->
|
|
|
|
case odbc_queries:get_roster_version(ejabberd_odbc:escape(LServer), ejabberd_odbc:escape(LUser)) of
|
|
|
|
{selected, ["version"], [{Version}]} -> Version;
|
|
|
|
{selected, ["version"], []} -> not_found
|
|
|
|
end;
|
|
|
|
false ->
|
|
|
|
roster_hash(ejabberd_hooks:run_fold(roster_get, LServer, [], [US]))
|
|
|
|
end.
|
|
|
|
|
|
|
|
%% Load roster from DB only if neccesary.
|
|
|
|
%% It is neccesary if
|
|
|
|
%% - roster versioning is disabled in server OR
|
|
|
|
%% - roster versioning is not used by the client OR
|
|
|
|
%% - roster versioning is used by server and client, BUT the server isn't storing versions on db OR
|
|
|
|
%% - the roster version from client don't match current version.
|
2008-09-18 16:55:03 +02:00
|
|
|
process_iq_get(From, To, IQ_Rec) ->
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
US = {LUser, LServer} = {exmpp_jid:prep_node(From), exmpp_jid:prep_domain(From)},
|
|
|
|
try
|
|
|
|
{ItemsToSend, VersionToSend} =
|
|
|
|
case {exmpp_xml:get_attribute_as_list(exmpp_iq:get_request(IQ_Rec), ver, not_found),
|
|
|
|
roster_versioning_enabled(LServer),
|
|
|
|
roster_version_on_db(LServer)} of
|
|
|
|
{not_found, _ , _} ->
|
|
|
|
{lists:map(fun item_to_xml/1,
|
|
|
|
ejabberd_hooks:run_fold(roster_get, exmpp_jid:prep_domain(To), [], [US])), false};
|
|
|
|
{_, false, _} ->
|
|
|
|
{lists:map(fun item_to_xml/1,
|
|
|
|
ejabberd_hooks:run_fold(roster_get, exmpp_jid:prep_domain(To), [], [US])), false};
|
|
|
|
|
|
|
|
{RequestedVersion, true, true} ->
|
|
|
|
%% Retrieve version from DB. Only load entire roster
|
|
|
|
%% when neccesary.
|
|
|
|
case odbc_queries:get_roster_version(ejabberd_odbc:escape(LServer), ejabberd_odbc:escape(LUser)) of
|
|
|
|
{selected, ["version"], [{RequestedVersion}]} ->
|
|
|
|
{false, false};
|
|
|
|
{selected, ["version"], [{NewVersion}]} ->
|
|
|
|
{lists:map(fun item_to_xml/1,
|
|
|
|
ejabberd_hooks:run_fold(roster_get, exmpp_jid:prep_domain(To), [], [US])), NewVersion};
|
|
|
|
{selected, ["version"], []} ->
|
|
|
|
RosterVersion = sha:sha(term_to_binary(now())),
|
|
|
|
{atomic, {updated,1}} = odbc_queries:sql_transaction(binary_to_list(LServer), fun() ->
|
|
|
|
odbc_queries:set_roster_version(ejabberd_odbc:escape(LUser), RosterVersion)
|
|
|
|
end),
|
|
|
|
{lists:map(fun item_to_xml/1,
|
|
|
|
ejabberd_hooks:run_fold(roster_get, exmpp_jid:prep_domain(To), [], [US])), RosterVersion}
|
|
|
|
end;
|
|
|
|
|
|
|
|
{RequestedVersion, true, false} ->
|
|
|
|
RosterItems = ejabberd_hooks:run_fold(roster_get, exmpp_jid:prep_domain(To), [] , [US]),
|
|
|
|
case roster_hash(RosterItems) of
|
|
|
|
RequestedVersion ->
|
|
|
|
{false, false};
|
|
|
|
New ->
|
|
|
|
{lists:map(fun item_to_xml/1, RosterItems), New}
|
|
|
|
end
|
|
|
|
|
|
|
|
end,
|
|
|
|
case {ItemsToSend, VersionToSend} of
|
|
|
|
{false, false} ->
|
|
|
|
exmpp_iq:result(IQ_Rec);
|
|
|
|
{Items, false} ->
|
|
|
|
exmpp_iq:result(IQ_Rec, exmpp_xml:element(?NS_ROSTER, 'query', [] , Items));
|
|
|
|
{Items, Version} ->
|
|
|
|
exmpp_iq:result(IQ_Rec, exmpp_xml:element(?NS_ROSTER, 'query', [?XMLATTR('ver', Version)], Items))
|
|
|
|
end
|
|
|
|
catch
|
|
|
|
_:_ ->
|
|
|
|
exmpp_iq:error(IQ_Rec, 'internal-server-error')
|
|
|
|
end.
|
2006-01-24 22:47:53 +01:00
|
|
|
|
|
|
|
get_user_roster(Acc, {LUser, LServer}) ->
|
2007-08-24 18:15:05 +02:00
|
|
|
Items = get_roster(LUser, LServer),
|
|
|
|
lists:filter(fun(#roster{subscription = none, ask = in}) ->
|
|
|
|
false;
|
|
|
|
(_) ->
|
|
|
|
true
|
|
|
|
end, Items) ++ Acc.
|
|
|
|
|
2009-01-03 16:15:38 +01:00
|
|
|
get_roster(LUser, LServer) when is_binary(LUser), is_binary(LServer)->
|
2009-02-23 20:45:55 +01:00
|
|
|
Username = ejabberd_odbc:escape(LUser),
|
2009-01-03 16:15:38 +01:00
|
|
|
DomainString = binary_to_list(LServer),
|
|
|
|
case catch odbc_queries:get_roster(DomainString, Username) of
|
2004-12-19 21:47:35 +01:00
|
|
|
{selected, ["username", "jid", "nick", "subscription", "ask",
|
2006-05-26 02:00:32 +02:00
|
|
|
"askmessage", "server", "subscribe", "type"],
|
2004-12-19 21:47:35 +01:00
|
|
|
Items} when is_list(Items) ->
|
2009-01-03 16:15:38 +01:00
|
|
|
JIDGroups = case catch odbc_queries:get_roster_jid_groups(DomainString, Username) of
|
2006-09-03 17:15:46 +02:00
|
|
|
{selected, ["jid","grp"], JGrps}
|
|
|
|
when is_list(JGrps) ->
|
2009-02-23 20:45:55 +01:00
|
|
|
[{list_to_binary(S), list_to_binary(G)} || {S, G} <- JGrps];
|
2005-07-26 05:04:26 +02:00
|
|
|
_ ->
|
|
|
|
[]
|
|
|
|
end,
|
2006-01-24 22:47:53 +01:00
|
|
|
RItems = lists:flatmap(
|
2004-12-19 21:47:35 +01:00
|
|
|
fun(I) ->
|
2006-02-12 19:40:03 +01:00
|
|
|
case raw_to_record(LServer, I) of
|
2007-07-28 11:36:37 +02:00
|
|
|
%% Bad JID in database:
|
2004-12-19 21:47:35 +01:00
|
|
|
error ->
|
|
|
|
[];
|
|
|
|
R ->
|
2008-09-18 16:55:03 +02:00
|
|
|
{U2, S2, R2} = R#roster.jid,
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = exmpp_jid:to_binary(U2, S2, R2),
|
2005-07-26 05:04:26 +02:00
|
|
|
Groups = lists:flatmap(
|
2006-09-05 06:26:28 +02:00
|
|
|
fun({S, G}) when S == SJID ->
|
|
|
|
[G];
|
|
|
|
(_) ->
|
|
|
|
[]
|
2005-07-26 05:04:26 +02:00
|
|
|
end, JIDGroups),
|
2006-02-12 00:55:21 +01:00
|
|
|
[R#roster{groups = Groups}]
|
2004-12-19 21:47:35 +01:00
|
|
|
end
|
|
|
|
end, Items),
|
2007-08-24 18:15:05 +02:00
|
|
|
RItems;
|
2005-07-13 05:24:13 +02:00
|
|
|
_ ->
|
2007-08-24 18:15:05 +02:00
|
|
|
[]
|
2005-07-13 05:24:13 +02:00
|
|
|
end.
|
|
|
|
|
|
|
|
|
2004-12-19 21:47:35 +01:00
|
|
|
item_to_xml(Item) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
{U, S, R} = Item#roster.jid,
|
|
|
|
Attrs1 = exmpp_xml:set_attribute_in_list([],
|
2009-06-01 18:59:08 +02:00
|
|
|
'jid', exmpp_jid:to_binary(U, S, R)),
|
2004-12-19 21:47:35 +01:00
|
|
|
Attrs2 = case Item#roster.name of
|
2009-01-08 15:54:00 +01:00
|
|
|
<<>> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
Attrs1;
|
|
|
|
Name ->
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_xml:set_attribute_in_list(Attrs1, 'name', Name)
|
2004-12-19 21:47:35 +01:00
|
|
|
end,
|
2008-09-18 16:55:03 +02:00
|
|
|
Attrs3 = exmpp_xml:set_attribute_in_list(Attrs2,
|
|
|
|
'subscription', Item#roster.subscription),
|
2004-12-19 21:47:35 +01:00
|
|
|
Attrs = case ask_to_pending(Item#roster.ask) of
|
|
|
|
out ->
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_xml:set_attribute_in_list(Attrs3,
|
2009-02-23 20:45:55 +01:00
|
|
|
'ask', <<"subscribe">>);
|
2004-12-19 21:47:35 +01:00
|
|
|
both ->
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_xml:set_attribute_in_list(Attrs3,
|
2009-02-23 20:45:55 +01:00
|
|
|
'ask', <<"subscribe">>);
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
|
|
|
Attrs3
|
|
|
|
end,
|
2005-07-26 05:04:26 +02:00
|
|
|
SubEls = lists:map(fun(G) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_xml:set_cdata(
|
|
|
|
#xmlel{ns = ?NS_ROSTER, name = 'group'}, G)
|
2005-07-26 05:04:26 +02:00
|
|
|
end, Item#roster.groups),
|
2008-09-18 16:55:03 +02:00
|
|
|
#xmlel{ns = ?NS_ROSTER, name = 'item', attrs = Attrs, children = SubEls}.
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
process_iq_set(From, To, #iq{payload = Request} = IQ_Rec) ->
|
|
|
|
case Request of
|
|
|
|
#xmlel{children = Els} ->
|
|
|
|
lists:foreach(fun(El) -> process_item_set(From, To, El) end, Els);
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
2008-09-18 16:55:03 +02:00
|
|
|
ok
|
|
|
|
end,
|
|
|
|
exmpp_iq:result(IQ_Rec).
|
|
|
|
|
|
|
|
process_item_set(From, To, #xmlel{} = El) ->
|
|
|
|
try
|
2009-06-01 18:35:55 +02:00
|
|
|
JID1 = exmpp_jid:parse(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
2009-06-01 18:39:36 +02:00
|
|
|
User = exmpp_jid:prep_node(From),
|
2009-06-01 18:37:15 +02:00
|
|
|
Server = exmpp_jid:prep_domain(From),
|
2009-02-23 20:45:55 +01:00
|
|
|
LServer = binary_to_list(Server),
|
2008-10-02 15:17:49 +02:00
|
|
|
{U0, S0, R0} = LJID = jlib:short_prepd_jid(JID1),
|
2009-02-23 20:45:55 +01:00
|
|
|
Username = ejabberd_odbc:escape(User),
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = ejabberd_odbc:escape(exmpp_jid:to_binary(U0, S0, R0)),
|
2008-09-18 16:55:03 +02:00
|
|
|
F = fun() ->
|
|
|
|
{selected,
|
|
|
|
["username", "jid", "nick", "subscription",
|
|
|
|
"ask", "askmessage", "server", "subscribe", "type"],
|
|
|
|
Res} = odbc_queries:get_roster_by_jid(LServer, Username, SJID),
|
|
|
|
Item = case Res of
|
|
|
|
[] ->
|
2009-02-23 20:45:55 +01:00
|
|
|
#roster{usj = {User, Server, LJID},
|
|
|
|
us = {User, Server},
|
2008-09-18 16:55:03 +02:00
|
|
|
jid = LJID};
|
|
|
|
[I] ->
|
2009-06-01 18:37:15 +02:00
|
|
|
R = raw_to_record(exmpp_jid:prep_domain(From), I),
|
2008-09-18 16:55:03 +02:00
|
|
|
case R of
|
|
|
|
%% Bad JID in database:
|
|
|
|
error ->
|
2009-02-23 20:45:55 +01:00
|
|
|
#roster{usj = {User, Server, LJID},
|
|
|
|
us = {User, Server},
|
2008-09-18 16:55:03 +02:00
|
|
|
jid = LJID};
|
|
|
|
_ ->
|
|
|
|
R#roster{
|
2009-02-23 20:45:55 +01:00
|
|
|
usj = {User, Server, LJID},
|
|
|
|
us = {User, Server},
|
2008-09-18 16:55:03 +02:00
|
|
|
jid = LJID,
|
2009-01-08 15:54:00 +01:00
|
|
|
name = <<>>}
|
2008-09-18 16:55:03 +02:00
|
|
|
end
|
|
|
|
end,
|
|
|
|
Item1 = process_item_attrs(Item, El#xmlel.attrs),
|
|
|
|
Item2 = process_item_els(Item1, El#xmlel.children),
|
|
|
|
case Item2#roster.subscription of
|
2004-12-19 21:47:35 +01:00
|
|
|
remove ->
|
2009-08-05 19:39:47 +02:00
|
|
|
odbc_queries:del_roster(LServer, Username, SJID);
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
2008-09-18 16:55:03 +02:00
|
|
|
ItemVals = record_to_string(Item2),
|
|
|
|
ItemGroups = groups_to_string(Item2),
|
|
|
|
odbc_queries:update_roster(LServer, Username, SJID, ItemVals, ItemGroups)
|
|
|
|
end,
|
|
|
|
%% If the item exist in shared roster, take the
|
|
|
|
%% subscription information from there:
|
|
|
|
Item3 = ejabberd_hooks:run_fold(roster_process_item,
|
2009-06-01 18:37:15 +02:00
|
|
|
exmpp_jid:prep_domain(From), Item2, [exmpp_jid:prep_domain(From)]),
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
case roster_version_on_db(Server) of
|
|
|
|
true -> odbc_queries:set_roster_version(Username, sha:sha(term_to_binary(now())));
|
|
|
|
false -> ok
|
|
|
|
end,
|
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
{Item, Item3}
|
|
|
|
end,
|
|
|
|
case odbc_queries:sql_transaction(LServer, F) of
|
|
|
|
{atomic, {OldItem, Item}} ->
|
2009-06-01 18:37:15 +02:00
|
|
|
push_item(exmpp_jid:node(From), exmpp_jid:prep_domain(From), To, Item),
|
2008-09-18 16:55:03 +02:00
|
|
|
case Item#roster.subscription of
|
|
|
|
remove ->
|
|
|
|
IsTo = case OldItem#roster.subscription of
|
|
|
|
both -> true;
|
|
|
|
to -> true;
|
|
|
|
_ -> false
|
|
|
|
end,
|
|
|
|
IsFrom = case OldItem#roster.subscription of
|
|
|
|
both -> true;
|
|
|
|
from -> true;
|
|
|
|
_ -> false
|
|
|
|
end,
|
|
|
|
{U, S, R} = OldItem#roster.jid,
|
|
|
|
if IsTo ->
|
|
|
|
ejabberd_router:route(
|
2009-06-01 18:30:15 +02:00
|
|
|
exmpp_jid:bare(From),
|
2009-06-01 18:26:00 +02:00
|
|
|
exmpp_jid:make(U, S, R),
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_presence:unsubscribe());
|
|
|
|
true -> ok
|
|
|
|
end,
|
|
|
|
if IsFrom ->
|
|
|
|
ejabberd_router:route(
|
2009-06-01 18:30:15 +02:00
|
|
|
exmpp_jid:bare(From),
|
2009-06-01 18:26:00 +02:00
|
|
|
exmpp_jid:make(U, S, R),
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_presence:unsubscribed());
|
|
|
|
true -> ok
|
|
|
|
end,
|
|
|
|
ok;
|
|
|
|
_ ->
|
|
|
|
ok
|
|
|
|
end;
|
|
|
|
E ->
|
|
|
|
?DEBUG("ROSTER: roster item set error: ~p~n", [E]),
|
|
|
|
ok
|
|
|
|
end
|
|
|
|
catch
|
|
|
|
_ ->
|
|
|
|
ok
|
2004-12-19 21:47:35 +01:00
|
|
|
end;
|
|
|
|
process_item_set(_From, _To, _) ->
|
|
|
|
ok.
|
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
process_item_attrs(Item, [#xmlattr{name = Attr, value = Val} | Attrs]) ->
|
2004-12-19 21:47:35 +01:00
|
|
|
case Attr of
|
2008-09-18 16:55:03 +02:00
|
|
|
'name' ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs(Item#roster{name = Val}, Attrs);
|
2008-09-18 16:55:03 +02:00
|
|
|
'subscription' ->
|
2004-12-19 21:47:35 +01:00
|
|
|
case Val of
|
2009-01-08 15:54:00 +01:00
|
|
|
<<"remove">> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs(Item#roster{subscription = remove},
|
|
|
|
Attrs);
|
|
|
|
_ ->
|
|
|
|
process_item_attrs(Item, Attrs)
|
|
|
|
end;
|
2008-09-18 16:55:03 +02:00
|
|
|
'ask' ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs(Item, Attrs);
|
|
|
|
_ ->
|
|
|
|
process_item_attrs(Item, Attrs)
|
|
|
|
end;
|
|
|
|
process_item_attrs(Item, []) ->
|
|
|
|
Item.
|
|
|
|
|
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
process_item_els(Item, [#xmlel{name = Name} = El | Els]) ->
|
2005-07-26 05:04:26 +02:00
|
|
|
case Name of
|
2008-09-18 16:55:03 +02:00
|
|
|
'group' ->
|
|
|
|
Groups = [exmpp_xml:get_cdata(El) | Item#roster.groups],
|
2005-07-26 05:04:26 +02:00
|
|
|
process_item_els(Item#roster{groups = Groups}, Els);
|
|
|
|
_ ->
|
|
|
|
process_item_els(Item, Els)
|
|
|
|
end;
|
2008-09-18 16:55:03 +02:00
|
|
|
process_item_els(Item, [_ | Els]) ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_els(Item, Els);
|
|
|
|
process_item_els(Item, []) ->
|
|
|
|
Item.
|
|
|
|
|
|
|
|
|
2009-01-03 16:15:38 +01:00
|
|
|
push_item(User, Server, From, Item) when is_binary(User), is_binary(Server) ->
|
2009-06-01 18:26:00 +02:00
|
|
|
ejabberd_sm:route(exmpp_jid:make(),
|
|
|
|
exmpp_jid:make(User, Server),
|
2008-09-18 16:55:03 +02:00
|
|
|
#xmlel{name = 'broadcast', children =
|
2004-12-19 21:47:35 +01:00
|
|
|
[{item,
|
|
|
|
Item#roster.jid,
|
|
|
|
Item#roster.subscription}]}),
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
case roster_versioning_enabled(Server) of
|
|
|
|
true ->
|
2009-08-06 23:07:18 +02:00
|
|
|
push_item_version(Server, User, From, Item, roster_version(Server, User));
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
false ->
|
|
|
|
lists:foreach(fun(Resource) ->
|
|
|
|
push_item(User, Server, Resource, From, Item)
|
|
|
|
end, ejabberd_sm:get_user_resources(User, Server))
|
|
|
|
end.
|
|
|
|
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
% TODO: don't push to those who not load roster
|
2008-02-14 05:51:04 +01:00
|
|
|
push_item(User, Server, Resource, From, Item) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
Request = #xmlel{ns = ?NS_ROSTER, name = 'query',
|
2008-09-29 13:30:25 +02:00
|
|
|
children = [item_to_xml(Item)]},
|
2008-12-01 16:53:30 +01:00
|
|
|
ResIQ = exmpp_iq:set(?NS_JABBER_CLIENT, Request,
|
|
|
|
"push" ++ randoms:get_string()),
|
2004-12-19 21:47:35 +01:00
|
|
|
ejabberd_router:route(
|
|
|
|
From,
|
2009-06-01 18:26:00 +02:00
|
|
|
exmpp_jid:make(User, Server, Resource),
|
2008-09-18 16:55:03 +02:00
|
|
|
ResIQ).
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2009-08-06 23:07:18 +02:00
|
|
|
%% @doc Roster push, calculate and include the version attribute.
|
|
|
|
%% TODO: don't push to those who didn't load roster
|
|
|
|
push_item_version(Server, User, From, Item, RosterVersion) ->
|
|
|
|
lists:foreach(fun(Resource) ->
|
|
|
|
push_item_version(User, Server, Resource, From, Item, RosterVersion)
|
|
|
|
end, ejabberd_sm:get_user_resources(User, Server)).
|
|
|
|
|
|
|
|
push_item_version(User, Server, Resource, From, Item, RosterVersion) ->
|
|
|
|
Request = #xmlel{ns = ?NS_ROSTER, name = 'query', attrs = [?XMLATTR('ver', RosterVersion)],
|
|
|
|
children = [mod_roster:item_to_xml(Item)]},
|
|
|
|
ResIQ = exmpp_iq:set(?NS_JABBER_CLIENT, Request,
|
|
|
|
"push" ++ randoms:get_string()),
|
|
|
|
ejabberd_router:route(
|
|
|
|
From,
|
|
|
|
exmpp_jid:make(User, Server, Resource),
|
|
|
|
ResIQ).
|
|
|
|
|
2009-01-03 16:15:38 +01:00
|
|
|
get_subscription_lists(_, User, Server)
|
|
|
|
when is_binary(User), is_binary(Server) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
2009-01-03 16:15:38 +01:00
|
|
|
LServer = binary_to_list(Server),
|
2009-02-23 20:45:55 +01:00
|
|
|
Username = ejabberd_odbc:escape(User),
|
2008-09-18 16:55:03 +02:00
|
|
|
case catch odbc_queries:get_roster(LServer, Username) of
|
|
|
|
{selected, ["username", "jid", "nick", "subscription", "ask",
|
|
|
|
"askmessage", "server", "subscribe", "type"],
|
|
|
|
Items} when is_list(Items) ->
|
2009-01-03 16:15:38 +01:00
|
|
|
fill_subscription_lists(Server, Items, [], []);
|
2008-09-18 16:55:03 +02:00
|
|
|
_ ->
|
|
|
|
{[], []}
|
|
|
|
end
|
|
|
|
catch
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
|
|
|
{[], []}
|
|
|
|
end.
|
|
|
|
|
2006-02-12 19:40:03 +01:00
|
|
|
fill_subscription_lists(LServer, [RawI | Is], F, T) ->
|
|
|
|
I = raw_to_record(LServer, RawI),
|
2007-07-28 11:36:37 +02:00
|
|
|
case I of
|
|
|
|
%% Bad JID in database:
|
|
|
|
error ->
|
|
|
|
fill_subscription_lists(LServer, Is, F, T);
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
2007-07-28 11:36:37 +02:00
|
|
|
J = I#roster.jid,
|
|
|
|
case I#roster.subscription of
|
|
|
|
both ->
|
|
|
|
fill_subscription_lists(LServer, Is, [J | F], [J | T]);
|
|
|
|
from ->
|
|
|
|
fill_subscription_lists(LServer, Is, [J | F], T);
|
|
|
|
to ->
|
|
|
|
fill_subscription_lists(LServer, Is, F, [J | T]);
|
|
|
|
_ ->
|
|
|
|
fill_subscription_lists(LServer, Is, F, T)
|
|
|
|
end
|
2004-12-19 21:47:35 +01:00
|
|
|
end;
|
2006-02-12 19:40:03 +01:00
|
|
|
fill_subscription_lists(_LServer, [], F, T) ->
|
2004-12-19 21:47:35 +01:00
|
|
|
{F, T}.
|
|
|
|
|
|
|
|
ask_to_pending(subscribe) -> out;
|
|
|
|
ask_to_pending(unsubscribe) -> none;
|
|
|
|
ask_to_pending(Ask) -> Ask.
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-05-23 22:19:37 +02:00
|
|
|
in_subscription(_, User, Server, JID, Type, Reason) ->
|
|
|
|
process_subscription(in, User, Server, JID, Type, Reason).
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2005-07-13 05:24:13 +02:00
|
|
|
out_subscription(User, Server, JID, Type) ->
|
2008-10-06 17:16:09 +02:00
|
|
|
process_subscription(out, User, Server, JID, Type, <<>>).
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2009-01-03 16:15:38 +01:00
|
|
|
process_subscription(Direction, User, Server, JID1, Type, Reason)
|
|
|
|
when is_binary(User), is_binary(Server) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
2009-01-03 16:15:38 +01:00
|
|
|
LServer = binary_to_list(Server),
|
2008-10-06 17:16:09 +02:00
|
|
|
{N0,D0,R0} = LJID = jlib:short_prepd_jid(JID1),
|
2009-02-23 20:45:55 +01:00
|
|
|
Username = ejabberd_odbc:escape(User),
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = ejabberd_odbc:escape(exmpp_jid:to_binary(N0,D0,R0)),
|
2008-09-18 16:55:03 +02:00
|
|
|
F = fun() ->
|
|
|
|
Item =
|
|
|
|
case odbc_queries:get_roster_by_jid(LServer, Username, SJID) of
|
|
|
|
{selected,
|
|
|
|
["username", "jid", "nick", "subscription", "ask",
|
|
|
|
"askmessage", "server", "subscribe", "type"],
|
|
|
|
[I]} ->
|
|
|
|
%% raw_to_record can return error, but
|
|
|
|
%% jlib_to_string would fail before this point
|
2009-01-03 16:15:38 +01:00
|
|
|
R = raw_to_record(list_to_binary(LServer), I),
|
2008-09-18 16:55:03 +02:00
|
|
|
Groups =
|
|
|
|
case odbc_queries:get_roster_groups(LServer, Username, SJID) of
|
|
|
|
{selected, ["grp"], JGrps} when is_list(JGrps) ->
|
2009-02-23 20:45:55 +01:00
|
|
|
[list_to_binary(JGrp) || {JGrp} <- JGrps];
|
2008-09-18 16:55:03 +02:00
|
|
|
_ ->
|
|
|
|
[]
|
|
|
|
end,
|
|
|
|
R#roster{groups = Groups};
|
|
|
|
{selected,
|
|
|
|
["username", "jid", "nick", "subscription", "ask",
|
|
|
|
"askmessage", "server", "subscribe", "type"],
|
|
|
|
[]} ->
|
2009-02-23 20:45:55 +01:00
|
|
|
#roster{usj = {User, Server, LJID},
|
|
|
|
us = {User, Server},
|
2008-09-18 16:55:03 +02:00
|
|
|
jid = LJID}
|
|
|
|
end,
|
|
|
|
NewState = case Direction of
|
|
|
|
out ->
|
|
|
|
out_state_change(Item#roster.subscription,
|
|
|
|
Item#roster.ask,
|
|
|
|
Type);
|
|
|
|
in ->
|
|
|
|
in_state_change(Item#roster.subscription,
|
|
|
|
Item#roster.ask,
|
|
|
|
Type)
|
|
|
|
end,
|
|
|
|
AutoReply = case Direction of
|
|
|
|
out ->
|
|
|
|
none;
|
|
|
|
in ->
|
|
|
|
in_auto_reply(Item#roster.subscription,
|
|
|
|
Item#roster.ask,
|
|
|
|
Type)
|
2005-11-16 03:59:05 +01:00
|
|
|
end,
|
2008-09-18 16:55:03 +02:00
|
|
|
AskMessage = case NewState of
|
|
|
|
{_, both} -> Reason;
|
|
|
|
{_, in} -> Reason;
|
2008-10-06 17:16:09 +02:00
|
|
|
_ -> <<>>
|
2008-09-18 16:55:03 +02:00
|
|
|
end,
|
|
|
|
case NewState of
|
|
|
|
none ->
|
|
|
|
{none, AutoReply};
|
|
|
|
{none, none} when Item#roster.subscription == none,
|
|
|
|
Item#roster.ask == in ->
|
|
|
|
odbc_queries:del_roster(LServer, Username, SJID),
|
|
|
|
{none, AutoReply};
|
|
|
|
{Subscription, Pending} ->
|
2008-10-06 17:16:09 +02:00
|
|
|
AskBinary = case AskMessage of
|
|
|
|
undefined -> <<>>;
|
|
|
|
B -> B
|
|
|
|
end,
|
2008-09-18 16:55:03 +02:00
|
|
|
NewItem = Item#roster{subscription = Subscription,
|
|
|
|
ask = Pending,
|
2008-10-06 17:16:09 +02:00
|
|
|
askmessage = AskBinary},
|
2008-09-18 16:55:03 +02:00
|
|
|
ItemVals = record_to_string(NewItem),
|
|
|
|
odbc_queries:roster_subscribe(LServer, Username, SJID, ItemVals),
|
Support for roster versioning (EJAB-964)
Introduces two options for mod_roster and mod_roster_odbc:
- {versioning, true | false} Enable or disable roster versioning on ejabberd.
- {store_current_id, true | false} If true, the current roster version is stored on DB (internal or odbc). Otherwise it is calculated on the fly each time.
Performance:
Setting store_current_id to true should help in reducing the load for both ejabberd and the DB.
Details:
If store_current_id is false, the roster version is a hash of the entire roster. If store_current_id is true, the roster version is a hash, but of the current time
(this has to do with transactional semantics; we need to perform both the roster update and the version update on the same transaction, but we don't
have the entire roster when we are changing a single item on DB. Loading it there requires significant changes to be introduced, so I opted for this simpler approach).
In either case, there is no difference for the clients, the roster version ID is opaque.
IMPORTANT:
mod_shared_roster is not compatible with the option 'store_current_id'. Shared roster and roster versioning can be both enabled, but store_current_id MUST be set to false.
SVN Revision: 2428
2009-08-06 17:45:13 +02:00
|
|
|
case roster_version_on_db(Server) of
|
|
|
|
true -> odbc_queries:set_roster_version(Username, sha:sha(term_to_binary(now())));
|
|
|
|
false -> ok
|
|
|
|
end,
|
2008-09-18 16:55:03 +02:00
|
|
|
{{push, NewItem}, AutoReply}
|
|
|
|
end
|
|
|
|
end,
|
|
|
|
case odbc_queries:sql_transaction(LServer, F) of
|
|
|
|
{atomic, {Push, AutoReply}} ->
|
|
|
|
case AutoReply of
|
2005-11-16 03:59:05 +01:00
|
|
|
none ->
|
2008-09-18 16:55:03 +02:00
|
|
|
ok;
|
|
|
|
_ ->
|
|
|
|
ejabberd_router:route(
|
2009-06-01 18:26:00 +02:00
|
|
|
exmpp_jid:make(User, Server), JID1,
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_presence:AutoReply())
|
|
|
|
end,
|
|
|
|
case Push of
|
|
|
|
{push, Item} ->
|
|
|
|
if
|
|
|
|
Item#roster.subscription == none,
|
|
|
|
Item#roster.ask == in ->
|
|
|
|
ok;
|
|
|
|
true ->
|
|
|
|
push_item(User, Server,
|
2009-06-01 18:26:00 +02:00
|
|
|
exmpp_jid:make(User, Server), Item)
|
2005-11-16 03:59:05 +01:00
|
|
|
end,
|
2008-09-18 16:55:03 +02:00
|
|
|
true;
|
|
|
|
none ->
|
|
|
|
false
|
|
|
|
end;
|
|
|
|
_ ->
|
|
|
|
false
|
|
|
|
end
|
|
|
|
catch
|
2004-12-19 21:47:35 +01:00
|
|
|
_ ->
|
|
|
|
false
|
|
|
|
end.
|
|
|
|
|
|
|
|
|
|
|
|
%% in_state_change(Subscription, Pending, Type) -> NewState
|
|
|
|
%% NewState = none | {NewSubscription, NewPending}
|
2005-12-11 20:48:31 +01:00
|
|
|
-ifdef(ROSTER_GATEWAY_WORKAROUND).
|
|
|
|
-define(NNSD, {to, none}).
|
|
|
|
-define(NISD, {to, in}).
|
|
|
|
-else.
|
|
|
|
-define(NNSD, none).
|
|
|
|
-define(NISD, none).
|
|
|
|
-endif.
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
in_state_change(none, none, subscribe) -> {none, in};
|
2005-12-11 20:48:31 +01:00
|
|
|
in_state_change(none, none, subscribed) -> ?NNSD;
|
2004-12-19 21:47:35 +01:00
|
|
|
in_state_change(none, none, unsubscribe) -> none;
|
|
|
|
in_state_change(none, none, unsubscribed) -> none;
|
|
|
|
in_state_change(none, out, subscribe) -> {none, both};
|
|
|
|
in_state_change(none, out, subscribed) -> {to, none};
|
|
|
|
in_state_change(none, out, unsubscribe) -> none;
|
|
|
|
in_state_change(none, out, unsubscribed) -> {none, none};
|
|
|
|
in_state_change(none, in, subscribe) -> none;
|
2005-12-11 20:48:31 +01:00
|
|
|
in_state_change(none, in, subscribed) -> ?NISD;
|
2004-12-19 21:47:35 +01:00
|
|
|
in_state_change(none, in, unsubscribe) -> {none, none};
|
|
|
|
in_state_change(none, in, unsubscribed) -> none;
|
|
|
|
in_state_change(none, both, subscribe) -> none;
|
|
|
|
in_state_change(none, both, subscribed) -> {to, in};
|
|
|
|
in_state_change(none, both, unsubscribe) -> {none, out};
|
|
|
|
in_state_change(none, both, unsubscribed) -> {none, in};
|
|
|
|
in_state_change(to, none, subscribe) -> {to, in};
|
|
|
|
in_state_change(to, none, subscribed) -> none;
|
|
|
|
in_state_change(to, none, unsubscribe) -> none;
|
|
|
|
in_state_change(to, none, unsubscribed) -> {none, none};
|
|
|
|
in_state_change(to, in, subscribe) -> none;
|
|
|
|
in_state_change(to, in, subscribed) -> none;
|
|
|
|
in_state_change(to, in, unsubscribe) -> {to, none};
|
|
|
|
in_state_change(to, in, unsubscribed) -> {none, in};
|
|
|
|
in_state_change(from, none, subscribe) -> none;
|
2010-02-24 13:14:45 +01:00
|
|
|
in_state_change(from, none, subscribed) -> {both, none};
|
2004-12-19 21:47:35 +01:00
|
|
|
in_state_change(from, none, unsubscribe) -> {none, none};
|
|
|
|
in_state_change(from, none, unsubscribed) -> none;
|
|
|
|
in_state_change(from, out, subscribe) -> none;
|
|
|
|
in_state_change(from, out, subscribed) -> {both, none};
|
|
|
|
in_state_change(from, out, unsubscribe) -> {none, out};
|
|
|
|
in_state_change(from, out, unsubscribed) -> {from, none};
|
|
|
|
in_state_change(both, none, subscribe) -> none;
|
|
|
|
in_state_change(both, none, subscribed) -> none;
|
|
|
|
in_state_change(both, none, unsubscribe) -> {to, none};
|
|
|
|
in_state_change(both, none, unsubscribed) -> {from, none}.
|
|
|
|
|
|
|
|
out_state_change(none, none, subscribe) -> {none, out};
|
|
|
|
out_state_change(none, none, subscribed) -> none;
|
|
|
|
out_state_change(none, none, unsubscribe) -> none;
|
|
|
|
out_state_change(none, none, unsubscribed) -> none;
|
2006-05-29 18:48:20 +02:00
|
|
|
out_state_change(none, out, subscribe) -> {none, out}; %% We need to resend query (RFC3921, section 9.2)
|
2004-12-19 21:47:35 +01:00
|
|
|
out_state_change(none, out, subscribed) -> none;
|
|
|
|
out_state_change(none, out, unsubscribe) -> {none, none};
|
|
|
|
out_state_change(none, out, unsubscribed) -> none;
|
|
|
|
out_state_change(none, in, subscribe) -> {none, both};
|
|
|
|
out_state_change(none, in, subscribed) -> {from, none};
|
|
|
|
out_state_change(none, in, unsubscribe) -> none;
|
|
|
|
out_state_change(none, in, unsubscribed) -> {none, none};
|
|
|
|
out_state_change(none, both, subscribe) -> none;
|
|
|
|
out_state_change(none, both, subscribed) -> {from, out};
|
|
|
|
out_state_change(none, both, unsubscribe) -> {none, in};
|
|
|
|
out_state_change(none, both, unsubscribed) -> {none, out};
|
|
|
|
out_state_change(to, none, subscribe) -> none;
|
2010-02-24 13:14:45 +01:00
|
|
|
out_state_change(to, none, subscribed) -> {both, none};
|
2004-12-19 21:47:35 +01:00
|
|
|
out_state_change(to, none, unsubscribe) -> {none, none};
|
|
|
|
out_state_change(to, none, unsubscribed) -> none;
|
|
|
|
out_state_change(to, in, subscribe) -> none;
|
|
|
|
out_state_change(to, in, subscribed) -> {both, none};
|
|
|
|
out_state_change(to, in, unsubscribe) -> {none, in};
|
|
|
|
out_state_change(to, in, unsubscribed) -> {to, none};
|
|
|
|
out_state_change(from, none, subscribe) -> {from, out};
|
|
|
|
out_state_change(from, none, subscribed) -> none;
|
|
|
|
out_state_change(from, none, unsubscribe) -> none;
|
|
|
|
out_state_change(from, none, unsubscribed) -> {none, none};
|
|
|
|
out_state_change(from, out, subscribe) -> none;
|
|
|
|
out_state_change(from, out, subscribed) -> none;
|
|
|
|
out_state_change(from, out, unsubscribe) -> {from, none};
|
|
|
|
out_state_change(from, out, unsubscribed) -> {none, out};
|
|
|
|
out_state_change(both, none, subscribe) -> none;
|
|
|
|
out_state_change(both, none, subscribed) -> none;
|
|
|
|
out_state_change(both, none, unsubscribe) -> {from, none};
|
|
|
|
out_state_change(both, none, unsubscribed) -> {to, none}.
|
|
|
|
|
|
|
|
in_auto_reply(from, none, subscribe) -> subscribed;
|
|
|
|
in_auto_reply(from, out, subscribe) -> subscribed;
|
|
|
|
in_auto_reply(both, none, subscribe) -> subscribed;
|
|
|
|
in_auto_reply(none, in, unsubscribe) -> unsubscribed;
|
|
|
|
in_auto_reply(none, both, unsubscribe) -> unsubscribed;
|
|
|
|
in_auto_reply(to, in, unsubscribe) -> unsubscribed;
|
|
|
|
in_auto_reply(from, none, unsubscribe) -> unsubscribed;
|
|
|
|
in_auto_reply(from, out, unsubscribe) -> unsubscribed;
|
|
|
|
in_auto_reply(both, none, unsubscribe) -> unsubscribed;
|
|
|
|
in_auto_reply(_, _, _) -> none.
|
|
|
|
|
|
|
|
|
2009-01-03 16:15:38 +01:00
|
|
|
remove_user(User, Server) when is_binary(User), is_binary(Server) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
2009-02-23 20:45:55 +01:00
|
|
|
LUser = exmpp_stringprep:nodeprep(User),
|
2009-02-20 16:30:16 +01:00
|
|
|
LServer = binary_to_list(exmpp_stringprep:nameprep(Server)),
|
2008-09-18 16:55:03 +02:00
|
|
|
Username = ejabberd_odbc:escape(LUser),
|
2009-03-03 19:57:47 +01:00
|
|
|
send_unsubscription_to_rosteritems(LUser, LServer),
|
2008-09-18 16:55:03 +02:00
|
|
|
odbc_queries:del_user_roster_t(LServer, Username),
|
|
|
|
ok
|
|
|
|
catch
|
|
|
|
_ ->
|
|
|
|
ok
|
|
|
|
end.
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2009-03-03 19:57:47 +01:00
|
|
|
%% For each contact with Subscription:
|
|
|
|
%% Both or From, send a "unsubscribed" presence stanza;
|
|
|
|
%% Both or To, send a "unsubscribe" presence stanza.
|
|
|
|
send_unsubscription_to_rosteritems(LUser, LServer) ->
|
|
|
|
RosterItems = get_user_roster([], {LUser, LServer}),
|
|
|
|
From = jlib:make_jid({LUser, LServer, ""}),
|
|
|
|
lists:foreach(fun(RosterItem) ->
|
|
|
|
send_unsubscribing_presence(From, RosterItem)
|
|
|
|
end,
|
|
|
|
RosterItems).
|
|
|
|
|
|
|
|
%% @spec (From::jid(), Item::roster()) -> ok
|
|
|
|
send_unsubscribing_presence(From, Item) ->
|
|
|
|
IsTo = case Item#roster.subscription of
|
|
|
|
both -> true;
|
|
|
|
to -> true;
|
|
|
|
_ -> false
|
|
|
|
end,
|
|
|
|
IsFrom = case Item#roster.subscription of
|
|
|
|
both -> true;
|
|
|
|
from -> true;
|
|
|
|
_ -> false
|
|
|
|
end,
|
2009-08-05 19:39:47 +02:00
|
|
|
{INode, IDom, IRes} = Item#roster.jid,
|
|
|
|
SendToJID = exmpp_jid:make(INode, IDom, IRes),
|
2009-03-03 19:57:47 +01:00
|
|
|
if IsTo ->
|
2009-08-05 19:39:47 +02:00
|
|
|
ejabberd_router:route(
|
|
|
|
exmpp_jid:bare(From),
|
|
|
|
SendToJID,
|
|
|
|
exmpp_presence:unsubscribe());
|
2009-03-03 19:57:47 +01:00
|
|
|
true -> ok
|
|
|
|
end,
|
|
|
|
if IsFrom ->
|
2009-08-05 19:39:47 +02:00
|
|
|
ejabberd_router:route(
|
|
|
|
exmpp_jid:bare(From),
|
|
|
|
SendToJID,
|
|
|
|
exmpp_presence:unsubscribed());
|
2009-03-03 19:57:47 +01:00
|
|
|
true -> ok
|
|
|
|
end,
|
|
|
|
ok.
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-12-19 21:47:35 +01:00
|
|
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
|
|
|
|
2009-02-23 20:45:55 +01:00
|
|
|
set_items(User, Server, #xmlel{children = Els}) when is_binary(User), is_binary(Server) ->
|
2009-01-19 12:16:44 +01:00
|
|
|
LUser = exmpp_stringprep:nodeprep(User),
|
|
|
|
LServer = exmpp_stringprep:nameprep(Server),
|
|
|
|
catch odbc_queries:sql_transaction(
|
|
|
|
LServer,
|
|
|
|
lists:flatmap(fun(El) ->
|
|
|
|
process_item_set_t(LUser, LServer, El)
|
|
|
|
end, Els)).
|
2008-09-18 16:55:03 +02:00
|
|
|
|
|
|
|
process_item_set_t(LUser, LServer, #xmlel{} = El) ->
|
|
|
|
try
|
2009-06-01 18:35:55 +02:00
|
|
|
JID1 = exmpp_jid:parse(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
2008-10-02 15:17:49 +02:00
|
|
|
{U0, S0, R0} = LJID = jlib:short_prepd_jid(JID1),
|
2008-09-18 16:55:03 +02:00
|
|
|
Username = ejabberd_odbc:escape(LUser),
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = ejabberd_odbc:escape(exmpp_jid:to_binary(U0, S0, R0)),
|
2008-09-18 16:55:03 +02:00
|
|
|
Item = #roster{usj = {LUser, LServer, LJID},
|
|
|
|
us = {LUser, LServer},
|
|
|
|
jid = LJID},
|
|
|
|
Item1 = process_item_attrs_ws(Item, El#xmlel.attrs),
|
|
|
|
Item2 = process_item_els(Item1, El#xmlel.children),
|
|
|
|
case Item2#roster.subscription of
|
|
|
|
remove ->
|
|
|
|
odbc_queries:del_roster_sql(Username, SJID);
|
|
|
|
_ ->
|
|
|
|
ItemVals = record_to_string(Item1),
|
|
|
|
ItemGroups = groups_to_string(Item2),
|
|
|
|
odbc_queries:update_roster_sql(Username, SJID, ItemVals, ItemGroups)
|
|
|
|
end
|
|
|
|
catch
|
|
|
|
_ ->
|
|
|
|
[]
|
2004-12-19 21:47:35 +01:00
|
|
|
end;
|
2005-07-13 05:24:13 +02:00
|
|
|
process_item_set_t(_LUser, _LServer, _) ->
|
2005-07-26 05:04:26 +02:00
|
|
|
[].
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2008-09-18 16:55:03 +02:00
|
|
|
process_item_attrs_ws(Item, [#xmlattr{name = Attr, value = Val} | Attrs]) ->
|
2004-12-19 21:47:35 +01:00
|
|
|
case Attr of
|
2008-09-18 16:55:03 +02:00
|
|
|
'name' ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item#roster{name = Val}, Attrs);
|
2008-09-18 16:55:03 +02:00
|
|
|
'subscription' ->
|
2004-12-19 21:47:35 +01:00
|
|
|
case Val of
|
2009-01-08 15:54:00 +01:00
|
|
|
<<"remove">> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item#roster{subscription = remove},
|
|
|
|
Attrs);
|
2009-01-08 15:54:00 +01:00
|
|
|
<<"none">> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item#roster{subscription = none},
|
|
|
|
Attrs);
|
2009-01-08 15:54:00 +01:00
|
|
|
<<"both">> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item#roster{subscription = both},
|
|
|
|
Attrs);
|
2009-01-08 15:54:00 +01:00
|
|
|
<<"from">> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item#roster{subscription = from},
|
|
|
|
Attrs);
|
2009-01-08 15:54:00 +01:00
|
|
|
<<"to">> ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item#roster{subscription = to},
|
|
|
|
Attrs);
|
|
|
|
_ ->
|
|
|
|
process_item_attrs_ws(Item, Attrs)
|
|
|
|
end;
|
2008-09-18 16:55:03 +02:00
|
|
|
'ask' ->
|
2004-12-19 21:47:35 +01:00
|
|
|
process_item_attrs_ws(Item, Attrs);
|
|
|
|
_ ->
|
|
|
|
process_item_attrs_ws(Item, Attrs)
|
|
|
|
end;
|
|
|
|
process_item_attrs_ws(Item, []) ->
|
|
|
|
Item.
|
|
|
|
|
2009-01-03 16:15:38 +01:00
|
|
|
get_in_pending_subscriptions(Ls, User, Server)
|
|
|
|
when is_binary(User), is_binary(Server) ->
|
2009-06-01 18:26:00 +02:00
|
|
|
JID = exmpp_jid:make(User, Server),
|
2009-06-01 18:39:36 +02:00
|
|
|
LUser = exmpp_jid:prep_node(JID),
|
2009-06-01 18:38:28 +02:00
|
|
|
LServer = exmpp_jid:prep_domain_as_list(JID),
|
2006-05-26 02:00:32 +02:00
|
|
|
Username = ejabberd_odbc:escape(LUser),
|
2006-09-03 17:15:46 +02:00
|
|
|
case catch odbc_queries:get_roster(LServer, Username) of
|
2006-05-26 02:00:32 +02:00
|
|
|
{selected, ["username", "jid", "nick", "subscription", "ask",
|
|
|
|
"askmessage", "server", "subscribe", "type"],
|
|
|
|
Items} when is_list(Items) ->
|
2006-05-23 22:19:37 +02:00
|
|
|
Ls ++ lists:map(
|
2006-05-26 02:00:32 +02:00
|
|
|
fun(R) ->
|
|
|
|
Message = R#roster.askmessage,
|
2008-10-06 17:16:09 +02:00
|
|
|
{U0, S0, R0} = R#roster.jid,
|
2008-09-18 16:55:03 +02:00
|
|
|
Pres1 = exmpp_presence:subscribe(),
|
|
|
|
Pres2 = exmpp_stanza:set_jids(Pres1,
|
2009-06-01 18:59:08 +02:00
|
|
|
exmpp_jid:to_binary(U0, S0, R0),
|
|
|
|
exmpp_jid:to_binary(JID)),
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_presence:set_status(Pres2, Message)
|
2006-05-26 02:00:32 +02:00
|
|
|
end,
|
|
|
|
lists:flatmap(
|
|
|
|
fun(I) ->
|
2009-06-01 18:37:15 +02:00
|
|
|
case raw_to_record(exmpp_jid:prep_domain(JID), I) of
|
2007-07-28 11:36:37 +02:00
|
|
|
%% Bad JID in database:
|
2006-12-07 03:56:14 +01:00
|
|
|
error ->
|
|
|
|
[];
|
|
|
|
R ->
|
|
|
|
case R#roster.ask of
|
|
|
|
in -> [R];
|
|
|
|
both -> [R];
|
|
|
|
_ -> []
|
|
|
|
end
|
2006-05-26 02:00:32 +02:00
|
|
|
end
|
|
|
|
end,
|
|
|
|
Items));
|
|
|
|
_ ->
|
|
|
|
Ls
|
2006-05-23 22:19:37 +02:00
|
|
|
end.
|
2006-05-26 02:00:32 +02:00
|
|
|
|
2006-05-23 22:19:37 +02:00
|
|
|
|
2004-12-19 21:47:35 +01:00
|
|
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
2009-01-03 16:15:38 +01:00
|
|
|
%% JID is jid() record, because it's used latter on for both short_prepd_jid
|
2008-10-06 17:00:34 +02:00
|
|
|
%% and short_prepd_bare_jid
|
2009-01-03 16:15:38 +01:00
|
|
|
get_jid_info(_, User, Server, JID) when is_binary(User), is_binary(Server) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
2009-01-03 16:15:38 +01:00
|
|
|
LServer = binary_to_list(Server),
|
2008-10-06 17:00:34 +02:00
|
|
|
LJID = {N, D, R} = jlib:short_prepd_jid(JID),
|
2009-02-23 20:45:55 +01:00
|
|
|
Username = ejabberd_odbc:escape(User),
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = ejabberd_odbc:escape(exmpp_jid:to_binary(N, D, R)),
|
2008-09-18 16:55:03 +02:00
|
|
|
case catch odbc_queries:get_subscription(LServer, Username, SJID) of
|
|
|
|
{selected, ["subscription"], [{SSubscription}]} ->
|
|
|
|
Subscription = case SSubscription of
|
|
|
|
"B" -> both;
|
|
|
|
"T" -> to;
|
|
|
|
"F" -> from;
|
|
|
|
_ -> none
|
|
|
|
end,
|
|
|
|
Groups = case catch odbc_queries:get_rostergroup_by_jid(LServer, Username, SJID) of
|
|
|
|
{selected, ["grp"], JGrps} when is_list(JGrps) ->
|
2009-02-23 20:45:55 +01:00
|
|
|
[list_to_binary(JGrp) || {JGrp} <- JGrps];
|
2008-09-18 16:55:03 +02:00
|
|
|
_ ->
|
|
|
|
[]
|
|
|
|
end,
|
|
|
|
{Subscription, Groups};
|
|
|
|
_ ->
|
|
|
|
LRJID = jlib:short_prepd_bare_jid(JID),
|
|
|
|
if
|
|
|
|
LRJID == LJID ->
|
|
|
|
{none, []};
|
|
|
|
true ->
|
2008-10-06 17:00:34 +02:00
|
|
|
{LR_N, LR_D, LR_R} = LRJID,
|
2009-06-01 18:59:08 +02:00
|
|
|
SRJID = ejabberd_odbc:escape(exmpp_jid:to_binary(LR_N, LR_D, LR_R)),
|
2008-09-18 16:55:03 +02:00
|
|
|
case catch odbc_queries:get_subscription(LServer, Username, SRJID) of
|
|
|
|
{selected, ["subscription"], [{SSubscription}]} ->
|
|
|
|
Subscription = case SSubscription of
|
|
|
|
"B" -> both;
|
|
|
|
"T" -> to;
|
|
|
|
"F" -> from;
|
|
|
|
_ -> none
|
|
|
|
end,
|
|
|
|
Groups = case catch odbc_queries:get_rostergroup_by_jid(LServer, Username, SRJID) of
|
|
|
|
{selected, ["grp"], JGrps} when is_list(JGrps) ->
|
2009-02-23 20:45:55 +01:00
|
|
|
[list_to_binary(JGrp) || {JGrp} <- JGrps];
|
2008-09-18 16:55:03 +02:00
|
|
|
_ ->
|
|
|
|
[]
|
|
|
|
end,
|
|
|
|
{Subscription, Groups};
|
|
|
|
_ ->
|
|
|
|
{none, []}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
catch
|
2005-07-26 05:04:26 +02:00
|
|
|
_ ->
|
2008-09-18 16:55:03 +02:00
|
|
|
{none, []}
|
2005-07-26 05:04:26 +02:00
|
|
|
end.
|
2004-12-19 21:47:35 +01:00
|
|
|
|
|
|
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
|
|
|
|
2006-05-26 02:00:32 +02:00
|
|
|
raw_to_record(LServer, {User, SJID, Nick, SSubscription, SAsk, SAskMessage,
|
2009-01-03 16:15:38 +01:00
|
|
|
_SServer, _SSubscribe, _SType}) when is_binary(LServer) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
2009-06-01 18:35:55 +02:00
|
|
|
JID = exmpp_jid:parse(SJID),
|
2008-09-18 16:55:03 +02:00
|
|
|
LJID = jlib:short_prepd_jid(JID),
|
|
|
|
Subscription = case SSubscription of
|
|
|
|
"B" -> both;
|
|
|
|
"T" -> to;
|
|
|
|
"F" -> from;
|
|
|
|
_ -> none
|
|
|
|
end,
|
|
|
|
Ask = case SAsk of
|
|
|
|
"S" -> subscribe;
|
|
|
|
"U" -> unsubscribe;
|
|
|
|
"B" -> both;
|
|
|
|
"O" -> out;
|
|
|
|
"I" -> in;
|
|
|
|
_ -> none
|
|
|
|
end,
|
2009-01-03 16:15:38 +01:00
|
|
|
UserB = list_to_binary(User),
|
|
|
|
#roster{usj = {UserB, LServer, LJID},
|
|
|
|
us = {UserB, LServer},
|
2008-09-18 16:55:03 +02:00
|
|
|
jid = LJID,
|
2009-01-08 15:54:00 +01:00
|
|
|
name = list_to_binary(Nick),
|
2008-09-18 16:55:03 +02:00
|
|
|
subscription = Subscription,
|
|
|
|
ask = Ask,
|
|
|
|
askmessage = list_to_binary(SAskMessage)}
|
|
|
|
catch
|
|
|
|
_ ->
|
|
|
|
error
|
2004-12-19 21:47:35 +01:00
|
|
|
end.
|
|
|
|
|
2006-02-12 19:40:03 +01:00
|
|
|
record_to_string(#roster{us = {User, _Server},
|
2004-12-19 21:47:35 +01:00
|
|
|
jid = JID,
|
|
|
|
name = Name,
|
|
|
|
subscription = Subscription,
|
2006-05-23 22:19:37 +02:00
|
|
|
ask = Ask,
|
|
|
|
askmessage = AskMessage}) ->
|
2009-02-23 20:45:55 +01:00
|
|
|
Username = ejabberd_odbc:escape(User),
|
2008-10-01 11:41:57 +02:00
|
|
|
{U, S, R} = JID,
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = ejabberd_odbc:escape(exmpp_jid:to_binary(U, S, R)),
|
2009-02-23 20:45:55 +01:00
|
|
|
Nick = ejabberd_odbc:escape(Name),
|
2004-12-19 21:47:35 +01:00
|
|
|
SSubscription = case Subscription of
|
|
|
|
both -> "B";
|
|
|
|
to -> "T";
|
|
|
|
from -> "F";
|
|
|
|
none -> "N"
|
|
|
|
end,
|
|
|
|
SAsk = case Ask of
|
|
|
|
subscribe -> "S";
|
|
|
|
unsubscribe -> "U";
|
|
|
|
both -> "B";
|
|
|
|
out -> "O";
|
|
|
|
in -> "I";
|
|
|
|
none -> "N"
|
|
|
|
end,
|
2009-02-23 20:45:55 +01:00
|
|
|
SAskMessage = ejabberd_odbc:escape(AskMessage),
|
2009-01-19 12:16:44 +01:00
|
|
|
[Username, SJID, Nick, SSubscription, SAsk, SAskMessage, "N", "", "item"].
|
2004-12-19 21:47:35 +01:00
|
|
|
|
2006-02-12 19:40:03 +01:00
|
|
|
groups_to_string(#roster{us = {User, _Server},
|
2005-07-26 05:04:26 +02:00
|
|
|
jid = JID,
|
|
|
|
groups = Groups}) ->
|
|
|
|
Username = ejabberd_odbc:escape(User),
|
2008-10-01 11:41:57 +02:00
|
|
|
{U, S, R} = JID,
|
2009-06-01 18:59:08 +02:00
|
|
|
SJID = ejabberd_odbc:escape(exmpp_jid:to_binary(U, S, R)),
|
2006-09-03 17:15:46 +02:00
|
|
|
|
|
|
|
%% Empty groups do not need to be converted to string to be inserted in
|
|
|
|
%% the database
|
2009-01-19 12:16:44 +01:00
|
|
|
lists:foldl(
|
|
|
|
fun([], Acc) -> Acc;
|
|
|
|
(Group, Acc) ->
|
2009-02-23 20:45:55 +01:00
|
|
|
G = ejabberd_odbc:escape(Group),
|
2009-01-19 12:16:44 +01:00
|
|
|
[[Username, SJID, G]|Acc] end, [], Groups).
|
2005-07-26 05:04:26 +02:00
|
|
|
|
2007-08-24 18:15:05 +02:00
|
|
|
webadmin_page(_, Host,
|
|
|
|
#request{us = _US,
|
|
|
|
path = ["user", U, "roster"],
|
|
|
|
q = Query,
|
|
|
|
lang = Lang} = _Request) ->
|
|
|
|
Res = user_roster(U, Host, Query, Lang),
|
|
|
|
{stop, Res};
|
|
|
|
|
|
|
|
webadmin_page(Acc, _, _) -> Acc.
|
|
|
|
|
|
|
|
user_roster(User, Server, Query, Lang) ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
|
|
|
LUser = exmpp_stringprep:nodeprep(User),
|
|
|
|
LServer = exmpp_stringprep:nameprep(Server),
|
|
|
|
US = {LUser, LServer},
|
|
|
|
Items1 = get_roster(LUser, LServer),
|
|
|
|
Res = user_roster_parse_query(User, Server, Items1, Query),
|
|
|
|
Items = get_roster(LUser, LServer),
|
|
|
|
SItems = lists:sort(Items),
|
|
|
|
FItems =
|
|
|
|
case SItems of
|
|
|
|
[] ->
|
|
|
|
[?CT("None")];
|
|
|
|
_ ->
|
|
|
|
[?XE("table",
|
|
|
|
[?XE("thead",
|
|
|
|
[?XE("tr",
|
|
|
|
[?XCT("td", "Jabber ID"),
|
|
|
|
?XCT("td", "Nickname"),
|
|
|
|
?XCT("td", "Subscription"),
|
|
|
|
?XCT("td", "Pending"),
|
|
|
|
?XCT("td", "Groups")
|
|
|
|
])]),
|
|
|
|
?XE("tbody",
|
|
|
|
lists:map(
|
|
|
|
fun(R) ->
|
|
|
|
Groups =
|
|
|
|
lists:flatmap(
|
|
|
|
fun(Group) ->
|
2010-04-14 10:58:27 +02:00
|
|
|
[?C(binary_to_list(Group)), ?BR]
|
2008-09-18 16:55:03 +02:00
|
|
|
end, R#roster.groups),
|
|
|
|
Pending = ask_to_pending(R#roster.ask),
|
2009-01-19 12:59:40 +01:00
|
|
|
TDJID = build_contact_jid_td(R#roster.jid),
|
2008-09-18 16:55:03 +02:00
|
|
|
?XE("tr",
|
2009-01-19 12:59:40 +01:00
|
|
|
[TDJID,
|
2009-05-27 19:29:58 +02:00
|
|
|
?XAC("td", [?XMLATTR('class', <<"valign">>)],
|
2009-01-08 15:54:00 +01:00
|
|
|
binary_to_list(R#roster.name)),
|
2009-05-27 19:29:58 +02:00
|
|
|
?XAC("td", [?XMLATTR('class', <<"valign">>)],
|
2008-09-18 16:55:03 +02:00
|
|
|
atom_to_list(R#roster.subscription)),
|
2009-05-27 19:29:58 +02:00
|
|
|
?XAC("td", [?XMLATTR('class', <<"valign">>)],
|
2008-09-18 16:55:03 +02:00
|
|
|
atom_to_list(Pending)),
|
2009-05-27 19:29:58 +02:00
|
|
|
?XAE("td", [?XMLATTR('class', <<"valign">>)], Groups),
|
2008-09-18 16:55:03 +02:00
|
|
|
if
|
|
|
|
Pending == in ->
|
2009-05-27 19:29:58 +02:00
|
|
|
?XAE("td", [?XMLATTR('class', <<"valign">>)],
|
2008-09-18 16:55:03 +02:00
|
|
|
[?INPUTT("submit",
|
|
|
|
"validate" ++
|
|
|
|
ejabberd_web_admin:term_to_id(R#roster.jid),
|
|
|
|
"Validate")]);
|
|
|
|
true ->
|
|
|
|
?X("td")
|
|
|
|
end,
|
2009-05-27 19:29:58 +02:00
|
|
|
?XAE("td", [?XMLATTR('class', <<"valign">>)],
|
2008-09-18 16:55:03 +02:00
|
|
|
[?INPUTT("submit",
|
|
|
|
"remove" ++
|
|
|
|
ejabberd_web_admin:term_to_id(R#roster.jid),
|
|
|
|
"Remove")])])
|
|
|
|
end, SItems))])]
|
|
|
|
end,
|
|
|
|
[?XC("h1", ?T("Roster of ") ++ us_to_list(US))] ++
|
|
|
|
case Res of
|
2009-01-19 16:27:07 +01:00
|
|
|
ok -> [?XREST("Submitted")];
|
|
|
|
error -> [?XREST("Bad format")];
|
2008-09-18 16:55:03 +02:00
|
|
|
nothing -> []
|
|
|
|
end ++
|
2009-05-27 19:29:58 +02:00
|
|
|
[?XAE("form", [?XMLATTR('action', <<"">>), ?XMLATTR('method', <<"post">>)],
|
2008-09-18 16:55:03 +02:00
|
|
|
FItems ++
|
|
|
|
[?P,
|
|
|
|
?INPUT("text", "newjid", ""), ?C(" "),
|
|
|
|
?INPUTT("submit", "addjid", "Add Jabber ID")
|
|
|
|
])]
|
|
|
|
catch
|
|
|
|
_ ->
|
|
|
|
[?XC("h1", ?T("Roster of ") ++ us_to_list({User, Server}))] ++
|
|
|
|
[?CT("Bad format"), ?P] ++
|
2009-05-27 19:29:58 +02:00
|
|
|
[?XAE("form", [?XMLATTR('action', <<"">>), ?XMLATTR('method', <<"post">>)],
|
2008-09-18 16:55:03 +02:00
|
|
|
[?P,
|
|
|
|
?INPUT("text", "newjid", ""), ?C(" "),
|
|
|
|
?INPUTT("submit", "addjid", "Add Jabber ID")
|
|
|
|
])]
|
|
|
|
end.
|
2007-08-24 18:15:05 +02:00
|
|
|
|
2009-01-19 12:59:40 +01:00
|
|
|
build_contact_jid_td({U, S, R}) ->
|
|
|
|
%% Convert {U, S, R} into {jid, U, S, R, U, S, R}:
|
2009-06-01 18:26:00 +02:00
|
|
|
ContactJID = exmpp_jid:make(U, S, R),
|
2009-06-01 18:39:36 +02:00
|
|
|
JIDURI = case {exmpp_jid:prep_node(ContactJID), exmpp_jid:prep_domain(ContactJID)} of
|
2009-01-19 12:59:40 +01:00
|
|
|
{undefined, _} -> "";
|
|
|
|
{CUser, CServer} ->
|
|
|
|
CUser_S = binary_to_list(CUser),
|
|
|
|
CServer_S = binary_to_list(CServer),
|
|
|
|
case lists:member(CServer_S, ?MYHOSTS) of
|
|
|
|
false -> "";
|
|
|
|
true -> "/admin/server/" ++ CServer_S ++ "/user/" ++ CUser_S ++ "/"
|
|
|
|
end
|
|
|
|
end,
|
|
|
|
case JIDURI of
|
|
|
|
[] ->
|
2009-06-01 18:52:14 +02:00
|
|
|
?XAC('td', [?XMLATTR('class', <<"valign">>)], exmpp_jid:to_list(ContactJID));
|
2009-01-19 12:59:40 +01:00
|
|
|
URI when is_list(URI) ->
|
2009-06-01 18:52:14 +02:00
|
|
|
?XAE('td', [?XMLATTR('class', <<"valign">>)], [?AC(JIDURI, exmpp_jid:to_list(ContactJID))])
|
2009-01-19 12:59:40 +01:00
|
|
|
end.
|
|
|
|
|
2007-08-24 18:15:05 +02:00
|
|
|
user_roster_parse_query(User, Server, Items, Query) ->
|
|
|
|
case lists:keysearch("addjid", 1, Query) of
|
|
|
|
{value, _} ->
|
|
|
|
case lists:keysearch("newjid", 1, Query) of
|
|
|
|
{value, {_, undefined}} ->
|
|
|
|
error;
|
|
|
|
{value, {_, SJID}} ->
|
2008-09-18 16:55:03 +02:00
|
|
|
try
|
2009-06-01 18:35:55 +02:00
|
|
|
JID = exmpp_jid:parse(SJID),
|
2008-09-18 16:55:03 +02:00
|
|
|
user_roster_subscribe_jid(User, Server, JID),
|
|
|
|
ok
|
|
|
|
catch
|
|
|
|
_ ->
|
2007-08-24 18:15:05 +02:00
|
|
|
error
|
|
|
|
end;
|
|
|
|
false ->
|
|
|
|
error
|
|
|
|
end;
|
|
|
|
false ->
|
|
|
|
case catch user_roster_item_parse_query(
|
|
|
|
User, Server, Items, Query) of
|
|
|
|
submitted ->
|
|
|
|
ok;
|
|
|
|
{'EXIT', _Reason} ->
|
|
|
|
error;
|
|
|
|
_ ->
|
|
|
|
nothing
|
|
|
|
end
|
|
|
|
end.
|
|
|
|
|
|
|
|
|
|
|
|
user_roster_subscribe_jid(User, Server, JID) ->
|
|
|
|
out_subscription(User, Server, JID, subscribe),
|
2009-06-01 18:26:00 +02:00
|
|
|
UJID = exmpp_jid:make(User, Server),
|
2007-08-24 18:15:05 +02:00
|
|
|
ejabberd_router:route(
|
2008-09-18 16:55:03 +02:00
|
|
|
UJID, JID, exmpp_presence:subscribe()).
|
2007-08-24 18:15:05 +02:00
|
|
|
|
|
|
|
user_roster_item_parse_query(User, Server, Items, Query) ->
|
|
|
|
lists:foreach(
|
|
|
|
fun(R) ->
|
|
|
|
JID = R#roster.jid,
|
|
|
|
case lists:keysearch(
|
|
|
|
"validate" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of
|
|
|
|
{value, _} ->
|
2008-09-18 16:55:03 +02:00
|
|
|
{U, S, R} = JID,
|
2009-06-01 18:26:00 +02:00
|
|
|
JID1 = exmpp_jid:make(U, S, R),
|
2007-08-24 18:15:05 +02:00
|
|
|
out_subscription(
|
|
|
|
User, Server, JID1, subscribed),
|
2009-06-01 18:26:00 +02:00
|
|
|
UJID = exmpp_jid:make(User, Server),
|
2007-08-24 18:15:05 +02:00
|
|
|
ejabberd_router:route(
|
2008-09-18 16:55:03 +02:00
|
|
|
UJID, JID1, exmpp_presence:subscribed()),
|
2007-08-24 18:15:05 +02:00
|
|
|
throw(submitted);
|
|
|
|
false ->
|
|
|
|
case lists:keysearch(
|
|
|
|
"remove" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of
|
|
|
|
{value, _} ->
|
2009-06-01 18:26:00 +02:00
|
|
|
UJID = exmpp_jid:make(User, Server),
|
2008-09-18 16:55:03 +02:00
|
|
|
Attrs1 = exmpp_xml:set_attribute_in_list([],
|
2009-06-01 18:52:14 +02:00
|
|
|
'jid', exmpp_jid:to_list(JID)),
|
2008-09-18 16:55:03 +02:00
|
|
|
Attrs2 = exmpp_xml:set_attribute_in_list(Attrs1,
|
|
|
|
'subscription', "remove"),
|
|
|
|
Item = #xmlel{ns = ?NS_ROSTER, name = 'item',
|
|
|
|
attrs = Attrs2},
|
|
|
|
Request = #xmlel{
|
|
|
|
ns = ?NS_ROSTER,
|
|
|
|
name = 'query',
|
|
|
|
children = [Item]},
|
2007-08-24 18:15:05 +02:00
|
|
|
process_iq(
|
|
|
|
UJID, UJID,
|
2008-09-18 16:55:03 +02:00
|
|
|
exmpp_iq:set(?NS_JABBER_CLIENT, Request)),
|
2007-08-24 18:15:05 +02:00
|
|
|
throw(submitted);
|
|
|
|
false ->
|
|
|
|
ok
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
end, Items),
|
|
|
|
nothing.
|
|
|
|
|
|
|
|
us_to_list({User, Server}) ->
|
2009-06-01 18:54:33 +02:00
|
|
|
exmpp_jid:bare_to_list(User, Server).
|
2007-08-24 18:15:05 +02:00
|
|
|
|
|
|
|
webadmin_user(Acc, _User, _Server, Lang) ->
|
|
|
|
Acc ++ [?XE("h3", [?ACT("roster/", "Roster")])].
|