b1ef38f627
Merge remote-tracking branch 'upstream/master'
2012-03-07 16:08:48 +08:00
2905b90c41
Update copyright dates
2012-02-23 17:47:43 +02:00
b4c2a3b85f
Fix a crash in debug prints of XML messages
2012-02-21 05:28:08 +08:00
80188d3a52
Fix presence problem after first unavailable (thanks to Christopher Faulet) (EJAB-1466)
2011-11-09 15:11:50 +10:00
adc4a7f67c
Fix zlib compression connection (EJAB-1448)
2011-09-03 00:06:53 +02:00
fef8c3a1f3
New option resource_conflict defines server action (thanks to Lee Boynton)(EJAB-650)
2011-08-17 19:44:56 +02:00
24f5c964cd
New SASL authentication method: SCRAM-SHA-1 (thanks to Stephen Röttger)(EJAB-1196)
2011-08-16 00:28:25 +02:00
d09acc8231
Fix flash client patch
2011-07-18 21:56:23 +02:00
72e3e0e6ad
Ported flash clients patch from 2.1.x
2011-07-08 18:17:05 +03:00
82296c277a
Support XEP-0191 Simple Communications Blocking (thanks to Stephan Maka)(EJAB-695)
2011-05-27 11:54:50 +02:00
f839b1c6ff
Log this cached exception as DEBUG in ejabberd log file
2011-05-04 23:04:07 +02:00
71bfa17354
Fix crash when SASL PLAIN denies auth (EJAB-1425)
2011-03-16 18:38:44 +01:00
4a2005f7cc
update copyright up to 2011
2011-02-14 13:47:22 +01:00
70a2200888
Fix initial presence after roster subscription approval (EJAB-1384)
...
Send initial presence after the roster subscription workflow
is complete.
2011-01-27 11:05:16 -03:00
a4728d14d5
Change c2s state before offline messages resending
2010-12-28 21:12:33 +09:00
f2925d8efc
new caps processing and related fixes in ejabberd_c2s.erl and miscellaneous fixes in mod_pubsub.erl (Thanks to Karim Gemayel)(EJAB-620)
2010-12-24 16:21:28 +01:00
980d9c37ea
Fix bug introduced with an old commit (EJAB-72)
2010-12-23 19:19:00 +01:00
fe909a45e9
Allow auth modules to provide SASL errors; default is "not-authorized".
...
See
http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09#section-7.4
2010-12-23 13:27:24 +01:00
9afaec40f5
fix pubsub cross domain eventing (EJAB-1340)
2010-12-02 14:05:19 +01:00
c9db1f691c
Merge branch 'master' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline
2010-11-29 16:56:32 -03:00
ef572c815f
Port to latest exmpp changes (attribute names as binary()).
...
All atributes are now binary() instead of atoms.
2010-11-29 16:44:31 -03:00
312574cbc5
add the ability to send raw xml packets over http bind
2010-11-29 20:06:00 +01:00
7d93cad452
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:41:08 +01:00
860d8525ee
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:41:07 +01:00
351635d0aa
Use ejabberd_c2s:privacy_check_packet/5 for all those hook folded runs in the c2s module
2010-11-10 15:41:06 +01:00
614f13714c
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:41:05 +01:00
e4a1eb4370
Take care of xml:lang attribute in unauthenticated stanzas as well
2010-11-06 21:53:16 +01:00
29fbe6d8e1
Do not store long language tag to avoid possible DoS/flood attacks
2010-11-06 21:53:13 +01:00
81546f3270
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 14:04:10 +01:00
16f0873488
Fix bug when routing error stanza
2010-10-16 22:51:51 +02:00
17b4aaa1f7
When privacy list denies local user's outgoing stanza, try to return error (EJAB-1320)
...
See:
http://xmpp.org/extensions/xep-0016.html#example-51
Example 51. Error: contact is blocked
2010-10-16 22:51:50 +02:00
eddbad2c76
Check privacy of outgoing Message stanzas (EJAB-1320)
2010-10-16 22:51:48 +02:00
ce9ce8293b
Merge branch 'master' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline
2010-10-12 10:57:07 -03:00
82a8dc7b3a
Cosmetic code changes to support emacs indentation
2010-10-07 17:38:18 +02:00
89a98be605
Display priority, login time, pid and pid info in webadmin (EJAB-1300)
2010-09-13 17:49:55 +02:00
0d5f20cae1
Include roster pack patch from Geoff
...
Patch was already applied to 2.x branch, but not yet ported to master.
2010-09-10 15:32:19 -03:00
8a5b08e3f0
New access option in mod_roster to disable changes (EJAB-72)
2010-07-30 13:21:58 +02:00
59a19ca87a
Don't offer SASL auth before doing TLS if TLS is required (thanks to Etan Reisner)
...
Originally reported in
http://yo.jabber.ru/bugzilla/show_bug.cgi?id=251
Implements:
http://tools.ietf.org/html/rfc3920#section-6.2
If Use of TLS (Section 5) needs to be
established before a particular authentication mechanism may be used, the
receiving entity MUST NOT provide that mechanism in the list of available SASL
authentication mechanisms prior to TLS negotiation.
2010-07-29 23:14:03 +02:00
07e459d577
Various fixes (EJAB-831)
2010-07-23 01:23:37 +02:00
aa791ad0c4
Support SASL GSSAPI authentication (thanks to Mikael Magnusson)(EJAB-831)
2010-07-23 01:23:35 +02:00
cdb379a22c
Patch core for MH (thanks to Alexey Shchepin and Geoff Cant)
2010-07-23 00:29:28 +02:00
f36da63a3a
Allow roster change from external component (TECH-1001)
2010-07-22 11:06:51 +02:00
de6675a433
Added catches to reset_stream calls to avoid errors during a race condition (thanks to Aleksey Shchepin)
2010-07-13 22:13:38 +02:00
67da88f0bd
Improve ejabberd's broadcast stanzas to satisfy #xmlel type
2010-06-18 21:24:51 +02:00
be111b6749
More remove support for XEP-0018 (EJAB-810)
2010-06-18 21:24:51 +02:00
b6711e407e
Remove support for the rejected XEP-0018 Invisible Presence (EJAB-810)
2010-06-17 22:43:15 +02:00
2187bccc38
consistent hashing support. WARNING: update exmpp before running this
2010-06-03 00:01:36 +10:00
41484213fd
Use multicast in C2S presence broadcast (EJAB-267)
2010-05-20 00:03:05 +02:00
110819525f
Partially revert "Fix more HTTP-Bind", add proper fix: c2s works again, BOSH not yet
2010-05-10 13:56:58 +02:00
92ec42565e
full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189)
2010-05-10 16:00:30 +10:00
Ben Homnick