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,401 Commits 7 Branches 109 Tags 66 MiB
6e40573c13
Commit Graph

3402 Commits

Author SHA1 Message Date
Paweł Chmielowski
b5ac0db895 Be able to merge old style configs with {listen,...} 2015-10-08 13:07:00 +02:00
Paweł Chmielowski
6d25db6600 Handler module shouldn't be used for differentiating listeners when merging configs 2015-10-07 16:45:07 +02:00
Christophe Romain
880114a909 Enforce get_allowed_items_call 2015-10-07 16:40:37 +02:00
Christophe Romain
653105a44f Fix acl issue from cleanup 2015-10-07 15:12:15 +02:00
Christophe Romain
f938c2a5e2 Revert "Avoid crypto:hmac/3 call for R15B compatibility" 
This reverts commit 31e356c126.
 2015-10-07 14:18:56 +02:00
Christophe Romain
6a23cad454 Revert "Fix compilation on Erlang R15B" 
This reverts commit a5d6044448.
 2015-10-07 14:18:47 +02:00
Christophe Romain
6aeb9dcb38 cosmetic cleanup 2015-10-07 14:18:38 +02:00
Evgeniy Khramtsov
6378c673df Avoid MAM dups when routing to multiple resources 2015-10-02 16:09:55 +02:00
Evgeniy Khramtsov
c7750689e8 Fix force_update_presence 2015-10-02 16:06:47 +02:00
Paweł Chmielowski
24fa95fd60 Fix problem with --auth in ejabberd_ctl:process2/2 2015-10-01 21:09:03 +02:00
Paweł Chmielowski
67d3b50598 Switch macros resolving in config files to be global instead of per file 2015-10-01 14:34:48 +02:00
Alexey Shchepin
cf975da8f2 Update several commands for recent ejabberd_commands changes 2015-09-28 15:29:25 +03:00
Alexey Shchepin
88a206400a Add oauth_access option 2015-09-25 19:48:53 +03:00
Badlop
1781a58929 Strip Nick element in message stanzas sent to a room (#686) 2015-09-25 17:00:00 +02:00
Christophe Romain
a1129dc96b Add OAuth support (thanks to Aleksey) 2015-09-25 15:49:07 +02:00
Badlop
ee456cc2af Fix regression introduced when code was binarized (EJAB-641) 2015-09-24 17:21:14 +02:00
Holger Weiss
484fd1f51f Log TLS errors as [debug] messages only 
Closes #652 and closes #679.
 2015-09-24 12:00:59 +02:00
Evgeniy Khramtsov
89b3471742 Add <stanza-id/> (XEP-0359) to archived messages 2015-09-22 21:15:34 +03:00
Paweł Chmielowski
e289344972 Nameprep host name passed to http-bind before using in (EJAB-1658) 2015-09-22 15:42:57 +02:00
Christophe Romain
23a1aceac0 Improve external module configuration management (EJAB-1746) 2015-09-22 12:49:55 +02:00
Evgeniy Khramtsov
70b1dc479c Add MAM (XEP-0313) v0.4 support 2015-09-22 12:23:36 +03:00
Jerome Sautret
df3862cf84 Add set_loglevel command (EJABS-2524) 2015-09-21 17:07:44 +02:00
Christophe Romain
497cbb3ec2 Merge branch 'master' of github.com:processone/ejabberd 2015-09-18 09:06:51 +02:00
Christophe Romain
ec1969ddca Remove unused functions from old get_items api 2015-09-17 18:00:17 +02:00
Paweł Chmielowski
f6b892b366 Guard against passing undefined C2SPid to xml parser before become_controller gets called 
Our new nif xml parser don't handle this gracefully, so we better don't
call it that way.

This is only triggered on old style ssl sockets, where ssl layer must
be activated early, before association between socket and c2s is
established
 2015-09-17 11:37:01 +02:00
Holger Weiss
4a4065c9c6 Let BOSH/WebSocket support "max_resume_timeout" 
Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
 2015-09-17 00:33:08 +02:00
Quan Zhuo
ae51277316 Comment unused type, unused term 2015-09-16 22:52:36 +08:00
Paweł Chmielowski
5593ebbbca Properly handle define_macros in merged config files 2015-09-16 12:20:07 +02:00
Holger Weiss
59321ac56e XEP-0198: Improve handling of non-message stanzas 
When an XEP-0198 session times out, always return an error for
unacknowledged IQ stanzas, and always drop presence stanzas.  That is,
the "resend_on_timeout" option no longer applies to those stanzas types,
but only to messages.
 2015-09-15 22:42:22 +02:00
Evgeniy Khramtsov
fc7d3a44b8 Simplify MSSQL configuration 2015-09-13 18:34:10 +03:00
Evgeniy Khramtsov
25791cfde8 Fix MSSQL support 2015-09-13 18:31:49 +03:00
Christophe Romain
48c5e73321 ext_mod must be started before ejabberd_config 2015-09-11 15:14:12 +02:00
Badlop
a50f00f9e8 Include ext_mod modules when checking accepted options (ejabberd-contrib#116) 2015-09-10 20:11:02 +02:00
Paweł Chmielowski
f56a9e400d Pass stream management options defined in http listener to http-bind and websocket 2015-09-04 12:42:53 +02:00
Holger Weiss
5095fdb6b0 New XEP-0198 option: "max_resume_timeout" 
In the past, the "resume_timeout" option defined both the default resume
timeout and the maximum resume timeout clients are permitted to request.
Admins might want to allow clients to request a timeout value that's
larger than the default, though.  This can now be done by specifying the
"max_resume_timeout" option.
 2015-09-03 21:20:15 +02:00
Badlop
8d1ea87e02 Use hide_sensitive_log_data in eldap.erl 2015-09-03 16:28:21 +02:00
Evgeniy Khramtsov
6740b1f0e1 Rename idna.erl to ejabberd_idna.erl (#702) 2015-09-02 16:02:46 +03:00
Badlop
1bc2c8cbb1 Add verification of hide_sensitive_log_data global option 2015-09-02 13:46:03 +02:00
Evgeniy Khramtsov
eebd4bbd8f Remove unused function now_to_iso/1 2015-09-02 14:13:23 +03:00
Evgeniy Khramtsov
14ddbce3a9 Do not forget to set from/to when fetching from MUC history 2015-09-01 12:35:51 +03:00
Paweł Chmielowski
e24bfe7b62 Fix problem with merging same port, different ip listeners in config files 
Also switch to function used by ejabberd_listener to extract that
information instead of rolling our own code for that.
 2015-09-01 10:57:48 +02:00
Evgeniy Khramtsov
190f76c676 Fetch MUC MAM messages from room history directly if it's not enabled in room configuration 2015-09-01 11:52:08 +03:00
oxpa
3d5d1ecbe4 get_room_options will not crash in case of query for a non-existent room 2015-08-28 03:34:51 -08:00
Evgeniy Khramtsov
832f6d39f9 Always include RSM in final message 2015-08-24 13:29:15 +03:00
Evgeniy Khramtsov
94444c87e8 Remove MAM archives on MUC room destroy 2015-08-24 13:28:58 +03:00
Badlop
247bd9eae5 More eye-candy mod_http_bind help page (thanks to Marek Foss) 2015-08-21 15:23:15 +02:00
Evgeniy Khramtsov
6177ae3ffb Improve S2S certificate checks 2015-08-20 01:04:56 +03:00
Evgeniy Khramtsov
b570070834 Fix case clause during S2S certificate checks 2015-08-19 23:47:45 +03:00
Evgeniy Khramtsov
775cf2d459 Change namespace from muc#admin to muc#user 2015-08-19 15:31:35 +03:00
Paweł Chmielowski
6f0ee83317 Don't overwrite listeners for different transports in config merging 
Before this having listeners on same port for both tcp and udp would after
config merging step left only one of them.

Many thanks to Holger Weiß for noticing this.
 2015-08-19 10:14:39 +02:00
Paweł Chmielowski
f89db30d77 Catch errors when calling inet:peername in ejabberd_http 2015-08-17 15:50:35 +02:00
Badlop
ac6b436dcf Prettify copyright links (thanks to GreenLunar)(#692) 2015-08-13 12:22:14 +02:00
Badlop
994602c97d Store and retrieve "mam" value in room configuration 2015-08-12 20:28:23 +02:00
Badlop
279d4b00ac Fix and document create_rooms_file and destroy_ 2015-08-12 17:18:41 +02:00
Badlop
8c9c556f1f Changed API of some mod_muc_admin command arguments 
With this commit, arguments change in two commands:
* destroy_room: does not require Host argument
* send_direct_invitation: instead of Room, now requires Name and Service
 2015-08-12 13:26:24 +02:00
Badlop
ab0f488dda Room response to disco#info node muc#traffic should be an error (EJAB-741) 2015-08-12 12:40:51 +02:00
Evgeniy Khramtsov
40feed723d Add support for MUC MAM 2015-08-08 22:15:36 +03:00
Paweł Chmielowski
c71d57a05d Handle merging of append_host_config as is done for host_config 2015-08-06 17:53:18 +02:00
Paweł Chmielowski
5a1ac4faf1 Add ability to override main config file options with data from included files 2015-08-06 17:12:15 +02:00
Christophe Romain
45a312a0eb Remove obsolete pubsub migration command 2015-08-06 16:57:04 +02:00
Matthias Rieber
f5e857a5bd typo 2015-08-06 08:44:15 +02:00
Alexey Shchepin
4125dfd166 mod_multicast changes: 
- catch exceptions
- do ets:give_away for multicastp table on init
- don't send multicasts to itself
- don't check user@server for multicast support
- handle empty disco items
- ignore cdata in <addresses/>
- properly check for subdomains
 2015-08-05 19:21:28 +03:00
Paweł Chmielowski
3a5dd51b42 Use websocket pings also on old style connections 2015-08-05 16:09:23 +02:00
Christophe Romain
dc0934bff7 Update FSF address 2015-08-05 09:52:54 +02:00
Holger Weiss
c0497d46af mod_client_state: Throttle stanzas by default 
Enable the mod_client_state options "drop_chat_states" and
"queue_presence" by default.  These features are now well-tested in
practice.
 2015-08-05 00:05:11 +02:00
Holger Weiss
13f7be682d Rename muc_filter_packet to muc_filter_message 
The hook is just triggered on groupchat messages, not on other types of
stanzas.
 2015-08-04 21:16:45 +02:00
Holger Weiss
3d4e8ffac6 New hook: muc_filter_presence 
Add a hook that allows for modifying or dropping presence stanzas sent
to MUC rooms.
 2015-08-04 20:13:00 +02:00
Mickael Remond
e3b7d43b76 Add split_jid/1 
This is a convenience reverse of make_jid/1. It allows extracting the jid parts
without relying on using the jid record structure, to abstract details.
 2015-08-04 09:48:59 +02:00
Evgeniy Khramtsov
f377992232 Do not crash SIP authentication on SCRAMed passwords 2015-08-02 14:47:45 +03:00
Holger Weiss
04094b3dcf Don't copy messages of type "normal" without body 
Don't carbon-copy messages of type "normal" that don't have a body
element as an immediate subtag.  Those messages are usually generated by
clients or servers (as opposed to messages written by humans).  This
includes MAM messages, for example.
 2015-07-28 21:34:02 +02:00
Holger Weiss
8fe930c3d1 Also check for <no-storage/> hint 
Check for the <no-storage/> and <no-permanent-storage/> hints in
addition to <no-store/> and <no-permanent-store/>.  XEP-0334 (0.1)
mentions both variants, and unfortunately, both of them are in use.
 2015-07-28 21:08:33 +02:00
Holger Weiss
1048e21643 XEP-0198: Don't add <delay/> tags to IQ stanzas 2015-07-28 21:00:12 +02:00
Badlop
d03d08539b Reuse some strings in WebAdmin's Listening Ports 2015-07-27 11:40:56 +02:00
Paweł Chmielowski
76104cd117 Fix problem with merging values from multiple config files 2015-07-24 15:46:08 +02:00
Christophe Romain
e211bf7131 Ensure config snippet is loaded at module installation (EJAB-1741) 2015-07-24 15:09:57 +02:00
Christophe Romain
32fc586c08 Allow contribution to include .yml or .yaml config file 2015-07-24 14:30:31 +02:00
Christophe Romain
8fedc945bf Allow migration of old pubsub items with xmlelement in body (#479) 2015-07-24 13:44:01 +02:00
Christophe Romain
d481017746 Merge pull request #642 from weiss/pep-on-caps-update 
Also send PEP notifications when local contact updates CAPS
 2015-07-24 12:07:22 +02:00
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
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