diff options
Diffstat (limited to '')
| -rw-r--r-- | src/mod_roster.erl | 9 | ||||
| -rw-r--r-- | src/mod_vcard.erl | 154 | ||||
| -rw-r--r-- | src/namespaces.hrl | 1 | ||||
| -rw-r--r-- | src/sha.erl | 38 | ||||
| -rw-r--r-- | src/xml.erl | 24 |
5 files changed, 146 insertions, 80 deletions
diff --git a/src/mod_roster.erl b/src/mod_roster.erl index a25f923e..281a7094 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -20,6 +20,7 @@ -include_lib("mnemosyne/include/mnemosyne.hrl"). -include("ejabberd.hrl"). +-include("namespaces.hrl"). -record(roster, {uj, user, @@ -40,7 +41,7 @@ init() -> mnesia:create_table(roster,[{disc_copies, [node()]}, {attributes, record_info(fields, roster)}]), mnesia:add_table_index(roster, user), - ejabberd_local:register_iq_handler("jabber:iq:roster", + ejabberd_local:register_iq_handler(?NS_ROSTER, ?MODULE, process_iq), loop(). @@ -91,7 +92,7 @@ process_iq_get(From, To, {iq, ID, Type, XMLNS, SubEl}) -> {atomic, Items} -> XItems = lists:map(fun item_to_xml/1, Items), {iq, ID, result, XMLNS, [{xmlelement, "query", - [{"xmlns", "jabber:iq:roster"}], + [{"xmlns", ?NS_ROSTER}], XItems}]}; _ -> {iq, ID, error, XMLNS, @@ -244,9 +245,9 @@ push_item(User, From, Item) -> % TODO: don't push to those who not load roster push_item(User, Resource, From, Item) -> - ResIQ = {iq, "", set, "jabber:iq:roster", + ResIQ = {iq, "", set, ?NS_ROSTER, [{xmlelement, "query", - [{"xmlns", "jabber:iq:roster"}], + [{"xmlns", ?NS_ROSTER}], [item_to_xml(Item)]}]}, ejabberd_router ! {route, From, diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index b1312e3b..6ddf9094 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -12,15 +12,26 @@ -export([start/0, init/0, process_local_iq/3, - process_sm_iq/3]). + process_sm_iq/3, + reindex_vcards/0]). -include("ejabberd.hrl"). -include("namespaces.hrl"). --record(vcard_search, {user, fn, family, given, middle, nickname, - bday, ctry="", locality="", email, - orgname, orgunit}). +-record(vcard_search, {user, luser, + fn, lfn, + family, lfamily, + given, lgiven, + middle, lmiddle, + nickname, lnickname, + bday, lbday, + ctry, lctry, + locality, llocality, + email, lemail, + orgname, lorgname, + orgunit, lorgunit + }). -record(vcard, {user, vcard}). @@ -30,17 +41,17 @@ start() -> mnesia:create_table(vcard_search, [{disc_copies, [node()]}, {attributes, record_info(fields, vcard_search)}]), - mnesia:add_table_index(vcard_search, fn), - mnesia:add_table_index(vcard_search, family), - mnesia:add_table_index(vcard_search, given), - mnesia:add_table_index(vcard_search, middle), - mnesia:add_table_index(vcard_search, nickname), - mnesia:add_table_index(vcard_search, bday), - mnesia:add_table_index(vcard_search, ctry), - mnesia:add_table_index(vcard_search, locality), - mnesia:add_table_index(vcard_search, email), - mnesia:add_table_index(vcard_search, orgname), - mnesia:add_table_index(vcard_search, orgunit), + mnesia:add_table_index(vcard_search, lfn), + mnesia:add_table_index(vcard_search, lfamily), + mnesia:add_table_index(vcard_search, lgiven), + mnesia:add_table_index(vcard_search, lmiddle), + mnesia:add_table_index(vcard_search, lnickname), + mnesia:add_table_index(vcard_search, lbday), + mnesia:add_table_index(vcard_search, lctry), + mnesia:add_table_index(vcard_search, llocality), + mnesia:add_table_index(vcard_search, lemail), + mnesia:add_table_index(vcard_search, lorgname), + mnesia:add_table_index(vcard_search, lorgunit), ejabberd_local:register_iq_handler(?NS_VCARD, @@ -71,7 +82,7 @@ process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -> LServer = jlib:tolower(Server), case ?MYNAME of LServer -> - set_vcard(LUser, SubEl), + set_vcard(User, SubEl), {iq, ID, result, XMLNS, []}; _ -> {iq, ID, error, XMLNS, @@ -120,8 +131,7 @@ process_sm_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -> {iq, ID, result, XMLNS, Els} end. - -set_vcard(LUser, VCARD) -> +set_vcard(User, VCARD) -> FN = xml:get_path_s(VCARD, [{elem, "FN"}, cdata]), Family = xml:get_path_s(VCARD, [{elem, "N"}, {elem, "FAMILY"}, cdata]), Given = xml:get_path_s(VCARD, [{elem, "N"}, {elem, "GIVEN"}, cdata]), @@ -134,6 +144,7 @@ set_vcard(LUser, VCARD) -> OrgName = xml:get_path_s(VCARD, [{elem, "ORG"}, {elem, "ORGNAME"}, cdata]), OrgUnit = xml:get_path_s(VCARD, [{elem, "ORG"}, {elem, "ORGUNIT"}, cdata]), + LUser = jlib:tolower(User), LFN = jlib:tolower(FN), LFamily = jlib:tolower(Family), LGiven = jlib:tolower(Given), @@ -148,19 +159,20 @@ set_vcard(LUser, VCARD) -> F = fun() -> mnesia:write(#vcard{user = LUser, vcard = VCARD}), - mnesia:write(#vcard_search{user = LUser, - fn = LFN, - family = LFamily, - given = LGiven, - middle = LMiddle, - nickname = LNickname, - bday = LBDay, - ctry = LCTRY, - locality = LLocality, - email = LEMail, - orgname = LOrgName, - orgunit = LOrgUnit - }) + mnesia:write( + #vcard_search{user = User, luser = LUser, + fn = FN, lfn = LFN, + family = Family, lfamily = LFamily, + given = Given, lgiven = LGiven, + middle = Middle, lmiddle = LMiddle, + nickname = Nickname, lnickname = LNickname, + bday = BDay, lbday = LBDay, + ctry = CTRY, lctry = LCTRY, + locality = Locality, llocality = LLocality, + email = EMail, lemail = LEMail, + orgname = OrgName, lorgname = LOrgName, + orgunit = OrgUnit, lorgunit = LOrgUnit + }) end, mnesia:transaction(F). @@ -380,20 +392,76 @@ filter_fields([{SVar, [Val]} | Ds], Match) when is_list(Val) and (Val /= "") -> LVal = jlib:tolower(Val), NewMatch = case SVar of - "user" -> Match#vcard_search{user = LVal}; - "fn" -> Match#vcard_search{fn = LVal}; - "family" -> Match#vcard_search{family = LVal}; - "given" -> Match#vcard_search{given = LVal}; - "middle" -> Match#vcard_search{middle = LVal}; - "nickname" -> Match#vcard_search{nickname = LVal}; - "bday" -> Match#vcard_search{bday = LVal}; - "ctry" -> Match#vcard_search{ctry = LVal}; - "locality" -> Match#vcard_search{locality = LVal}; - "email" -> Match#vcard_search{email = LVal}; - "orgname" -> Match#vcard_search{orgname = LVal}; - "orgunit" -> Match#vcard_search{orgunit = LVal}; + "user" -> Match#vcard_search{luser = LVal}; + "fn" -> Match#vcard_search{lfn = LVal}; + "family" -> Match#vcard_search{lfamily = LVal}; + "given" -> Match#vcard_search{lgiven = LVal}; + "middle" -> Match#vcard_search{lmiddle = LVal}; + "nickname" -> Match#vcard_search{lnickname = LVal}; + "bday" -> Match#vcard_search{lbday = LVal}; + "ctry" -> Match#vcard_search{lctry = LVal}; + "locality" -> Match#vcard_search{llocality = LVal}; + "email" -> Match#vcard_search{lemail = LVal}; + "orgname" -> Match#vcard_search{lorgname = LVal}; + "orgunit" -> Match#vcard_search{lorgunit = LVal}; _ -> Match end, filter_fields(Ds, NewMatch); filter_fields([_ | Ds], Match) -> filter_fields(Ds, Match). + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +set_vcard_t(R, _) -> + User = R#vcard.user, + VCARD = R#vcard.vcard, + + FN = xml:get_path_s(VCARD, [{elem, "FN"}, cdata]), + Family = xml:get_path_s(VCARD, [{elem, "N"}, {elem, "FAMILY"}, cdata]), + Given = xml:get_path_s(VCARD, [{elem, "N"}, {elem, "GIVEN"}, cdata]), + Middle = xml:get_path_s(VCARD, [{elem, "N"}, {elem, "MIDDLE"}, cdata]), + Nickname = xml:get_path_s(VCARD, [{elem, "NICKNAME"}, cdata]), + BDay = xml:get_path_s(VCARD, [{elem, "BDAY"}, cdata]), + CTRY = xml:get_path_s(VCARD, [{elem, "ADR"}, {elem, "CTRY"}, cdata]), + Locality = xml:get_path_s(VCARD, [{elem, "ADR"}, {elem, "LOCALITY"},cdata]), + EMail = xml:get_path_s(VCARD, [{elem, "EMAIL"}, cdata]), + OrgName = xml:get_path_s(VCARD, [{elem, "ORG"}, {elem, "ORGNAME"}, cdata]), + OrgUnit = xml:get_path_s(VCARD, [{elem, "ORG"}, {elem, "ORGUNIT"}, cdata]), + + LUser = jlib:tolower(User), + LFN = jlib:tolower(FN), + LFamily = jlib:tolower(Family), + LGiven = jlib:tolower(Given), + LMiddle = jlib:tolower(Middle), + LNickname = jlib:tolower(Nickname), + LBDay = jlib:tolower(BDay), + LCTRY = jlib:tolower(CTRY), + LLocality = jlib:tolower(Locality), + LEMail = jlib:tolower(EMail), + LOrgName = jlib:tolower(OrgName), + LOrgUnit = jlib:tolower(OrgUnit), + + mnesia:write( + #vcard_search{user = User, luser = LUser, + fn = FN, lfn = LFN, + family = Family, lfamily = LFamily, + given = Given, lgiven = LGiven, + middle = Middle, lmiddle = LMiddle, + nickname = Nickname, lnickname = LNickname, + bday = BDay, lbday = LBDay, + ctry = CTRY, lctry = LCTRY, + locality = Locality, llocality = LLocality, + email = EMail, lemail = LEMail, + orgname = OrgName, lorgname = LOrgName, + orgunit = OrgUnit, lorgunit = LOrgUnit + }). + + +reindex_vcards() -> + F = fun() -> + mnesia:foldl(fun set_vcard_t/2, [], vcard) + end, + mnesia:transaction(F). + + diff --git a/src/namespaces.hrl b/src/namespaces.hrl index 222b2d8b..671fe86a 100644 --- a/src/namespaces.hrl +++ b/src/namespaces.hrl @@ -9,6 +9,7 @@ -define(NS_DISCO_INFO, "http://jabber.org/protocol/disco#info"). -define(NS_VCARD, "vcard-temp"). -define(NS_SEARCH, "jabber:iq:search"). +-define(NS_ROSTER, "jabber:iq:roster"). -define(NS_XDATA, "jabber:x:data"). -define(NS_DELAY, "jabber:x:delay"). -define(NS_EVENT, "jabber:x:event"). diff --git a/src/sha.erl b/src/sha.erl index b0339b1a..f48d6928 100644 --- a/src/sha.erl +++ b/src/sha.erl @@ -10,33 +10,23 @@ -author('alexey@sevcom.net'). -vsn('$Revision$ '). --export([start/0, init/0, sha/1]). +-export([start/0, sha/1]). start() -> - register(sha, spawn(?MODULE, init, [])). + crypto:start(). -init() -> - ok = erl_ddll:load_driver(".", sha_erl), - Port = open_port({spawn, sha_erl}, [binary]), - loop(Port). - -loop(Port) -> - receive - {From, {text, Str}} -> - Port ! {self(), {command, Str}}, - SHA = receive - {Port, {data, Bin}} -> - binary_to_term(Bin) - end, - From ! {sha, SHA}, - loop(Port) - end. +digit_to_xchar(D) when (D >= 0) and (D < 10) -> + D + 48; +digit_to_xchar(D) -> + D + 87. sha(Text) -> - sha ! {self(), {text, Text}}, - receive - {sha, S} -> - S - end. - + Bin = crypto:sha(Text), + lists:reverse(ints_to_rxstr(binary_to_list(Bin), [])). + +ints_to_rxstr([], Res) -> + Res; +ints_to_rxstr([N | Ns], Res) -> + ints_to_rxstr(Ns, [digit_to_xchar(N rem 16), + digit_to_xchar(N div 16) | Res]). diff --git a/src/xml.erl b/src/xml.erl index 00b7087d..1c5d9213 100644 --- a/src/xml.erl +++ b/src/xml.erl @@ -57,15 +57,21 @@ crypt([], R) -> R. -remove_cdata(L) -> - lists:reverse(remove_cdata(L, [])). - -remove_cdata([{xmlelement, Name, Attrs, Els} | L], R) -> - remove_cdata(L, [{xmlelement, Name, Attrs, Els} | R]); -remove_cdata([{xmlcdata, CData} | L], R) -> - remove_cdata(L, R); -remove_cdata([], R) -> - R. +remove_cdata_p({xmlelement, Name, Attrs, Els}) -> true; +remove_cdata_p(_) -> false. + +remove_cdata(L) -> [E || E <- L, remove_cdata_p(E)]. + + +%remove_cdata(L) -> +% lists:reverse(remove_cdata(L, [])). +% +%remove_cdata([{xmlelement, Name, Attrs, Els} | L], R) -> +% remove_cdata(L, [{xmlelement, Name, Attrs, Els} | R]); +%remove_cdata([{xmlcdata, CData} | L], R) -> +% remove_cdata(L, R); +%remove_cdata([], R) -> +% R. get_cdata(L) -> get_cdata(L, ""). |