Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-01 17:53:00 +01:00
Code Releases Activity

* src/ejabberd_service.erl: Fix XEP-0114 compliance: define xmlns

Browse Source 
in header of error response; check the connection is attempted to
a served component; include in response the JID of served
component not server (thanks to Sergei Golovan)

SVN Revision: 1516
This commit is contained in:
Badlop 2008-08-09 18:08:00 +00:00
parent fa86e6aa85
commit 62f22e8976
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-08-09 Badlop <badlop@process-one.net>
* src/ejabberd_service.erl: Fix XEP-0114 compliance: define xmlns
in header of error response; check the connection is attempted to
a served component; include in response the JID of served
component not server (thanks to Sergei Golovan)
2008-08-04 Jerome Sautret <jerome.sautret@process-one.net> 2008-08-04 Jerome Sautret <jerome.sautret@process-one.net>
* src/odbc/ejabberd_odbc.erl: Restart the database connection when * src/odbc/ejabberd_odbc.erl: Restart the database connection when

30
src/ejabberd_service.erl
View File

@ -1,7 +1,7 @@
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
%%% File : ejabberd_service.erl %%% File : ejabberd_service.erl
%%% Author : Alexey Shchepin <alexey@process-one.net> %%% Author : Alexey Shchepin <alexey@process-one.net>
%%% Purpose : External component management %%% Purpose : External component management (XEP-0114)
%%% Created : 6 Dec 2002 by Alexey Shchepin <alexey@process-one.net> %%% Created : 6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
%%% %%%
%%% %%%
@ -73,11 +73,19 @@
-define(STREAM_TRAILER, "</stream:stream>"). -define(STREAM_TRAILER, "</stream:stream>").
-define(INVALID_HEADER_ERR, -define(INVALID_HEADER_ERR,
"<stream:stream>" "<stream:stream "
"xmlns:stream='http://etherx.jabber.org/streams'>"
"<stream:error>Invalid Stream Header</stream:error>" "<stream:error>Invalid Stream Header</stream:error>"
"</stream:stream>" "</stream:stream>"
). ).
-define(HOST_UNKNOWN_ERR,
"<stream:stream "
"xmlns:stream='http://etherx.jabber.org/streams'>"
"<stream:error>Host Unknown</stream:error>"
"</stream:stream>"
).
-define(INVALID_HANDSHAKE_ERR, -define(INVALID_HANDSHAKE_ERR,
"<stream:error>Invalid Handshake</stream:error>" "<stream:error>Invalid Handshake</stream:error>"
"</stream:stream>" "</stream:stream>"
@ -168,13 +176,21 @@ init([{SockMod, Socket}, Opts]) ->
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) -> wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
% TODO
case xml:get_attr_s("xmlns", Attrs) of case xml:get_attr_s("xmlns", Attrs) of
"jabber:component:accept" -> "jabber:component:accept" ->
Header = io_lib:format(?STREAM_HEADER, %% Check that destination is a served component
[StateData#state.streamid, ?MYNAME]), To = xml:get_attr_s("to", Attrs),
send_text(StateData, Header), case lists:member(To, StateData#state.hosts) of
{next_state, wait_for_handshake, StateData}; true ->
Header = io_lib:format(?STREAM_HEADER,
[StateData#state.streamid,
xml:crypt(To)]),
send_text(StateData, Header),
{next_state, wait_for_handshake, StateData};
_ ->
send_text(StateData, ?HOST_UNKNOWN_ERR),
{stop, normal, StateData}
end;
_ -> _ ->
send_text(StateData, ?INVALID_HEADER_ERR), send_text(StateData, ?INVALID_HEADER_ERR),
{stop, normal, StateData} {stop, normal, StateData}