Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity
4,549 Commits 7 Branches 109 Tags 66 MiB
47039aed15
Commit Graph

3476 Commits

Author SHA1 Message Date
Badlop
19aad464da Provide command for ODBC's convert_to_scram 2015-07-23 13:16:15 +02:00
Paweł Chmielowski
8df134e025 Don't crash web admin when displaying info about websocket using users 2015-07-22 11:54:11 +02:00
Christophe Romain
9091fcb1a1 Let nodetree call default flat plugin now 
this fix mistake from previous commit 311fedaa
 2015-07-22 11:20:06 +02:00
Christophe Romain
9aa2d92d90 Allow include of simple dependencies (EJAB-1737)(#391) 
Either contributed module include dependencies this way
  deps/
    dep1/
      src/
      include/
    dep1/
      src/
      include/

Or includes rebar.config or rebar.config.script:
In this case, only git is supported (if git command available)
and ext_mod checkout code in deps directory.

In both case, only basic built procedure is supported. ext_mod
does not do more than bare compilation like this:
erlc -I include src/*erl
 2015-07-22 10:48:44 +02:00
Christophe Romain
311fedaa12 Let flat be default plugin (#609) 2015-07-22 10:37:26 +02:00
Christophe Romain
9c36a9df78 Do not init nodes from mod_pubsub (#609) 
Let each plugin do its own initialisation in init_plugins
init_nodes was an old function to be removed.
 2015-07-22 08:03:27 +02:00
Christophe Romain
b47a27f3ac Merge pull request #608 from weiss/bare-jid-subscription 
PubSub: Check for node subscription of bare JID
 2015-07-22 07:58:34 +02:00
Evgeny Khramtsov
531638e946 Merge pull request #632 from weiss/increase-max-ack-queue 
XEP-0198: Increase default value of "max_ack_queue" option
 2015-07-21 12:36:01 +03:00
Evgeny Khramtsov
a724893887 Merge pull request #618 from weiss/muc-message-hook 
New hook: muc_filter_packet
 2015-07-21 12:35:27 +03:00
Evgeniy Khramtsov
7f4c74dec9 Print content types more gracefully 2015-07-17 14:29:11 +03:00
Badlop
7395cc910e Set direction of resource and connection (#650) 2015-07-15 21:39:13 +02:00
Badlop
c53d764119 If local guide.html file not found, redirect to the online guide 2015-07-15 20:45:55 +02:00
Badlop
3eb0b161b2 Update links to Guide in WebAdmin 2015-07-15 20:40:13 +02:00
Badlop
65551afcba Support RTL page direction in WebAdmin for Hebrew (#650) 2015-07-15 19:01:32 +02:00
Badlop
f4376671ac Set LTR direction to Raw links (#650) 2015-07-15 18:51:31 +02:00
Badlop
c012d7555b Add links in WebAdmin to ejabberd and ProcessOne (#661) 2015-07-15 13:10:12 +02:00
Badlop
9ede414f01 Support more mod_muc_admin translation strings (#659) 2015-07-15 11:54:35 +02:00
Evgeniy Khramtsov
a53191fed5 Add "complete" attribute to MAM final response (EJABS-2484) 2015-07-10 14:05:47 +03:00
Evgeniy Khramtsov
8e27decdfd Fix mod_mam compatibility with RSM for other backends 2015-07-10 13:59:33 +03:00
Evgeniy Khramtsov
0dfc8ade68 Fix tests related to MAM 2015-07-10 13:57:27 +03:00
Jerome Sautret
1db65e3614 Fix mod_mam compatibility with RSM (only with odbc backend). 2015-07-10 13:56:33 +03:00
Evgeniy Khramtsov
a168340838 During halt only shutdown MUC rooms on local node 2015-07-08 15:35:26 +03:00
Jerome Sautret
2598375051 Changed mam iq get to set as specified by XEP-0313 v0.3 2015-07-08 13:15:14 +03:00
Holger Weiss
0f96414279 Trigger PEP notifications on CAPS updates 
Let mod_pubsub send last items whenever a contact updates the entity
capabilities.  This was already done for remote contacts and is now also
done for local contacts.
 2015-07-07 09:33:00 +02:00
Holger Weiss
edb18deb8f mod_pubsub: Explain caps_update usage in a comment 
The reason to use the caps_update hook for sending last items to remote
contacts is probably not obvious.
 2015-07-06 23:45:25 +02:00
Mickael Remond
0770252e9b Fix dialyzer warning 
The function is call with binary format from ejabberd_c2s.
 2015-07-05 13:33:34 +02:00
Holger Weiss
b7d7dc5201 XEP-0198: Increase timeout during resumption 
Give gen_fsm:sync_send_all_state_event/3 a little more time to transfer
the (possibly somewhat large) c2s #state during session resumption.
 2015-07-03 11:35:22 +02:00
Holger Weiss
5856f6d06a XEP-0198: Increase default "max_ack_queue" value 
During login, clients might receive a relatively large number of stanzas
in one go.  For some users, the default value of the "max_ack_queue"
option turned out to be too small in that situation.
 2015-07-03 11:35:22 +02:00
Holger Weiss
a25051fead New hook: muc_filter_packet 
Add a hook that allows for modifying or dropping MUC room messages.

Closes #491.
 2015-07-03 11:34:44 +02:00
Holger Weiss
4045c848c4 Send notifications on MUC configuration changes 
Notify clients when the room configuration changes, as mandated by
XEP-0045, #10.2.1.

Closes #623.
 2015-07-02 00:36:16 +02:00
Evgeniy Khramtsov
3c12d1a960 Do not rely on behaviour info when doing config validation 2015-06-29 22:50:34 +03:00
Holger Weiss
7c7e51b6e8 Omit warning message regarding non-anonymous room 
Previous versions of XEP-0045 suggested sending a warning message to new
occupants of a non-anonymous MUC room.  The current revision (1.25) says
that a status code of "100" must be returned with the user's initial
presence, instead.  We already do this (in addition to generating the
warning message).

Receiving the warning message each time the client joins the room can
become annoying, especially when reconnections occur frequently (e.g.,
on mobile devices).  So, we omit it, now.
 2015-06-28 14:05:55 +02:00
Badlop
4ae1b4db03 When passwords are scrammed, report check_password_hash cannot work (#559) 2015-06-25 13:39:45 +02:00
Badlop
72f35a6dc6 Add xep definition to mod_mam 2015-06-24 11:58:37 +02:00
Evgeniy Khramtsov
83cce468a5 Add MAM (XEP-0313) support 2015-06-22 16:56:08 +03:00
Badlop
6631078884 Document a few more supported protocols 2015-06-22 13:11:37 +02:00
Holger Weiss
fc0754c609 Add s2s_dhfile to list of known options 2015-06-20 00:14:54 +02:00
Holger Weiss
73a0fb418c Update comment that explains how to set up node_mb 
Specify settings that make sense with current ejabberd versions, and use
the YAML configuration format.  Also, specify the "urn:xmpp:microblog:0"
namespace, as that's the microblogging node name currently defined by
XEP-0277.
 2015-06-19 23:13:36 +02:00
Holger Weiss
04038c01f7 PubSub: Check for node subscription of bare JID 
Don't just check whether the full JID is subscribed when a node
subscription is required to list or publish items.  If the bare JID is
subscribed, these requests are now also accepted.
 2015-06-19 00:50:08 +02:00
Badlop
36a96ae3f5 change_room_option misses handling some room options #604 2015-06-18 13:13:49 +02:00
Christophe Romain
d528457ba5 Don't force persistence if cache enabled (fix previous commit) 2015-06-18 12:54:46 +02:00
Christophe Romain
e5a98b100d Fix max_items and don't let PEP depends on item cache 2015-06-18 12:06:29 +02:00
Badlop
1cf2dfe63a New hide_sensitive_log_data option to hide client IP in log (#452 #471) 2015-06-17 11:32:42 +02:00
Holger Weiss
e608274243 Add s2s_dhfile option to configuration validator 2015-06-16 15:18:34 +02:00
Alexey Shchepin
2110b929bc Merge pull request #581 from weiss/dh-param-file 
New options: dhfile and s2s_dhfile
 2015-06-16 11:59:06 +03:00
Paweł Chmielowski
dcf5aefea0 Add option to set net_ticktime (EJAB-1742) 2015-06-15 14:57:07 +02:00
Badlop
357ff6c8f7 Fix bug introduced in commit b88fa6f617 2015-06-04 15:47:02 +02:00
Badlop
fe10c6f6f2 Pick first local multicast service, otherwise remote (ejabberd-contrib#105) 2015-06-04 12:13:10 +02:00
Holger Weiss
6c712b6caa Don't add body element to MUC subject messages 2015-06-04 09:55:38 +02:00
jpegger
6f48f22c71 Authmodule using old style XML:get_attr_s() 2015-06-03 18:11:35 +02:00
Evgeniy Khramtsov
9a9633dbc5 Do not ignore unknown options so far 2015-06-03 16:21:22 +03:00
Evgeniy Khramtsov
c1119b1f39 Remove unused validation code 2015-06-03 16:05:17 +03:00
Evgeniy Khramtsov
ab196b4b02 Move opt_type/1 function out of if-else block 2015-06-03 15:52:19 +03:00
Evgeniy Khramtsov
730fd55ec9 Fix typo 2015-06-03 15:45:15 +03:00
Evgeniy Khramtsov
0ae9ef2b41 Add missing options of ejabberd_logger to validator 2015-06-03 15:25:20 +03:00
Evgeniy Khramtsov
83faff37e5 Add missing options of mod_muc to validator 2015-06-03 15:18:09 +03:00
Badlop
4ed6a3d78f Fix commands export2odbc, connected_users_vhost and push_alltoall (#586) 2015-06-02 12:52:15 +02:00
badlop
0de7864880 Merge pull request #585 from CorCornelisse/master 
push_roster* not updated on binarification
 2015-06-02 12:24:46 +02:00
Evgeniy Khramtsov
157ff4d093 Merge branch 'master' of github.com:processone/ejabberd 2015-06-01 15:38:37 +03:00
Evgeniy Khramtsov
fb6267f38e Add config validation at startup 2015-06-01 15:38:27 +03:00
Badlop
9a802185ad Fix anonymous user login, it wasn't stored in anonymous mnesia table 2015-06-01 14:34:49 +02:00
Evgeniy Khramtsov
a9f7d9481f Do not try to fetch module options via eldap_utils 2015-06-01 15:22:31 +03:00
Evgeniy Khramtsov
ea7de2097f Reorganize get_opt() code in some modules 2015-06-01 15:20:49 +03:00
Evgeniy Khramtsov
48213b09ce Get rid of some fuzzy macros as it makes syntax tools getting mad 2015-06-01 15:19:56 +03:00
Cor Cornelisse
22d9011c0c These arguments should be binary instead of strings, otherwise it won't work properly 2015-06-01 13:30:26 +02:00
Badlop
100827ec6e In xmlrpc use process_unicode_codepoints instead of list_to_binary 2015-05-29 15:49:12 +02:00
Evgeniy Khramtsov
a291e7d4e6 Fix MUC room options vaildation 2015-05-29 12:08:36 +03:00
Evgeniy Khramtsov
e8ffbbb0b4 Validate MUC room options from the configuration file 2015-05-28 11:42:17 +03:00
Badlop
d0443bb714 An auth external module requires ext_mod to be started first (#578) 2015-05-27 13:10:15 +02:00
Holger Weiss
5585fb1ecf New options: dhfile and s2s_dhfile 
Let admins specify a file that contains custom parameters for
Diffie-Hellman key exchange.
 2015-05-26 21:06:04 +02:00
Christophe Romain
b83c07251c Fix pubsub/odbc crash on remote user unsubscribe (EJAB-1483) 2015-05-26 19:19:57 +02:00
Alexey Shchepin
b2f98099bb Merge pull request #569 from weiss/send-element-error-checking 
Update send_element error checking (EJAB-1739)
 2015-05-26 15:59:50 +03:00
Mickael Remond
9574e71e8d Include session record from header file instead of duplicating it 2015-05-26 10:08:46 +02:00
Paweł Chmielowski
3af507cc43 Fix merging of not yaml config files 2015-05-25 15:37:46 +02:00
Christophe Romain
e54e556e01 Fix use of publish_only affiliation with odbc backend 2015-05-22 18:47:17 +02:00
Badlop
b07cb1ed84 Use namespace definitions when possible 2015-05-21 17:04:14 +02:00
Badlop
0c725b5fac Document protocol support (EJABS-1620) 2015-05-21 17:04:05 +02:00
badlop
b04f3a4c93 Merge pull request #573 from sezuan/fix_odbc 
Fix some string/binary issues with non-native ODBC drivers
 2015-05-21 11:31:47 +02:00
Holger Weiss
889459b45c Fix function specification 2015-05-20 12:13:15 +02:00
Evgeniy Khramtsov
3b267eaa61 Do not bounce normal messages sent to unavailable resource 2015-05-19 10:58:36 +03:00
Holger Weiss
fba13a0b93 Simplify XEP-0203 (Delayed Delivery) code a bit 
Now that XEP-0091 support is removed, the XEP-0203 code can be
simplified a little further.  This doesn't change the behavior.
 2015-05-18 21:26:51 +02:00
Christophe Romain
8bb994dbca Call integer_to_binary using jlib (#554) 2015-05-18 17:30:25 +02:00
Badlop
2af659b737 Remove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849) 2015-05-18 12:38:25 +02:00
Matthias Rieber
16532dd643 Fixed some string()/binary() issues in ejabberd_odbc 2015-05-18 12:14:56 +02:00
Matthias Rieber
f5c9dfbc93 fixed erl_prettypr in encode_term 2015-05-17 19:37:49 +02:00
Badlop
084d0c4efe New command get_room_options (#567) 2015-05-15 17:47:10 +02:00
Holger Weiss
61afd668c2 Fix indentation 2015-05-15 15:50:43 +02:00
Paweł Chmielowski
de7ff536b2 Load config snippets for modules installed with ext_mod (EJAB-1741) 2015-05-15 12:30:15 +02:00
Paweł Chmielowski
5dbe7a3c6c Export modules_dir/0 2015-05-15 12:27:59 +02:00
Holger Weiss
6efce7f706 Cosmetic change: Simplify error checking 
Let send_stanza_and_ack_req/2 update the #state instead of propagating
the value returned by send_element/2.  This doesn't change the behavior.
 2015-05-14 01:04:23 +02:00
Holger Weiss
42c7205739 Don't assume send_element/2 returns ok or error 
Let send_text/2 and (therefore) send_element/2 return {error, Reason}
instead of error for consistency, and let send_stanza_and_ack_req/2
interpret any non-ok value as an error.  (EJAB-1739)
 2015-05-14 00:58:36 +02:00
Badlop
d885435552 Fix setting 'description' with change_room_option command (#567) 2015-05-12 17:37:39 +02:00
Badlop
f817762cc4 New max_users_presence mod_muc option (thanks to anhcoi123)(#562) 2015-05-08 13:09:25 +02:00
Badlop
25beb46391 Fix check_password_hash argument parsing (#559) 2015-05-08 12:04:04 +02:00
Badlop
7ab6c4b4fd Try to support access_commands in YAML (ejabberd-contrib#45) 2015-05-07 18:34:05 +02:00
Badlop
b0b004b26e Revert "Add private and roster local handlers (EJAB-682)" due to #556 
This reverts commit 2e194bd997.
 2015-05-07 17:07:49 +02:00
Badlop
f7d9bb7ce4 Don't announce register feature once user is authenticated (#41) 2015-05-07 11:41:59 +02:00
Ben Langfeld
917d48f30b Use SASL PLAIN authzid as client identity if auth module permits it 
This allows the authentication modules to perform SASL proxy authentication. It puts the onus on them to authorize the authcid to masquerade as the authzid. Doesn't currently implement such functionality in existing auth modules, since they cannot currently codify a relationship between the two identities. Does not permit the authzid to use a domain differently from the one of the connection.

Note: digest might not work, but I have no interest in it, being deprecated.
 2015-05-06 14:12:15 -03:00
Ben Langfeld
d9814709e2
Remove commented code 2015-05-06 12:55:35 -03:00
Holger Weiss
7297b23508 Tag private MUC messages with muc#user namespace 
Make it possible for clients to identify private MUC messages.  One use
case would be to filter out undesired carbon copies of those.
 2015-05-05 22:00:05 +02:00
Badlop
fa99519f8b Simplify internal code of get_last and set_last commands 2015-05-05 12:54:20 +02:00
Badlop
96c62acb1b Improve get_last command to provide also last activity status 2015-05-05 12:46:21 +02:00
Badlop
77e57afae1 Fix set_last command to work with recent ejabberd (#555) 2015-05-05 12:45:53 +02:00
Evgeniy Khramtsov
60fe008268 Remove duplicated code 2015-04-29 14:51:45 +03:00
Christophe Romain
6987e85602 Improve module install code, allows better error checking 2015-04-29 13:30:03 +02:00
Badlop
7492ecae52 New command get_user_rooms 2015-04-29 13:22:49 +02:00
Christophe Romain
4440b03b89 Fix fetching from git@github url and allow compilation from ejabberd sources 2015-04-29 10:19:15 +02:00
badlop
6f99775115 Merge pull request #547 from weiss/fix-account-jid-disco 
Fix service discovery handling for account JIDs
 2015-04-27 19:39:32 +02:00
Badlop
987e337c66 Rely on core routine for handling affiliation changes (thanks to Ben Langfeld) 
This ensures that all of the usual stanzas and such go out
 2015-04-27 17:00:22 +02:00
Holger Weiss
dc449687a0 mod_disco: Apply minor readability improvements 2015-04-26 16:36:17 +02:00
Holger Weiss
0edba763fb mod_disco: Omit 'roster_get' call if possible 
As a small optimization, avoid running the 'roster_get' hook in the
(common) case where a client requests service discovery information for
its own bare JID.
 2015-04-26 16:32:03 +02:00
Holger Weiss
50f35f1b07 Fix service disco handling for bare account JIDs 
Don't swap the sending and receiving JIDs while checking whether the
client that requested service discovery information for a bare account
JID is a subscribed contact.
 2015-04-26 16:22:09 +02:00
Evgeniy Khramtsov
9c85cb5f25 Fix validating function for iqdisc 2015-04-23 14:59:18 +03:00
Christophe Romain
38dd44e18f Improve purge_offline filter and speed (#543) 2015-04-22 18:11:39 +02:00
Badlop
2e194bd997 Add private and roster local handlers to get listed in disco#info (EJAB-682) 2015-04-22 13:27:25 +02:00
Badlop
e280de8452 Allow to modify host when registering account in web (#291) 2015-04-22 11:01:47 +02:00
Christophe Romain
6e4d6caebf Add support for publish-only (#30) 2015-04-21 17:23:59 +02:00
Christophe Romain
cf37f3977a Fix typo, oups... 2015-04-21 16:13:23 +02:00
Christophe Romain
61f80396da remove deferred Collection shim header 2015-04-21 16:11:00 +02:00
Christophe Romain
cbd45974e2 Owner can subscribe to its node (#454) 2015-04-21 15:24:31 +02:00
Christophe Romain
747d25b4ad Fixed node type (thanks to saczawap) (#435) 2015-04-21 15:24:24 +02:00
Christophe Romain
e0563e3918 PubSub improvements 
This commit contains
- code cleanup
- use of db_type instead of old mod_pubsub_odbc
- some minor optimizations
- some minor bugfixes
 2015-04-21 15:24:16 +02:00
Christophe Romain
28090a3958 Merge pull request #540 from weiss/queue-error-stanza 
Add privacy error stanza to XEP-0198 queue
 2015-04-21 11:19:49 +02:00
Evgeniy Khramtsov
ed79a61752 Fix LDAP substrings filter (EJAB-1715) 2015-04-21 11:49:41 +03:00
Holger Weiss
94936b261e Add privacy error stanza to XEP-0198 queue 2015-04-20 22:03:18 +02:00
Alexey Shchepin
fd54181435 Fixed error replying on blocked messages 2015-04-20 17:19:09 +03:00
Badlop
c2e6ce0f04 Remove load_config command because is superseded by reload_config (#532) 2015-04-20 15:57:44 +02:00
Evgeny Khramtsov
837706e9d9 Merge pull request #536 from weiss/fail2ban-whitelist 
Add mod_fail2ban option to whitelist IP addresses
 2015-04-18 12:28:36 +03:00
Holger Weiss
aa36742a40 mod_fail2ban: Add 'access' option for whitelisting 
Closes #535.
 2015-04-18 11:08:05 +02:00
Holger Weiss
c01940f33c cyrsasl_scram: Return user name with error message 
Let ejabberd_c2s run the 'c2s_auth_result' hook (which needs the user
name) on SCRAM authentication failure.
 2015-04-17 20:21:11 +02:00
Holger Weiss
afdc269825 ejabberd_s2s_out: Remove Erlang/OTP version check 
The version check won't work for Erlang/OTP >= 17; and it's no longer
needed, as we don't support versions older than R16 anyway.
 2015-04-16 23:51:16 +02:00
Badlop
d624753410 Update get_password_s description with SCRAM return values 2015-04-15 11:51:34 +02:00
Badlop
a5adaf5798 Revert "Hook on group message" 
This reverts commit b81250d667.
 2015-04-15 11:51:29 +02:00
badlop
31c5775025 Merge pull request #426 from hairyhum/master 
Migration of scram passwords with piefxis (riak and internal only)
 2015-04-15 11:04:29 +02:00
Paweł Chmielowski
ba69c469b5 Remove http_poll module 
For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.
 2015-04-15 10:47:10 +02:00
Holger Weiss
e408276283 Don't forget gen_tcp:listen/2 options 
Fixes #530.
 2015-04-14 20:22:34 +02:00
Badlop
b67af5e036 Fix nick logging in mod_muc_log plaintext (#522) 2015-04-14 15:46:59 +02:00
Badlop
25449a076f Clean multicast routing code detected by xref 2015-04-10 16:02:45 +02:00
Paweł Chmielowski
8732817c3c Fix problem with pushing bufferend #xmlel-s to receiver in websocket code 2015-04-09 13:35:37 +02:00
Badlop
f129c6530c Fix bug when sorting the list of rooms in WebAdmin 2015-04-08 15:34:08 +02:00
Evgeniy Khramtsov
32b60d4250 Remove hack with binary to integer conversion 2015-04-08 16:11:06 +03:00
Evgeniy Khramtsov
7a89dda816 Merge branch 'master' of github.com:processone/ejabberd 2015-04-08 15:31:41 +03:00
Evgeniy Khramtsov
9b4942890d Add virtual host support for SQLite 2015-04-08 15:31:28 +03:00
Badlop
0cf8d1fa6e Copy multicast code from ejabberd-contrib to provide XEP-0033 (#521) 2015-04-08 14:01:16 +02:00
Evgeniy Khramtsov
675c428f21 Disable awkward trap_exit flag 2015-04-08 14:40:28 +03:00
Evgeniy Khramtsov
bdedcf8d8a Enable FOREIGN KEYS by default 2015-04-08 14:39:47 +03:00
Evgeniy Khramtsov
2a3a2d9804 Make sure SQLite always returns binaries 2015-04-08 14:38:04 +03:00
Evgeny Khramtsov
5a820aca40 Merge pull request #486 from saa/sqlite_support 
Add SQLite support
 2015-04-08 14:34:56 +03:00
Jerome Sautret
c3280e9dad Add mod_muc_admin contrib. 2015-04-07 17:05:43 +02:00
Holger Weiss
0fd4984c23 ejabberd_listener: Remove Erlang/OTP version check 
We don't support Erlang/OTP versions older than R16 anyway.
 2015-04-07 09:47:05 +02:00
Evgeny Khramtsov
b81b0d0be9 Merge pull request #518 from liudanking/master 
fix otp version check in ejabberd_listener.erl listen_tcp/5
 2015-04-07 10:34:18 +03:00
Mickael Remond
c140f98276 Explicitly start crypto with start 
This is to please Elixir / Phoenix enviroment
 2015-04-07 09:03:37 +02:00
liudan
f981a53f9a fix otp version check in listen_tcp/5 2015-04-07 09:28:35 +08:00
Holger Weiss
2a94c68724 Don't call send_element/2 if previous call failed 
Be sure not to try sending data over a TCP socket that is no longer
usable.
 2015-04-06 22:34:48 +02:00
Paweł Chmielowski
81b0643036 Fix problem with c2s buffering on old style websocket connections 
Old style websocket do use binaries for transferring data to C2S, so when
we buffer that data we need to handle it different than list of #xml structs
used by new style connections.

This fixes github issue #515.
 2015-04-06 17:54:45 +02:00
Paweł Chmielowski
64978b3d9c Merge pull request #513 from weiss/ignore-header-case 
ejabberd_websocket: Ignore case of HTTP header values
 2015-04-06 17:49:51 +02:00
Mickael Remond
34f8f6d868 Explicitely start crypto module 
Without explicit start, it causes issue when embedding ejabberd into other apps.
 2015-04-06 13:46:09 +02:00
Evgeniy Khramtsov
69bff82301 Fix type spec 2015-04-06 12:38:54 +03:00
Mickael Remond
47537aa901 Make sure Mnesia dir environment and log file are list, not binary 
This is useful for Elixir configuration, as binary is the more natural data type.
Closes #514
 2015-04-06 11:36:16 +02:00
Holger Weiss
0cd77ab942 ejabberd_websocket: Ignore case of header values 
RFC 6455 says that the client's opening handshake includes an Upgrade
header field "containing the value 'websocket', treated as an ASCII
case-insensitive value."

Closes #510.
 2015-04-05 14:48:08 +02:00
Mickael Remond
ea8db9967f ejabberd can be embedded in an Elixir application 2015-04-04 17:42:12 +02:00
Badlop
7d3b2cad26 Replace crypto calls that will be removed in a future release 2015-04-04 14:09:58 +02:00
Badlop
cf40daf663 Replace undefined value with empty one (processone/ejabberd-contrib#92) 2015-04-04 13:48:17 +02:00
Holger Weiss
1fa73fd33f Remove unused case clauses to make dialyzer happy 2015-04-03 20:37:42 +02:00
Badlop
94761ff31e Improve srg_get_info result format (processone/ejabberd-contrib#92) 2015-04-03 12:16:11 +02:00
Paweł Chmielowski
088c5c4672 Fix output formatting in srg_get_info commend from mod_admin_extra 2015-04-02 16:55:51 +02:00
Paweł Chmielowski
b580da3547 Fix problems with get_vcard* functions from mod_admin_extra 2015-04-01 16:32:34 +02:00
Paweł Chmielowski
cf3b4dbc7b Drop exmpp usage from mod_admin_extra 2015-04-01 15:44:49 +02:00
Evgeny Khramtsov
305b281c15 Merge pull request #493 from weiss/rfc-6121-routing 
Update ejabberd_sm's routing rules as per RFC 6121
 2015-04-01 11:41:05 +03:00
Evgeniy Khramtsov
821039b7d5 Swap 'mnesia' and 'internal' types correctly 2015-03-30 12:25:25 +03:00
Evgeniy Khramtsov
fb1fd50df5 The 'default_db' option should impact ejabberd_auth as well 2015-03-30 12:18:18 +03:00
Evgeniy Khramtsov
4af15df546 Add new 'default_db' option 2015-03-30 12:15:29 +03:00
Sergey Abramyan
15af88a09a Fix lite.sql and convert binary to integer 2015-03-27 22:14:29 +03:00
Badlop
176114d28e Try to fix more Dialyzer warnings 2015-03-27 15:55:57 +01:00
Badlop
9c96d30719 Ensure set_presence changes are kept in state (thanks to Davide Colombo)(EJAB-1184) 2015-03-27 15:03:14 +01:00
Badlop
30dc82a98a Fix even more dialyzer warnings 2015-03-27 12:28:24 +01:00
Badlop
8707c0b045 Fix set_presence command (ejabberd-contrib#61) 2015-03-27 11:43:56 +01:00
Badlop
10dfd182f6 Fix more mod_admin_extra commands 2015-03-26 20:41:16 +01:00
Badlop
9b3dda105d Fix problems in process_rosteritems command 2015-03-26 16:18:39 +01:00
Badlop
fbb6b65192 Detect correctly when vCard does not exist (#21) 2015-03-26 14:00:58 +01:00
Badlop
0c30beb93d Fix return error when requesting non-existing vcard value (#21) 2015-03-26 14:00:54 +01:00
Mickaël Rémond
c9393bc4f4 Ignore errors when retrieving status if the users just got offline 
Fix possible race condition.
 2015-03-26 14:00:50 +01:00
Holger Weiss
5103ed1c3b mod_admin_extra: Let send_message omit subject 
Let the send_message command omit the subject if the user either
specified an empty subject or a message type of "chat".
 2015-03-26 14:00:48 +01:00
Badlop
88cd8c7b12 Update FSF address (solves #73) 2015-03-26 14:00:46 +01:00
HAMANO Tsukasa
00fe68ed06 fix connected_users_info in mod_admin_extra 2015-03-26 14:00:44 +01:00
Holger Weiss
09dd288ac0 mod_admin_extra: Fix private_get/private_set types 2015-03-26 14:00:42 +01:00
Badlop
2186c03a9c Support TEL XXX in set and get_vcard commands 2015-03-26 14:00:40 +01:00
colm
441d48f080 Changed signature of user_sessions_info to take binaries rather than strings as it doesn't match anything in mnesia if it searches it by string 2015-03-26 14:00:38 +01:00
Badlop
c3afc3c7c0 Join three send_message_* commands in one (PR #68) 2015-03-26 14:00:36 +01:00
HAMANO Tsukasa
9a64bfe605 add send_message_normal command 2015-03-26 14:00:34 +01:00
HAMANO Tsukasa
ca25d44c8b fix mod_admin_extra stats command 2015-03-26 14:00:32 +01:00
Holger Weiss
4e9b4cbc11 mod_admin_extra: Fix stats(_host) argument types 2015-03-26 14:00:30 +01:00
Badlop
46b33b51b4 Update kick_session to work with ejabberd master 2015-03-26 14:00:28 +01:00
Sonny Scroggin
3eebf100f9 Binary conversions 2015-03-26 14:00:24 +01:00
Sonny Scroggin
5c0a1dde1c More binary conversions 2015-03-26 14:00:21 +01:00
Badlop
949705b04a Update add_roster_item and get_roster to ejabberd 13 2015-03-26 14:00:18 +01:00
Badlop
f682dfe3a6 Fix get_vcard and set_vcard when using option module_resource (issue #21) 2015-03-26 14:00:16 +01:00
Sonny Scroggin
14a3662ca4 Fix add_rosteritem, delete_rosteritem, and get_roster 2015-03-26 14:00:14 +01:00
Badlop
ffea2bf350 Update get_vcard and set_vcard to ejabberd 13 (fixes issue #21) 2015-03-26 14:00:12 +01:00
Rahul Gautam
f314da7b1f mod_admin_extra: for support in ejabberd-v13.x changed args from string to binary : all changes tested with ejabberdv13.12 2015-03-26 14:00:10 +01:00
Badlop
d72c739630 Fix command change_password (fixes #16) 2015-03-26 14:00:08 +01:00
Badlop
57035b383c Handle error when requesting information of a non-existing shared roster (fixes #14) 2015-03-26 14:00:06 +01:00
Badlop
2746e358b3 Fixes srg_* commands (fixes #147) 2015-03-26 14:00:04 +01:00
Badlop
d66f40d94f Fix srg_create when calling ejabberd_regexp (fixes issue #12) 2015-03-26 14:00:01 +01:00
Badlop
e6a9c5ccee Add get_last to ejabberdctl for last user activity (thanks to lehrblogger) 
The logic for determining the response is borrowed from here:
6d811f5178/src/web/ejabberd_web_admin.erl (L1583-L1601)
 2015-03-26 13:59:59 +01:00
Badlop
f0cf90c11e Initial import from ejabberd-modules SVN 2015-03-26 13:59:57 +01:00
Paweł Chmielowski
de26af3fdb Make sure that we send each time <close> before closing websocket connection 2015-03-25 17:10:08 +01:00
Badlop
d9ad26b4ec If command crashes, return restuple with error and explanation (ejabberd-contrib #21) 2015-03-25 13:57:08 +01:00
Holger Weiss
f40e6a0421 Don't bother with filtering out PEP error messages 
Now that ejabberd_sm won't deliver error messages that were sent to bare
JIDs anymore, PEP error messages should no longer arrive.
 2015-03-25 02:02:08 +01:00
Holger Weiss
1b1878409f Route headlines sent to bare JIDs to all resources 
As per RFC 6121, deliver headline messages that were sent to a bare JID
to all resources with a non-negative priority, not just to those with
the highest priority.  If no such resource is available, discard them
silently.
 2015-03-25 01:17:35 +01:00
Holger Weiss
8f9a2d6df8 Don't route error/groupchat messages to bare JIDs 
As per RFC 6121, drop error messages that were sent to bare JIDs, and
return an error if a groupchat message was sent to a bare JID.
 2015-03-25 00:52:49 +01:00
Holger Weiss
bc008d4041 Update routing for unavailable resources 
As per RFC 6121, don't reroute non-chat messages sent to unavailable
resources.
 2015-03-25 00:13:05 +01:00
Holger Weiss
33c9f21171 Return error when incoming message is blocked 
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message was blocked by a privacy list.  This lets the user
appear offline to the contact.
 2015-03-24 23:10:47 +01:00
Holger Weiss
27a4d783a5 Fix "IP address not available" error message 2015-03-24 17:32:57 +01:00
Alexey Shchepin
736710cc9c Add support for ciphers and protocol_options in ejabberd_http 2015-03-24 18:14:47 +03:00
Holger Weiss
31e356c126 Avoid crypto:hmac/3 call for R15B compatibility 2015-03-21 22:56:23 +01:00
Holger Weiss
a5d6044448 Fix compilation on Erlang R15B 2015-03-21 22:06:38 +01:00
Christophe Romain
8b23727cc6 Start ext_mod before module as it's setup contrib path 2015-03-20 15:06:02 +01:00
Alexey Shchepin
5135e30633 Removed deprecated calls to crypto:sha_mac in scram.erl 2015-03-20 14:09:38 +03:00
Alexey Shchepin
f6db84282b Add ejabberd_auth_odbc:convert_to_scram/1 2015-03-20 13:46:17 +03:00
Alexey Shchepin
e575c87ea2 Add SCRAM support to ejabberd_auth_odbc 2015-03-20 13:45:24 +03:00
Jerome Sautret
6b67a66a1b Added MySQL support for delete_old_messages (offline) command. 2015-03-20 10:40:19 +01:00
Evgeniy Khramtsov
4d2924a3ef Fix mod_offline termination 2015-03-20 10:40:13 +01:00
Alexey Shchepin
b7726ee392 Explicitly set standard_conforming_strings to off with PostreSQL 2015-03-20 10:39:29 +01:00
Evgeniy Khramtsov
51508a9fc3 Report TLS errors 2015-03-20 10:39:14 +01:00
Sergey Abramyan
5ae01e8bb4 Add SQLite support 2015-03-20 01:10:47 +03:00
Christophe Romain
aa1250a3dd Add missing list_to_binary call 2015-03-13 17:59:19 +01:00
Christophe Romain
5b9635cc07 Add contributed modules code path on start 2015-03-13 12:20:25 +01:00
Christophe Romain
588f98fc3a Rename module function to keep them grouped on help 2015-03-13 11:54:32 +01:00
Evgeniy Khramtsov
f72799b3cc Improve module structure 2015-03-13 13:05:16 +03:00
Evgeniy Khramtsov
bbe5c6b74e Do not fail on badly formed SQL results 2015-03-13 12:59:16 +03:00
Evgeniy Khramtsov
c7dc56c314 Fix unblock all when Riak is used as a backend 2015-03-13 12:47:08 +03:00
Paweł Chmielowski
bf5c7198fc Update sockmod() type after adding websocket support 2015-03-12 13:15:31 +01:00
Christophe Romain
7209954a5f Remove unused clause 2015-03-12 13:15:07 +01:00
Paweł Chmielowski
e855791f16 Update types to fix dialyzer warnings 2015-03-12 10:34:34 +01:00
Holger Weiss
b045bd806a mod_offline: Remove a few superfluous newlines 2015-03-11 20:38:22 +01:00
Holger Weiss
0bfde19ebd Don't crash in mod_offline:export/1 
(Thanks to Christophe Romain.)
 2015-03-11 20:35:08 +01:00
Christophe Romain
2d53f7f83e start ext_mod in later stage at init 2015-03-11 17:39:07 +01:00
Christophe Romain
a1a46f7df5 Remove unused code 2015-03-11 17:15:42 +01:00
Christophe Romain
c9b82ff1e5 Compile contributed module with lager if enabled in ejabberd 2015-03-11 14:35:01 +01:00
Christophe Romain
f77622067b Add packaging support for contributed modules 
This is a preliminary version that is tested to work with the packaging
branch of ejabberd-modules repository

This version lacks automatic configuration include at runtime
 2015-03-11 14:14:28 +01:00
Evgeniy Khramtsov
a0fafc383a Add Redis backend for SM 2015-03-11 14:46:57 +03:00
Holger Weiss
d991b92a49 Always specify room JID for MUC <delay/> elements 
As per version 1.25 of XEP-0045, use the room JID as the 'from' address
for <delay/> elements also when the room is non-anonymous, and specify
the original JID of the sender as an XEP-0033-style tag instead.

Closes #465.
 2015-03-10 00:02:32 +01:00
badlop
0a88255ef6 Merge pull request #467 from hamano/mod_offline_restart 
change mod_offline restart type
 2015-03-09 19:26:19 +01:00
Evgeniy Khramtsov
c0540e1377 Fix R15B compilation 2015-03-09 17:50:14 +03:00
Evgeniy Khramtsov
72d9b099c6 Make it possible to use SQL as an SM backend 2015-03-09 16:41:13 +03:00
Evgeniy Khramtsov
86e03f3828 Separate db backend from the SM 2015-03-09 14:57:33 +03:00
HAMANO Tsukasa
f55de94314 change mod_offline restart type 2015-03-09 20:28:55 +09:00
Mickaël Rémond
8fef3d1f3f Reorganize / clean ejabberd_hooks header 2015-03-08 19:03:02 +01:00
Mickaël Rémond
a339df2d6a More ejabberd_hooks refactor 2015-03-08 18:44:43 +01:00
Mickaël Rémond
fd91ee5169 ejabberd_hooks refactor and better types 2015-03-08 18:23:22 +01:00
Mickaël Rémond
750fefcd6d Add Elixir test on ejabberd hooks 
This is to prepare ejabberd_hooks module refactoring.

I also expanded API to help with testing.
 2015-03-08 17:06:43 +01:00
Badlop
f18ce9564c Fix: default_host is forgotten between consecutive HTTP requests (#416) 2015-03-06 12:40:48 +01:00
Badlop
e0228e9b7a Access list editing broken in web_admin (#252) 2015-03-05 11:34:25 +01:00
Badlop
e575f401cd Accept configuration file with .yaml extension (#290) 2015-03-04 17:18:57 +01:00
Mickaël Rémond
8a99287374 Merge branch 'master' of github.com:processone/ejabberd 2015-03-03 22:20:08 +01:00
Mickaël Rémond
f0f8301b5e Fix typo on state reuse 
It should help with the crash on #453
 2015-03-03 22:19:51 +01:00
Christophe Romain
a265ea53f9 Merge pull request #384 from weiss/fix-last-item-type 
Use correct message type when sending last published PEP/PubSub items
 2015-02-27 11:40:12 +01:00
badlop
e10d5af303 Merge pull request #443 from mojolingo/feature/muc_admin/affiliation-change-propogate-xmpp 
Permit modifying affiliations via an event
 2015-02-26 11:48:17 +01:00
Ben Langfeld
a6c5a3593f Permit modifying affiliations via an event 
Allows us to implement mod_muc_admin:set_room_addiliation properly
 2015-02-25 12:31:27 -03:00
Badlop
5bd8724801 Update FSF address 2015-02-25 15:19:33 +01:00
Paweł Chmielowski
ab3d38c9fc Fix processing POST messages after changes from adding websocket handling 2015-02-25 14:36:48 +01:00
Paweł Chmielowski
8e33f31f50 Try not to use c2s:send_text, it causes problem with websocket 2015-02-25 13:57:03 +01:00
Paweł Chmielowski
b42b171613 Add support for websocket connections 2015-02-25 13:57:02 +01:00
Feotov Daniil
b81250d667 Hook on group message 2015-02-24 11:06:41 +03:00
Christophe Romain
0c0947a241 Add compatibility macros for deprecated types (thanks to Alexey) 2015-02-23 09:58:00 +01:00
Holger Weiss
e87d332394 mod_carboncopy: Apply small code simplification 2015-02-12 00:14:57 +01:00
Holger Weiss
bc7f93ad1e Check availability before carbon copying 
Before generating a carbon copy for a resource, make sure it's actually
available.  This handles the case where, for some reason, the
'unset_presence_hook' wasn't called during logout of a resource.  Carbon
copies sent to that resource would otherwise be re-routed to another
resource (which might've received a copy of that message already).
 2015-02-11 16:12:08 +01:00
Holger Weiss
9f822dd2b8 Don't crash if 'request_path' has unexpected type 2015-02-11 15:38:55 +01:00
Holger Weiss
834c680f97 Remove unused function clause in mod_carboncopy 2015-02-11 00:52:47 +01:00
Mickaël Rémond
01e1f677c7 Add Elixir support to ejabberd 2015-02-10 17:56:44 +01:00
Holger Weiss
d00f0fb1f4 Don't convert configuration values to strings 2015-02-09 01:08:01 +01:00
Holger Weiss
7fd7e53e4a Fix typo in debug message 2015-02-08 23:49:17 +01:00
Feotov Daniil
eb52c118d0 Migration of scram passwords with piefxis (riak and internal only) 2015-02-05 18:44:08 +03:00
Badlop
87d2eb5f9a Support for "> ." in YAML configuration files 2015-01-28 17:16:10 +01:00
Holger Weiss
0a047d790f Fix a few function specifications 2015-01-23 00:42:18 +01:00
Christophe Romain
c4d17d939d Fix integer parameter which can be set to 0 2015-01-22 12:40:27 +01:00
Evgeny Khramtsov
561025ba32 Merge pull request #413 from weiss/fix-timestamp-overflow 
Fix timestamp formatting
 2015-01-22 11:00:41 +03:00
Badlop
15e77e9c0f New command to reload config (EJAB-1140) 2015-01-21 15:18:46 +01:00
Christophe Romain
120e581865 Fix missing copyright dates to 2015 (EJAB-1733) 2015-01-21 14:52:37 +01:00
Holger Weiss
528aabf49c Increment number of seconds on timestamp overflow 
Increment the number of seconds and set the fractional part to zero if
the latter is too large.
 2015-01-21 11:20:26 +01:00
Holger Weiss
18d9f18642 Don't match integer() against float() value 2015-01-21 11:06:06 +01:00
Nathan Bruning
a983df4848 Fix overflow in XEP-0203 delay: if microseconds exceeded 999499, *** was put in the formatted timestamp 2015-01-21 01:10:41 +01:00
Evgeny Khramtsov
104009b3a9 Merge pull request #409 from hamano/scram-stringprep-checking 
Scram stringprep checking(correct fix)
 2015-01-19 15:23:47 +03:00
HAMANO Tsukasa
e01eb734b4 correct fix for #396 2015-01-19 16:00:18 +09:00
HAMANO Tsukasa
cb57cfa1a6 correct fix for #396 2015-01-19 15:25:58 +09:00
Badlop
2c4647a980 Fix binaries when ejabberd_ctl passes auth details 2015-01-15 20:00:06 +01:00
Badlop
7690320f0f Fix access_commands option in ejabberd_xmlrpc, now it works 2015-01-15 17:39:12 +01:00
Evgeniy Khramtsov
4575649e10 Get rid of asn1rt calls 2015-01-15 14:51:20 +03:00
Taufan Aditya
f650fc83ae Fix spec comment and remove useless case block 2015-01-09 22:19:46 +07:00
Taufan Aditya
864e113256 Fix unused vars warning 2015-01-09 01:00:26 +07:00
Badlop
5a35405cd5 Update copyright dates to 2015 (EJAB-1733) 2015-01-08 17:34:43 +01:00
Evgeny Khramtsov
4ef2d08456 Merge pull request #396 from hamano/scram-stringprep-checking 
checking stringprep in scram authentication
 2015-01-08 11:02:23 +03:00
HAMANO Tsukasa
ede5a353e8 checking stringprep in scram authentication 2015-01-08 14:12:05 +09:00
Badlop
b88fa6f617 Fix missing presences when adding shared groups (Github PR#99, thanks to Bokner) 2015-01-07 13:11:53 +01:00
Badlop
3882c4d514 Fix binaries in command ejabberdctl stop_kindly 2015-01-07 11:44:04 +01:00
badlop
d24dc4e9c8 Merge pull request #383 from weiss/fix-shutdown 
Give temporary processes a little time to stop cleanly
 2015-01-07 11:42:22 +01:00
Holger Weiss
9dc9d75502 Fix ejabberd_captcha's listener parsing 
If the "captcha_host" is specified without "http://" or "https://"
prefix, ejabberd_captcha tries to figure out the protocol automatically.
Fix the code that parses the listener configuration in order to do that.
 2014-12-24 00:35:22 +01:00
Holger Weiss
06db65e108 Give temporary processes time to stop cleanly 
Allow temporary processes to perform some final actions when shutting
down.  For example, moc_muc_room:terminate/3 fails to send 'unavailable'
presence to the room participants when killed immediately.
 2014-12-21 21:03:22 +01:00
Holger Weiss
d734f6beca Use correct message type for last published items 
When sending last published PubSub/PEP items, set the message type
that was used for broadcasting those items originally.
 2014-12-21 20:11:05 +01:00
Holger Weiss
e5428c5500 Improve add_message_type/2 function 
Let add_message_type/2 accept the type as an atom, and let the function
handle the 'normal' message type.  This doesn't change the behavior, but
avoids some code duplication.
 2014-12-21 18:44:53 +01:00
Jerome Sautret
cc958f7787 Fix upgrade of PubSub mnesia tables from older ejabberd version. 2014-12-18 11:51:28 +01:00
Evgeny Khramtsov
df88d9f2e5 Merge pull request #377 from weiss/new-timestamps 
Add timestamps to stanzas resent from stream management queue
 2014-12-13 09:42:30 +03:00
Holger Weiss
466278fde1 Let jlib use "B" instead of "w" to format integers 
As a small optimization, use io:format's "B" control sequence to format
integers.  We don't need to let Erlang figure out the data type if we
already know it.
 2014-12-12 23:50:03 +01:00
Holger Weiss
0a19dac4fd Add fractions of seconds to <delay/> timestamps 
Include fractions of a second with XEP-0203 <delay/> timestamps, as
specified in XEP-0082.

	Old timestamp: 2014-05-19T11:55:00Z
	New timestamp: 2014-05-19T11:55:00.123Z
 2014-12-11 23:11:35 +01:00
Holger Weiss
455039ae69 mod_muc_log: Fix configuration parsing 
Fix mod_muc_log's parsing of the "file_permissions" option.

Resolves #373.
 2014-12-08 15:51:06 +01:00
Holger Weiss
a78a0a65fe Let CSI code add timestamp at later point in time 
As a small optimization, make sure we won't add timestamps to presence
stanzas which end up being thrown away by the CSI code.
 2014-12-07 16:27:51 +01:00
Holger Weiss
ba8f38e2eb XEP-0198: Add timestamp to resent stanzas 
When an unacknowledged stanza is resent from the Stream Management
queue, add a timestamp so that the receiving client can display the time
at which the stanza was originally sent.
 2014-12-07 16:12:06 +01:00
Holger Weiss
9899935e42 Improve interface for adding timestamps 
Provide a simpler interface for adding <delay/> and <x/> timestamps to
stanzas.  This also makes sure that only one <delay/> tag and one <x/>
tag is added to a given stanza.
 2014-12-07 15:55:18 +01:00
Holger Weiss
2cb16bc509 Remove unused field from c2s #state 2014-11-26 00:15:19 +01:00
Evgeny Khramtsov
00dfcc1e10 Merge pull request #350 from flygoast/master 
Used current working home as base directory to config relative path.
 2014-11-25 14:24:37 +03:00
Evgeny Khramtsov
4163626844 Merge pull request #365 from weiss/csi-config 
Fix mod_client_state's configuration parsing
 2014-11-25 14:21:18 +03:00
Evgeny Khramtsov
f60c721f84 Merge pull request #364 from weiss/copy-normal-messages 
Also carbon-copy messages of type "normal"
 2014-11-25 14:21:06 +03:00
Evgeny Khramtsov
e97e56d776 Merge pull request #363 from weiss/drop-pep-errors 
Don't route PEP error messages to clients
 2014-11-25 14:20:11 +03:00
Evgeny Khramtsov
6b916e7a04 Merge pull request #354 from weiss/pep-privacy 
Respect privacy lists for incoming PEP messages
 2014-11-25 14:20:01 +03:00
Evgeny Khramtsov
6279c3fd8d Merge pull request #352 from weiss/no-last-pep-duplicates 
Don't duplicate last published PEP items
 2014-11-25 14:19:53 +03:00
Holger Weiss
6900a41e7d Fix mod_client_state's configuration parsing 
Don't log an "invalid value" message when "queue_presence" or
"drop_chat_states" is set to "false".
 2014-11-25 12:05:09 +01:00
Holger Weiss
a456482e2f Also carbon-copy messages of type "normal" 
It makes no sense to restrict carbon-copying to "chat" messages.
XEP-0280 is expected to be updated accordingly.
 2014-11-24 22:37:14 +01:00
Holger Weiss
30687c40ef Don't route PEP error messages to clients 2014-11-24 21:19:32 +01:00
Holger Weiss
16311b73c8 Add new hook: c2s_filter_packet_in 
The c2s_filter_packet_in hook can be used to modify or drop incoming
packets before they are transmitted to the client.
 2014-11-24 20:55:18 +01:00
Evgeny Khramtsov
946b64e166 Merge pull request #361 from weiss/parse-ldap-dn-filter 
Fix parsing of "ldap_dn_filter" option
 2014-11-22 10:36:21 +03:00
Holger Weiss
46d035c142 Fix parsing of "ldap_dn_filter" option 2014-11-22 01:33:23 +01:00
Leif Bredgaard Honore
5afa1f6ade Fix for ejabbed bug #359 - now strings are formatted correctly. 2014-11-20 14:21:51 +04:00
Holger Weiss
c566b1d01e Respect privacy lists for incoming PEP messages 2014-11-18 01:25:12 +01:00
Holger Weiss
84c227e6ae Don't duplicate last published PEP items 
When a contact becomes available, usually both the 'caps_update' hook
and the 'presence_probe_hook' are called.  For remote contacts, both
hooks triggered PEP notifications, so each item was sent twice.  Fix
this by ignoring the 'presence_probe_hook' for remote contacts.
 2014-11-18 01:13:22 +01:00
Holger Weiss
3b96525550 Support floating point message/presence intervals 
Let mod_muc support floating point values for "min_message_interval" and
"min_presence_interval", as documented in the guide.
 2014-11-15 22:35:56 +01:00
Gu Feng
62ccf1cf0e Used current working home as base directory to config relative path. 
When a config relative path specified, get_absolute_path would not
return an absolute path. The patch fixed it using current working
home as base directory.

Signed-off-by: Gu Feng <flygoast@126.com>
 2014-11-16 00:09:52 +08:00
Evgeny Khramtsov
d5ecd32cec Merge pull request #345 from weiss/last-pep-items 
Fix sending of last published PEP items to newly-available resources
 2014-11-14 21:27:24 +03:00
Holger Weiss
2446b66016 Use correct type for initial c2s #state.user value 2014-11-14 15:32:48 +01:00
Holger Weiss
f69d1ca282 Send last PEP items to remote subscribers 
When a remote subscriber becomes available, send him the last published
PEP items, as we do for local subscribers.

However, the current implementation depends on a running ejabberd_c2s
process of the publisher to send items to remote subscribers.  So, for
those, the behavior is always like it is for local subscribers when
"ignore_pep_from_offline" is set to "true".
 2014-11-14 01:33:11 +01:00
Holger Weiss
830fdccd21 Don't broadcast last published PEP items 
When a client becomes available, don't send the last published PEP items
of all his peers to all his other peers, but only to that client.
 2014-11-14 01:03:26 +01:00
Holger Weiss
5cc30c3977 Move routing of last PEP items into new function 
This doesn't change the behavior, but avoids some code duplication.
 2014-11-14 00:16:13 +01:00
Holger Weiss
8efae1f05b ODBC: Sync last item notifications with mod_pubsub 
A while back, mod_pubsub was modified to address EJAB-1456.  However,
the change was only partially applied to mod_pubsub_odbc.  This commit
adds the remaining part.
 2014-11-14 00:02:59 +01:00
Matthias Rieber
8184326eb9 Fix kick_user command 2014-11-10 20:53:00 +01:00
Evgeny Khramtsov
f47a59de2f Merge pull request #340 from weiss/disable-mechanisms 
New option: disable_sasl_mechanisms
 2014-11-10 11:47:10 +03:00
Holger Weiss
ee0ecd2419 New option: disable_sasl_mechanisms 
The new "disable_sasl_mechanisms" option allows for restricting the list
of SASL mechanisms offered to the client.

Closes #339.
 2014-11-10 01:10:04 +01:00
Holger Weiss
41dc1efde4 Avoid duplicates of carbon copies 
When multiple resources have the same (highest) priority, the session
manager routes messages sent to their bare JID to each of these
resources.  When another resource has a lower priority but receives
carbon copies, make sure it won't receive multiple copies of such
messages.
 2014-11-05 19:04:02 +01:00
Evgeny Khramtsov
56dab7ddbe Merge pull request #328 from flygoast/master 
Return an empty <vCard/> element in an IQ-result when no vCard exists.
 2014-10-29 16:43:49 +03:00
Evgeniy Khramtsov
74b67fa0dc Add new option: store_empty_body 2014-10-27 14:18:09 +03:00
Evgeniy Khramtsov
067958d705 Merge branch 'master' of github.com:processone/ejabberd 2014-10-27 13:44:59 +03:00
Evgeniy Khramtsov
dec1e1f67f Revert "fix mod_offline to store only chat messages with body xml element" 
This reverts commit 436f0832c1.
 2014-10-27 13:44:46 +03:00
Holger Weiss
2399aba67d Accept trailing whitespace in Base64 strings 2014-10-25 02:05:02 +02:00
Gu Feng
94cdcd7b34 Return an empty <vCard/> element in an IQ-result when no vCard exists. 
According to XEP-0054, if no vCard exists, the server MUST return a stanza
error (which SHOULD be <item-not-found/>) or an IQ-result containing an
empty <vCard/> element.

Signed-off-by: Gu Feng <flygoast@126.com>
 2014-10-25 00:55:49 +08:00
Holger Weiss
2d748115ee Don't advertise auth mechanisms too early 
If "starttls_required: true" is specified for c2s connections,
authentication mechanisms shouldn't be offered before negotiating the
TLS connection.
 2014-10-23 10:04:14 +02:00
Evgeny Khramtsov
0b22277b11 Merge pull request #321 from weiss/fix-http-request-record 
Use 'request' record definition from header file
 2014-10-21 12:12:55 +04:00
liudan
d2edcf1288 fix odbc keepalive interval bug 2014-10-21 10:05:44 +08:00
Holger Weiss
0c24e18b5e XEP-0198: Abort immediately on queue overflow 
Terminate the ejabberd_c2s process immediately once stanza queue
overflow is detected.  This makes sure the FSM won't process additional
stanzas before terminating if the recipient is flooded.
 2014-10-17 01:35:30 +02:00
Holger Weiss
96d6aacede Use 'request' record definition from header file 
This fixes a 'badrecord' crash in mod_http_fileserver.
 2014-10-16 13:51:13 +02:00
Holger Weiss
1ccc0d8bcb XEP-0198: Set #state.conn field on session resume 2014-10-12 19:44:35 +02:00
Holger Weiss
7bdc1151b1 Make sure "starttls_required" can't be bypassed 
Don't allow clients to circumvent the "starttls_required" option by
enabling XMPP stream compression.
 2014-10-12 02:08:08 +02:00
Evgeniy Khramtsov
4bbf16b21a Fix list unblocking when Riak is used as a backend 2014-10-10 11:38:13 +04:00
Evgeniy Khramtsov
d87ca9fb7b Fix format of an XML-RPC response 2014-10-04 12:55:59 +04:00
Evgeniy Khramtsov
7b3209cc7f Switch to P1 implementation of XML-RPC 2014-10-04 12:49:33 +04:00
Evgeniy Khramtsov
1d782db84f Process XML-RPC requests via p1_xml and ejabberd_http 2014-10-04 12:49:12 +04:00
Evgeniy Khramtsov
e109f352e3 Make directory creation more robust 2014-10-02 14:21:27 +04:00
Holger Weiss
277e1dc3ff Offer CSI stream feature only if configured 
Don't offer the CSI stream feature when mod_client_state isn't actually
configured to filter stanzas.  This makes sure clients won't send CSI
tags that end up being ignored.
 2014-09-25 18:28:20 +02:00
Holger Weiss
56175fef1b Add new hook: c2s_post_auth_features 
The c2s_post_auth_features hook can be used to extend the list of stream
features offered after authentication.
 2014-09-25 18:15:33 +02:00
Holger Weiss
7aec0337e1 Remove invisible presence fields from c2s #state 
Invisible presence isn't supported anymore, so the corresponding
ejabberd_c2s #state fields were unused.
 2014-09-25 00:08:56 +02:00
Holger Weiss
61c8836740 Rename deref_aliases back to ldap_deref_aliases 
The "ldap_deref_aliases" option has accidentally been renamed to
"deref_aliases".  Revert that change (but accept both names for a
while), so that the option name now matches the documentation again.
 2014-09-23 11:31:44 +02:00
Holger Weiss
0a9212583d XEP-0198: Support "resend_on_timeout: if_offline" 
If "resend_on_timeout" is set to "if_offline", resend unacknowledged
stanzas only if no other resource is online when the session times out.
In other words, allow for sending them to offline storage, but nowhere
else.
 2014-09-16 22:42:34 +02:00
Holger Weiss
b8c98232b8 Support XEP-0352: Client State Indication 2014-09-11 17:44:29 +02:00
Evgeny Khramtsov
7a48e30523 Merge pull request #296 from weiss/remove-unused-clause 
XEP-0198: Remove unused function clause
 2014-09-07 07:27:17 +04:00
Holger Weiss
2ca563e328 XEP-0198: Remove unused function clause 
In the 'wait_for_resume' state, #state.mgmt_pending_since is always
initialized.  fsm_next_state/2 takes care of that.
 2014-09-06 20:39:38 +02:00
Holger Weiss
2e169167d4 XEP-0198: Change state on gen_tcp:send/2 failure 
When Stream Management is enabled and a gen_tcp:send/2 call fails, go
into the 'wait_for_resume' state immediately.  This makes sure that
gen_tcp:send/2 won't be called again, which might avoid an Erlang issue
where gen_tcp:send/2 apparently hangs despite 'send_timeout' (and
'send_timeout_close') being set.
 2014-09-06 20:34:32 +02:00
Holger Weiss
11b2921971 XEP-0198: Let fsm_next_state/2 check timeout value 
Don't force the fsm_next_state/2 caller to check for 'mgmt_timeout = 0'.
 2014-09-06 20:29:02 +02:00
Evgeniy Khramtsov
ac2ba399a9 Make sure x:data form possesses 'type' attribute 2014-09-03 21:28:55 +04:00
Evgeniy Khramtsov
fda73c3d16 Fix privacy checks of presence probes 2014-09-01 16:39:02 +04:00
Evgeniy Khramtsov
a1ce33ebf8 Automatically remove IPs from ban, add the documentation 2014-08-27 13:25:49 +04:00
Evgeniy Khramtsov
9be9949dab Remove useless -include() 2014-08-27 13:18:29 +04:00
Evgeniy Khramtsov
0f1d95a074 Ban the IP if there are too many failed authentications 2014-08-27 13:18:22 +04:00
Evgeniy Khramtsov
2430e6691b Add mod_fail2ban 2014-08-27 13:17:56 +04:00
Holger Weiss
f1ad6f017b Fix a comment in ejabberd_hooks 2014-08-26 01:04:15 +02:00
vesvalo
01a3c1c2e1 Fix return value of mod_shared_roster:delete_group. Current one is not compatible with mod_admin_extra. 2014-08-21 15:13:43 +04:00
vesvalo
c48b7f272b fix 404 on pep first publishing with odbc 2014-08-21 11:23:58 +04:00
Holger Weiss
2802b6cee2 Allow for "max_ack_queue: infinity", as documented 2014-08-20 12:53:26 +02:00
Holger Weiss
7274dafe10 Store persistent MUC room during creation 
Make sure persistent rooms are stored to the database.  Without this
change, a room got lost if the 'persistent' flag was handed over to
mod_muc:create_room/5 and the server was then restartet before any
activity took place in that room.
 2014-08-19 11:12:51 +02:00
Evgeny Khramtsov
bc2e26fecd Merge pull request #277 from weiss/xep-0198 
XEP-0198: Create shorter session resume IDs
 2014-08-15 19:15:32 +04:00
Holger Weiss
2d4c39cd54 XEP-0198: Create shorter resume IDs 
Omit the user and server name from the 'previd' value.
 2014-08-15 10:56:59 +02:00
Evgeny Khramtsov
9484b11383 Merge pull request #276 from weiss/xep-0198 
XEP-0198: Don't crash if the resume ID is incorrect
 2014-08-15 10:49:59 +04:00
Holger Weiss
848e1497d1 XEP-0198: Gracefully handle broken 'previd' 
Produce a proper error message instead of crashing when the 'previd'
value of a <resume/> request has an unexpected format.
 2014-08-15 01:54:41 +02:00
Holger Weiss
2daf95e93f XEP-0198: Gracefully handle wrong credentials 
Produce a proper error message instead of crashing when the JID encoded
in the 'previd' value of a <resume/> request is different from the
authenticated JID.
 2014-08-15 01:53:47 +02:00
Evgeny Khramtsov
1b1d9b5a73 Merge pull request #269 from Iperity/master 
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on...
 2014-08-15 03:20:36 +04:00
Evgeny Khramtsov
5836eb5bc2 Merge pull request #268 from benlangfeld/fix/ldap_filter_dnattributes_new_ejabberd 
Set dnAttributes on when it's requested by a filter
 2014-08-15 03:19:18 +04:00
Evgeniy Khramtsov
5c88f6423a Fix the deprecation warning to reflect YAML format 2014-08-12 14:26:15 +04:00
Evgeny Khramtsov
0917209711 Merge pull request #273 from gamenet/master 
odb_queries patch return value of functions update and update_t in case of sql insert
 2014-08-08 16:03:03 +04:00
vesvalo
436f0832c1 fix mod_offline to store only chat messages with body xml element 2014-08-08 13:57:27 +04:00
vesvalo
92f89e3d45 Fix odbc update_t and update insert case return value 2014-08-08 13:26:16 +04:00
Holger Weiss
38c016a041 Log auth method for incoming s2s connections 
Generate an [info] message that logs whether an incoming s2s connection
is authenticated using the SASL EXTERNAL mechanism or via Server
Dialback.  While at it, also mention whether TLS is enabled.
 2014-08-05 14:10:32 +02:00
Nathan Bruning
4f63cb21c2 Fix migration of pubsub nodes. Was deleting and re-creating all nodes on each startup. 2014-08-03 21:03:16 +02:00
Alexey Shchepin
f00725dffb mod_offline now uses gen_server 2014-07-31 14:26:09 +04:00
Christophe Romain
4205108f30 typo fix on roster subscription (EJAB-1711) 2014-07-31 11:50:22 +02:00
Ben Langfeld
651de2ca8e Set dnAttributes on when it's requested by a filter 2014-07-29 15:22:54 -03:00
Evgeniy Khramtsov
3d3a4f7543 Fix events broadcasting via C2S 2014-07-22 19:42:49 +04:00
Christophe Romain
320abee110 apply pull request #250 to pubsub_odbc as well 2014-07-21 17:14:59 +02:00
Christophe Romain
0579fc80ec Merge pull request #250 from Iperity/master 
Fix configuraton with custom nodetree plugin
 2014-07-21 17:11:29 +02:00
Evgeniy Khramtsov
014d61955c Move some namespaces definitions into header file 2014-07-21 08:32:26 +04:00
Evgeniy Khramtsov
1f4e0c8aea Fix Record-Route signing 2014-07-17 20:30:36 +04:00
Paweł Chmielowski
e0c9242dcf treap.erl was moved to p1_utils 2014-07-17 11:57:23 +02:00
Paweł Chmielowski
0456b78d87 Use p1_utils 2014-07-17 10:52:31 +02:00
Evgeniy Khramtsov
568068c79f Get rid of p1_mnesia file 2014-07-17 08:32:13 +04:00
Evgeniy Khramtsov
b5c4fe6626 Change return type to reflect recent changes in p1_sip 2014-07-16 15:28:36 +04:00
Evgeniy Khramtsov
64205426bf Fix returned types 2014-07-16 10:33:49 +04:00
Evgeniy Khramtsov
89025eea39 Fix blocklist get 2014-07-16 07:43:24 +04:00
Evgeniy Khramtsov
4ef0dd6997 Better Riak usage detection 2014-07-15 20:26:45 +04:00
Evgeniy Khramtsov
b5f1b17926 Fix broken hooked functions 2014-07-15 19:22:33 +04:00
Nathan Bruning
99c28ab4d6 Fix configuraton with custom nodetree plugin 2014-07-15 12:04:06 +02:00
Evgeniy Khramtsov
792b5a24df Serialize records to proplists before storing then in Riak 2014-07-14 08:24:44 +04:00
Evgeniy Khramtsov
a5987633e0 Fix compile errors introduced by previous cherry picks 2014-07-10 14:16:33 +04:00
Evgeniy Khramtsov
2fe8e0dea5 Make it possible to check Riak connection status 2014-07-10 13:55:24 +04:00
Evgeniy Khramtsov
6a73b96459 Fix roster versioning support when Riak backend is enabled 2014-07-10 13:54:06 +04:00
Evgeniy Khramtsov
538d4ffbd0 Fix case clause 2014-07-10 13:53:57 +04:00
Evgeniy Khramtsov
c15dc01cff Improve Riak pool management 2014-07-10 13:52:29 +04:00
Evgeniy Khramtsov
e82219185b Add SQL to Riak converter 2014-07-10 13:29:01 +04:00
Evgeniy Khramtsov
0490c2f139 Improve Riak support 2014-07-10 13:26:37 +04:00
Alexey Shchepin
a4b02c38db Updated riak support 2014-07-10 13:15:15 +04:00
Alexey Shchepin
47763c10e3 Preliminary Riak support 2014-07-10 13:04:39 +04:00
Evgeniy Khramtsov
fc692ea512 Add start_module/2 2014-07-08 20:58:03 +04:00
Evgeniy Khramtsov
2b8c4acd57 Rename options 2014-07-07 09:40:08 +04:00
Evgeniy Khramtsov
ee40c0e9a7 Add new option support: always_record_route 2014-07-07 09:40:01 +04:00
Matwey V. Kornilov
50a73d1188 Use -include_lib instead of -include for esip and p1_xml 
-include_lib is used in order to find deps. Rebar include magic is not required anymore.
Rebar uses deps as library directory.
 2014-07-05 17:57:35 +04:00
Evgeniy Khramtsov
76ebebf2a0 Revert "Fix IQ XML generation." 
This reverts commit 26a4d91297.
 2014-07-05 17:53:45 +04:00
Jerome Sautret
aba7150af1 Return MySQL error messages as binary. 2014-07-04 17:39:28 +02:00
Jerome Sautret
26a4d91297 Fix IQ XML generation. 2014-07-04 15:21:40 +02:00
Christophe Romain
9265720f92 add ability to rotate logs on given date condition 2014-07-02 23:46:54 +02:00
Evgeniy Khramtsov
273631c242 New option support: log_rotate_count 2014-07-02 14:59:05 +02:00
Evgeniy Khramtsov
bb8a0f71e6 Support new options: log_rotate_size and log_rate_limit 2014-07-02 14:58:58 +02:00
Evgeniy Khramtsov
ffdb39d269 Disable SASL error logger if lager is enabled 2014-07-02 14:58:46 +02:00
Badlop
8fae4748a1 mod_caps doesn't provide Mnesia export feature 2014-06-27 13:49:17 +02:00
Evgeny Khramtsov
31440a586c Merge pull request #238 from weiss/log-node-mismatch 
Check for Mnesia node name mismatches on startup
 2014-06-12 13:23:17 +04:00
Holger Weiss
1ef2dd45f3 Check for Mnesia node name mismatches 
Log a proper error message if the node running ejabberd doesn't own the
Mnesia database.
 2014-06-12 11:00:22 +02:00
Evgeniy Khramtsov
b29615561c Change default flow timeout as recommended per the RFC 2014-06-12 09:30:10 +04:00
Evgeniy Khramtsov
7892b72bcb Don't forget to close socket of timed out flow 2014-06-12 09:30:04 +04:00
Holger Weiss
c20acbf4d8 Mention configuration file path in error messages 
If reading or parsing a YAML configuration fails, log the full path to
the configuration file (as we do for old-style ".cfg" files).
 2014-06-11 15:03:33 +02:00
Evgeny Khramtsov
e66899e68e Merge pull request #231 from hamano/case_clause_error_at_node_hometree_odbc 
case_clause_error_at_node_hometree_odbc
 2014-06-09 23:50:43 +04:00
Evgeniy Khramtsov
87f8c2ecd8 Don't stop roster table conversion on broken askmessage 2014-06-09 10:55:05 +04:00
Evgeniy Khramtsov
62be3bc111 Fix previous commit 2014-06-09 10:40:52 +04:00
Evgeniy Khramtsov
c485aea48b Don't stop irc table conversion on broken JIDs 2014-06-09 10:36:42 +04:00
Evgeniy Khramtsov
6f4b4ad087 Ignore malformed parameters for mod_irc module 2014-06-07 07:45:36 +04:00
Evgeniy Khramtsov
3e8a0af6d1 Fix data convertion 2014-06-07 07:05:24 +04:00
Evgeniy Khramtsov
12ab5a749f Clean up all timers gracefully 2014-06-06 22:29:50 +04:00
Evgeniy Khramtsov
ddfbca5830 Use a different timer for flow control 2014-06-06 13:53:13 +04:00
Evgeniy Khramtsov
9e72529544 SIP Outbound (RFC 5626) support 2014-06-06 09:36:45 +04:00
Christophe Romain
11aa51373a add missing format handler 2014-06-05 16:23:17 +02:00
Holger Weiss
e0e74a9d5e Don't "forget" listener options 
If a listener is started or stopped via ejabberd_listener:add_listener/3
or ejabberd_listener:delete_listener/3, the configuration for all
listener modules is updated using the Module:transform_listen_option/2
function for each listener module that exports such a function.
However, for listener modules that don't provide that function (such as
ejabberd_stun), all but one option was dropped.  This is now fixed.

The issue could be triggered e.g. by enabling mod_proxy65 in the modules
section.
 2014-06-04 20:54:26 +02:00
HAMANO Tsukasa
cc228db337 e_clause error at node_hometree_odbc:get_items/3 2014-06-04 18:53:37 +09:00
Evgeniy Khramtsov
c546ce2439 Reply to pings 2014-06-03 21:18:30 +04:00
Evgeniy Khramtsov
6441c284e0 Don't add 'rport' paramater to 'Via' header 2014-06-02 20:46:29 +04:00
Evgeniy Khramtsov
0aea9c74bd Rename option 'route' to 'record_route' and add new option 'routes' 2014-06-02 10:16:34 +04:00
Evgeniy Khramtsov
9a0d77571d Add global static shared_key option 2014-06-01 14:20:09 +04:00
Evgeniy Khramtsov
f446e7fc0b Sign 'Record-Route' in order to proxy unauthorized ACKs 2014-06-01 13:35:14 +04:00