Pablo Polvorin
02eeebd41a
Fix mod_ack, make it work with both oor and normal clients.
...
If the client is able to go to oor, mod_ack must made it do so.
If the client is not able to to go oor mode, mod_ack must stop
the c2s session, and wait for it to really terminate before
continuing (to avoid race conditions, see EJABS-1677).
Conflicts:
src/ejabberd_c2s.erl
src/mod_ack.erl
src/mod_ping.erl
2012-09-13 14:05:36 -03:00
Christophe Romain
011535f0de
binary refactoring
2012-09-11 15:45:59 +02:00
Christophe Romain
7d7c739cb3
Merge remote-tracking branch 'mainline/2.1.x' into 2.2.x
2012-02-23 16:59:22 +01:00
Alexey Shchepin
b1e2538488
Update copyright dates
2012-02-23 17:52:34 +02:00
Alexey Shchepin
ea6e85d926
Use separate timer for C2S_OPEN_TIMEOUT
2012-02-03 17:53:05 +02:00
Evgeniy Khramtsov
2948cddebf
Check a node of a receiver, not a monitor.
...
This should fix the previous commit (EJABS-1798)
2012-01-04 16:43:10 +10:00
Evgeniy Khramtsov
438dc57def
Merge branch '2.2.x' of git+ssh://gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2012-01-03 11:26:32 +10:00
Evgeniy Khramtsov
4d64fbb0ac
Also migrate C2S sessions with remote receivers (EJABS-1798)
2012-01-03 11:25:55 +10:00
Christophe Romain
e0781d9217
merge from 2.1.10 and resolve conflicts
2011-12-30 11:33:34 +01:00
Alexey Shchepin
39acf823ef
Ignore CDATA ping while not in session_established state
2011-12-21 09:40:30 +02:00
Evgeniy Khramtsov
944791e888
Fix presence problem after first unavailable (thanks to Christopher Faulet) (EJAB-1466)
2011-11-09 15:09:02 +10:00
Evgeniy Khramtsov
54acf9bde4
Do not send <success/> twice when SCRAM-SHA-1 is used.
...
This is a merge bug actually
2011-09-15 19:24:41 +10:00
Badlop
dd772404c5
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/configure
src/ejabberd.app
src/ejabberd_auth_anonymous.erl
src/ejabberd_c2s.erl
src/ejabberd_sm.erl
2011-08-24 18:29:25 +02:00
Badlop
a0f8a2c3a4
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
2011-08-17 19:44:39 +02:00
Badlop
e80b92b481
Preliminary patch for SASL SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:25:03 +02:00
Evgeniy Khramtsov
5bef1a8f77
Now it is possible to migrate C2S/BOSH/MUC sessions.
...
Example usage:
$ ejabberdctl stop_migrate 30
This will migrate c2s/bosh/muc processes smoothly within 30 seconds and stop ejabberd.
The commit also resolves EJABS-1661
2011-08-13 19:05:21 +10:00
Evgeniy Khramtsov
4f1637fa40
Implement BOSH session migration
2011-08-12 23:48:39 +10:00
Evgeniy Khramtsov
302294faec
HTTP prebinding support (TECH-1327)
...
Example configuration:
{modules,
[
...
{mod_http_bind, [{prebind, true}]},
...
]}
2011-07-06 18:04:26 +10:00
Evgeniy Khramtsov
41fad8956b
Merge branch '2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd_c2s.erl
2011-05-30 23:29:41 +10:00
Badlop
bfebcebeb7
Support XEP-0191 Simple Communications Blocking (thanks to Stephan Maka)(EJAB-695)
2011-05-27 11:47:22 +02:00
Evgeniy Khramtsov
8806fdc1c2
Implement C2S redirection
...
- The feature is based on <see-other-host/> stream error, see RFC6120, 4.9.3.19
- To enable the feature you must set {redirect, true} in C2S listener section and set global "hostname" option on all nodes in cluster. The hostname must be string in the form as described in the RFC, for example: "foo.org", "foo.org:5222", "1.2.3.4", "[2001:41D0:1:A49b::1]:9222" and so on
2011-05-09 14:02:08 +10:00
Evgeniy Khramtsov
1922bf21f0
Do not try to start TLS twice when front-end socket is used
2011-05-05 19:02:34 +10:00
Evgeniy Khramtsov
49365da481
Stringprep JID before get_node calculation
2011-04-27 15:22:25 +10:00
Evgeniy Khramtsov
4a2f62062e
New migration procedure
2011-04-27 15:07:10 +10:00
Alexey Shchepin
494add4fd0
Updated rebind from the latest 2.2.x-applepush branch
2011-03-21 19:11:05 +02:00
Christophe Romain
f39ccd73c5
Merge remote branch 'mainline/2.1.x' into 2.2.x
2011-02-14 13:54:06 +01:00
Christophe Romain
fd52f2cb7d
update copyright up to 2011
2011-02-14 13:50:55 +01:00
Badlop
14b39a0ee4
Merge remote branch 'origin/2.1.x' into 2.2.x
...
Conflicts:
src/web/ejabberd_http_bind.erl
2011-01-31 18:57:13 +01:00
Badlop
36166aa40e
Comment unused code
2011-01-28 12:11:34 +01:00
Eric Cestari
92b6c12420
Merge branch '2.2.x' of gitorious.process-one.net:+ejabberd-developers/ejabberd/maincustomers into 2.2.x
2011-01-07 15:54:00 +01:00
Mickaël Rémond
4a9e7f0a3a
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-05 14:36:21 +01:00
Mickaël Rémond
bd43505db9
Use route instead of send_element to go through standard workflow Offline messages should thus be tracked for ack if needed (TEXTO-226).
...
Signed-off-by: Evgeniy Khramtsov <ekhramtsov@process-one.net>
2011-01-04 15:21:10 +01:00
Evgeniy Khramtsov
149f8e2b45
Merge remote branch 'mainline-2.1.x/2.1.x' into 2.2.x
...
Conflicts:
src/ejabberd.app
2010-12-28 21:17:01 +09:00
Evgeniy Khramtsov
4c8b034874
Change c2s state before offline messages resending
2010-12-28 21:09:15 +09:00
Eric Cestari
2ab31cb613
Merge branch '2.2.x-applepush' into 2.2.x
...
Without applepush
Conflicts:
src/ejabberd_c2s.erl
src/ejabberd_c2s.hrl
2010-12-23 15:30:14 +01:00
Evgeniy Khramtsov
02cfb11a6d
Merge branch '2.1.x' into mergefix
...
Conflicts:
.gitignore
src/ejabberd.app
src/ejabberd_c2s.erl
src/ejabberd_captcha.erl
src/ejabberd_node_groups.erl
src/mod_caps.erl
src/web/ejabberd_http.erl
src/web/ejabberd_http_bind.erl
2010-12-14 23:10:08 +09:00
Alexey Shchepin
31e4ccf78b
Fixed "To" variable in ejabberd_c2s:roster_change
2010-12-03 16:39:04 +02:00
Christophe Romain
f0a848ef45
fix pubsub cross domain eventing (EJAB-1340)
2010-12-02 13:56:45 +01:00
Evgeniy Khramtsov
9f3cdad3f7
Do not add "jabber ❌ delay" more than once
2010-12-01 15:19:07 +02:00
Christopher tofu Zorn
3e24408710
add the ability to send raw xml packets over http bind
2010-11-29 20:05:37 +01:00
Evgeniy Khramtsov
b8d6aee1ce
Merge branch 'caps' into 2.1.x
...
Conflicts:
src/ejabberd_c2s.erl
2010-11-24 16:45:05 +09:00
Badlop
9b88fd6646
Fix some English strings
2010-11-19 13:44:30 +01:00
Andreas Köhler
510fd8cf73
Before forwarding last activity requests to a user, check that the user's presence is visible for From
...
According to XEP-0012, 4. Online User Query, "if the requesting entity
is not authorized to view the user's presence information (normally via
a presence subscription as defined in XMPP IM), the user's server MUST
NOT deliver the IQ-get to an available resource but instead MUST return
a <forbidden/> error in response to the last activity request."
So check for a subscription of from of the jid and bare jid and whether
outgoing presences to From are allowed.
Fixes problem 3 of EJAB-1158.
2010-11-10 15:40:01 +01:00
Andreas Köhler
080922a3de
Remove dead code for NS_VCARD iq packets from ejabberd_c2s
...
For EJAB-1045, the special NS_VCARD block for handling incoming vcard
iqs on behalf of clients has already been restricted to cases where the
user or resource part of the recipient is empty. But then the packets
should not have been routed to the c2s process anyway. This patch
completely removes it.
2010-11-10 15:40:00 +01:00
Andreas Köhler
cb7d8c8ead
Use ejabberd_c2s:privacy_check_packet/5 for all those hook folded runs in the c2s module
2010-11-10 15:39:59 +01:00
Andreas Köhler
c47252aea1
Use c2s state data as user and server in ejabberd_c2s:is_privacy_allow
...
is_privacy_allow is only used in ejabberd_c2s:handle_info/3 to determine
for a few presence types whether the packet is allowed to be forwarded
to the user's client. This only makes sense if To#jid.user and
To#jid.server match StateData#state.user and StateData#state.server.
Also, add the atom in as parameter to a new argument Dir of
is_privacy_allow and extract from that function
privacy_check_packet(StateData, From, To, Packet, Dir) which runs the
privavcy check without converting allow/deny to true/false.
2010-11-10 15:39:57 +01:00
Evgeniy Khramtsov
1f16e4783c
Take care of xml:lang attribute in unauthenticated stanzas as well
2010-11-06 13:58:52 +09:00
Evgeniy Khramtsov
c4289095e0
Do not store long language tag to avoid possible DoS/flood attacks
2010-11-05 05:10:18 +09:00
Badlop
2d59efb515
Fix crash in ejabberd_c2s when blacklist hook returned true (thanks to Jonas Ådahl)
...
Cause of the crash jlib:ip_to_list/1 only supports IP tuples using the
form {N1,N2,N3,N4} which is not the case when IPv6 is enabled.
2010-11-02 13:51:36 +01:00
Alexey Shchepin
aea394861d
Added a protocol for a client to send the number of local unread messages
...
Conflicts:
src/ejabberd_c2s.erl
2010-10-25 10:09:06 +03:00