Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Store privacy list user_host and name as binary, not string

This commit is contained in:
Badlop 2011-05-18 19:46:22 +02:00
parent 4d2408c9c9
commit c55aa9be7b
1 changed files with 52 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/mod_privacy.erl
View File

@ -59,16 +59,16 @@
%%% Same as 2.1.x %%% Same as 2.1.x
%%% %%%
%%% 3.0.0-alpha / mnesia / privacy_default_list %%% 3.0.0-alpha / mnesia / privacy_default_list
%%% user_host = {Username::string(), Server::string()} %%% user_host = {Username::binary(), Server::binary()}
%%% name = string() %%% name = binary()
%%% 3.0.0-alpha / mnesia / privacy_list %%% 3.0.0-alpha / mnesia / privacy_list
%%% user_host = {Username::string(), Server::string()} %%% user_host = {Username::binary(), Server::binary()}
%%% name = string() %%% name = binary()
%%% 3.0.0-alpha / mnesia / privacy_list_data %%% 3.0.0-alpha / mnesia / privacy_list_data
%%% user_host = {Username::string(), Server::string()} %%% user_host = {Username::binary(), Server::binary()}
%%% name = string() %%% name = binary()
%%% type = jid | group | subscription | none %%% type = jid | group | subscription | none
%%% value = JID::binary() | Group::binary() | <<"none">> | <<"both">> | <<"from">> | <<"to">> %%% value = JID::binary() | Group::binary() | <<"none">> | <<"both">> | <<"from">> | <<"to">> | none
%%% action = allow | deny %%% action = allow | deny
%%% order = integer() %%% order = integer()
%%% match_all = boolean() %%% match_all = boolean()
@ -196,15 +196,15 @@ process_iq(_From, _To, IQ_Rec) ->
process_iq_get(_, From, _To, #iq{payload = SubEl}, process_iq_get(_, From, _To, #iq{payload = SubEl},
#userlist{name = Active}) -> #userlist{name = Active}) ->
LUser = exmpp_jid:prep_node_as_list(From), LUser = exmpp_jid:prep_node(From),
LServer = exmpp_jid:prep_domain_as_list(From), LServer = exmpp_jid:prep_domain(From),
case exmpp_xml:get_child_elements(SubEl) of case exmpp_xml:get_child_elements(SubEl) of
[] -> [] ->
process_lists_get(LUser, LServer, Active); process_lists_get(LUser, LServer, Active);
[#xmlel{name = Name} = Child] -> [#xmlel{name = Name} = Child] ->
case Name of case Name of
list -> list ->
ListName = exmpp_xml:get_attribute_as_list(Child, <<"name">>, false), ListName = exmpp_xml:get_attribute_as_binary(Child, <<"name">>, false),
process_list_get(LUser, LServer, ListName); process_list_get(LUser, LServer, ListName);
_ -> _ ->
{error, 'bad-request'} {error, 'bad-request'}
@ -215,20 +215,19 @@ process_iq_get(_, From, _To, #iq{payload = SubEl},
process_lists_get(LUser, LServer, Active) -> process_lists_get(LUser, LServer, Active) ->
LServerB = list_to_binary(LServer),
F = fun() -> F = fun() ->
Default = Default =
case gen_storage:read(LServerB, {privacy_default_list, {LUser, LServer}}) of case gen_storage:read(LServer, {privacy_default_list, {LUser, LServer}}) of
[#privacy_default_list{name = Name}] -> [#privacy_default_list{name = Name}] ->
Name; Name;
_ -> _ ->
none none
end, end,
Lists = [List#privacy_list.name Lists = [List#privacy_list.name
|| List <- gen_storage:read(LServerB, {privacy_list, {LUser, LServer}})], || List <- gen_storage:read(LServer, {privacy_list, {LUser, LServer}})],
{Default, Lists} {Default, Lists}
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{aborted, _Reason} -> {aborted, _Reason} ->
{error, 'internal-server-error'}; {error, 'internal-server-error'};
{atomic, {Default, Lists}} -> {atomic, {Default, Lists}} ->
@ -259,20 +258,19 @@ process_list_get(_LUser, _LServer, false) ->
{error, 'bad-request'}; {error, 'bad-request'};
process_list_get(LUser, LServer, Name) -> process_list_get(LUser, LServer, Name) ->
LServerB = list_to_binary(LServer),
F = fun() -> F = fun() ->
case gen_storage:select(LServerB, privacy_list, case gen_storage:select(LServer, privacy_list,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]) of {'=', name, Name}]) of
[] -> [] ->
none; none;
[#privacy_list{}] -> [#privacy_list{}] ->
gen_storage:select(LServerB, privacy_list_data, gen_storage:select(LServer, privacy_list_data,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]) {'=', name, Name}])
end end
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{aborted, _Reason} -> {aborted, _Reason} ->
{error, 'internal-server-error'}; {error, 'internal-server-error'};
{atomic, none} -> {atomic, none} ->
@ -355,11 +353,11 @@ list_to_action(S) ->
process_iq_set(_, From, _To, #iq{payload = SubEl}) -> process_iq_set(_, From, _To, #iq{payload = SubEl}) ->
LUser = exmpp_jid:prep_node_as_list(From), LUser = exmpp_jid:prep_node(From),
LServer = exmpp_jid:prep_domain_as_list(From), LServer = exmpp_jid:prep_domain(From),
case exmpp_xml:get_child_elements(SubEl) of case exmpp_xml:get_child_elements(SubEl) of
[#xmlel{name = Name} = Child] -> [#xmlel{name = Name} = Child] ->
ListName = exmpp_xml:get_attribute_as_list(Child, <<"name">>, false), ListName = exmpp_xml:get_attribute_as_binary(Child, <<"name">>, false),
case Name of case Name of
list -> list ->
process_list_set(LUser, LServer, ListName, process_list_set(LUser, LServer, ListName,
@ -377,11 +375,10 @@ process_iq_set(_, From, _To, #iq{payload = SubEl}) ->
process_default_set(LUser, LServer, false) -> process_default_set(LUser, LServer, false) ->
LServerB = list_to_binary(LServer),
F = fun() -> F = fun() ->
gen_storage:delete(LServerB, {privacy_default_list, {LUser, LServer}}) gen_storage:delete(LServer, {privacy_default_list, {LUser, LServer}})
end, end,
case gen_storage:transaction(LServerB, privacy_default_list, F) of case gen_storage:transaction(LServer, privacy_default_list, F) of
{atomic, _} -> {atomic, _} ->
{result, []}; {result, []};
_ -> _ ->
@ -389,21 +386,20 @@ process_default_set(LUser, LServer, false) ->
end; end;
process_default_set(LUser, LServer, Name) -> process_default_set(LUser, LServer, Name) ->
LServerB = list_to_binary(LServer),
F = fun() -> F = fun() ->
case gen_storage:select(LServerB, privacy_list, case gen_storage:select(LServer, privacy_list,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]) of {'=', name, Name}]) of
[] -> [] ->
{error, 'item-not-found'}; {error, 'item-not-found'};
[#privacy_list{}] -> [#privacy_list{}] ->
gen_storage:write(LServerB, gen_storage:write(LServer,
#privacy_default_list{user_host = {LUser, LServer}, #privacy_default_list{user_host = {LUser, LServer},
name = Name}), name = Name}),
{result, []} {result, []}
end end
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{atomic, {error, _} = Error} -> {atomic, {error, _} = Error} ->
Error; Error;
{atomic, {result, _} = Res} -> {atomic, {result, _} = Res} ->
@ -417,13 +413,12 @@ process_active_set(_LUser, _LServer, false) ->
{result, [], #userlist{}}; {result, [], #userlist{}};
process_active_set(LUser, LServer, Name) -> process_active_set(LUser, LServer, Name) ->
LServerB = list_to_binary(LServer),
F = fun() -> F = fun() ->
case gen_storage:select(LServerB, privacy_list, case gen_storage:select(LServer, privacy_list,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]) of {'=', name, Name}]) of
[#privacy_list{}] -> [#privacy_list{}] ->
Data = gen_storage:select(LServerB, privacy_list_data, Data = gen_storage:select(LServer, privacy_list_data,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]), {'=', name, Name}]),
List = list_data_to_items(Data), List = list_data_to_items(Data),
@ -435,7 +430,7 @@ process_active_set(LUser, LServer, Name) ->
{error, 'item-not-found'} {error, 'item-not-found'}
end end
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{atomic, Res} -> {atomic, Res} ->
Res; Res;
_ -> _ ->
@ -448,27 +443,26 @@ process_list_set(_LUser, _LServer, false, _Els) ->
{error, 'bad-request'}; {error, 'bad-request'};
process_list_set(LUser, LServer, Name, Els) -> process_list_set(LUser, LServer, Name, Els) ->
LServerB = list_to_binary(LServer),
case parse_items(Els) of case parse_items(Els) of
false -> false ->
{error, 'bad-request'}; {error, 'bad-request'};
remove -> remove ->
F = fun() -> F = fun() ->
case gen_storage:read(LServerB, case gen_storage:read(LServer,
{privacy_default_list, {LUser, LServer}}) of {privacy_default_list, {LUser, LServer}}) of
[#privacy_default_list{name = Default}] when Name == Default -> [#privacy_default_list{name = Default}] when Name == Default ->
{error, 'conflict'}; {error, 'conflict'};
_ -> _ ->
gen_storage:delete_where(LServerB, privacy_list, gen_storage:delete_where(LServer, privacy_list,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]), {'=', name, Name}]),
gen_storage:delete_where(LServerB, privacy_list_data, gen_storage:delete_where(LServer, privacy_list_data,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]), {'=', name, Name}]),
{result, []} {result, []}
end end
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{atomic, {error, _} = Error} -> {atomic, {error, _} = Error} ->
Error; Error;
{atomic, {result, _} = Res} -> {atomic, {result, _} = Res} ->
@ -486,24 +480,24 @@ process_list_set(LUser, LServer, Name, Els) ->
List -> List ->
F = fun() -> F = fun() ->
OldData = OldData =
gen_storage:select(LServerB, privacy_list_data, gen_storage:select(LServer, privacy_list_data,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Name}]), {'=', name, Name}]),
lists:foreach( lists:foreach(
fun(Data1) -> fun(Data1) ->
gen_storage:delete_object(LServerB, Data1) gen_storage:delete_object(LServer, Data1)
end, OldData), end, OldData),
gen_storage:write(LServerB, #privacy_list{user_host = {LUser, LServer}, gen_storage:write(LServer, #privacy_list{user_host = {LUser, LServer},
name = Name}), name = Name}),
NewData = list_items_to_data(LUser, LServer, Name, List), NewData = list_items_to_data(LUser, LServer, Name, List),
lists:foreach( lists:foreach(
fun(Data1) -> fun(Data1) ->
gen_storage:write(LServerB, Data1) gen_storage:write(LServer, Data1)
end, NewData), end, NewData),
{result, []} {result, []}
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{atomic, {error, _} = Error} -> {atomic, {error, _} = Error} ->
Error; Error;
{atomic, {result, _} = Res} -> {atomic, {result, _} = Res} ->
@ -656,17 +650,15 @@ is_list_needdb(Items) ->
end end
end, Items). end, Items).
get_user_list(_, User, LServerB) get_user_list(_, LUser, LServer)
when is_binary(User), is_binary(LServerB) -> when is_binary(LUser), is_binary(LServer) ->
LUser = binary_to_list(User),
LServer = binary_to_list(LServerB),
F = fun() -> F = fun() ->
case gen_storage:read(LServerB, case gen_storage:read(LServer,
{privacy_default_list, {LUser, LServer}}) of {privacy_default_list, {LUser, LServer}}) of
[] -> [] ->
#userlist{}; #userlist{};
[#privacy_default_list{name = Default}] -> [#privacy_default_list{name = Default}] ->
Data = gen_storage:select(LServerB, privacy_list_data, Data = gen_storage:select(LServer, privacy_list_data,
[{'=', user_host, {LUser, LServer}}, [{'=', user_host, {LUser, LServer}},
{'=', name, Default}]), {'=', name, Default}]),
List = list_data_to_items(Data), List = list_data_to_items(Data),
@ -676,7 +668,7 @@ get_user_list(_, User, LServerB)
list = List} list = List}
end end
end, end,
{atomic, Res} = gen_storage:transaction(LServerB, privacy_default_list, F), {atomic, Res} = gen_storage:transaction(LServer, privacy_default_list, F),
Res. Res.
@ -789,16 +781,15 @@ is_type_match(group, Value, _JID, _Subscription, Groups) ->
%% The ejabberd hook provides the arguments as binaries, %% The ejabberd hook provides the arguments as binaries,
%% but the mod_privacy internal functions provide them as strings. %% but the mod_privacy internal functions provide them as strings.
%% Once this module stores information as binaries, this incoherence will be solved. %% Once this module stores information as binaries, this incoherence will be solved.
remove_user(User, Server) when is_binary(User) and is_binary(Server) ->
remove_user(binary_to_list(User), binary_to_list(Server));
remove_user(User, Server) when is_list(User) and is_list(Server) -> remove_user(User, Server) when is_list(User) and is_list(Server) ->
remove_user(list_to_binary(User), list_to_binary(Server));
remove_user(User, Server) when is_binary(User) and is_binary(Server) ->
LUser = exmpp_stringprep:nodeprep(User), LUser = exmpp_stringprep:nodeprep(User),
LServer = exmpp_stringprep:nameprep(Server), LServer = exmpp_stringprep:nameprep(Server),
LServerB = list_to_binary(LServer),
F = fun() -> F = fun() ->
gen_storage:delete(LServerB, {privacy_list, {LUser, LServer}}) gen_storage:delete(LServer, {privacy_list, {LUser, LServer}})
end, end,
case gen_storage:transaction(LServerB, privacy_list, F) of case gen_storage:transaction(LServer, privacy_list, F) of
{atomic, _} -> {atomic, _} ->
{result, []}; {result, []};
_ -> _ ->
@ -823,9 +814,11 @@ update_tables(Host, mnesia) ->
gen_storage_migration:migrate_mnesia( gen_storage_migration:migrate_mnesia(
Host, privacy_default_list, Host, privacy_default_list,
[{privacy, [us, default, lists], [{privacy, [us, default, lists],
fun({privacy, US, Default, Lists}) -> fun({privacy, {U, S}, Default, Lists}) ->
US = {list_to_binary(U), list_to_binary(S)},
lists:foreach( lists:foreach(
fun({Name, List}) -> fun({Name, List}) ->
NameBin = list_to_binary(Name),
lists:foreach( lists:foreach(
fun(#listitem{type = Type, fun(#listitem{type = Type,
value = Value, value = Value,
@ -839,7 +832,7 @@ update_tables(Host, mnesia) ->
ValueBin = convert_value_to_binary(Value), ValueBin = convert_value_to_binary(Value),
gen_storage:write(HostB, gen_storage:write(HostB,
#privacy_list_data{user_host = US, #privacy_list_data{user_host = US,
name = Name, name = NameBin,
type = Type, type = Type,
value = ValueBin, value = ValueBin,
action = Action, action = Action,
@ -852,12 +845,13 @@ update_tables(Host, mnesia) ->
end, List), end, List),
gen_storage:write(HostB, gen_storage:write(HostB,
#privacy_list{user_host = US, #privacy_list{user_host = US,
name = Name}) name = NameBin})
end, Lists), end, Lists),
if if
is_list(Default) -> is_list(Default) ->
DefaultBin = list_to_binary(Default),
#privacy_default_list{user_host = US, #privacy_default_list{user_host = US,
name = Default}; name = DefaultBin};
true -> null true -> null
end end
end}]); end}]);