Badlop
6374b5b1e7
Fix characters not allowed in username. Don't include that in translatable string.
...
List mentioned in:
http://xmpp.org/rfcs/rfc3920.html#nodeprep-prohibited
2010-11-29 19:34:26 +01:00
Badlop
26ac75bdc9
Support negative part-hour TZ values (thanks to Alexander Zhukov)(EJAB-1301)
2010-11-29 14:36:09 +01:00
Alexey Shchepin
1d1496a667
Don't loop when there is nothing after a stream start
2010-11-26 17:08:00 +01:00
Andreas Köhler
e34eebb5ad
Correct domain_certfile tlsopts modifications for s2s connections (EJAB-1086)
...
* In ejabberd_s2s_out:wait_for_feature_request/2, the domain to use for
looking up domain_certfile options is #state.myname and not
#state.server
* If s2s_certfile is not specified, connect should still be part of the
tls options used by ejabberd_s2s_out
* Add #state.server to ejabberd_s2s_in processes and store the to
attribute in :wait_for_stream/2. Then use that server in
:wait_for_feature_request/2 to change the tls options like in
ejabberd_s2s_out.
Fixes EJAB-1086.
2010-11-26 00:14:46 +01:00
Badlop
776930fa06
Update French translation (thanks to Nicolas Vérité)
2010-11-25 21:31:21 +01:00
Badlop
38af7c85a6
Update German translation (thanks to Nikolaus Polak)
2010-11-25 21:31:19 +01:00
Alexey Shchepin
b3facf092a
Don't loop when there is nothing after a stream start
2010-11-25 20:33:51 +02:00
Badlop
99b7a285d7
Update Japanese translation (thanks to Tsukasa Hamano)
2010-11-24 17:10:54 +01:00
Badlop
19e20f75d7
Update Chinese translation (thanks to Shelley Shyan)
2010-11-24 13:42:19 +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
Otavio Fernandes
48b768b5b0
Updating Brazilian Portuguese (pt_BR) translations for v2.1.6
2010-11-23 17:54:37 +01:00
Badlop
bd604945c9
Update Polish translation (thanks to Zbyszek Żółkiewski)
2010-11-23 13:07:14 +01:00
Badlop
0a59ebe405
Use pg2 from R14B in systems with older versions (EJAB-1349)
...
pg2_backport.erl is a copy of pg2.erl from Erlang/OTP R14B.
That module is used in ejabberd installations where an OTP
previous to R14 is installed.
2010-11-22 16:04:07 +01:00
Christophe Romain
32eaa01929
Revert "populate pubsub#roster_groups_allowed in node configuration options (EJAB-1344)"
...
This reverts commit dfaeb3bc88
.
2010-11-22 11:15:04 +01:00
Badlop
12aaa0125b
Update Russian translation (thanks to Evgeniy Khramtsov)
2010-11-19 15:15:47 +01:00
Badlop
cb7cd9abb8
Update translate files
2010-11-19 13:47:24 +01:00
Badlop
ca701e1675
Update the Spanish translation
2010-11-19 13:45:32 +01:00
Badlop
9b88fd6646
Fix some English strings
2010-11-19 13:44:30 +01:00
Badlop
76ca7ae7f0
Translate mod_register_web to Ukrainian (thanks to Rain)
2010-11-19 00:23:40 +01:00
Badlop
043effc3ce
Translate mod_register_web to Spanish
2010-11-17 23:16:46 +01:00
Badlop
4fd1a8ba63
Translate mod_register_web to Russian (thanks to Rain)
2010-11-17 22:42:43 +01:00
Badlop
36303fb4be
Update strings to translate
2010-11-17 22:36:56 +01:00
Badlop
808029b868
Fix http-bind supervisor to support multiple vhosts (EJAB-1321)
2010-11-17 20:31:28 +01:00
Andreas Köhler
cfd377b98e
Fix R12B5 compatibility in ejabberd_http_bind.erl (EJAB-1343)
...
erlang:max/2 and :min/2 are new functions
2010-11-17 13:01:17 +01:00
Andreas Köhler
6eeb355a22
Use LFrom and LTo consistently in ejabberd_s2s_in:stream_established/2 (EJAB-1342)
2010-11-17 12:57:05 +01:00
Evgeniy Khramtsov
a0e2e943b4
Do not start mod_proxy65 if it is unable to bind an address (EJAB-1336)
2010-11-17 18:13:19 +09:00
Evgeniy Khramtsov
78931d8efa
Use MEDIUMTEXT type for vcard avatars in MySQL schema (EJAB-1252)
2010-11-17 17:36:51 +09:00
Evgeniy Khramtsov
0d2a8cd04f
Do not print full error message when LDAP timeout occurs (EJAB-1324)
2010-11-17 17:14:47 +09:00
Evgeniy Khramtsov
97087eb3b9
Set SSL_MODE_RELEASE_BUFFERS mode when available (EJAB-1351)
2010-11-17 13:54:27 +09:00
Badlop
6eeef62ce4
Provide new, not old, affiliation in kick/ban presence with codes 321 and 301
2010-11-16 00:03:09 +01:00
Evgeniy Khramtsov
0ccff15599
Strip status when needed in presence-unavailable as well
2010-11-15 13:47:31 +09:00
Badlop
325fb8caef
Fix typos in the example configuration file
2010-11-12 21:24:01 +01:00
Andreas Köhler
18ef908759
Before binding tcp ports, checks the socket type and listener options
...
If the callback module has a socket type of independent and needs to
create the listener itself, do not pre-bind the port. The same holds if
there are errors in the listener configuration.
2010-11-10 23:46:18 +01:00
Andreas Köhler
1f1d2bd5f5
Bind listener ports early and start accepting connections later
...
It may happen that auth or rdbms client tcp connections bind a local
socket to a port number required by a configered listener. The ejabberd
applications fails to start up and needs to be restarted.
In plain C you would bind(2) the listener port and listen(2) later on.
gen_tcp:listen/2 does not allow to separate these two steps though, so
another way is not to accept connections while start up. OTOH, the
kernel will syn/ack incoming connections and receive data, leaving them
in a buffer for the ejabberd to read from. If this is unwanted, a load
balancer would need to receive data from the ejabberd server before
adding the node to its pool.
This patch binds tcp ports while initializing the ejabberd_listener
process, storing ListenSockets in an ets table. start_listeners/0 will
reuse these ports later on.
2010-11-10 23:46:16 +01:00
Andreas Köhler
0c484369c9
In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one
...
Fixes problem 2 of EJAB-1158.
2010-11-10 15:40:04 +01:00
Andreas Köhler
100f2e9a13
Refactor mod_last to use the same core get_last/2 functionality, but keep api stable
...
The local function get_last/4 has been renamed to get_last_iq/4, since
it converts the result of get_last/2 (typically {ok, TimeStamp, Status})
to an iq packet.
2010-11-10 15:40:03 +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
Andreas Köhler
f96074057c
Correct error responses of forbidden offline last activity queries
...
According to XEP-0012 Last Activity, the server must return iq errors
with forbidden instead of not-allowed.
Fixes problem 1 of EJAB-1158.
2010-11-10 15:39:55 +01:00
Christophe Romain
dfaeb3bc88
populate pubsub#roster_groups_allowed in node configuration options (thanks to Karim Gemayel)(EJAB-1344)
2010-11-10 15:15:03 +01:00
Christophe Romain
c31f59e326
fix bad plugin order issue injected in previous patch (EJAB-1286)
2010-11-09 14:32:40 +01:00
Andreas Köhler
7c2b9eaf97
Correct privacy check direction in mod_last (EJAB-1339)
...
The change for EJAB-1271 to change the direction of the privacy check
from out to in violates the idea that the check should imitate a
subscription state check of from. Rather correct the order of the From
and To parameters.
2010-11-09 13:57:57 +01:00
Andreas Köhler
79f5251d69
Change max restart strategy of ejabberd_odbc_sup to handle some SQL timeouts.
2010-11-08 18:41:03 +01:00
Christophe Romain
917e8640c2
avoid node_call to break transaction (thanks to Karim Gemayel)(EJAB-1286)
2010-11-08 11:16:51 +01:00
Andreas Köhler
c4bc0e7252
Re-raise exceptions caught in gen_mod:start_module/3 (EJAB-1335)
...
Modules configured by the administrator normally should not be treated
as optional, so a exception (error, exit, throw) to start them should not
be caught and logged only.
This patch re-raises a caught exception instead of ignoring the
exception and inserting the module's opts on success. That way
gen_mod:get_module_opt/4 should work while calling Module:start/2.
2010-11-07 00:49:52 +01:00
Evgeniy Khramtsov
1f16e4783c
Take care of xml:lang attribute in unauthenticated stanzas as well
2010-11-06 13:58:52 +09:00
Badlop
7f3a5066c6
New ip_access option restricts which IPs can register (thanks to Alexey Shchepin)(EJAB-915)
2010-11-05 19:33:52 +01:00
Badlop
6f3713a67d
Disable mod_register_web in default config because by default captcha is disabled
2010-11-05 19:33:50 +01:00
Badlop
f672fd0824
Added mod_register_web: web page for account registration (EJAB-471)
2010-11-05 18:19:52 +01:00
Evgeniy Khramtsov
60b36beda8
Disable LRU caching algorithm for LDAP shared rosters
2010-11-05 17:01:18 +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
Evgeniy Khramtsov
31757116fc
LDAP shared roster support (thanks to Realloc and Marcin Owsiany)
2010-11-05 02:34:45 +09:00
Christophe Romain
70c1e1d0b1
enforce pubsub cleaner
2010-11-04 16:54:24 +01:00
Jonas Ådahl
2f68733708
Fixes a leak of ejabberd_receiver processes.
...
When a (non-frontend) socket module without any custom receiver fails to
start, the newly created ejabberd_receiver process needs to be properly
closed.
2010-11-03 17:10:52 +01:00
Badlop
184ec38510
Implement the mod_irc option default_encoding, it was already documented
...
Related:
http://www.ejabberd.im/node/4270#comment-56609
http://www.ejabberd.im/node/4270#comment-56780
2010-11-02 22:40:08 +01: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
Evgeniy Khramtsov
195d22d906
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-11-01 22:23:01 +09:00
Evgeniy Khramtsov
ab80513755
Do not run set_last request inside a transaction
2010-11-01 22:22:41 +09:00
Badlop
8a116411bb
Fix errors in EDoc comments
2010-10-28 18:48:27 +02:00
Badlop
bd3889b6ec
Include a Required xml element in the captcha field
2010-10-27 00:50:17 +02:00
Andreas Köhler
400fb69f15
Ignore Length argument to tls:recv/[23] (EJAB-1327)
...
The Length argument cannot be used for gen_tcp:recv/3, because the
compressed size does not equal the desired uncompressed one.
2010-10-26 19:32:15 +02:00
Andreas Köhler
9da45d40c7
Re-use the TLSSock argument in tls:send/2 (EJAB-1327)
2010-10-26 19:30:32 +02:00
Evgeniy Khramtsov
23db206ea1
* Add top-level instructions for x:data incompatible clients
...
* Remove trailing dot
2010-10-26 03:47:14 +10:00
Badlop
964b7b6b67
Changes in registration form to workaround client problems (EJAB-1262)
...
Changes included:
* Remove var in fixed field because Gajim and Tkabber display it to user
* Add workaround for Psi's overlap fields
* Add var=url attribute, required by Psi to display the field
* Provide the image URL as a copy-able form field
2010-10-25 19:00:52 +02:00
Badlop
9c5f34794a
Workaround for Psi's wrong Type in form submission
2010-10-25 18:58:31 +02:00
Badlop
a15d583d4d
Add CAPTCHA example configurations to cfg (EJAB-1262)(EJAB-1326)
2010-10-25 18:57:39 +02:00
Evgeniy Khramtsov
e03c453c78
Provide image url in registration form when captcha is enabled
2010-10-25 23:36:31 +10: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
Evgeniy Khramtsov
641dc7d695
Add password entropy check (EJAB-1326)
2010-10-24 17:17:30 +10:00
Evgeniy Khramtsov
0a1b0498a6
* Rename option captcha to captcha_protected for consistency.
...
* Document captcha_protected option
2010-10-24 15:45:42 +10:00
Evgeniy Khramtsov
a6858a6ce4
Merge branch '2.1.x' of git+ssh://gitorious.process-one.net/ejabberd/mainline into 2.1.x
2010-10-24 15:30:37 +10:00
Evgeniy Khramtsov
f4beeb1706
CAPTCHA IBR support (EJAB-1262)
2010-10-24 15:30:16 +10:00
Badlop
2e33904bb8
Don't check whether the contact is a locally registered account or not (EJABS-1550)
2010-10-24 00:48:57 +02:00
Badlop
2d3bbd43d7
Allow add_rosteritem functions to work even when no know mod_roster is enabled
2010-10-21 21:07:07 +02:00
Christophe Romain
011464e6ac
improve documentation (thanks to Karim Gemayel)
2010-10-21 11:14:24 +02:00
Badlop
6c0e9ef575
Fix return values of some functions. newgroups argument changed to groups.
2010-10-21 00:23:33 +02:00
Badlop
ca62271a89
Apply Apollo fixes. More fixes. Improve command descriptions.
2010-10-20 16:41:27 +02:00
Evgeniy Khramtsov
c96a1805e8
- get rid of rpc:call to avoid group leader inheritance
...
- do not log migration errors
- remove stopping node from cluster hashing explicitly
2010-10-20 17:26:01 +10:00
Badlop
babff870a8
Remove custom ON command: send_notification/6
2010-10-19 17:17:55 +02:00
Badlop
5cd3de9cd7
Copy changes from Apollo's mod_xmlrpc to 2.2.x's mod_xmlrpc
...
Changes:
* link_contacts new arguments: group1::string, group2::string
* New method add_rosteritem_groups/5
* New method del_rosteritem_groups/5
* New method modify_rosteritem_groups/7
* get_roster change argument group::string -> groups::[string]
2010-10-19 16:55:24 +02:00
Badlop
437d8c6b7c
Copy ejabberd_xmlrpc from ejabberd-modules SVN
2010-10-19 16:51:28 +02:00
Badlop
440eef74e9
Copy xmlrpc-1.13 source code
2010-10-19 16:51:24 +02:00
Christophe Romain
c849552177
fix add_rosteritem issue (TECH-1181)
2010-10-19 15:19:41 +02:00
Alexey Shchepin
aa60140ba8
Revert "Merge ApplePush to 2.2.x"
...
This reverts commit b8b6fc0da5
.
Conflicts:
src/mod_applepush.erl
src/mod_applepush_service.erl
2010-10-19 13:53:10 +03:00
Alexey Shchepin
59135cac6f
Revert "ApplePush : previous merge missed timeout handler in c2s."
...
This reverts commit 40625b29f2
.
2010-10-19 13:52:46 +03:00
Alexey Shchepin
8d69d4aaba
Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into aplepush-test"
...
This reverts commit 00d8b2ac30
, reversing
changes made to cac23c39c9
.
2010-10-19 13:52:17 +03:00
Alexey Shchepin
426b7ca769
Revert "Merge branch '2.1.x-applepush' of git@gitorious.process-one.net:+applepush/ejabberd/applepush.git into 2.2.x"
...
This reverts commit ba326eb976
, reversing
changes made to 00d8b2ac30
.
2010-10-19 13:52:09 +03:00
Alexey Shchepin
b61d16dd33
Revert "Merge remote branch 'applepush/2.1.x-applepush' into 2.2.x"
...
This reverts commit f76dcd0d48
, reversing
changes made to 7da8d9e4e3
.
2010-10-19 13:51:44 +03:00
Alexey Shchepin
807af3c08a
Merge branch '2.2.x' of git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 2.2.x-applepush
2010-10-19 13:08:46 +03:00
Peter Lemenkov
c53e8012b2
Change directory before any operation to one readable by INSTALLUSER (EJAB-1322)
...
This is required in order to suppress error messages like
"File operation error: eacces" when ejabberd was started from directory,
which is not readable by INSTALLUSER (/root, for example). See rhbz #564686 :
https://bugzilla.redhat.com/564686
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2010-10-19 01:05:31 +02:00
Badlop
fe04d57284
Fix bug in mod_pubsub in_subscription return value
2010-10-19 00:26:36 +02:00
Badlop
d07424365d
Fix bug in mod_pubsub in_subscription return value
2010-10-19 00:25:14 +02:00
Badlop
70fe2948b9
Revert "Remove some compiled files"
...
That removal was only intended for ejabberd master,
as it requires also changes in gitignore, Makefile.in and aclocal.m4
This reverts commit 179a0cf255
.
2010-10-18 23:17:12 +02:00
Christophe Romain
0f3bd782c4
documentation update (thanks to Karim Gemayel)
2010-10-18 16:53:21 +02:00
Badlop
91cf9194d8
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:53:12 +02:00
Badlop
e2dbad6242
Check privacy of outgoing IQ stanzas (EJAB-1320)
2010-10-16 22:53:10 +02:00
Badlop
84d4a1619b
Check privacy of incoming IQ stanzas (EJAB-1320)
2010-10-16 22:53:08 +02:00
Badlop
16fae4d117
Add support to ejabberd_ctl to handle anonymous command arguments
2010-10-15 21:53:03 +02:00