b72ed7afa4
Update mix.lock
2018-09-26 15:01:27 +02:00
c109d3eff0
Add odbc connection robustness ( #2428 )
2018-09-25 16:59:49 +02:00
0d743da595
Update xmpp
2018-09-25 16:18:16 +02:00
ef57067edc
Update deps in mix.lock
2018-09-25 14:31:22 +02:00
e054c2800b
Allow a subscribed owner/admin to kick lower-affiliation moderator
2018-09-25 10:55:57 +02:00
49f1b4a691
Allow an occupant owner/admin to kick lower-affiliation moderator
2018-09-25 10:55:56 +02:00
8b61c7fe4b
Allow a subscribed owner/admin to kick participants and visitors
2018-09-25 10:55:54 +02:00
9bac2fa185
Allow a subscribed owner/admin to change participant<->visitor
2018-09-25 10:55:51 +02:00
c3f62c037d
Update deps once more
2018-09-24 15:49:26 +02:00
4ddee2d89b
Increase validity of generated test ca cert and regenerate all certs
2018-09-24 15:19:19 +02:00
054426072e
Update deps
2018-09-24 14:37:54 +02:00
f28200b6de
Update ISSUE_TEMPLATE
2018-09-21 19:20:23 +03:00
8c16400332
Update ISSUE_TEMPLATE
2018-09-21 19:02:14 +03:00
0394baaa7a
Allow changing invitation message from muc_invite hook
2018-09-21 16:37:52 +02:00
1b3a6dd54a
Recognize more fields that aren't atom in format_room_option
2018-09-20 18:02:47 +02:00
6d1ea222c0
Remove forgotten debug line
2018-09-19 23:17:04 +03:00
08f3d066b1
Switch more log message to warning level
...
The commit is supposed to improve logging at loglevel 3, which
is the recommended level for high loaded ejabberd servers
2018-09-19 23:12:14 +03:00
ddca2e8b4a
Switch mod_fail2ban log messages to warning level
2018-09-19 19:33:33 +03:00
a2b2a27bb6
Resize SQL pool on configuration reload
...
Fixes #2541
2018-09-19 11:55:40 +03:00
d60d72d7bf
Don't hide 'undef' exceptions during config validation
2018-09-19 01:00:50 +03:00
7ff5f2d3fa
Fail early when loading unavailable SIP or STUN modules
2018-09-18 18:19:42 +03:00
1866b56e3b
Report real address of a listener
2018-09-18 14:51:42 +03:00
e96bfbdbfa
Remove useless type specs
2018-09-18 13:24:06 +03:00
3cc964fbcc
Fix listeners child specs creation
2018-09-18 13:22:34 +03:00
29f6c43ae3
Remove forgotten debug line
2018-09-18 12:58:29 +03:00
03de853e4f
Refactor ejabberd_listener
2018-09-18 12:53:36 +03:00
fb367469d4
Add ability to configure test to use new sql schema
2018-09-18 09:44:54 +02:00
d2cdfa66f9
mod_http_upload: Log error if 'put_url' is reused
...
Log a proper [error] message if a single 'put_url' is used for multiple
virtual hosts.
2018-09-17 21:46:37 +02:00
d5c1174385
Revert "New option tombstone_expiry locks recent room creation after destroy ( #2546 )"
...
This reverts commit efb4fd0d10
2018-09-17 12:28:39 +02:00
dd888f90ec
Improve error formatting
2018-09-17 12:08:04 +03:00
bb9593dd12
Remove unused variables
2018-09-17 10:42:29 +02:00
de385591d0
Refactor ejabberd listener API
2018-09-17 11:21:02 +03:00
78dae4036e
Reintroduce change removed by mistake in 'Improve match macro'
2018-09-17 09:34:15 +02:00
dafea66c0f
Increase 'max_stanza_size' limit for c2s listener
...
Specify a larger 'max_stanza_size' limit for c2s connections in the
default configuration in order to reduce the risk of this limit being
hit by legitimate traffic (such as avatar uploads).
2018-09-17 00:18:38 +02:00
c851f9608a
Set a 'max_stanza_size' for incoming s2s listener
...
Specify a 'max_stanza_size' limit for incoming s2s connections in the
example configuration, but use a relatively large value in order to
minimize the risk of this limit being hit by legitimate traffic.
2018-09-16 23:57:44 +02:00
3367c5b120
MySQL: Use MEDIUMTEXT for MAM/offline messages
...
Let MySQL/MariaDB accept message stanzas with a size of up to 16 MiB,
rather than truncating at 64 KiB.
2018-09-16 20:42:37 +02:00
d4579d2a20
[test] Improve match macro
2018-09-14 20:27:59 +02:00
410ac9b966
[tests] Update stream_id from stream:stream after auth
2018-09-14 20:27:33 +02:00
adf0d7de91
mod_muc_room: Fix the room's CAPS hash
...
Don't forget the room's xdata when calculating the CAPS hash.
2018-09-14 00:18:17 +02:00
8c03427c25
Merge pull request #2605 from af8a524db1/remove_unused_error
...
mod_register: Remove unused error 'too_many_users'
2018-09-13 22:36:59 +03:00
c156eabb24
mod_register: Remove unused error 'too_many_users'
2018-09-13 21:34:12 +02:00
1d6cbd2561
Trigger hook for user_send_packet in send_message command ( #2604 )
2018-09-13 18:21:30 +02:00
a7a1e7be94
Merge pull request #2602 from aquarhead/expect-mnesia-up
...
Expect mnesia_up event when joining cluster
2018-09-12 17:15:04 +03:00
8673d2926d
Expect mnesia_up event when joining cluster
2018-09-12 11:01:05 +00:00
2d246f61dd
Fix some dialyzer warnings
2018-09-09 09:59:08 +03:00
9de2ca4568
Merge pull request #2597 from dmitryDemchenko/master
...
fix for freetds UTF-8 corruption
2018-09-07 22:50:16 +03:00
b545301f63
fix for freetds UTF-8 corruption
2018-09-07 19:56:39 +03:00
145c0116bf
Bump lager version
...
This is needed for OTP-21 compatibility
2018-09-07 18:03:36 +03:00
79c511a441
Add information about real sender to mucsub message meta
2018-09-06 13:36:59 +02:00
90b22da880
Use newere fast_tls
2018-09-05 11:14:19 +02:00
57936bfa4e
Don't stop sending pings when receiving timeout for timeout_action=none
2018-09-04 09:52:41 +02:00
5c931d7004
Correctly handle empty result with RSM
...
Fixes #2588
2018-09-02 00:37:07 +03:00
88d0b71d58
Get stacktrace out of lager context
...
Calling erlang:get_stacktrace() inside lager functions produces
stacktraces of the logging function itself, not the function which has failed.
2018-09-01 19:37:26 +03:00
b416527e4f
Don't set termination reason into presence-unavailable status
...
Fixes https://github.com/processone/xmpp/issues/35
2018-09-01 17:39:39 +03:00
8c8c480477
ejabberd_s2s_in: Log message on connection close
...
Log a message when an incoming s2s connection is closed, analogous to
the message on outgoing s2s connection close.
2018-08-29 16:23:56 +02:00
66132353df
Sign certs used by tests with sha256
...
Seems that openssl1.1.1 (at least debian version) rejects certs signed with
md5 or sha1, so lets use something that works.
2018-08-28 11:27:44 +02:00
b30a9f2f75
Better formatting of unexpected return from Module:start/2
2018-08-28 10:41:57 +03:00
0cbd41fbdc
Fix max_user_conferences in Mnesia to consider only one MUC service ( #2556 )
2018-08-20 15:47:53 +02:00
5b055d7eec
Use "localhost" as a default host
2018-08-17 18:42:09 +03:00
01a1f929b4
Bump xmpp version
2018-08-17 18:16:14 +03:00
f0f3ec211e
Disable cache for anonymous auth backend
...
Fixes #2566
2018-08-17 17:56:23 +03:00
fd76bc9242
Update xmpp
2018-08-16 11:59:26 +02:00
6cd70947be
Third attempt to fix the typo!
2018-08-15 12:56:41 +02:00
8cefe58a89
Fix typo from commit 0bf93eefc
2018-08-15 12:40:39 +02:00
c3361bab95
Handle get_presence(Pid) when session doesn't exist ( #2547 )
2018-08-15 12:16:01 +02:00
f3f3b1586e
Fix typo in command description
2018-08-13 16:42:16 +02:00
0bf93eefcb
Try to update tests to handle recent MUC subscriptions change ( #2272 )
2018-08-13 15:26:40 +02:00
10e01b7bfc
Return human error messages when calling export2sql with wrong path ( #2480 )
2018-08-13 13:56:29 +02:00
8f0e066135
In response with list of room subscriptions include also events ( #2272 )
2018-08-13 12:52:33 +02:00
dfd96b6037
Remove num_active_users as it uses calls to last_activity mnesia table ( #2448 )
2018-08-08 14:18:49 +02:00
5b373470ac
Remove direct calls to muc_room mnesia table in mod_muc_admin ( #2448 )
2018-08-08 14:18:34 +02:00
0146189b65
Add markdown options as specified in the docs git repo
2018-08-07 16:59:26 +02:00
4c4c82897c
Add import_prosody explanation from docs git repo
2018-08-07 16:58:53 +02:00
5509e648ad
Allow acme and oauth commands to be read by gen_markdown_doc_for_commands
2018-08-07 16:58:48 +02:00
c9ba0e83d2
Handle ejabberd_captcha error reports in mod_register_web ( #2553 )
2018-08-02 18:36:41 +02:00
b56c012407
Merge pull request #2551 from MarcelWaldvogel/configurable-extauth-pool
...
Make it possible to join extauth pools
2018-07-31 07:52:06 +03:00
9b48dc9cc3
Make it possible to join extauth pools
2018-07-30 22:49:18 +02:00
efb4fd0d10
New option tombstone_expiry locks recent room creation after destroy ( #2546 )
...
Setting the new mod_muc option tombstone_expiry to a positive integer
will make that any room destroyed gets replaced with a room tombstone.
That tombstone cannot be joined, so it blocks accessing the old room JID
until the expiry seconds have passed.
The default value is 0 seconds, so tombstones are not created.
2018-07-30 19:24:35 +02:00
83e2462853
mod_mam: Don't strip offline message stanza IDs
...
As mod_offline currently doesn't preserve metadata, add an explicit
check for messages retrieved from offline storage to avoid stripping
their stanza IDs.
Thanks to Zuglufttier for spotting this.
2018-07-27 00:27:10 +02:00
cdfd0cce7b
mod_mam: Make sure stanza IDs aren't reused
...
Strip the stanza ID from the metadata of outgoing messages to make sure
it's not reused for the (local) recipient's MAM archive.
2018-07-27 00:14:48 +02:00
2d45832a39
ejabberd_auth: Restore lost case clause
...
Let check_password_with_authmodule/6 handle the case where
validate_credentials/2 returns an error. This got lost in commit
4f8af723c6
2018-07-26 22:37:25 +02:00
1af2cf37ea
Wait for more data than just <stream:stream> before sending in bosh
...
This fixes issue #2545
2018-07-26 18:56:05 +02:00
ca022b6d1f
Make sure that we always start inactivity timer from drop_holding_receiver
2018-07-26 17:29:35 +02:00
e54f1a8485
Set wait_timer to undefined when timer was triggered
2018-07-26 17:29:35 +02:00
1be2112634
Fix search for User in vjud
...
See https://stackoverflow.com/questions/51478247/ejabberd-search-module-failed-to-handle-the-query
2018-07-24 20:01:22 +02:00
6dc452e7f5
Update xmpp
2018-07-23 17:23:11 +02:00
57a3512dcc
mod_http_upload: Adjust default value of 'put_url'
...
Let the default 'put_url' point to the HTTPS listener specified in the
new default configuration.
2018-07-18 19:44:56 +02:00
1de69174ef
Merge pull request #2538 from weiss/tls-by-default
...
Enable TLS by default (and require it for c2s)
2018-07-18 19:38:13 +03:00
26b9d25f32
Enable TLS by default (and require it for c2s)
2018-07-18 18:22:24 +02:00
8ad6afd652
mod_http_upload: Deprecate 'service_url' option
...
Users should migrate to the 'external_secret' interface.
2018-07-18 18:16:42 +02:00
7fed5a3eb6
Merge pull request #2537 from rouen-sk/patch-1
...
Update mssql.sql
2018-07-18 18:37:30 +03:00
b199b68380
Update mssql.sql
...
Fixed:
- conflicting clustered indexes on 2 tables
- semicolon type
- Azure SQL incompatibility
2018-07-18 17:12:17 +02:00
e433a63105
mod_http_upload: Avoid function-like macros
2018-07-17 22:28:31 +02:00
68c9328a9c
Move cancel_timer/1 function into 'misc' module
2018-07-17 20:50:58 +02:00
6601f182c4
mod_http_upload: Add "Allow" to OPTIONS response
...
RFC 2616 says: "A 200 response SHOULD include any header fields that
indicate optional features implemented by the server and applicable to
that resource (e.g., Allow) [...]."
2018-07-17 19:42:57 +02:00
326db5535c
mod_muc: Don't set default for muc#roomconfig_lang
...
For the muc#roomconfig_lang setting, no default is preferable over a
possibly incorrect default value.
2018-07-16 15:15:36 +02:00
2539be1a04
mod_http_upload: Avoid timers from timer module
...
Use erlang:start_timer/3 instead of timer:send_after/2, as the former is
more efficient.
2018-07-16 00:17:11 +02:00
4e9930597d
mod_http_upload: Don't store "external" slots
...
Don't store requested upload slots if an 'external_secret' is
configured.
2018-07-15 21:53:50 +02:00
2dfb5a6a5c
Note about Redis requirement in the test suite README
2018-07-15 10:14:47 +03:00
8faa6afa67
Require Redis version >= 3.2.0
...
Since we now use Lua scripting for cleaning up c2s sessions
the minimum supported Redis version is 3.2.0 or above because
we need to work correctly with Redis replication mechanism.
****** BACKWARD INCOMPATIBILITY WARNING *******
** THIS SHOULD BE ADDED TO THE RELEASE NOTES **
*** PACKAGE MAINTAINERS SHOULD BE INFORMED ***
***********************************************
2018-07-15 09:52:03 +03:00
12e537c43f
Avoid "ejabberdctl status" crash
2018-07-14 20:27:30 +02:00
4394ec38b6
Don't forget to remove Lua scripts on uninstall
2018-07-14 18:02:50 +03:00
420e05fa0d
Clean up contributed code for Redis SM
2018-07-14 17:53:00 +03:00
e2fb154fe9
Merge pull request #2525 from satish-olx/master
...
Use lua scripting to clear redis sessions.
2018-07-14 16:53:45 +03:00
e9f219a0ac
Improve wording
2018-07-14 16:52:09 +03:00
711c5c0d54
Merge pull request #2526 from nosnilmot/enforce-pubsub-option-attributes
...
Enforce pubsub option required/rejected attributes
2018-07-14 16:42:15 +03:00
f9ed34db4d
Enforce pubsub option required/rejected attributes
...
XEP-0060 states that 'node' and 'jid' attributes to <options> element MUST NOT
be included when <options> are specified at same time as <subscribe> :
https://xmpp.org/extensions/xep-0060.html#subscriber-configure-subandconfig
mod_pubsub will require 'node' and 'jid' attributes on standalone pubsub
options requests, and reject subscribe requests that have options that include
either 'node' or 'jid'
2018-07-14 11:55:38 +01:00
9a895058e7
Merge pull request #2522 from weiss/bump-max-user-conferences
...
mod_muc: Increase default 'max_user_conferences' value
2018-07-14 08:51:11 +03:00
e76a57e144
Ensure that returned priority in a number in mod_admin_extra
2018-07-13 09:51:19 +02:00
6fc6bdefc2
Update ejabberd_sm_redis.erl
2018-07-12 16:14:26 +05:30
96e35a3248
Lua script for cleaning redis sessions
...
Changes:
1. Added extra keys for tracking node -> session mapping
2. Lua script for clearing the sessions in redis itself.
2018-07-12 16:10:24 +05:30
48be8e7b1e
Adopt code that uses parse_listener_portip after result change
2018-07-11 14:07:24 +02:00
f40f3a9da7
Fix piefxis import of privacy lists (thanks to crosser)( #2412 )
2018-07-11 12:56:57 +02:00
f81b49fe44
Fix piefxis import of vCard elements ( #2514 )
2018-07-11 12:56:38 +02:00
395d2e86bc
Improve listener errors formatting
2018-07-11 09:29:55 +03:00
5b3af9d4cd
Fix compiler warnings regarding test cases
2018-07-11 00:07:57 +02:00
7e5d766a02
pubsub_tests: Fix race condition
2018-07-10 21:25:06 +02:00
c5dd1bdd9d
mod_http_upload_quota: Fix process name lookup
...
Fix mod_http_upload_quota's process name lookup for the case where a
slot is requested by a JID whose domain part is not the virtual host the
mod_http_upload_quota process is running on.
2018-07-10 21:19:15 +02:00
d03432a956
Fix regression: list SASL EXTERNAL mechanism for inbound s2s
2018-07-10 10:14:08 +03:00
4b747c2c78
mod_muc: Increase 'max_user_conferences' default
...
Let up to 100 clients of a given account join MUC rooms by default. The
old default value can be too small, e.g., when users join many (private)
rooms with multiple devices.
2018-07-10 01:00:06 +02:00
3a566e3cdf
mod_stream_mgmt: Remove dead case clauses
2018-07-10 00:52:27 +02:00
b915469f5e
mod_stream_mgmt: Add descriptive text to errors
...
Closes #2485 .
2018-07-10 00:46:48 +02:00
8b9166d067
Improve value formatting
2018-07-09 20:32:01 +03:00
dc6861eb73
Use ejabberd_config:get_version in ejabberdctl status
2018-07-09 17:11:40 +02:00
90a4aafec0
Merge pull request #2516 from licaon-kter/patch-6
...
Remove vcard search default value
2018-07-09 10:08:00 +03:00
4c06f13d18
Remove vcard search default value
2018-07-08 23:48:08 +00:00
8c796ed027
Better format invalid values when logging them
2018-07-08 20:42:53 +03:00
68d12017cc
Better detection of duplicated routes/hosts
2018-07-08 20:28:11 +03:00
491993d401
Reload internal room's configuration when mod_muc is reloaded
...
Fixes #2513
2018-07-08 14:52:12 +03:00
a981bf9a59
Merge pull request #2511 from licaon-kter/patch-5
...
Remove stats and time from template
2018-07-08 10:43:25 +03:00
920e4512b6
Merge pull request #2515 from ChaosKid42/fix_HMAC_in_http_upload
...
fix generation of HMAC for external_secret
2018-07-08 10:42:55 +03:00
fbdcc44fd9
fix HMAC for external_secret
2018-07-07 17:01:39 +02:00
b2b29269ec
Remove cyrsasl elixir tests, we no longer have it
2018-07-06 09:49:30 +02:00
11811e5f48
Only lookup FQDN at configuration (re)loading
2018-07-06 09:18:27 +03:00
b7f62a4fa7
Remove stats and time from template
...
Are these important for a new admin?
2018-07-06 01:33:41 +00:00
0bb14d16c7
Move XMPP stream and SASL processing to xmpp repo
2018-07-06 01:07:36 +03:00
59f5a098b5
Use p1_rand in the test suite
2018-07-05 11:53:04 +03:00
ed1ee6061e
Move move randoms module to p1_utils repo
2018-07-05 11:51:49 +03:00
50b645aa92
Move shaper to p1_utils repo
2018-07-05 09:31:55 +03:00
52f2a7de4b
Set 'from' attribute for client connections when it is absent
2018-07-04 08:59:14 +03:00
bce8922e5d
Don't set from/to attributes in resource binding iq
2018-07-04 08:57:28 +03:00
86236431b9
mod_http_upload: Treat file and network errors differently
2018-07-04 08:55:52 +03:00
c0d4d31b5b
Merge pull request #2495 from rodrigues/update_ptbr
...
Update pt-br translations
2018-07-03 16:50:29 +02:00
295bec8551
Don't ignore send() result
2018-07-03 13:44:58 +03:00
b341a3cef3
Increase default buffer size for mod_proxy65
2018-07-03 13:38:49 +03:00
fface33d54
HTTP Upload: introduce new option 'external_secret'
...
The option makes it possible to offload all HTTP Upload processing
to a separate HTTP server. Both ejabberd and the HTTP server
should share this secret and behave exactly as described at
at https://modules.prosody.im/mod_http_upload_external.html
in the 'Implementation' section. Example configuration:
modules:
...
mod_http_upload:
...
put_url: "http://separate.http.server/upload"
external_secret: "foo bar baz"
...
2018-07-02 16:53:44 +03:00
fbf6ba2738
Merge branch 'master' of github.com:processone/ejabberd
2018-07-02 01:08:09 +03:00
38ec3f66c7
Enable Roster Versioning in the default config file
2018-07-02 01:08:02 +03:00
56dc625f9a
Merge pull request #2502 from licaon-kter/patch-4
...
Default config example fix reversed text
2018-07-02 00:20:46 +03:00
7c5ee93c88
Default config example fix reversed text
...
...in enable OMEMO
2018-07-01 21:18:18 +00:00
77163c43d2
Simplify the default configuration file
...
After some discussion with the community it was decided to
clean the configuration file from excessive comments and
explicitly configured default values. Also, mod_mam and
mod_http_upload have been added.
The rationale for this is to have a clean and not bloated
configuration file which doesn't scare away newcomers and
which has all features from the Compliance Suite 2018 (XEP-0387)
enabled by default.
For further configuration an admin is encouraged to read the
documentation at https://docs.ejabberd.im/admin/configuration
2018-07-01 23:57:27 +03:00
d1d02e2f26
Update pt-br translations
2018-07-01 15:15:41 +02:00
6b8bc811ac
Don't crash on most common gen_server:call errors
2018-07-01 14:26:49 +03:00
b662ec2a78
Accept IP address as a return value from resolve/2 callback
2018-06-30 10:19:58 +03:00
8ca035496e
Update fast_xml and xmpp in mix.lock
2018-06-29 15:41:37 +02:00
a463f5a25a
Replace hardcoded disco features with macros
2018-06-29 14:48:07 +03:00
dce4e4de6d
Add check for files missing in hex packaging
2018-06-29 12:51:20 +02:00
9b70177fd5
Update xmpp
2018-06-29 12:50:57 +02:00
1fbb36c34a
Fix misc:try_url for erlang < R20
2018-06-29 11:13:29 +02:00
46abf7cfab
Rename obsolete type in comments
2018-06-29 11:10:35 +02:00
62cb398734
Convert test that used moka, and drop that dependancy
2018-06-29 10:52:47 +02:00
dff940b89e
Support both filenames and URLs in 'cssfile' option of mod_muc_log
...
If filename is provided, its content is inserted into the HTML page.
If URL is provided, it's used as a value of 'href' HTML attribute.
2018-06-29 11:34:53 +03:00
66591b1c0d
Improve URLs validation
2018-06-29 11:06:24 +03:00
b094ce8ea5
HTTP Upload: increase gen_server call timeout
2018-06-29 10:32:53 +03:00
9c82c2f6d0
HTTP Upload: put more info in log messages
2018-06-29 09:58:33 +03:00
0a40ab93c8
Don't crash when encoding {xmlcdata, _}
...
Fixes #2493
2018-06-28 15:04:46 +03:00
c526b0e8ff
Update mix.lock
2018-06-28 12:11:44 +02:00
35136f47ed
Bump version in mix.exs
2018-06-28 10:57:09 +02:00
8f2233eff7
Update deps
2018-06-28 10:56:59 +02:00
8879d1d533
Avoid code duplication when checking presence subscription
2018-06-28 10:37:20 +03:00
71ae7e9fd9
Work-around against public_key incompatibility introduced in OTP21
...
The commit introduced the incompatility is
https://github.com/erlang/otp/commit/304dd8f81e28ed04cde9f6f7ac1f79870da1c2cd
Thanks to Stu Tomlinson for spotting the issue.
Fixes #2488
2018-06-27 19:40:03 +03:00
644873dae9
Don't check packets sent to self
2018-06-27 15:02:03 +03:00
9a11db91f9
Use lists:foldl/3
2018-06-27 13:36:58 +03:00
af8c6d2428
Generate HTTP Upload form using xdata codec
2018-06-27 13:29:38 +03:00
87357c700f
Do not ignore a certificate containing no domain names
...
Log a warning instead and assign it to an "empty" domain
2018-06-27 11:27:39 +03:00
7881c5670c
Don't replace valid certificates with invalid ones
...
When building the certificates chains, if several certificates
are found matching the same domain their validity is checked:
* the invalid one is ignored and the valid one is picked
* if both are valid or both are invalid, then the one with
sooner expiration is ignored.
Fixes #2454
2018-06-27 10:55:37 +03:00
881e02632b
Improve error formatting in mod_http_upload
2018-06-26 19:32:29 +03:00
47d117c1bf
Support SASL PLAIN by xmpp_stream_out
...
Also, SASL mechanisms chaining is now supported:
if several mechanisms are supported and authentication
fails, next mechanism in the list is picked, until the
list is exhausted. In the case of a failure, the latest
SASL failure reason is returned within handle_auth_failure/3
callback.
2018-06-25 19:16:33 +03:00
cf6f540d53
Don't pass sockmod to xmpp_stream_out
2018-06-25 15:28:02 +03:00
557e6ecdd0
Introduce resolve/2 and connect_options/3 callbacks for xmpp_stream_out
2018-06-25 15:19:49 +03:00
5dd3f4c22b
Allow gen_server process registration
2018-06-25 14:55:33 +03:00
e7c3b57b8b
Allow reconnecting from disconnected state
2018-06-25 14:52:33 +03:00
c907915695
Intercept EXIT signal
2018-06-25 14:46:31 +03:00
911ed4a7ca
Add Resource Binding support to xmpp_stream_out
2018-06-25 13:50:35 +03:00
499ae96254
Don't use 'unsupported-version' inside SM <failed/> element
...
This error condition is defined within stream errors, however,
XEP-0198 says:
> This element SHOULD contain an error condition, which MUST
> be one of the **stanza** error conditions defined in RFC 6120.
2018-06-25 09:56:44 +03:00
ac31c85866
Use error formatting functions from xmpp library
2018-06-25 09:45:45 +03:00
c4c91cc956
Generate SASL failures on unencrypted connections only for s2s
2018-06-23 20:31:01 +03:00
d809aafba0
Fix Erlang limits in ejabberdctl.cfg.example to reflect current situation
2018-06-23 20:01:21 +03:00
6ffb120fce
Fix typo
2018-06-21 15:14:19 +03:00
55f8aa1b22
Add new options for OOM watchdog
...
* oom_watermark: 1..100
Start OOM watchdog only when system memory usage exceeds
this value in percents. When the usage drops below the value,
OOM watchdog is stopped. The default is 80 (percents).
Note that once OOM watchdog is started, it performs full garbage
collection periodically: this can be seen as spikes in CPU
utilization and drops in RAM usage. If your system is permanently
above the watermark, it may cause significant CPU overhead.
* oom_queue: positive integer
Only trigger OOM killer when total amount of messages in all queues
of all Erlang processes is above this value. The default is 10000.
Note that this value only takes effect when `oom_killer` is set
to `true` (this is the default). Otherwise, only a warning will
be logged.
2018-06-21 14:35:19 +03:00
274e9fe7b5
Guard against pres_last=undefined in mod_offline
2018-06-20 12:16:10 +02:00
f465742f2c
Remove lowercased duplicates from ejabberd.pot
2018-06-20 13:02:06 +03:00
9e83c45b3c
Restore forgotten translations from previous commit
2018-06-20 12:50:36 +03:00
446e6e6f3b
Update ejabberd.pot
2018-06-20 12:32:10 +03:00
3a5d2dbed8
Move mod_irc to ejabberd-contrib
2018-06-20 12:27:44 +03:00
aea6166efe
Omit summary form for push tests
2018-06-20 00:15:56 +02:00
23cc0f8c3c
mod_push: Include a static body text by default
...
Set the 'include_body' option to a static text by default. Some app
servers check for the presence of a 'last-message-body' field to
distinguish between notifications generated for actual chat messages and
notifications triggered by other types of traffic.
2018-06-19 23:12:27 +02:00
81f4dd0e6a
mod_push_keepalive: Increase default timeout
...
Set the default session timeout to three days. This way, sessions will
survive a weekend without traffic, for example.
2018-06-19 22:26:08 +02:00
dee3081df1
Fix reset_stream in websocket using pre-rfc protocol
2018-06-19 17:51:09 +02:00
6acac7c93f
Render roomname, allowinvites and allowpm in room disco#info
2018-06-19 14:02:45 +03:00
c2f664f941
mod_push_mnesia: Simplify record matching
...
Omit record fields that aren't used for matching.
2018-06-18 23:12:27 +02:00
75127a0deb
mod_push_mnesia: Fix lookup of all host sessions
2018-06-18 23:05:08 +02:00
bb76da03ea
mod_mam: Don't replace existing stanza ID
...
Preserve the original stanza ID for resent messages. This avoids
storing duplicates in the MAM archive.
2018-06-16 00:43:22 +02:00
3099702039
New shaper implementation
2018-06-15 11:56:46 +02:00
3ec623f329
Make connected_users_info and user_sessions_info DB-agnostic ( #2448 )
...
The result returned by connected_users_info command has changed,
and is now similar to the result of user_sessions_info.
Notice that num_active_users and process_rosteritems still require Mnesia.
2018-06-15 11:28:57 +02:00
6c323b729b
Improve type spec
2018-06-14 19:51:50 +03:00
17b05ff4b7
Get rid of all calls to jlib.erl module
2018-06-14 19:49:27 +03:00
7bd5c7fe59
Update mod_muc_room.hrl
2018-06-14 19:19:09 +03:00
7b04a625be
Get rid of jlib.hrl/jlib.erl
2018-06-14 19:11:43 +03:00
49b08949b1
Do not check for deprecated types
...
Since we support only Erlang >= OTP-17.5, the check for old-style
dict/queue/etc types is no longer needed
2018-06-14 18:58:35 +03:00
141be53c21
Get rid of ejabberd.hrl reference from the test suite
2018-06-14 14:24:15 +03:00
fd8e07af47
Get rid of ejabberd.hrl header
...
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
2018-06-14 14:00:47 +03:00
c3c75affa9
Log modules startup
2018-06-14 10:18:10 +03:00
85f09b365f
mod_push: Omit summary for outgoing messages
...
Don't include a urn:xmpp:push:summary form in push notifications that
are triggered by outgoing messages. App servers might use the form
fields to generate user-visible notifications directly (as opposed to
just waking the client app). This is usually not desired for outgoing
messages.
2018-06-13 21:43:40 +02:00
645f11d79d
Advertise disco#info and disco#items features in mod_disco
...
Fixes #2470
2018-06-13 14:55:06 +03:00
0a20e45690
mod_push: Further improve handling of carbons
...
Also check for carbon-copied messages (with a body) in the queue of
unacknowledged stanzas.
2018-06-13 00:25:14 +02:00
0a9f522222
mod_push: Also include sender/body for carbons
...
If the 'include_sender' and/or 'include_body' options are specified,
also include a urn:xmpp:push:summary form in push notifications that are
generated for carbon-copied messages (with a body).
2018-06-12 22:47:23 +02:00
4f293751f0
Update mix deps
2018-06-11 14:21:35 +02:00
6f481e3ceb
Avoid lager crash on external authentication failure
...
Fixes #2463
2018-06-08 09:51:26 +03:00
00534d4566
Increase start-up/stop timeout in systemd unit
...
On slow systems, it can take quite a while for "ejabberdctl started"
and/or "ejabberdctl stopped" to return.
2018-06-07 17:40:05 +02:00
40185b6bd3
Add ability to modify version string
2018-06-07 15:38:33 +02:00
1de407c420
Merge pull request #2460 from imShara/patch-1
...
OMEMO enable HOWTO added
2018-06-06 20:05:42 +03:00
815b95c623
OMEMO enable HOWTO added
...
Depend on #2425
2018-06-06 20:03:42 +03:00
8e1a13b259
upload_tests: Make size error check stricter
2018-06-04 23:29:24 +02:00
a4049d9418
Omit 'xmlns' field from 'feature_csi' record
...
The 'xmpp' library has been updated to omit the 'xmlns' field from the
'feature_csi' record.
2018-06-04 23:05:11 +02:00
ba30ac8ce8
Return detailed error if HTTP upload is too large
...
If the file size specified in an HTTP upload slot request exceeds the
the configured maximum size, include the limit with the stanza error.
2018-06-04 22:18:56 +02:00
43c3134f55
Also format gracefully errors returned during module reload
2018-06-03 18:53:30 +03:00
67fc2015de
Fix problem in commit 548ef7b835
2018-06-01 18:36:39 +02:00
548ef7b835
Don't crash in bosh when we receive request with RID < prev_rid
2018-06-01 16:12:22 +02:00
4337300fce
Always display room's xdata in disco#info
2018-06-01 09:07:16 +03:00
cab8005bf3
Display muc#roomconfig_changesubject in room's disco#info
...
Fixes #2449
2018-06-01 08:56:56 +03:00
4fc8d1c4a4
Send trailer and close socket explicitly on stream end
2018-06-01 07:58:03 +03:00
1261502f6a
Improve indentation
2018-05-30 22:53:34 +03:00
dacba3ec00
Merge remote-tracking branch 'processone/pr/2446'
...
* processone/pr/2446:
Fix authentication for usernames containing uppercase characters
2018-05-30 20:53:11 +02:00
4f8af723c6
Fix authentication for usernames containing uppercase characters
...
Applies to authentication methods that compare User (normalized)
and AuthzId (was not being normalized). These are external, ldap & pam.
Fixes #2280
2018-05-30 18:43:26 +01:00
5e446d50a8
Get rid of direct calls to 'session' Mnesia table
...
Fixes #2439
2018-05-30 19:21:56 +03:00
22d76659c0
Bump xmpp version in order to support language tags validation
2018-05-30 09:54:26 +03:00
0f9db50c8d
Support for roomconfig_lang/roominfo_lang
...
Now room owners are able to set a preferred language
for the discussions in the room, so other users can
discover rooms based on the language they wish to talk.
TODO: the language format should conform to RFC 5646.
This check should be implemented in 'xmpp' library.
Fixes #2436
2018-05-30 08:11:58 +03:00
52b8226671
Use 'list-multi' type for XEP-0157 xdata fields
...
Thanks to Jonas Wielicki for spotting this
2018-05-29 19:37:24 +03:00
3b9e6eaa95
Merge pull request #2438 from licaon-kter/patch-3
...
Add default_db in the example config
2018-05-28 16:22:30 +03:00
2c18f89d5b
Add default_db in the example config
...
I only found it in the docs after setting up per module db_
2018-05-28 13:19:59 +00:00
0381ce1e75
Better report errors of module startup
2018-05-28 09:19:49 +03:00
fc77051b68
Don't call Mod:function() in xmpp_stream callbacks
...
If a callback function is not defined by the `Mod` then
a call to code_server process is performed. Under heavy load
this may cause code_server to get overloaded. We now avoid this.
2018-05-26 09:06:24 +03:00
bfe2545c01
mod_muc_sql: Fix export to SQL
...
The "host" column is supposed to hold the MUC host name.
2018-05-24 01:28:29 +02:00
c6a9c30f1c
mod_push_mnesia: Apply cosmetic changes
...
Improve the readability of the 'max_user_sessions' check.
2018-05-23 21:40:54 +02:00
508f3ef88d
mod_push_sql: Check 'max_user_sessions' limit
...
Remove the oldest push session(s) of a user if the number of enabled
sessions exceeds the 'max_user_sessions' limit.
2018-05-23 20:02:52 +02:00
97f7d99007
Handle "Expect: 100-continue" request header in ejabberd_http
2018-05-23 14:52:47 +02:00
2bbfc0b79e
Merge pull request #2431 from yokomizor/fix-xmpp-commit
...
Missing #block_item{} record building with mix
2018-05-22 17:45:53 +03:00
10a5a5eb01
Merge pull request #2430 from yokomizor/ext_mod-export-add_sources_1
...
Export ext_mod:add_sources/1
2018-05-22 17:39:27 +03:00
2e529f5826
Missing #block_item{} record building with mix
...
Ref: #638f2d2
2018-05-22 16:37:39 +02:00
4a4cc32650
Export ext_mod:add_sources/1
2018-05-22 16:16:13 +02:00
d2114be6f3
Correctly calculate remaining bytes on file upload
2018-05-19 18:29:33 +03:00
db51d522e8
Add support for REST API custom headers
...
ext_api_headers can be defined as a single string. Headers are separated
by comma. Definition MUST NOT contain spaces. Example
"X-MyHead:test,X-Token:082748"
2018-05-17 14:47:21 +02:00
82c42051c3
Correctly resolve upload.localhost for the test suite
2018-05-17 13:24:23 +03:00
e4c106e0dd
Add tests for mod_http_upload
2018-05-17 12:02:00 +03:00
b64e1d95d2
Fix typo file:read() -> file:open()
2018-05-17 12:00:06 +03:00
c41bab9ca0
Clean state between requests in ejabberd_http
2018-05-15 14:25:19 +02:00
063737e4f5
Optimize HTTP requests memory usage
...
Due to historical reasons, ejabberd loads the whole file/data
into the memory when serving an HTTP request. This is now improved:
1) For GET requests ejabberd uses sendfile(2) if the underlying
connection is HTTP and falls back to read/write loop with 64kb
buffer for HTTPS connections. This type of requests are handled
by mod_http_fileserver, mod_http_upload, ejabberd_captcha, etc
2) POST requests are now limited to 20Mb and are fully downloaded
into the memory for further processing (by ejabberd_web_admin,
mod_bosh, etc)
3) PUT requests (e.g. for mod_http_upload) are handled by read/write
loop with 64kb buffer
2018-05-14 19:39:58 +03:00
cb3bb710bd
Handle muc_register_nick success correctly ( #2415 )
2018-05-14 12:24:56 +02:00
c30715e67b
Disable thumbnails creation by default
2018-05-11 18:56:31 +03:00
27594db029
Support IPv6 connections for PostgreSQL, MySQL and LDAP
...
Fixes #2411
2018-05-11 16:43:49 +03:00
6ac8f6eaee
Relax check for valid command name in access_persmissions
2018-05-11 12:24:00 +02:00
338d27b45b
Use never version of moka
2018-05-09 10:58:00 +02:00
35a076c251
Stop ejabberd initialization on invalid/unknown options
...
Since now, ejabberd doesn't ignore unknown options and doesn't
allow to have options with malformed values. The rationale for
this is to avoid unexpected behaviour during runtime, i.e. to
conform to "fail early" approach. Note that it's safe to reload
a configuration with potentialy invalid and/or unknown options:
this will not halt ejabberd, but will only prevent the configuration
from loading.
***NOTE FOR PACKAGE BUILDERS***
This new behaviour should be documented in the upgrade notes.
2018-05-09 11:44:24 +03:00
680384c342
Reduce IQ handler code copying
2018-05-09 10:30:00 +03:00
11ff2a1ccf
Fix a typo
2018-05-09 09:44:26 +03:00
3ac1675919
Option watchdog_admins has no effect anymore
2018-05-08 23:47:37 +03:00
de85c1718e
Bypass account creation error when password is empty, caused by extauth
2018-05-08 18:19:07 +02:00
46f47db512
Get rid of unused rebar instructions
2018-05-08 16:17:07 +03:00
6811b92a80
Don't use warnings_as_errors in samerlib
2018-05-08 11:37:20 +02:00
8766854870
Get rid of ?FUNCTION_NAME macro (it's OTP19+ feature)
2018-05-08 12:06:58 +03:00
61ae0ff02c
Improve logging of external authentication failures
2018-05-08 09:36:34 +03:00
5522403e8e
Don't stop on out-of-date requests
2018-05-07 22:43:01 +03:00
b23d5754e8
Improve robustness of external authentication backends
...
Now all external ports are attached to supervising processes
and requests are balanced in round-robin manner until the pool
is exhausted.
The commit also deprecates `extauth_instances` option and introduces
`extauth_pool_size` option instead, with the default value of a number
of logical processors (i.e. CPU cores).
Fixes #2403
2018-05-07 19:27:18 +03:00
b1a03cc346
Make trusted_proxied ejabberd_http option accept ip masks
2018-05-04 09:53:07 +02:00
ca94cbfd31
Teach acl ip matching about ipv4 mapped ipv6 addresses
2018-05-04 09:52:06 +02:00
410db89167
ejabberd_auth: Don't use cache if it's disabled
...
Don't let the check whether a user exists use the cache if caching was
disabled in the configuration.
2018-05-03 00:31:33 +02:00
638f2d2e67
mod_blocking: Use #block_item{} record
2018-05-02 22:17:32 +02:00
56ee6f0518
Ignore any policy when signing a certificate for the test suite
2018-05-02 10:52:46 +03:00
4e83fc41d4
Also generate CA certificates for the test suite
2018-05-02 10:28:22 +03:00
4ea481d1dd
Add validator for 'accept_interval' listening option
2018-04-30 11:52:00 +03:00
0bd4d1aade
Update mix.exs version
2018-04-25 12:30:36 +02:00
d49aa429ca
Update deps
2018-04-25 10:45:18 +02:00
316a19d600
Merge pull request #2399 from 4z3/ejabberdctl-fix-parser
...
ejabberdctl: fix parameters parsing
2018-04-25 10:39:19 +02:00
c43037887a
ejabberdctl: fix parameter parsing
2018-04-25 00:41:30 +02:00
538e0d4844
misc: Catch all Base64 decoding errors
2018-04-24 18:29:10 +02:00
f3795e9d03
mod_http_upload: Add MIME type for M4A files
2018-04-24 18:16:16 +02:00
3df919244c
PubSub purge_node must use a transaction ( #2231 )
2018-04-24 15:58:56 +02:00
67773c5174
Merge branch 'master' of github.com:processone/ejabberd
2018-04-24 14:44:58 +02:00
61dee97738
Pubsub creation/modification use varchar ( #2397 )
2018-04-24 14:44:52 +02:00
6774418a7f
Introduce new mod_muc option: access_register
...
The option is an ACL rule defining who is able to register
nicknames within the conference service. The default is `all`
(for backward compatibility).
2018-04-24 12:29:59 +03:00
ad6fcc7865
Get rid of useless memory/disk usage warnings
2018-04-24 12:12:48 +03:00
ca28faa51a
Fix get_affiliation/2
2018-04-24 12:07:10 +03:00
5b730cdbf2
Use httpc directly instead of using p1_http wrapper
2018-04-23 17:40:44 +02:00
9ed0357760
Use correct headers in rest calls
2018-04-23 12:29:56 +02:00
06ce884aa8
Add stubs for affiliation-specific backend callbacks
2018-04-23 11:35:43 +03:00
3fc0eb4f5b
Use correct db backend for remove_mam_for_user_with_peer
2018-04-20 14:06:23 +02:00
3bfa683586
Fix mnesia call in mam archive management function
2018-04-20 13:36:54 +02:00
5be49cc0fa
Add commands for cleaning up mam archive
2018-04-20 13:27:46 +02:00
42c029d5f7
Fix type of rest:url/2
2018-04-19 13:21:33 +02:00
a567abcfdf
Fix deprecated call injected by 265c7b62
2018-04-18 14:16:56 +02:00
265c7b62c7
Add flexibility on rest url config
2018-04-18 13:16:08 +02:00
332567693c
mod_push_keepalive: Reset timeout on messages only
...
Some mobile apps might only be notified on actual chat messages with
a body, so don't let mod_push_keepalive reset the stream management
timeout on other types of traffic.
2018-04-17 00:27:07 +02:00
de7dc4affa
mod_push: Optionally include message sender/body
...
Add 'include_sender' and 'include_body' options. If one or both of them
are set to 'true', a urn:xmpp:push:summary form with the enabled
field(s) is included in push notifications that are generated for
messages with a body.
The 'include_body' option can instead be set to a static text. In this
case, the specified text will be included in place of the actual message
body. This can be useful to signal the push service whether the
notification was triggered by a message with body (as opposed to other
types of traffic) without leaking actual message contents.
2018-04-16 23:18:03 +02:00
48c5ab59f1
mod_http_upload*: Remove empty lines after specs
...
Remove blank lines following function specifications in mod_http_upload
and mod_http_upload_quota for consistency with other modules.
2018-04-16 18:22:54 +02:00
b2855d63a7
mod_http_upload*: Add function specifications
2018-04-16 18:17:28 +02:00
0282cf64a0
mod_push: Add function specification
2018-04-16 18:14:07 +02:00
e5cb9dad40
mod_push: Add/adjust debug messages
2018-04-16 18:12:46 +02:00
ec819b4002
Update MUC MAM tests
2018-04-16 16:10:44 +03:00
acc162f4f4
Carefully validate options list
2018-04-16 15:48:06 +03:00
b8505f3e78
Don't crash on invalid module's sub-options
...
Fixes #2387
2018-04-16 11:06:57 +03:00
8a71e2e4f7
mod_push: Don't notify on stream errors
...
If a pending stream management session is closed with a stream error,
this is usually due to the client opening a new stream that conflicts
with the old one. Don't generate a push notification in this situation.
2018-04-16 01:08:56 +02:00
a5284229cb
Merge branch 'muc-self-presence'
2018-04-14 18:32:12 +03:00
d0f36537fb
Clear fast_tls cache on configuration reload
2018-04-13 11:10:20 +03:00
3cf4fbc7b0
mod_roster: Use 'lserver' for configuration lookup
2018-04-13 00:12:07 +02:00
fe4b1a492c
Fix notification payload generated by pubsub
2018-04-12 18:02:32 +02:00
c3b4b4ce4f
Pass access option from websocket to c2s
...
This fixes issue #2223
2018-04-12 17:42:59 +02:00
95244c3b6f
Fix csi tests
2018-04-12 17:08:27 +02:00
89d91b609a
New schema support for tests. ( #2355 )
2018-04-12 15:42:43 +02:00
d28064518b
Improve pubsub#itemreply implementation ( #2325 )
2018-04-12 15:38:12 +02:00
7627575856
Update the xmpp dependency to support 'parent' attribute
...
Fixes #2375
2018-04-11 09:34:06 +03:00
99444f2d0e
Fix illegal match on previous commit
2018-04-10 15:02:03 +02:00
4c0f87b2ff
Improve fix for #2288 , don't mask errors on get_item
2018-04-10 14:47:18 +02:00
54363f8476
gen_mod: Support global module processes
2018-04-04 18:25:19 +02:00
094f586811
gen_mod: Remove frontend process support
...
ejabberd doesn't support frontend processes anymore.
2018-04-04 18:22:59 +02:00
45a3c7e0ce
Improve mod_multicast
2018-04-04 12:06:35 +02:00
e2652ce02f
mod_http_upload: Accept characters of any script
...
Accept all alphanumeric characters of any script in user and file names
rather than replacing non-ASCII characters with underscores. However,
non-alphanumeric characters are still replaced, except for "." and "-".
Closes #2346 .
2018-04-03 21:00:15 +02:00
df651d893e
Remove old hex conversion functions
...
Depend on list_to_integer/2 and integer_to_list/2 being available.
2018-04-03 00:21:33 +02:00
a2e1f5c882
Move ejabberd_http:url_encode/1 to 'misc' module
2018-04-03 00:12:43 +02:00
7f5796fe31
Fix Code format when logging a MUC room kick/ban
2018-04-02 13:51:19 +02:00
5f1191b9f5
mod_client_state: Add 'csi_activity' hook
...
Closes #2358 .
2018-04-01 17:13:04 +02:00
0041a11c4a
Merge pull request #2357 from Pouriya-Jahanbakhsh/component-send-packet-hook
...
feat: add hook for sending packet from component
2018-03-30 21:51:03 +03:00
e17a16a300
fix: run 'component_send_packet' hook in global mode
2018-03-30 23:19:33 +04:30
7b3d26992b
feat: add hook for sending packet from component
...
New hook 'component_send_packet' added.
Callback function must accept one argument {Pkt, ComponentState} and should yield 'drop' or {NewPkt, NewComponentState}.
2018-03-30 21:31:30 +04:30
9373ad20ca
Don't produce a crash dump during intentional exit
...
Also halt faster without relying on timeouts for buffers flushing
2018-03-29 12:14:31 +03:00
b283cfa6f2
Remove unused variable
2018-03-29 10:34:09 +03:00
a84771fd14
Merge pull request #2351 from rom1dep/config-order_c2s-direct
...
config: move section about direct-tls for c2s just under regular c2s config
2018-03-29 08:32:13 +03:00
2bb6782bee
config: move section about direct-tls for c2s just under regular c2s config (to ease parameters comparison)
2018-03-28 23:17:43 +02:00
ae151927ae
Add support for PATCH http method
...
This is needed to improve out APIs.
2018-03-28 17:34:47 +02:00
dfbdffad44
Fix process_discoitems_result in mod_multicast
2018-03-28 11:23:28 +02:00
d71bc73271
Update eimp
2018-03-26 16:18:29 +02:00
ea9c3fd8f7
Fix returning value from mod_vcard_ldap's search() callback
...
Fixes #2335
2018-03-25 10:53:46 +03:00
f3b3bffec0
Get rid of 'fs' package dependency in mix
2018-03-23 14:48:17 +01:00
f39dbe6e49
Get rid of 'fs' package dependency
...
Certificates auto-reloading will be fixed later.
For now to reload certificates call `reload-config` ejabberd command.
2018-03-23 16:40:26 +03:00
75450a62b3
Clarify the statement about mod_http_upload thumbnails
2018-03-23 16:19:13 +03:00
a15039638b
Force node config for bookmarks
2018-03-23 16:16:27 +03:00
50de427570
Set empty least as a default for force_node_config
2018-03-23 16:09:18 +03:00
55604b2d97
Move force_node_config defaults into ejabberd.yml.example
2018-03-23 16:08:12 +03:00
92bc5dc85b
Update mix deps
2018-03-23 13:27:58 +01:00
baf2473688
Update mix.exs version
2018-03-23 12:56:17 +01:00
f5bab5d6c4
Fetch 'registration_watchers' option from the correct module
...
Fixes #2337
2018-03-23 09:42:55 +03:00
b23be02dfe
Update deps
2018-03-22 16:15:19 +01:00
0bda169a5a
Remove items of unregistered user ( #2129 )
2018-03-22 11:59:24 +01:00
96c183c04b
Accept atoms in api_permission command lists and commands with numbers in them
2018-03-21 12:53:46 +01:00
b293e99aee
Add option --enable-group=xxx (thanks to andreabenini)( #1429 )
2018-03-20 23:39:07 +01:00
b4b3ff50d6
If mod_last is disabled, return error instead of crashing ( #2330 )
2018-03-20 22:18:43 +01:00
8962397cf3
Report meaningful error when luerl is not available
2018-03-19 20:09:35 +03:00
b1ecd8ac01
Set -protocol() directive for mod_avatar
2018-03-19 19:23:15 +03:00
4f1d7c4b66
Avoid logging IP addresses in mod_register when it's not desired
...
Fixes #2326
2018-03-19 18:23:52 +03:00
bb20e5f3fa
Apply some dirty hacks for mod_shared_roster
...
Probably this fixes #1846
2018-03-19 12:32:43 +03:00
e1e7986918
Hardcode ACL rules used by ejabberd_web_admin
2018-03-19 12:29:07 +03:00
7ba6fae67c
Improve result of XEP-0060 §6.5.9.12 ( #2288 )
...
Moving get_item result control to keep item-not-found on transaction
error when node does not exists
2018-03-17 10:59:34 +01:00
7beb19b01e
Fix result of XEP-0060 §6.5.9.12 ( #2288 )
2018-03-16 17:48:42 +01:00
a84dd0f627
Add transient notification condition ( #2267 )
2018-03-16 17:26:51 +01:00
d8f9219b4f
Refactor publish_item conditions ( #2267 )
2018-03-16 17:17:53 +01:00
ddc29d42de
Fulfill all requirements of XEP-0398 v0.2.0
...
These include:
- Avoid rewriting vcard:x:update tags with empty <photo/> element
- Advertise "urn:xmpp:pep-vcard-conversion:0" feature
2018-03-16 12:10:57 +03:00
e15595df64
Add 'new_sql_schema' config option, --enable-new-sql-schema now sets its default value to true ( #2239 )
2018-03-15 17:55:05 +03:00
99b41146b1
Get rid of catch-all in mod_pubsub
2018-03-13 22:10:58 +03:00
6b079c0ab3
Preserve modules order
...
When modules for some virtual host are about to be started,
they are topologically sorted to preserve dependencies order.
We now keep this order for stop/reload functions to work properly.
2018-03-13 18:18:53 +03:00
c5aea779b4
Merge pull request #2314 from oxpa/mod_admin_extra_hashes
...
allow using hashes from "crypto" applications in mod_admin_extra
2018-03-12 15:20:53 +01:00
be33c93344
Return errors in admin#add-user command response stanza ( #2321 )
2018-03-12 13:33:44 +01:00
2785f1dfd2
Introduce force_node_config for mod_pubsub
...
The option can be used to override configuration options of a
particular PubSub node. Example:
mod_pubsub:
...
force_node_config:
"eu.siacs.conversations.axolotl.*":
access_model: whitelist
"*":
persist_items: true
Fixes #2276
2018-03-11 16:54:35 +03:00
b179874ec6
Add mod_fail2ban to the example config
2018-03-10 21:41:55 +03:00
c3eeb8624b
Strip duplicates from module's options
2018-03-07 17:46:16 +03:00
bc808ffcde
mod_stream_mgmt: Clean up on timed out resumption
...
During resumption, make sure the old process and the corresponding
session entry are disposed also in the case where the call that queries
the old process times out.
2018-03-06 21:03:31 +01:00
d9bf5a6865
Don't forget to remove mgmt_force_enqueue flag
2018-03-06 16:18:03 +03:00
67fe5d38a7
mod_push_keepalive: Preserve timeout on resumption
...
Don't forget to carry over the original XEP-0198 resumption timeout
value while resuming.
2018-03-05 01:10:12 +01:00
63dba3fd64
Merge branch 'master' into muc-self-presence
2018-03-03 21:09:27 +03:00
da1a5036fe
Revert "Support for default values in default_room_opts"
...
This reverts commit 5054a9933f
2018-03-03 21:08:05 +03:00
0d3637d18f
Simplify ejabberd_sup code
2018-03-03 18:05:12 +03:00
f2a3118ecc
allow using hashes from "crypto" applications in mod_admin_extra
2018-03-02 04:10:30 -09:00
dbf1cabdcd
Fix: mod_offline:store_offline_msg/1 expects a message, not list ( #2312 )
2018-03-02 11:44:10 +01:00
ad0fd1eac1
Simplify result of get_room_affiliation command ( #2301 )
2018-03-01 19:45:16 +01:00
3003307e60
Merge pull request #2301 from tsaqova/ejabberd_commands_get_room_affiliation
...
add ejabberd_command to get affiliation of a user in MUC room
2018-03-01 19:37:55 +01:00
76f827ac83
Increase log level for DIGEST-MD5 FQDN
...
SASL DIGEST-MD5 anyway deprecated anyway, so not point in
logging this. This is now logged in `debug` mode.
2018-02-28 21:43:43 +03:00
b5138a8ddb
Merge pull request #2311 from nosnilmot/validate-listen-opts
...
Validate additional listen opts
2018-02-28 19:37:57 +03:00
da81590fef
Validate additional listen opts
...
The options "inet", "inet6" and "backlog" are valid listen options, but are
currently logged as errors (even though they do work):
2018-02-28 16:08:44.141 [error] <0.338.0>@ejabberd_listener:validate_module_option:630 unknown listen option 'backlog' for 'ejabberd_c2s' will be likely ignored, available options are: access, shaper, certfile, ciphers, dhfile, cafile, client_cafile, protocol_options, tls, tls_compression, starttls, starttls_required, tls_verify, zlib, max_fsm_queue
This adds the necessary validators so they are correctly recognized.
2018-02-28 16:14:35 +00:00
8a41cfc0f5
add ejabberd_command to get affiliation of a user in MUC room
2018-02-28 20:22:27 +07:00
5054a9933f
Support for default values in default_room_opts
2018-02-26 17:22:37 +01:00
5912c573ea
Use length on fields in mysql indexes
2018-02-26 09:43:04 +01:00
b2095ebcfe
Simplify code for splitting auth string in cyrsasl
...
This may fix problem from issue #2296
2018-02-26 09:36:56 +01:00
0a67cdfb16
Merge pull request #2304 from weiss/run-auth-callbacks-earlier
...
Run SASL result callbacks earlier
2018-02-26 09:04:32 +03:00
c2235860ab
xmpp_stream_in: Run auth result callbacks earlier
...
Call Mod:handle_auth_success/4 and Mod:handle_auth_failure/4 before
sending the SASL response rather than afterwards. This way, callbacks
can send a custom response and disconnect.
2018-02-26 00:06:35 +01:00
22e43ebd8a
mod_stream_mgmt: Cope with exit during resumption
...
Don't crash if the old process exits while it is queried for the session
state.
2018-02-24 21:50:54 +01:00
35be7d2718
Merge pull request #2299 from weiss/add-username-to-indexes
...
Add username to peer indexes for MAM lookups
2018-02-24 07:41:44 +03:00
f7566bd00e
sql/*: Add username to peer indexes
...
The username is available for all MAM queries in question, and adding it
to the indexes can improve the lookup performance significantly.
2018-02-24 00:50:20 +01:00
5bf753fd2d
Merge pull request #2297 from af8a524db1/move_make_rand_string
...
Move make_rand_string() to 'randoms' module
2018-02-23 20:35:37 +03:00
c1e5ae5308
Move make_rand_string() to 'randoms' module
2018-02-23 18:32:34 +01:00
ea87bdfbe5
mod_carboncopy: Apply cosmetic change
...
The xmpp:has_subtag/2 function returns a boolen() value, so it can be
used with the 'not' operator.
2018-02-22 00:46:47 +01:00
7a1ed065fe
mod_carboncopy: Copy outgoing MUC PMs
...
Incoming MUC PMs aren't carbon-copied, as the MUC service usually forks
them. However, don't suppress copying of outgoing PMs, where no such
forking takes place.
2018-02-22 00:40:09 +01:00
ec0f0f7c72
Move some log messages to debug level
2018-02-21 17:12:50 +03:00
0acc69e303
Use nicks in disco#items or disco#info report
2018-02-21 10:25:15 +03:00
4bf4193d55
Add 'negotiation_timeout' to the known options list
2018-02-20 19:47:50 +03:00
d625e24029
Introduce 'negotiation_timeout'
...
The option can be used to specify a period (in seconds) for a stream
negotiation to complete. If the timer fires, the stream is considered
as failed and the underlying connection gets closed. This is a global
option (you cannot set it per domain) and the default is 30 seconds.
2018-02-20 11:38:00 +03:00
a875195940
mod_admin_extra: Fix srg_get_info with '@all@'
...
Don't let the srg_get_info command crash if the roster group has '@all@'
or the '@online@' users as members.
2018-02-20 00:44:47 +01:00
06c480106f
Don't emit validator's warning if the module is not found
2018-02-19 22:07:09 +03:00
e070e6bccb
Replace ?MYLANG with connection's language wherever possible
2018-02-19 21:47:20 +03:00
de49e7631f
Push blocking related IQs from bare JID
...
Fixes #2287
2018-02-18 18:00:20 +03:00
25abf8b634
Don't inject node name inside "id" attribute
...
Fixes #2284
2018-02-18 11:54:40 +03:00
ff06bdf144
Don't ask other nodes to invalidate cache when the key is not updated
2018-02-18 09:02:23 +03:00
d5afc767e6
Fix 'badmatch' crash
...
The crash was introduced in 4b012a99d2
2018-02-17 20:06:50 +03:00
5704a980c5
Introduce 'access' option for mod_block_stranger
...
The option is supposed to be used when `allow_local_users`
and `allow_transports` are not enough. It's an ACL where `deny`
means the message will be rejected (or a CAPTCHA would be
generated for a presence), and `allow` means the sender is
whitelisted and the stanza will pass through.
The default value is `none`, which means nothing is whitelisted.
2018-02-17 18:53:35 +03:00
cffdb06b66
Cache 'isuser' queries to external auth program
2018-02-16 20:50:22 +03:00
f5d208441d
Improve example extauth script
2018-02-16 20:34:09 +03:00
71a856deaa
Handle gracefully that mnesia is already loaded when starting tests
2018-02-16 16:49:48 +01:00
7e1df0752a
Export helper function
2018-02-16 09:53:38 +01:00
f0ccdebf7f
Export helper functions
2018-02-16 09:52:29 +01:00
32e5a3255d
Export aux functions from mod_muc_room
2018-02-16 08:28:33 +03:00
c102a45fac
Rename some keys and functions for clarity
2018-02-15 15:50:20 +03:00
52ded14b7f
Update incoming stanzas counter on invalid XML
2018-02-15 15:42:55 +03:00
e5ba7c3f3c
Better solution for a previous fix
2018-02-15 10:48:59 +03:00
51aa9d98a7
Don't forget to add invalid XML responses to sending queue
2018-02-15 10:18:06 +03:00
a65500b6aa
Fix external components unregistration
2018-02-14 13:09:27 +03:00
032f796292
Introduce option 'global_routes' for ejabberd_service
...
The option emulates legacy behaviour which registers all routes
defined in `hosts` on a component connected. This behaviour
is considered harmful in the case when it's desired to multiplex
different components on the same port, so, to disable it,
set `global_routes` to `false`. The default value is `true`,
e.g. legacy behaviour is emulated: the only reason for this is
to maintain backward compatibility with existing deployments.
2018-02-14 11:53:52 +03:00
516f4d03a1
Fix indentation
2018-02-14 11:42:43 +03:00
60a8623929
Change formatting of commands markdown documentation
2018-02-13 16:27:39 +01:00
9dbdeba6c1
Add case on create_room, avoid useless call
2018-02-13 11:08:13 +01:00
4632f5520f
Really run use_cache/1 and cache_nodes/1 callbacks for mod_mam
2018-02-13 11:38:41 +03:00
ffe02c46e4
Let a MUC room to route presences from its bare JID
...
The goal for this is to provide entity capabilities (XEP-0115) and
vCard-based avatar hash (XEP-0153)
2018-02-12 17:37:36 +03:00
42794ce4e4
Merge pull request #2274 from Torxen/feature/fixed-return-value-mod_muc
...
Issue: mod_muc.erl expect wrong return value
2018-02-12 17:36:47 +03:00
9188a7b838
Dialyzer checks always failed because the return value of the function 'get_subscribed_rooms' in 'mod_muc_sql' is different to the defined value in 'mod_muc'. Fix was to update the return value in 'mod_muc.erl'.
2018-02-12 15:12:46 +01:00
66fc1bf3b6
Remove 'iqdisc' option
...
Since we got rid of all bottle-neck processes and we have
a connection pool for every database, the option is no longer
needed and in fact is detrimental: in practice what you get
is just a bunch of overloaded processes in the IQ handlers pool
no matter how much you increase the `iqdisc` value.
Given that there are close to zero operators understanding
the meaning of the option and, hence, not using it all,
it's not simply deprecated but completely removed.
The commit also deprecates the following functions:
- gen_iq_handler:add_iq_handler/6
- gen_iq_handler:handle/5
- gen_iq_handler:iqdisc/1
2018-02-11 12:54:15 +03:00
11a58f8dff
Bump xmpp version
2018-02-11 09:45:54 +03:00
97f913b8d9
Merge branch 'master' of github.com:processone/ejabberd
2018-02-10 11:36:48 +03:00
6c1a1bd000
Rely on use_cache/1 callback in mod_caps
2018-02-10 11:36:39 +03:00
9fb2253aa9
mod_stream_mgmt: Abort connection on count error
...
If the client acknowledged more stanzas than the server sent, close the
connection with a stream error rather than hiding client bugs by silently
adjusting the server's count.
2018-02-10 00:06:19 +01:00
672c2f75d3
Introduce option 'validate_stream'
...
If set to `true`, all incoming XML packets are fully validated
against known schemas. If an error occurs, the packet will be bounced
with the corresponding error reason. The default value is `false`.
The option might be useful to protect client software from sofisticated
bugs related to XML validation as well as for client developers
who want to catch validation errors at early stage of development.
Note that the option might have slight performance impact, so use it
with care on loaded machines.
2018-02-09 18:12:50 +03:00
5c85106a41
Fix type spec
2018-02-07 22:20:12 +03:00
c2911222e4
Commands markdown also lack arguments when policy=user
2018-02-07 16:39:18 +01:00
232b66b0f4
Introduce 'rate_limit' option of mod_avatar
...
The option controls how many avatars a user can upload per minute.
The option takes positive integer values. The default is 10.
Note that the option only takes effect when an avatar is about
to convert to a different format, i.e. it implies that `convert`
option is configured.
2018-02-05 23:12:36 +03:00
3327da72a6
Merge branch 'master' of github.com:processone/ejabberd
2018-02-05 15:13:23 +03:00
c65dcfeda7
Export is_online/1 function
2018-02-05 15:13:13 +03:00
411d1711a0
Merge pull request #2266 from mieciu/master
...
Fix MySQL ERROR 1170 (42000) 'server_host'
2018-02-05 13:04:25 +01:00
bef7d1ba66
Fix MySQL error server_host used in key specification without a key length
2018-02-05 12:33:59 +01:00
c990abf222
Improve log message when module startup has failed
2018-02-02 13:16:14 +03:00
983aaac765
Another try to fix travis
2018-01-31 17:54:32 +01:00
0f25e59143
Properly escape string in travis config
2018-01-31 17:10:05 +01:00
2a77805072
Print something when doing tests in travis, as not doing that get us killed
2018-01-31 17:03:18 +01:00
b86402f3e7
Don't run tests in verbose mode on travis
2018-01-31 16:10:09 +01:00
f6ebbe4c78
Fix compilation ordering in mix by s/-behavior/-behaviour/
2018-01-31 14:57:43 +01:00
485f8e48e5
Fix mod_roster start invocation in elixir tests
2018-01-31 09:34:54 +01:00
51f652a1e1
Fix elixir tests
2018-01-30 19:45:12 +01:00
fc3c605945
Use correct default when getting list of modules from config
2018-01-30 19:44:27 +01:00
69de43d5ee
Remove line left from debugging
2018-01-30 18:37:17 +01:00
ad4ffce788
Start ejabberd_config earlier
2018-01-30 18:24:47 +01:00
cd82a9d534
Disable riak in travis
2018-01-30 15:31:07 +01:00
3b646cc2ec
Run tests only on backends enabled by configure
2018-01-30 15:30:37 +01:00
bb58307190
Match all possible values in mod_privilege checks, or we get crashes
2018-01-30 13:10:22 +01:00
53870c854e
Fix exception in mod_privilege:process_presence_in
...
This should fix problem reported in issue #2248
2018-01-30 12:52:38 +01:00
b69fb5aae0
Bump sqlite deps version
2018-01-30 12:51:38 +01:00
ddf6076328
Fix elixir tests
2018-01-29 18:28:02 +01:00
d2974cf48a
Fix processing of ldap_memberattr_format_re option
...
This makes sure that "" value is handled as before options processing
overhaul.
This fixed ldap shared roster testcase
2018-01-29 17:25:31 +01:00
dc601610b6
Don't return undefined from ejabberd_config:get_myhosts()
2018-01-29 11:05:59 +01:00
719dfe12f6
Use named functions instead of carrying self as argument
2018-01-29 10:02:20 +01:00
c47366ba97
Restore original return value to ejabberd_config:add_option
2018-01-29 09:46:11 +01:00
1b26c8d214
ejabberdctl: Omit redundant erl option
...
The "-detached" flag implies "-noinput".
2018-01-29 01:16:20 +01:00
f31782a252
mod_caps: Only store CAPS if contact is subscribed
...
If a user is subscribed to a contact but not vice versa, don't store the
contact's CAPS. This makes sure no PEP items are leaked to the contact.
2018-01-29 01:07:38 +01:00
d0af61f488
mod_caps: Fix indentation
2018-01-29 00:02:15 +01:00
795efb2ee1
Improve logging of idle s2s connections
2018-01-28 11:10:22 +03:00
6e5439db5c
Find and fix typos using 'codespell'
2018-01-27 19:35:38 +03:00
5d582080be
Fix a typo in call to create_captcha()
...
Thanks to Paul Schaub for spotting this
2018-01-26 22:56:49 +03:00
4b012a99d2
Introduce option 'captcha' for mod_block_strangers
...
When the option is set to `true`, the module will generate
CAPTCHA challenges for incoming subscription requests. The option
also implies that option `drop` is set to `true`. Note that
the module won't generate CAPTCHA challenges for messages: they
will still be rejected if `drop` is set to `true`.
Fixes #2246
2018-01-26 15:02:06 +03:00
7e561dd20a
Fix more tests
2018-01-25 18:43:34 +01:00
2afdde84ea
Adopt tests to changes in xmpp
2018-01-25 18:24:05 +01:00
2269d290d8
Switch to newer fast_xml and xmpp and update record fields in the code
2018-01-25 20:02:47 +03:00
56d4224e08
Handle ignore from xmpp_socket callback start
...
This should help with issue #2244
2018-01-24 17:32:24 +01:00
666da60cba
Reduce log level for unexpected XML input
...
Log a warning rather than an error when, for example, a client sends a
stanza before opening the stream.
2018-01-24 12:04:52 +01:00
e8f1de8785
mod_block_strangers: Bounce groupchat to bare JID
...
If a blocked message is of type 'groupchat', address the error message
to the bare JID (rather than sending it as MUC PM).
2018-01-24 11:49:31 +01:00
1f6c0022dd
Fix a typo in mod_caps
2018-01-23 23:20:10 +03:00
6cdb7b4468
Fix tag used in luerl dependency
2018-01-23 09:37:46 +01:00
a917f4d451
Merge branch 'mod-default-options'
2018-01-23 11:00:00 +03:00
ba2b650464
Introduce new gen_mod callback: mod_options/1
...
The callback is supposed to provide known options and their default
values, as long as the documentation. Passing default values into
get_mod functions is now deprecated: all defaults should be provided
by the Mod:mod_options/1 callback.
2018-01-23 10:54:52 +03:00
121d12f4d1
Move luerl as optional tools dependency
2018-01-22 17:42:27 +01:00
7abd13974b
Remove deps override on mix
2018-01-22 17:42:02 +01:00
ae86af9399
Merge remote-tracking branch 'processone/pr/2238'
...
* processone/pr/2238:
Fix typo /this/it/
2018-01-21 15:05:05 +01:00
a0c8cac1b6
Fix typo /this/it/
2018-01-21 13:44:30 +00:00
818ff5a263
Update 'pubsub_node' column name for DB export
...
The 'type' column has been renamed in commit
44700d91ba
2018-01-19 13:10:14 +01:00
c0ef054f6f
Do not try to start ezlib application too frequently
...
This may overload Erlang applicaton controller
2018-01-16 18:06:31 +03:00
d35a8805b0
Return debug message back
2018-01-16 17:57:21 +03:00
1daa7ef785
Sync mix and rebar for eimp dep
2018-01-16 11:45:29 +01:00
7b0fa7e6e2
Improve validation of 'convert' option
2018-01-16 01:06:20 +03:00
8bdccc25ab
Include acme deps in release, fixes f2c3fe8ac
2018-01-15 22:21:24 +01:00
59b7c89944
Use correct name of new rebar command
2018-01-15 15:21:04 +01:00
a7639fd4ad
Call configure on deps in separate rebar command that compile
...
This way we rebar.config.script can use vars detected by configure
2018-01-15 12:31:47 +01:00
99f8e58eaf
Use override syntax that rebar3 accepts
2018-01-15 11:56:20 +01:00
d3aab2ea18
Get rid of a call to misc:have_eimp()
2018-01-15 13:14:51 +03:00
b970c88941
Merge branch 'master' of github.com:processone/ejabberd
2018-01-15 13:00:19 +03:00
0f86559d83
Always build eimp dependency
...
Even if no suitable C graphics libraries are detected
at compile time, the package is still usable because it
provides `eimp:get_type/1` which is used by mod_avatar.
2018-01-15 12:54:57 +03:00
be592c9272
Don't report errors when trying to remove not existing files in make install
2018-01-15 10:38:36 +01:00
3df78d3a8f
Copy sh_to_ask function from xmerl_regexp.erl
...
This way we don't need to include xmerl application in our docker container
2018-01-15 10:31:26 +01:00
d2427c98c3
Merge pull request #2221 from licaon-kter/patch-1
...
Fix example config macro names
2018-01-14 09:54:22 +03:00
84819ba0fe
Fix example config macro names
...
These were missed in https://github.com/processone/ejabberd/commit/c26b56679e06ef8b88734030de11c6b885f9bb78#diff-19e0c10699732f76181f70cfbec95d38 I guess.
2018-01-13 21:38:01 +00:00
f66a004821
Improve logging of failed s2s EXTERNAL authentication
2018-01-13 13:01:40 +03:00
e1da673502
Fix detection of rebar3
...
Looks like sometimes rebar3 report version that can't be split to 3 fields
by '.', we need only first one so don't match the rest
2018-01-12 17:12:46 +01:00
7d58b7a100
Improve resolving of system deps
...
This version is able to search for know alternative names of deps and
helps with running tests when using system deps
2018-01-12 16:16:12 +01:00
f2c3fe8ac6
Add mix dependencies for acme support
2018-01-12 12:28:31 +01:00
1c1b12fc64
Note about direct-tls connections in example config
2018-01-12 10:27:33 +03:00
1825cfaf05
Include newly releases fast_tls/esip/stun in mix.lock
2018-01-11 14:38:54 +01:00
b8319c6617
Update mix.lock
2018-01-11 11:20:07 +01:00
9e3a000748
Update deps
2018-01-11 11:11:56 +01:00
d6e1bc242c
Remove old docker specs
2018-01-11 10:19:56 +01:00
465629d458
Prepare mix for 18.01
2018-01-10 23:06:06 +01:00
7875cac786
Update mix deps
2018-01-10 18:14:52 +01:00
d0bfcbbfd8
Handle error case from code:lib_dir in ResolveDepPath in rebar.config.script
2018-01-10 16:34:16 +01:00
88e6f1c6aa
Update mix deps
2018-01-10 12:07:19 +01:00
cea5f14e88
Update deps again
2018-01-10 11:55:34 +01:00
8641c6cb34
Update mix deps
2018-01-10 11:48:53 +01:00
e04b4c52fd
Update deps
2018-01-10 11:32:11 +01:00
1fac3e58b3
Fix indentation in commented example
2018-01-10 11:24:09 +01:00
f914c61f42
Report fs not suported on SunOS ( #2204 )
2018-01-10 10:58:47 +01:00
df8888ab38
Send privileges if at least one of them is set, don't require all to be set
2018-01-09 15:50:42 +01:00
8a05c4ee27
Create CODE_OF_CONDUCT.md
2018-01-09 14:17:55 +01:00
e822ce3554
Merge branch 'master' of github.com:processone/ejabberd
2018-01-08 13:45:21 +03:00
aa9f2e5b88
Ignore result of sending stream trailer in test suite
2018-01-08 13:45:08 +03:00
c5a4f67935
Delete old .so and executable files before installing new one
...
This fixes crash for people who have live ejabberd installed in make install
target directory, by ensuring that loaded binaries aren't replaced in memory
with new content.
2018-01-08 11:11:50 +01:00
2b0cc2ddb4
Make all install target rules as .PHONY
2018-01-08 11:11:50 +01:00
3f8eff27fa
Refactor code for installing binaries
2018-01-08 11:11:50 +01:00
9d94361466
Process 'name' option for all route-registering modules
...
The option allows to set arbitrary text for disco#info identity name.
Previously, option 'name' was supported by mod_proxy65 and mod_http_upload
only. Now, all the following modules support this option as well:
- mod_disco
- mod_irc
- mod_muc
- mod_multicast
- mod_pubsub
- mod_vcard
Example:
```
modules:
...
mod_disco:
name: "Cool XMPP Server"
...
```
2018-01-08 11:29:17 +03:00
150f33b39b
Update copyright dates in header files
2018-01-06 14:01:45 +03:00
2d23dfccfd
Don't display copyright dates in vCards of services
...
Copyright dates in vCards may paritally disclose server version,
which is not always desired
2018-01-06 13:55:24 +03:00
ee23b688a7
Use TLS defaults from fast_tls
2018-01-06 13:46:02 +03:00
cdc7c1d1ed
Update copyright dates
2018-01-05 23:18:58 +03:00
da2353d996
Refer to new fast_tls version
2018-01-05 17:56:32 +03:00
fb07c9929a
Return true or false from send() callback
...
Fixes #2209
2018-01-05 12:15:28 +03:00
946754536c
Merge pull request #2202 from weiss/bounce-to-stranger
...
mod_block_strangers: Bounce an error message
2018-01-05 11:43:18 +03:00
4c799528c7
Fix ejabberd command privacy_set
...
This fixes issue #2205
2018-01-04 14:57:36 +01:00
dbbe3a9e62
Merge remote-tracking branch 'processone/pr/2203'
...
* processone/pr/2203:
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:33:18 +01:00
264add87fa
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:31:06 +01:00
835360733b
mod_block_strangers: Bounce an error message
...
Return a stanza error when a message is rejected, in order to make
legitimate users aware of the issue.
Closes #2197 .
2018-01-03 15:41:30 +01:00
1fcb6d7f36
Make mysql and pgsql one of the default module for Mix
2017-12-29 17:22:59 +01:00
4ae688605f
Regenerated mix.lock file
2017-12-29 17:18:59 +01:00
485100f907
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 21:37:19 +03:00
240977a0da
Repair hosts check during certfiles validation
2017-12-28 21:36:57 +03:00
cdc9c93b9b
Fix stun/esip mix deps
2017-12-28 15:38:24 +01:00
529d6d8a93
Return default certificate on domain mismatch
2017-12-28 17:24:23 +03:00
dd9281da13
Let mix pass compile ejabberd as dependency
2017-12-28 15:16:29 +01:00
1b8794c991
Update mix spec
2017-12-28 14:43:13 +01:00
48c96dc1a9
Update stun and esip
2017-12-28 14:34:50 +01:00
439fe0b504
Fix check_opt_range when no boundary is configured
2017-12-28 13:51:26 +01:00
e03d41647b
Merge branch 'master' of github.com:processone/ejabberd
2017-12-28 14:01:39 +03:00
23c5fd9a4f
Return send() result to the caller
2017-12-28 14:01:34 +03:00
08e54dd621
Don't force rsm when max_items is not defined ( #2189 )
2017-12-28 11:48:54 +01:00
8918227fc3
Revert "Include os_mon application"
...
This reverts commit 56241feb58
2017-12-28 10:32:21 +01:00
5ba13df519
Revert "Start os_mon application"
...
This reverts commit 82b3bbf360
2017-12-27 17:21:17 +01:00
dd4d45fd28
Fix a regression in xmpp_socket
2017-12-27 18:49:25 +03:00
82b3bbf360
Start os_mon application
2017-12-27 16:23:04 +01:00
d59d4e27ec
Adopt tests to changes introduced by b54e1e49ba
2017-12-27 16:16:15 +01:00
e6d1ff85f1
Use bare jid when processing roster subscriptions
2017-12-27 16:14:47 +01:00
ef6af11f17
Rename mnesiadb
2017-12-27 12:42:55 +01:00
6bdf29676c
Add missing application building with mix
2017-12-27 12:33:52 +01:00
56241feb58
Include os_mon application
2017-12-27 12:28:13 +01:00
9fcc12dca7
Prepare mix for 17.12
2017-12-27 11:42:37 +01:00
bbb1f7002d
Merge pull request #2188 from weiss/fix-acl-reload
...
Forget old access/shaper rules and ACLs on reload
2017-12-27 09:34:19 +03:00
812acf0688
Update the test suite to support new XMPP socket API
2017-12-27 08:55:14 +03:00
60b6a508e0
Forget old access/shaper rules and ACLs on reload
2017-12-26 19:37:11 +01:00
34d09018a7
Add new schemas for SQLite and MySQL
2017-12-26 20:48:15 +03:00
7cdc51becd
Merge branch 'no-more-ejabberd-receivers'
...
Conflicts:
rebar.config
2017-12-26 19:02:54 +03:00
2d43c07c62
Get rid of ejabberd receiver
...
ejabberd receivers were meant to serve connections from frontends
to backends. However, this approach was not popular and frontend
related code was removed in previous releases. Now, ejabberd receiver's
code was also removed, making the code shorter and cleaner. Also, in
stress tests ejabberd now handles load more robustly, without
c2s processes overload (even with disabled shapers).
ejabberd_socket.erl is renamed to xmpp_socket.erl: it's supposed to
be finally moved into stand-alone xmpp library.
2017-12-26 18:55:57 +03:00
514df9ac18
Cleanup rebar.config
2017-12-26 11:16:48 +01:00
a8c3ed5ed4
Remove obsolete option
2017-12-26 11:13:47 +01:00
e7308b7d86
Update dependencies
2017-12-26 11:13:18 +01:00
4e49919d16
Revert "Don't set twice"
...
This reverts commit 6dca89f616
2017-12-25 08:41:51 +03:00
9ba471e210
Fix a typo in comment :)
2017-12-24 12:53:50 +03:00
6dca89f616
Don't set twice
2017-12-24 12:34:47 +03:00
1698956f34
Rely on Server Name Indication for incoming Direct-TLS connections
...
This commit also deprecates `certfile` option for ejabberd_http
listener.
2017-12-24 12:27:51 +03:00
b54e1e49ba
Don't let privacy list prevent local roster update
2017-12-23 22:45:01 +01:00
5e4c547856
mod_muc_admin: Fix last timestamp retrieval
2017-12-22 14:32:47 +01:00
50b19b47e0
Fix commands rooms_unused_list and _destroy
2017-12-21 17:00:43 +01:00
a3083b5d71
Fix race between join_cluster and ejabberd_mnesia ( #2079 )
2017-12-21 14:07:29 +01:00
32ad7d3761
Disable test for now
2017-12-21 11:49:33 +01:00
7f073fbcd8
Update expected error type in test
2017-12-21 11:43:09 +01:00
826387446a
Let mix aware of unpackaged hex.pm dependencies ( #2170 )
2017-12-21 11:10:56 +01:00
af9183cd54
Add pubsub#multi-items to features list ( #2162 )
2017-12-20 11:54:12 +01:00
242c3c1da5
Fix mix_sql features and options
2017-12-20 11:53:18 +01:00
212d44f419
Merge pull request #2164 from angelo-chan/master
...
add muc_online_rooms_by_regex to mod_muc_admin to filter list online r…
2017-12-19 23:10:20 +01:00
63a60f1cd8
ejabberd_sm: Fix get_session_sid/3
...
Let get_session_sid/3 cope with multiple session table entries for a
given resource.
2017-12-19 18:59:25 +01:00
08ce16f7ca
Change loglevel of TLS failures
2017-12-19 15:33:30 +03:00
051e1be832
send_direct_invitations accepts only user jids
2017-12-19 10:24:07 +01:00
9bccac03f5
Set disk_almost_full_threshold to 99%
2017-12-19 09:55:19 +03:00
c9333f247a
Don't crash on malformed IQ
...
Fixes #2175
2017-12-19 09:15:35 +03:00
c658f871a5
Log a warning when a disk is almost full
2017-12-18 12:30:10 +03:00
a0607f6740
Disable default alarm handler
2017-12-18 12:15:49 +03:00
47c2118fa7
Handle also process_memory_high_watermark alarm
2017-12-18 10:41:11 +03:00
59f4efe3dd
Kill and restart lager when it's overloaded
2017-12-17 21:03:40 +03:00
bd1ff0e897
Fix processing order
2017-12-17 20:19:44 +03:00
5b42fc1d0d
Avoid excessive logging of SQL failures
2017-12-17 19:46:55 +03:00
515f8b22c0
Rewrite ejabberd system monitor
...
Previous version was inefficient: it had a lot of false positives
along with a lot of false negatives, making its usage pointless.
The new verion is based on memsup(3erl) application: the OOM watchdog is
only started when total OS memory consumption is more than 80%.
A watchdog periodically inspects all running processes and collects
statistics about overloaded ones (those queueing a lot of messages).
If the OOM killer is enabled (`oom_killer: true`), all overloaded
processes would be killed. By default, OOM killer is enabled.
When memory consumption is back to normal, the OOM watchdog is stopped.
2017-12-17 18:52:37 +03:00
4352cb9fed
Merge pull request #2167 from weiss/last-pep-items-to-owner
...
Send last PEP items to owner on initial presence
2017-12-14 10:30:03 +03:00
5968bc9318
Send last PEP items to owner on initial presence
...
Closes #2112 .
2017-12-13 18:59:06 +01:00
a65a78ebfe
Merge pull request #2158 from bowlofeggs/su-with-sh
...
Use /bin/sh as the explicit shell when using su in ejabberdctl.
2017-12-13 16:04:25 +01:00
08e642b988
Only allow compression after SASL
...
See XEP-0170 for details
Thanks to Vitaly Takmazov for spotting this
2017-12-13 16:52:44 +03:00
42932fd19e
PubSub: Add missing Nidx building records from sql result
2017-12-13 11:35:36 +01:00
b204f9349f
add muc_online_room_by_regex to mod_muc_admin to filter list online rooms
2017-12-13 11:07:12 +08:00
03246f5ff4
mod_pubsub: Send last items on initial presence
...
Wait until we got initial presence from the client before sending the
last items of nodes the JID is subscribed to.
Closes #2132 .
2017-12-12 12:21:33 +01:00
57e3f49352
Merge pull request #2160 from weiss/publish-options
...
Support pubsub#publish-options PRECONDITIONs
2017-12-12 10:53:17 +01:00
b661bee4b1
Support pubsub#publish-options PRECONDITIONs
...
Support PubSub publishing options that are specified as PRECONDITIONs as
per XEP-0060 v1.14.
2017-12-12 01:04:14 +01:00
47f6fc8dd2
Revert removal of certfile option on http listener
2017-12-11 11:00:24 +01:00
42b2e6c5ab
Update example configuration
2017-12-11 10:27:48 +01:00
303eea5e4d
Fix typos in mod_legacy_auth and mod_register
2017-12-11 10:00:16 +03:00
bd064fa3fc
Use xmpp:try_subtag/2 wherever possible
2017-12-11 09:46:26 +03:00
12d9d97baa
Use /bin/sh as the explicit shell when using su in ejabberdctl.
...
Some distributions (such as Fedora) use /sbin/nologin as the login
shell for the ejabberd user. The newer version of ejabberdctl uses
su to perform the command if the INSTALLUSER invokes the script.
This commit adjusts the call to su so that it passes /bin/sh as
the shell to use so that it will work correctly when the ejabberd
user's shell is set to nologin.
Signed-off-by: Randy Barlow <randy@electronsweatshop.com >
2017-12-10 12:52:22 -05:00
ae66c17ec0
Include <x/> tag in presence errors related to nick change
...
Refer to example 52 and example 53 of XEP-0045 for details.
Thanks to Daniel Gultsch for spotting this.
2017-12-09 23:13:20 +03:00
614bd9dd72
Better process subtag decoding errors
2017-12-09 22:39:43 +03:00
e15a9a2b9e
Log warning on empty wildcard paths
2017-12-08 12:50:10 +03:00
f1ac793d56
Don't call pkix_is_self_signed/1 too frequently
2017-12-07 17:24:34 +03:00
97c9058246
Eat less memory during building certificates graph
2017-12-07 16:41:49 +03:00
a820d735c0
Replace s2s_cafile with ca_file in ejabberd.yml.example
2017-12-07 14:58:58 +03:00
a303373b0f
Speedup certificate chains creation and validation
2017-12-07 14:32:12 +03:00
d8ace67a50
Compile sql_pt early
2017-12-07 10:47:30 +01:00
344a2611f2
Avoid infinite loop between self-signed certs
2017-12-07 00:29:19 +03:00
c2b22bd6c1
mod_muc_room: Fix typo
...
Thanks to Evgeniy for spotting this.
2017-12-06 16:50:45 +01:00
abeee837fc
Bump xmpp and fast_xml revisions
2017-12-06 18:36:04 +03:00
7a9d2cabc0
Improve code using new xmpp API
2017-12-06 17:21:57 +03:00
e4a4839880
Use ejabberd_cluster:send() in SM/C2S
2017-12-06 14:15:20 +03:00
ab2a90181c
mod_offline: Always ignore groupchat messages
2017-12-02 21:35:09 +01:00
bca87e2c89
Set executable permission on mac_listener when installing ( #2138 )
2017-12-01 17:28:31 +01:00
418718de31
mod_muc_room: Include 110 status on shutdown
...
Add the 110 status code to the presence unavailable stanzas sent to room
occupants on system shutdown.
2017-11-30 23:58:01 +01:00
0b1a6d7e79
mod_mam: Never store MUC messages in user archives
...
Even if a groupchat message is tagged with a <store/> hint, don't store
it in a user archive. The hint should only be honored by the MUC
archive.
2017-11-30 22:15:33 +01:00
395b74a89f
Windows does not have /tmp, fallback to /home/chris/conf
2017-11-30 15:32:09 +01:00
a5849a0dab
Fix num_subscribers on node metadata ( #2122 )
2017-11-30 15:27:34 +01:00
8639da0e00
Fix session table cleanup
2017-11-30 13:31:23 +03:00
cf67b9ec54
Add missed server_host column in pg.new.sql
2017-11-30 13:08:38 +03:00
ddaa8c7c1d
Merge branch 'master' of github.com:processone/ejabberd
2017-11-27 13:09:53 +03:00
b072342aa9
Adapt test to changed error
2017-11-27 11:12:46 +01:00
10edbe3e09
Improve muc#roominfo and muc#roomconfig forms
...
Now 'muc#roominfo_contactjid' and 'muc#roominfo_pubsub' fields
are returned within muc#roominfo form. Also, both 'muc#roominfo_pubsub'
and 'muc#roomconfig_pubsub' are now validated.
2017-11-27 13:07:10 +03:00
783ebd1080
Introduce option 'ca_file'
...
The option is supposed to be used as a fallback for certificates
validation. For instance, the option will be used if 's2s_cafile'
option is not set. The value should be a path to a file containing
CA certificate(s) in PEM format, e.g.:
ca_file: "/etc/ssl/certs/ca-bundle.pem"
2017-11-26 18:10:25 +03:00
242b3d3968
Don't crash on unexpected XML events
...
In fact, seems like this is a problem in the receiver code
(or fast_xml?) and should be fixed there
2017-11-24 19:38:20 +03:00
cf8e70abc8
Fix minor typo in comment
2017-11-24 17:17:48 +01:00
5676adff30
Get rid of unused variable compile warning
2017-11-24 12:11:01 +03:00
e31f6409a6
Fix function clause on filelib:wildcard/1
2017-11-24 12:10:03 +03:00
a57c694f21
Fix SQL serialization
...
The regression is introduced in 11829906acFixes #2121
2017-11-24 09:45:22 +03:00
0e5b343f1b
Add Id attribute in stanza built by send_message command
2017-11-23 17:14:39 +01:00
25f7f974b9
Use ejabberd_pkix API in mod_sip
2017-11-23 11:09:40 +03:00
fbd6ea8a48
Move 'certfile' based options in a single place
2017-11-23 11:04:47 +03:00
3a02c4369f
Get rid of meaningless log message
2017-11-22 10:12:49 +03:00
19975962ea
Fix a bug introduced in the previous commit in ejabberd_sql_pt
2017-11-20 15:14:44 +03:00
6a0e24fb14
Update URL to IM Observatory
2017-11-20 15:07:06 +03:00
e9e56ed183
Add notes about s2s_cafile
2017-11-20 15:02:24 +03:00
6686a64d5f
Fix filtering of rebar list-deps
2017-11-20 12:51:19 +01:00
c26b56679e
Modernize the example config a bit
2017-11-20 13:34:16 +03:00
98b411523d
Update deps
2017-11-20 10:42:05 +01:00
4b9d299e90
Make update-deps-releases.pl work with older perl
2017-11-20 10:41:52 +01:00
49c4aa238f
Change file mode of ACME certficates
2017-11-19 10:10:21 +03:00
e709d6561c
Re-read ACME certificates on config reload
2017-11-19 09:56:05 +03:00
f06805534c
Fix renew_certificates ejabberdctl command
...
Thanks to Konstantinos Kallas
2017-11-17 18:37:49 +03:00
3202b7a9a1
Log a message when a user gets registered
2017-11-17 18:02:12 +03:00
4f12359b9c
Don't forget to include intermediate ACME certificate
...
Thanks to Konstantinos Kallas
2017-11-17 17:17:19 +03:00
f599c2ef82
Fix ACME options validation
2017-11-17 15:55:33 +03:00
b2680a776b
Prepare user and host arguments in get_user_rooms command ( #2064 )
2017-11-17 13:23:27 +01:00
b67a114ef5
Fix elixir tests
2017-11-17 12:19:26 +01:00
224a3e13c9
Improve ACME options validation
2017-11-17 13:06:04 +03:00
382fb62f29
Merge branch 'master' of github.com:processone/ejabberd
2017-11-17 12:50:38 +03:00
b6b70ec0d4
Switch riak backend to leveldb on travis
2017-11-17 10:54:28 +01:00
4835537776
Move ejabberdctl ACME commands to other location
2017-11-17 12:50:27 +03:00
ce98226603
Make ACME code working with ejabberd_pkix
2017-11-17 11:59:40 +03:00
c05626a1ba
Fix sed invocation that was incompatible with FreeBSD sed
2017-11-17 09:50:24 +01:00
514c25caef
PubSub: PEP services must send notifications to the account owner ( #2108 )
2017-11-16 15:31:28 +01:00
00e32ee4b6
Allow writing custom modules in own path ( #1327 )
...
in ejabberdctl, just add this to EJABBERD_OPTS
external_beams /path/to/my/beams
then all beams file /path/to/my/beams/*.beam will be known
by ejabberd_config, and allowed to be loaded.
2017-11-16 14:48:47 +01:00
44700d91ba
PubSub: Cleanup tree requests, rename pubsub_node.type->pubsub_node.plugin
2017-11-16 11:38:04 +01:00
2531f37e5c
Let validator know about c2s_dhfile
2017-11-16 00:40:36 +03:00
62aab0fce4
Fix select_type race on plugin_init
2017-11-15 19:04:47 +01:00
e706e24b92
Cleanup pubsub subscriptions quering, fix pep case
2017-11-15 11:16:15 +01:00
11ee896f10
Improve ACME description
2017-11-15 12:57:53 +03:00
1f21f64d5f
Improve some error log messages
2017-11-15 11:54:38 +03:00
ebb97bec44
Fix mod_mam reloading
2017-11-15 11:23:22 +03:00
0c6ef98d01
Avoid badarg error when running get-deps before ./configure has created src/ejabberd.app ( #2103 )
2017-11-15 09:21:05 +01:00
6cd3867197
Makefile.in: Fix "make clean && make"
2017-11-15 08:50:40 +01:00
b04c6b7d75
Merge branch 'lets_encrypt_acme_support' of git://github.com/angelhof/ejabberd into angelhof-lets_encrypt_acme_support
...
Conflicts:
rebar.config
src/ejabberd_pkix.erl
2017-11-15 10:01:30 +03:00
af49472373
mod_stream_mgmt: Improve logging on timeout
...
Produce a better error message if a pending stream management session
times out.
2017-11-15 01:11:37 +01:00
75f150f7ae
mod_mam: Simplify 'message_is_archived' callback
2017-11-15 00:36:07 +01:00
98419c6662
mod_mam: Improve handling of forked messages
...
Make sure a message that was forked in ejabberd_sm will really only be
tagged with a stanza ID if (another copy of) it was stored in MAM.
2017-11-15 00:30:38 +01:00
2b3890f1b0
Announce support for stanza IDs
...
Announce the namespace for stanza IDs as per XEP-0359 v0.5.0.
2017-11-15 00:18:25 +01:00
06d4f1ff33
mod_mam: Add a few function specifications
2017-11-14 22:58:16 +01:00
5ae23a7301
mod_mam: Apply minor cosmetic changes
2017-11-14 22:36:46 +01:00
8376370ae1
mod_mam: Don't store from 'sm_receive_packet' hook
...
Let mod_mam use the 'sm_receive_packet' hook to generate stanza IDs for
incoming messages, but not to actually store them. The latter would
require additional changes to make sure modules such as mod_privacy and
mod_block_strangers continue to affect MAM.
2017-11-14 22:02:48 +01:00
054413d8f4
Halt ejabberd if the top supervisor fails to start
2017-11-14 18:41:28 +03:00
ce99db0595
Explain what is needed for the acme configuration and other small changes
...
1. Add a request handler in ejabberd_http and explain how to configure the http listener so that the challenges can be solved.
2. Make acme configuration optional by providing defaults in ejabberd_acme.
3. Save the CA that the account has been created in so that it creates a new account when connecting to a new CA.
4. Small spec change in acme configuration.
2017-11-14 14:12:33 +02:00
f953621ed2
Use xmpp:io_format_error/1 wherever possible
2017-11-14 09:02:43 +03:00
474536817e
Implement parentnodes seek for hometree ( #1921 )
2017-11-13 18:13:31 +01:00
daed6a05a6
Rewrite pubsub export to sql ( #1571 )
2017-11-13 17:34:37 +01:00
9daf2dd925
Assign failed_auth ETS table to another owner
2017-11-13 14:34:59 +03:00
1413f5dd23
Fix a record default
2017-11-13 11:29:03 +03:00
b06adf1df2
Get rid of forgotten debug message
2017-11-13 11:26:49 +03:00
11829906ac
Properly store <subject/> element
...
Fixes #2099
2017-11-13 11:25:35 +03:00
78f494dd2e
Configuration file changes
...
Explain the acme configuration options
2017-11-11 15:38:47 +02:00
76e9555d55
Improve some type specs
2017-11-11 09:33:42 +03:00
e77172a784
Improve a diagnostic text
2017-11-11 09:30:19 +03:00
675a1e0b0f
Fix a test related to mod_caps
2017-11-10 20:58:13 +03:00
54c8ae4d2b
mod_mam: Make sure archived message isn't bounced
...
If mod_offline is disabled but a message is archived by mod_mam, no
error bounce should be generated. This functionality got lost when
mod_mam stopped using the 'offline_message_hook'.
2017-11-10 18:09:33 +01:00
5c6a37b20f
Cleanup some headers
2017-11-10 17:51:22 +01:00
50b3206f06
Add forgotten type specs
2017-11-10 18:11:04 +03:00
7a3092a859
Use new API for IQ routing
...
Functions ejabberd_local:route_iq/2,3 are now depecated:
ejabberd_router:route_iq/2,3,4 should be used instead.
2017-11-10 18:02:22 +03:00
66c9f6458d
Merge pull request #2096 from weiss/always-add-stanza-id
...
Tag all archived messages with a stanza ID
2017-11-10 09:34:49 +04:00
d1df522fd9
mod_push: Avoid notification duplicates (again)
...
Now that mod_mam no longer uses the 'offline_message_hook', avoid
duplicating notifications for messages written to both MAM and offline
storage in another way.
2017-11-10 01:11:24 +01:00
e47b016e76
Add fs as dep in mix.exs
2017-11-09 09:59:49 +01:00
28661d20bd
mod_mam: Always strip stanza IDs
...
XEP-0359 v0.5.0 says: "Stanza ID generating entities, which encounter a
<stanza-id/> element where the 'by' attribute matches the 'by' attribute
they would otherwise set, MUST delete that element even if they are not
adding their own stanza ID."
2017-11-09 01:10:24 +01:00
9c174e30b2
mod_mam: Fix indentation
2017-11-09 01:00:15 +01:00
40d725e9c1
mod_mam: Ignore non-message stanzas earlier
...
Let mod_mam's hook callbacks ignore non-message stanzas using pattern
matching.
2017-11-09 00:48:19 +01:00
5cf4e200ba
mod_mam: Make sure a stanza ID is always added
...
Let mod_mam store incoming messages from a new hook in ejabberd_sm.
This makes sure all messages are tagged with a stanza ID, including
those that are forked to multiple resources in ejabberd_sm.
Closes #1344 .
2017-11-09 00:21:40 +01:00
902c6d476b
Prepare version 0.6.1 of XEP-0313 (MAM) support
2017-11-08 15:15:39 +03:00
74749f5dbb
ejabberdctl: Fix 'read' syntax for non-bash shells
2017-11-07 21:23:48 +01:00
fe9b191382
Erase transient certificates on exit
2017-11-07 09:04:20 +03:00
5d5b4cdfb5
ejabberdctl: Fix paths for release build
...
The ejabberdctl version generated by "make rel" relies on the SCRIPT_DIR
variable which got lost in commit cbe6553baa
2017-11-06 21:35:44 +01:00
cbbfe32d8b
Unregister commands when stopping node only if it's last one ( #2083 )
2017-11-06 16:53:49 +01:00
7121a95428
Define flags that depend on erlang version in mix.exs
2017-11-06 12:40:00 +01:00
41c393466c
mod_push: Avoid notification duplicates
...
Don't let mod_mam and mod_offline both trigger push notifications for
the same message.
Closes #2078 .
2017-11-06 00:26:20 +01:00
7d8ad17fa1
Remove code left from debugging
2017-11-03 16:11:34 +01:00
44293235e5
Simulate vars usage in ejabberd_sql_pt to avoid unused var warnings
2017-11-03 17:43:21 +03:00
ec3ea61585
Don't start hosts for disabled backends from CT_BACKENDS passed to make test
2017-11-03 14:44:13 +01:00
90e1f3f29d
Use correct table field name in sql query
2017-11-03 12:17:34 +01:00
2060022b19
Remember previous German translator
2017-11-03 10:16:21 +01:00
681d81bdcc
Merge pull request #2081 from nekoswag/master
...
updated German translation
2017-11-03 09:56:19 +01:00
c72e0a6ca6
Log warnings for c2s/s2s certfile option
2017-11-03 08:32:34 +03:00
189d02cee0
Bug Fix
...
The dictionary returned after the directory call contains a meta key
whose value is a JSON dictionary. This is now taken care so that only
bitstring values are kept as resource URIs
2017-11-02 19:05:12 +02:00
79a9a0ed29
Disable server_host warnings
2017-11-02 19:48:35 +03:00
78dfb832b8
Add SQL_INSERT macro and update SQL queries to use server_host field
2017-11-02 18:21:40 +03:00
354a710e70
Fix pkix:validate() return value
2017-11-02 11:28:23 +01:00
8eb1e5c68c
updated de.po
2017-11-01 18:22:27 +01:00
a22aad0a4b
Remove -include() directive for unused header
2017-11-01 10:59:28 +03:00
ae07fd7f10
Clarify some error/warning messages
2017-11-01 10:14:34 +03:00
86809dff06
Avoid using "bag" ETS type for certificate storage
2017-11-01 08:47:07 +03:00
35dc164233
Start even if there are problems with fs application
2017-11-01 08:34:14 +03:00
170be1fbd5
Lower log level
2017-11-01 00:55:05 +03:00
35b7203e01
Introduce 'certfiles' global option
...
The option is supposed to replace existing options 'c2s_certfile',
's2s_certfile' and 'domain_certfile'. The option accepts a list
of file paths (optionally with wildcards "*") containing either
PEM certificates or PEM private keys. At startup, ejabberd sorts
the certificates, finds matching private keys and rebuilds full
certificates chains which can be used by fast_tls. Example:
certfiles:
- "/etc/letsencrypt/live/example.org/*.pem"
- "/etc/letsencrypt/live/example.com/*.pem"
2017-11-01 00:20:27 +03:00
efc4996625
Fix sql query
2017-10-31 17:59:55 +01:00
88558453fb
Typo
2017-10-31 17:11:17 +01:00
ee2b5be7f4
Use store_room where possible
2017-10-31 16:12:35 +01:00
ce98843dd4
Fix sql syntax error in lite.sql
2017-10-31 14:43:36 +01:00
5f2e33bdd0
Don't use depraced functions
2017-10-31 14:21:34 +01:00
0452ffc1df
Optimize muc subscriptions handling
2017-10-31 14:00:41 +01:00
e24e05c6af
Enforce module_name/1
2017-10-31 12:06:40 +01:00
e697a3e262
Add missing type conversion from 675cc3e
2017-10-31 11:59:53 +01:00
8cb71255eb
Do not bind unused tail from 675cc3e
2017-10-31 11:25:01 +01:00
675cc3e0ea
Allow auth and pubsub plugin to use Elixir module
2017-10-31 11:04:32 +01:00
5f0a84a331
Show real jid in mucsub subscription change events
2017-10-30 17:54:55 +01:00
9b8ae80dab
Improve --enable-system-deps
2017-10-30 13:55:10 +01:00
0633dd5802
Fix last commit
2017-10-30 13:27:37 +01:00
2b363c7aee
Add mucsub event for subscribers list changes
2017-10-30 12:34:09 +01:00
2aeee9eab4
Merge pull request #2028 from weiss/increase-queue-sizes
...
Increase max_fsm_queue and max_ack_queue sizes
2017-10-29 12:18:23 +04:00
ed792274e3
Omit "ProtectSystem" option from systemd unit
...
With "ProtectSystem", /usr is mounted read-only, so things will fail
when e.g. /usr/local is used as the installation prefix. Whether such
options make sense depends on the environment, so they should rather be
set by package maintainers and/or admins.
2017-10-28 21:31:04 +02:00
dbdda745af
Delete cached item on node removal ( #2071 )
2017-10-27 21:16:25 +02:00
df86ecdd87
Update Greek translation (thanks to James Iakovos Mandelis)
2017-10-27 15:39:48 +02:00
e1c8e88d87
Update SQL archive index to match mysql.sql
2017-10-27 15:20:29 +03:00
b6c88fb17e
Fix typespec
2017-10-27 12:05:05 +03:00
24df1262bb
Don't store xdata() in Mnesia table
2017-10-27 11:46:37 +03:00
484e5de072
Simplify backend interface for mod_push
2017-10-27 10:55:48 +03:00
568ab526e2
Improve ejd2sql logging
2017-10-27 08:59:49 +03:00
a8238d6a54
Fix typo
2017-10-27 08:12:24 +03:00
9eb2685f90
Make it possible to export push_session table to SQL
2017-10-26 21:05:09 +03:00
db57394399
Add SQL support for mod_push
2017-10-26 20:11:43 +03:00
88928c0149
Adopt 'make install' to updated output from 'rebar list-deps'
2017-10-26 11:21:41 +02:00
2161063e5e
Don't forget to convert ljid() to jid()
2017-10-26 10:29:23 +03:00
29462f0053
Make it possible to convert to SQL for any current db_type
...
It is now possible to run `export` command even when the current `db_type` is not `sql`
2017-10-25 21:21:52 +03:00
3162ec0d66
Allow dynamic node options on sql backends
2017-10-25 15:40:42 +02:00
e4054aab79
Get next record before deleting previous on, in case it's last one ( #2069 )
2017-10-25 12:58:07 +02:00
8028a9545a
Cosmetic change, remove useless case
2017-10-25 11:48:56 +02:00
7c1b4d0fcd
Fix pubsub test, title not mandatory
2017-10-25 11:41:45 +02:00
17e3ed513b
Fix delete item from unregistered user ( #2067 )
2017-10-25 11:16:54 +02:00
65c85eab03
Fix another typo ;)
2017-10-25 11:47:02 +03:00
5151136d17
Fix typo
2017-10-25 11:44:53 +03:00
debbddb763
Mix _xmpp-server and _xmpps-server SRV records
...
XEP-0368 describes this procedure as following:
> Both 'xmpp-' and 'xmpps-' records SHOULD be treated as
> the same record with regard to connection order as specified
> by RFC 2782 [3], in that all priorities and weights are mixed.
> This enables the server operator to decide if they would
> rather clients connect with STARTTLS or direct TLS.
2017-10-25 11:39:20 +03:00
8b588d2ff3
Add basic PubSub meta-data support ( #1421 )
2017-10-25 10:34:11 +02:00
90ee405d81
Mention XEP-0368 support
2017-10-25 10:01:05 +03:00
b0fa27395f
Add missing fix from 07a193d4d, Fix purge_offline ( #2057 )
2017-10-24 15:35:01 +02:00
ce83e2261e
Merge pull request #2065 from jorjeb/mix-enable-graphics
...
Support for --enable-graphics in mix.exs
2017-10-24 14:35:47 +04:00
06cd373a18
Support for --enable-graphics in mix.exs
2017-10-24 18:02:52 +08:00
46fb2d0f56
Update Hebrew translation (thanks to Genghis Khan)
2017-10-23 16:14:01 +02:00
21f2c57920
Merge pull request #2023 from rom1dep/endings
...
Line endings consistency edits in the example config file
2017-10-16 12:59:04 +02:00
5667b4b0f9
Merge pull request #2052 from suchatorg/patch-1
...
Update gl.po
2017-10-16 10:16:54 +02:00
91e8249284
Update gl.po
2017-10-14 11:06:03 +02:00
1bb2bae62b
Reflect changes in the xmpp lib
2017-10-13 20:48:21 +03:00
152e0d77c1
Send presence-unavailable when expulsing a participant
2017-10-13 09:17:22 +03:00
9d6ec1ba12
Fix ZH translation
2017-10-12 12:09:50 +02:00
0c29f07758
Merge pull request #2047 from fotock/patch-1
...
Update zh translations
2017-10-12 11:44:12 +02:00
7f93b72a1d
Update zh.po
2017-10-12 00:17:32 -05:00
e5e64c99f3
Don't crash when Host header is missing
2017-10-11 18:53:53 +03:00
85c703a8f7
updated and extended German translation
2017-10-11 16:56:05 +02:00
2832130afc
Update Catalan translation
2017-10-11 16:21:28 +02:00
f751023bd6
Update zh.po
2017-10-11 04:33:14 -05:00
f0a68b85f0
Update zh.po
2017-10-11 01:47:43 -05:00
02fa719a87
Fix a typo: meta -> viewport
2017-10-10 13:25:38 +03:00
5a184b0433
Don't include CSS, javascript and image data directly in the code
2017-10-09 23:35:42 +03:00
d22ee24e72
Better handle mobile devices in CSS of mod_register_web
...
Thanks to Marek Foss. Fixes #2039
2017-10-09 21:46:38 +03:00
a6e5a5ca9a
Resend presences and history if presence possesses <x/> MUC element
...
Behave according to the new rule from XEP-0045, section 7.2.2:
> When a MUC service receives an <x/> tagged join stanza from an
> already-joined client (as identified by the client's full JID),
> the service should assume that the client lost its synchronization,
> and therefore it SHOULD send exactly the same stanzas to the client
> as if it actually just joined the MUC.
2017-10-09 17:59:22 +03:00
8513e31498
Update Russian translation
2017-10-06 23:44:50 +03:00
6efdd0f350
Don't crash when 'from' is undefined
...
c2s_filter_send hook may pass a stanza with undefined from/to (due to
legacy auth for example). Work around this problem.
Fixes #2036
2017-10-06 21:48:54 +03:00
0ed210877a
Update French translation
2017-10-06 17:48:56 +02:00
a06f1a0ba5
Update Czech translation (thanks to Jan Pinkas)
2017-10-06 13:23:33 +02:00
4bd5846d40
More fix in mod_http_fileserver to log URLs with/out query elements ( #2021 )
2017-10-06 13:16:13 +02:00
3c7ab13374
Update pl.po
2017-10-06 12:11:14 +02:00
df439f27ee
Update Spanish translation
2017-10-06 10:54:36 +02:00
d37d43495b
Updated all translation files
...
Simply running:
make; make translations
2017-10-06 10:02:16 +02:00
6f922275eb
Improve logging of mismatched Hosts
2017-10-05 11:33:29 +03:00
94de13981b
Log request in access.log even when Host doesn't match
2017-10-05 11:16:05 +03:00
43e729293a
Don't report Host mismatch as an error
2017-10-05 11:08:58 +03:00
f3af117108
Correctly handle mod_client_state (re)load
2017-10-05 11:03:36 +03:00
bd06bc00e2
Accept routes in Host header and map them to vhosts
2017-10-05 10:26:10 +03:00
9e95150803
Fix warning when compile with newer elixir
2017-10-04 12:03:36 +02:00
532aba993b
mod_stream_mgmt: Increase 'max_ack_queue' default
...
Users with large rosters and/or certain transports might receive a very
large number of (e.g.) presence and/or PEP stanzas after logging in.
Clients might take some time to acknowledge them, especially over slow
(mobile) connections.
2017-10-03 01:37:10 +02:00
79685da90b
Increase 'max_fsm_queue' default
...
The old default was becoming too small for some workloads.
2017-10-03 01:29:52 +02:00
280aa2f1b0
Fix crash in mod_http_fileserver when logging URL with query elements ( #2021 )
2017-10-02 15:36:38 +02:00
668d45cbc7
Install binaries with 755 permissions
2017-10-02 11:51:15 +02:00
e2f4cb5838
Remove find-outdated-deps script, we have better replacement for it
2017-10-02 11:49:34 +02:00
6658806820
Generate more readable code for run_fold hooks
2017-10-02 10:47:03 +03:00
a7341957f2
config: makes line endings consistent when followed by '-'
2017-09-30 11:12:20 +02:00
2cb0cedc6b
config: makes line endings consistent when followed by ':'
2017-09-30 11:10:34 +02:00
77a1f728cf
Install eimp binary with +x attribute
2017-09-28 18:34:27 +02:00
d576902bd4
Prepare mix for 17.09
2017-09-28 15:21:11 +02:00
a3da27e917
Fix race introduced by ffdaff374 on ejabberd_mnesia init
2017-09-28 15:14:11 +02:00
3f015c829c
Make sure Riak gets compiled on OTP20
2017-09-28 12:25:06 +03:00
2732c8f6fc
Fix function clause introduced by c17ec50e3a
2017-09-28 12:24:24 +03:00
3192687334
Don't forget to route presence-unavailable
...
When a user has several resources joined to a room using the same
nick attempts to leave the room from a single resource, route
presence-unavailable back to this (and only this) resource.
Fixes #2007
2017-09-28 11:58:36 +03:00
126653e01b
Pubsub: implment '6.5.7 Requesting the Most Recent Items'
2017-09-27 20:54:50 +02:00
ce7acafe37
Remove useless condition
2017-09-27 20:40:07 +02:00
216a0c97b9
PubSub: add RSM support for mnesia backend
2017-09-27 20:39:54 +02:00
3c8308bb8d
PubSub: enforce controls on publish and delete
2017-09-27 17:37:38 +02:00
1c6aa5e84e
mysql.sql: Use multi-column index on username/ID
2017-09-27 15:30:23 +02:00
609a1d07cf
harden ejabberdctl ( #1977 )
2017-09-27 15:04:57 +02:00
8c026582ab
Fix xref error
2017-09-27 12:34:40 +02:00
81df1ae3af
Unbind unused variable
2017-09-27 12:13:45 +02:00
22435ca562
Remove calls to deprecated functions
2017-09-27 11:43:59 +02:00
f464189819
Update dependences
2017-09-27 11:39:16 +02:00
89e504c55f
PubSub: fix get_items behaviour with mnesia
2017-09-27 11:18:12 +02:00
c1d3d1318e
Merge branch 'master' of github.com:processone/ejabberd
2017-09-27 11:12:09 +02:00
d120e0ad91
PubSub: add correct order when requesting all items
2017-09-27 11:12:01 +02:00
c17ec50e3a
Add support for XEP-0368: SRV records for XMPP over TLS
...
Currently this is only supported for outgoing s2s connections.
For such connections ejabberd is now able to resolve SRV records
of type "_xmpps-server._tcp". Also, SNI and ALPN fields are set
during TLS handshake. No additional configuration is required.
2017-09-27 12:03:05 +03:00
368ba3fc55
When running "make translations", use the new tools/prepare-tr.sh
2017-09-27 10:57:11 +02:00
cd098c5adc
Remove remaining files of old contrib/ dir
2017-09-27 10:57:07 +02:00
221e58fff0
Simplify prepare-tr.sh to work with new extract-tr.sh
2017-09-27 10:57:03 +02:00
9b043ae276
Move prepare-translations.sh from contrib to tools/prepare-tr.sh
2017-09-27 10:56:58 +02:00
abc09054e5
Remove forgotten export_all
2017-09-27 11:56:22 +03:00
07a193d4dc
PubSub: fix RSM support ( #1994 )(#2Â014)
2017-09-27 10:51:37 +02:00
cf09ed2df2
PubSub: fix node_options, default options only apply on first plugin
2017-09-27 09:29:04 +02:00
0cc1ae0a6a
mod_http_upload: Don't ignore 'custom_headers'
...
Don't ignore the 'custom_headers' option if the domain part of the
'put_url' doesn't match the XMPP domain.
Closes #1482 .
2017-09-26 21:40:56 +02:00
e1efd29156
Improve presence-error processing
...
When a presence-error is received from a participant in a MUC, kick
only this particular participant's full JID, leaving other resources
untouched. This will prevent from erroneous kicking all user's resources
in the presence of "multi-session nicks".
2017-09-26 19:01:54 +03:00
05feab35c4
Call earlier deps configure scripts durring compilation
2017-09-26 17:32:37 +02:00
2198fbce97
Fix command set_last that always returned code 1, error ( #2010 )
2017-09-25 18:43:24 +02:00
b8ab80d1f3
Sync containers from rroemhild and add instructions in README ( #1655 )
2017-09-25 17:48:57 +02:00
30e5c9bd3e
Add mod_avatar to the example configuration
2017-09-25 16:23:02 +03:00
251756de00
Catch all p1_fsm errors
...
Fixes #2012
2017-09-25 13:01:00 +03:00
3e987d3bae
Use eimp instead of ImageMagick calls for thumbnails creation
2017-09-25 12:41:12 +03:00
138cc25355
Pre-install libgd and libwebp
2017-09-25 11:19:49 +03:00
a15f186253
Remove OTP20 from Travis tests for now
2017-09-25 11:17:46 +03:00
59ec3d36f4
mod_mam: Simplify check for anon MUC JID filtering
...
Refuse filtering anon MUC MAM queries by JID even if it's the client's
own JID. Clients probably won't perform such queries in practice, so
the additional complexity is unnecessary.
2017-09-24 15:04:09 +02:00
d7250111ce
Reuse some translation strings
2017-09-24 14:32:37 +03:00
adfb924808
Replace translate:mark/1 with ?T() macro
2017-09-24 12:42:35 +03:00
48f2adde98
mod_mam: Refuse filtering anon MUC queries by JID
...
Return an empty result set if a non-moderator attempts to filter by JID
while querying the archive of an anonymous MUC room.
2017-09-24 02:05:50 +02:00
c378ea403e
Add script to extract translation strings
2017-09-24 00:08:01 +03:00
692ccd2e20
mod_push_mnesia: Fix typo in error message
2017-09-22 23:36:51 +02:00
5882c9b456
Add some recommended TLSOPTS as comments in the default config ( #2004 )
2017-09-21 16:28:17 +02:00
db41643bea
Also replace vcard-x-update in direct presences
2017-09-18 14:17:34 +03:00
cb076924cc
Merge pull request #1996 from nosnilmot/ejabberdctl-quote-peer
...
Quote $PEER in ping command to avoid hostnames containing "-" being interpreted as arithmetic
2017-09-18 13:09:16 +02:00
cce4056040
Fix iexdebug and iexlive commands ( #1981 )
2017-09-18 13:01:10 +02:00
7ad525b542
PubSub: broadcast updated configuration ( #1945 )
2017-09-18 12:48:20 +02:00
5bf64381cb
Add 'width' and 'height' to avatar info
2017-09-18 09:33:57 +03:00
f435d0a103
Add GIF support
2017-09-17 17:34:31 +03:00
e4d21c1941
Introduce mod_avatar
...
The purpose of the module is to cope with legacy and modern
XMPP clients posting avatars. It automatically converts vCard based
avatars (XEP-0153) to PEP based avatars (XEP-0084) and vice versa.
Also, the module supports convertation between avatar image formats on
the fly: this is controlled by `convert` option. For example, to
convert all avatars into PNG format, configure the module as:
mod_avatar:
convert:
default: png
In order to convert only `webp` format to `jpeg`, set the following:
mod_avatar:
convert:
webp: jpeg
Note: the module depends on mod_vcard, mod_vcard_xupdate and mod_pubsub.
Also, ejabberd should be built with --enable-graphics option.
2017-09-17 10:26:48 +03:00
5414cbe821
Add riakc dependency version
2017-09-13 09:49:43 +02:00
e6b1521b29
mod_push_keepalive: Remove unused 'db_type' option
2017-09-11 23:48:25 +02:00
2a7d9d93c8
Quote $PEER in ping command to avoid hostnames containing "-" being interpreted as arithmetic
2017-09-11 15:00:00 +01:00
dfd2045523
Introduce option 'allow_transports'
...
This is a boolean option. If set to `true` and some server's JID
is in user's roster, then messages from any user of this server are
accepted even if no subscription present.
The option is enabled by default.
2017-09-08 23:10:01 +03:00
9e35af54e0
The redis_reconnect_timeout was no longer used ( #1983 )
2017-09-07 20:25:20 +02:00
d87151aee6
Simple optimization in get_room_occupants_number command ( #1964 )
2017-09-07 18:32:26 +02:00
4ecd8a0780
Really delete cache on set_data()
...
Fixes #1991
2017-09-07 19:27:48 +03:00
803c31f760
Always accept messages from local (sub)domains
2017-09-07 13:53:42 +03:00
978c92f5e1
Fix a typo and improve logging message
2017-09-07 13:41:51 +03:00
315e330237
Fix version of jose library
2017-09-06 18:35:33 +03:00
f55a8d045d
Solve Travis build xref problem
...
Travis build failed on xref because some functions that I used did not exist in OTP versions 17.5, 18.3
Those functions are: ets:take/2, lists:join/2, erlang:timestamp/0.
2017-09-06 18:10:38 +03:00
32397aa0c3
Replace example config of drop_chat_states with queue_* in mod_client_state ( #1985 )
2017-09-06 13:48:33 +02:00
1a58a201f8
Block messages from strangers before mod_mam/mod_offline processing
...
Fixes #1713
2017-09-02 22:54:46 +03:00
2acbf4625b
Deprecate s2s_use_starttls: required_trusted
...
The functionality can be now obtained by using
`s2s_use_starttls: required` with `mod_s2s_dialback`
being unloaded.
2017-09-02 11:45:06 +03:00
7566d254e4
Introduce 'redirect_url' option for mod_register
...
The option enables registration redirection as described in
https://xmpp.org/extensions/xep-0077.html#redirect
Fixes #1976
2017-09-01 12:14:01 +03:00
68dee8cbb3
Fix deletion of multiple offline messages using WebAdmin ( #1962 )
2017-08-25 12:44:53 +02:00
f7e8d287d5
Fix a typo
2017-08-25 12:47:33 +03:00
80b44d8c15
Remove some unused variable warnings, replace lists:join with string join
2017-08-25 12:08:16 +03:00
30bca124f4
Add forgotten caching options to the validator (thanks to Jan Pinkas)
2017-08-24 21:40:54 +03:00
d7891a5562
Fix 'make install' to work with new output from rebar list-deps
2017-08-24 11:43:47 +02:00
1d396b4716
Rewrite muc_register_nick and muc_unregister_nick to be DB independent ( #1954 )
...
Notice: The arguments expected have changed, instead of
muc_register_nick Tim tim@example.org muc.example.org
muc_unregister_nick Tim
it expects now:
muc_register_nick Tim tim@example.org example.org
muc_unregister_nick tim@example.org example.org
2017-08-24 10:40:54 +02:00
7f3fceb432
Recompile rebar script with OTP17.5
2017-08-23 11:45:10 +03:00
81581f7794
Use forked repo of Riak Erlang client
2017-08-23 10:35:39 +03:00
47175adc74
Explicitly match against <domain/resource>
...
Fixes #1958
2017-08-23 09:00:13 +03:00
350827f8f4
Ignore some options from rebar.config
...
Namely, the following options are ignored in dependency packets:
require_erts_vsn, require_otp_vsn and require_min_otp_vsn
2017-08-22 15:26:35 +03:00
f1ea67817c
More whitespace changes
2017-08-22 14:58:12 +03:00
30e729a150
Whitespace change
2017-08-22 14:54:23 +03:00
8c56fbc0d8
Remove debugging script
2017-08-22 14:53:38 +03:00
a59ccc6c9c
Merge remote-tracking branch 'upstream/master' into lets_encrypt_acme_support
2017-08-22 14:51:21 +03:00
62903155fd
Show SANs in list_Certificates
2017-08-22 14:44:19 +03:00
25ca6e5582
Acquire certificates for all subdomains of a host and include them in SAN
2017-08-22 13:36:34 +03:00
37a54cd498
List the possible ca_urls in example config file
2017-08-22 10:38:33 +03:00
6f972fa3fe
Clean run_acme testcase
2017-08-22 10:29:12 +03:00
10f7b5a548
Remove partial RSA key support
2017-08-22 10:25:37 +03:00
f2876bdad7
Add certfile when acquired
2017-08-22 10:12:42 +03:00
05c2995c7a
When creating room, set option to ensure config is set in muc_room table ( #1954 )
2017-08-21 15:58:10 +02:00
2fa6e2fd90
Fix crash when destroying room without providing reason ( #1954 )
2017-08-21 15:57:48 +02:00
9b3e160e18
Remove some debugging INFO_MSGs
2017-08-19 17:47:05 +03:00
15dd88385f
Delete a development acme module
2017-08-19 16:58:06 +03:00
f581e391ac
Merge remote-tracking branch 'upstream/master'
2017-08-19 13:42:05 +03:00
dd42d52ff9
Merge remove_account_option branch
2017-08-19 13:36:42 +03:00
e45f7ddfec
Cleanup some comments:
2017-08-19 13:32:13 +03:00
7cc7b74f1e
Add acme certificates for all configured hosts in ejabberd_pkix
2017-08-19 12:50:40 +03:00
ddfe8742c7
Add behaviour ejabberd_config in ejabberd_acme in order to validate the config
2017-08-19 11:35:15 +03:00
ba9a79c89c
Apply cosmetic changes to previous commit
2017-08-18 16:50:08 +02:00
13ad754ecc
Suppress push notifications for online clients
...
When a client enabled push notifications during the current session,
notifications should be suppressed as long as the client is online.
Suppressing the notification didn't work for the case where the
notification was triggered by MAM, but this is now fixed.
2017-08-18 16:44:32 +02:00
0b02d42836
Fix mod_multicast start and reading of configured limits ( #1949 )
2017-08-18 14:09:49 +02:00
ee0a8d2966
Preserve correct order of deserialized XML elements
...
Fixes #1939
2017-08-18 10:20:27 +03:00
793ca45dda
Add OTP 20.0 to Travis testsing platforms
2017-08-17 22:14:54 +03:00
6e20e9bcf9
Get rid of deprecated crypto functions
2017-08-17 19:32:15 +03:00
b8d2a72333
mod_stream_mgmt: Delete 'c2s_init' hook
...
Delete the 'c2s_init' hook when the last 'mod_stream_mgmt' instance is
stopped.
2017-08-17 18:25:06 +02:00
0760c7273c
mod_stream_mgmt: Remove outdated TODO comment
...
The CSI queue is now flushed from mod_client_state.
2017-08-17 18:19:04 +02:00
9bd099013f
Don't attempt to access(2) a certificate file
...
Fixes #1375
2017-08-17 14:33:41 +03:00
68fb12153e
Revert "Temporary remove recent last_item refactor"
...
This reverts commit 1820b4f63b
2017-08-14 15:25:45 +02:00
e19d1e9571
Merge remote-tracking branch 'processone/pr/1938'
...
* processone/pr/1938:
Let 'domain_certfile' take higher precedence
2017-08-14 14:43:03 +02:00
1820b4f63b
Temporary remove recent last_item refactor
2017-08-14 09:43:02 +02:00
64150cc7c5
Let 'domain_certfile' take higher precedence
...
If a 'domain_certfile' is specified, use that instead of the
's2s_certfile' (or 'c2s_certfile').
2017-08-13 20:31:03 +02:00
63aabed320
Apply URL decoding wherever possible
...
Fixes #1936
2017-08-13 19:18:19 +03:00
051e2c639c
Change some specs
2017-08-12 18:00:46 +03:00
3b22efeaee
Add throws when http requests fail
...
This was done in order to show the unexpected code in the top level
2017-08-12 17:26:07 +03:00
a72a7f830a
Add support to revoke a certificate by providing the pem
...
This is important so that a user can revoke a certificate that is not acquired or logged from our acme client
2017-08-12 17:14:23 +03:00
73f0b6707a
Move the ca_url to the config file
2017-08-12 15:59:54 +03:00
fd7bf7fed3
Fix typo from 9c5427e0c
2017-08-11 17:54:53 +02:00
1aadb797b3
Remove the new account option from get certificate. There is no reason for having this
2017-08-11 14:10:55 +03:00
7140c8d844
Format expired certificates differently in list_certificates
2017-08-11 13:28:17 +03:00
7a90cda8ff
Process on_user_offline only from valid sessions
2017-08-11 12:05:14 +02:00
35eeaa5869
Fix regression introduced by b82b93f8f0
...
Fixes #1928
2017-08-11 11:43:16 +03:00
024713a441
Remove temporary debug
2017-08-11 10:53:19 +02:00
32fbfe1981
Use correct c2s process sending PEP with multi devices
2017-08-11 10:32:36 +02:00
9c5427e0c2
PubSub: refactor send_last_items remove send_loop
2017-08-11 10:20:33 +02:00
8f5a1c4a2a
Merge pull request #1926 from weiss/import-metronome-pep
...
prosody2ejabberd: Support PEP import
2017-08-11 10:19:17 +02:00
7d3609d954
prosody2ejabberd: Support PEP import
2017-08-10 19:49:20 +02:00
fc7ba53c37
prosody2ejabberd: Remove superfluous 'catch'
2017-08-10 18:54:00 +02:00
2b1fea01cd
Renew certificate now renews all saved certificates that are close to expire
...
Before this commit renew_certificate only checked the hosts in the config file and renewd the certificates for those. However the user can request certificates apart from the hosts in the config file so he should be able to also renew them.
2017-08-10 18:54:26 +03:00
c20bfb3422
Revoke Certificate: Jose Private Key
...
Instead of signing the jose object with the account private key, it now signs the object using the certificate private key. This is useful in case the user wants to revoke a old certificate whose account key doesn't exist anymore.
2017-08-10 17:23:13 +03:00
011b7ac3f2
Support getting certificates for domains not specified in the configuration file
2017-08-10 15:26:35 +03:00
a96d72330d
Rename remove_room hook back
2017-08-10 14:49:05 +03:00
7d626b4f5c
Add support of section 4.9.3.16 on rfc6120
2017-08-10 12:17:31 +02:00
e903348dd3
Fix pubsub send_loop after 3fec7824
2017-08-09 11:34:36 +02:00
bee251d928
Merge pull request #1912 from mathiasertl/master
...
fix FIREWALL_WINDOW option
2017-08-09 09:48:18 +02:00
c658907331
fix typo
2017-08-08 19:09:55 +02:00
97a4d57f2e
Remove some debugging functions
2017-08-08 18:00:37 +03:00
3fec782494
Introduce 'hosts' option
...
The option can be used as a replacement of 'host' option
when several (sub)domains are needed to be registered for the module.
Note that you cannot combine both 'host' and 'hosts' in the config
because 'host' option is of a higher priority. Example:
mod_pubsub:
...
hosts:
- "pubsub1.@HOST@"
- "pubsub2.@HOST@"
Fixes #1883
2017-08-08 17:46:26 +03:00
9756b452d6
Implement renew_certificate command
...
This command renews the certificates for all domains that already have a certificate that has expired or is close to expiring. It is meant to be run automatically more often than the renewal process because if the certificates are valid nothing happens
2017-08-08 16:38:19 +03:00
7fa9a387ae
Try catch when formatting certificates
2017-08-08 12:45:57 +03:00
48254a1e10
Change certificate notAfter to 90 days
...
As stated in Let's Encrypt FAQ: https://letsencrypt.org/docs/faq/
2017-08-08 12:23:13 +03:00
52525eb76d
Fix tests for 8679cfd2f
2017-08-07 15:38:17 +02:00
8679cfd2f3
Rename stop_all_connections to stop_s2s_connections for consistency
2017-08-07 15:06:07 +02:00
25af3fb029
Compile mod_push early as it defines behaviour
2017-08-07 09:32:58 +02:00
2bceebc39d
Get rid of export_all
2017-08-05 21:01:29 +03:00
92532a0d66
Replace gen_fsm with p1_fsm to avoid warnings in OTP20+
2017-08-05 20:58:21 +03:00
b673539a2a
Merge remote-tracking branch 'processone/pr/1914'
...
* processone/pr/1914:
ejabberd_c2s: Fix priority of 'certfile' option
2017-08-05 19:27:43 +02:00
e1aaa1c99d
ejabberd_c2s: Fix priority of 'certfile' option
...
Use the 'certfile' listener option rather than a 'domain_certfile' for
ejabberd_c2s listeners that have "tls: true" configured. A
'domain_certfile' should only be preferred for STARTTLS connections.
Closes #1911 .
2017-08-05 18:59:32 +02:00
aa9eb001d0
fix FIREWALL_WINDOW option
2017-08-04 18:49:33 +02:00
101e808124
Fix warning in previous commit
2017-08-04 13:09:17 +02:00
766b7c65a6
Merge pull request #1881 from weiss/push
...
Support XEP-0357: Push Notifications
2017-08-04 12:58:06 +02:00
0516a3dc0e
Remove unused 'managers' option, related to the deferred XEP-0321 ( #1443 )
2017-08-04 12:29:15 +02:00
3d185c0fb8
Fix missing validation from 633b68db1 ( #1900 )
2017-08-04 11:53:32 +02:00
7815164216
Add minor details ( #1353 )
2017-08-04 10:34:13 +02:00
65f4094804
Prepare packaging for 17.08
2017-08-03 16:55:56 +02:00
06450f4a82
Keep disco#info on PEP compatible with XEP-0060 ( #1717 )
2017-08-03 15:48:23 +02:00
ce0beb550c
Move pubsub sql export to pubsub_db_sql module
2017-08-03 15:34:01 +02:00
96c0483533
Fix Xref from 5dcc97c
2017-08-03 14:54:06 +02:00
1274bcdba9
Change policy of user_resources command
...
This fixes issue #1908
2017-08-03 13:49:06 +02:00
5dcc97c85a
Preliminary export PubSub data from Mnesia tables to SQL file ( #1571 )
2017-08-03 10:53:01 +02:00
e6e8e64f84
Improve return format of get_certificates command
2017-08-02 21:10:49 +03:00
ac7105d39e
Implement verbose list_certificates option
2017-08-02 19:36:11 +03:00
6deceeec2e
Merge branch 'master' of github.com:processone/ejabberd
2017-08-02 14:36:43 +02:00
9edcbadd60
Fix clustering table reg_users_counter ( #1889 )
2017-08-02 14:36:32 +02:00
f65492e27f
Merge pull request #1837 from marcphilipp/feature/set_room_affiliation_test
...
Add integration test for set_room_affiliation
2017-08-02 14:34:30 +02:00
1df61a82c8
Merge branch 'master' of github.com:processone/ejabberd
2017-08-02 12:25:50 +02:00
73509686f1
Fix getting cached last item ( #1814 )
2017-08-02 12:24:34 +02:00
93e521d65e
Merge pull request #1903 from himawri/fix_pubsub_spec
...
Fix spec for mod_pubsub:subscribe_node
2017-08-02 13:52:21 +04:00
50511fcff7
Fix spec for mod_pubsub:subscribe_node
2017-08-02 10:31:42 +02:00
5e26190b98
Fix PubSub send last published items ( #1572 )
2017-08-01 17:00:52 +02:00
f22bd6eb46
Fix PEP node removal ( #1839 )
2017-08-01 15:40:34 +02:00
0ba6c78ed0
Fix disco#items on PEP service
2017-08-01 15:15:01 +02:00
636d68e0a9
Fix PEP node identity ( #1717 )
2017-08-01 14:41:16 +02:00
7e6d1c24c2
Update spec from custom and allow modules dependencies ( #1740 )
2017-08-01 13:33:14 +02:00
67918b17d3
Fix extauth.py so support : in passwords (thanks to jmberg)( #1676 )
2017-07-31 22:51:31 +02:00
3abe3aeeec
Finish revoke_certificate and add specs
...
1. Add a try catch in the final revoke_certificate function
2. Also delete the certificate from persistent memory when it is done revoked
2017-07-29 19:10:06 +03:00
51fa438340
Request basic auth dialog from browser
2017-07-28 16:08:05 +02:00
35a11526f9
Revert "Fix get_module_opt call in mod_block_strangers"
...
This reverts commit e5f64bc24a
2017-07-27 18:23:10 +02:00
0cfec92c14
Generate log messages when websocket is closed due timeouts
2017-07-27 17:53:16 +02:00
e5f64bc24a
Fix get_module_opt call in mod_block_strangers
2017-07-27 17:48:41 +02:00
cc6f4b90fb
Support certificate revocation
2017-07-27 18:25:44 +03:00
5c48ba4609
Set high water mark in lager for all backends
2017-07-27 17:14:03 +02:00
3ca62a797a
Fix nick bug with MUC on riak
2017-07-27 17:06:34 +02:00
b66dab1313
Add muc related hooks
2017-07-27 17:02:06 +02:00
58110e4bc1
Update OTP version check by configure
2017-07-27 15:31:59 +02:00
ea96615460
Ability to filter passwords from the log in mod_http_api ( #1888 )
...
* Ability to filter passwords from the log when creating users through the mod_http_api
2017-07-27 15:30:56 +02:00
61d1411ab3
Sync fork with upstream
2017-07-26 09:54:23 +03:00
1a506da932
Add an erl_opt so that rsa can be used when the otp version is enough
2017-07-26 09:52:44 +03:00
b8c26671c4
Update oauth2 dependency
2017-07-25 17:59:32 +02:00
92e38190aa
Encode strings using a library function and not my custom made
2017-07-25 14:13:40 +03:00
09918b5912
Add a try catch arounf list certificates
2017-07-23 21:47:22 +03:00
2e88d001d6
Fix errors from 1a0db3d
2017-07-21 11:42:03 +02:00
1a0db3de3a
Describe commands arguments and results in ejabberd_sm, ext_mod, mod_mam
2017-07-21 11:26:53 +02:00
250876ea1a
Fix indentation of commands lines
2017-07-21 11:26:47 +02:00
66510c1d78
Add mod_push_keepalive
...
This module tries to keep pending stream management sessions of push
clients alive (as long as the disconnected clients are reachable via
push notifications).
2017-07-21 01:07:36 +02:00
d6f1d3df5b
Support XEP-0357: Push Notifications
...
Closes #1379 .
2017-07-20 20:22:50 +02:00
72dbb6e7c1
Fix errors when running ejabberdctl as root
2017-07-20 14:40:50 +02:00
b1082a96c9
Add ability to update changelog in update-deps-releases
2017-07-20 11:43:25 +02:00
ed17586cf0
Update cache_tab and xmpp dep
2017-07-20 11:43:06 +02:00
26b8dd75f7
Merge pull request #1869 from wahjava/master
...
Fix ERLANG_OPTS when setting INET_DIST_INTERFACE
2017-07-19 11:33:38 +02:00
c3473c2077
Update fast_tls
2017-07-19 10:58:10 +02:00
e216654c52
Don't add indentation after single item result in docs
2017-07-18 17:48:53 +02:00
cc3391cc1c
Use string:join instead of lists:join
2017-07-18 15:43:46 +02:00
b8d56a7c11
Improve formatting of documented API parameters
2017-07-18 15:01:01 +02:00
9ce1f12b66
Pretty print list-certificates
2017-07-18 13:28:44 +03:00
1bb9e83501
Merge pull request #1871 from rstgroup/master
...
Fix old route record in mnesia's route table haven't been remove when restarting in some cases (#1184 )
2017-07-17 17:56:39 +04:00
de1a66dfbe
Fix old route record in mnesia's route table haven't been remove when restarting in some cases ( #1184 )
2017-07-17 15:14:30 +02:00
2e18122cd9
Print validity in list-certificates
2017-07-17 13:40:53 +03:00
8fe551cc68
Add a stub for the list-certificates command
2017-07-17 11:39:27 +03:00
09c3496ff1
Remove httpdir from some function arguments as we now use the built in ejabberd http server for authorizations
2017-07-17 10:48:57 +03:00
fa3108e6e2
Save acquired certificates in persistent storage
2017-07-17 10:42:09 +03:00
9cf596c67b
Change the persistent data structure from a record to a proplist
...
This is done so that possible future updates to the data structure don't break existing code.
With this change it will be possible to update the data structure and keep the same old persistent data file, which will still have the expected list format but with more properties
2017-07-17 09:59:38 +03:00
478a12637d
Separate the persistent data structure functions
2017-07-17 09:40:36 +03:00
4d977535f2
Make some persistent data wrapper functions
2017-07-17 09:35:37 +03:00
95613a11ab
Fix ERLANG_OPTS when setting INET_DIST_INTERFACE
2017-07-15 16:42:47 +05:30
2cd193f97c
Expand catch block used to report errors in doc generator
2017-07-14 17:18:07 +02:00
33a9d6a3c3
Fix args_examples from last commit
2017-07-14 17:17:26 +02:00
fdb863ce70
Describe even more command arguments and results in mod_admin_extra
2017-07-14 16:43:30 +02:00
43fc29873e
Add refresh repos option in update-deps-releases
2017-07-14 15:08:13 +02:00
e216a54ead
Update fast_tls
2017-07-14 15:08:13 +02:00
77a96b0ec6
Solve acme challenges using built in http server
2017-07-12 19:23:52 +03:00
d4cdc3a246
Fix ERLANG_OPTS end lines when setting FIREWALL_WINDOW ( #1856 )
2017-07-12 14:43:28 +02:00
5199ede4a2
Changle acme file permissions
...
Also changed some specs
2017-07-11 11:11:00 +03:00
b4b4e247dd
Add the certificate directory in ejabberd.yml.ecample
2017-07-07 19:40:57 +03:00
c50f6c218f
Clean up code by adding throws instead of passing the error value
2017-07-07 18:32:07 +03:00
5866124138
Clean up get_certificate code
2017-07-07 17:37:44 +03:00
f6bdc6fdb2
mod_privacy: Don't crash while copying c2s state
...
Don't assume 'privacy_active_list' is set when c2s_copy_session/2 is
called.
2017-07-07 14:28:22 +02:00
8f25baada6
mod_privacy: Apply cosmetic change to type spec
2017-07-07 14:25:55 +02:00
aaef1a14b4
Fix set_presence command to work in recent ejabberd
2017-07-07 10:55:08 +02:00
22e8f5fd51
Add copyright and fix description for some sources
2017-07-06 21:27:04 +03:00
88ab787ba6
Start gen_mod from elixir tests
2017-07-06 17:57:46 +02:00
eb9faffadd
Improve elixir tests
2017-07-06 17:19:22 +02:00
3b0eee785f
Handle new possible result from ejabberd_config.add_option
2017-07-06 17:19:22 +02:00
5ef542a638
Remove tests for old commands interface
2017-07-06 17:19:22 +02:00
ffdaff3740
Make ejabberd_cluster modular
...
For setting the cluster backend new global option 'cluster_backend' is
introduced. The default and only available value at the moment is 'mnesia'
2017-07-06 15:47:35 +03:00
56d273477e
Remove old command calling interface
2017-07-06 14:24:25 +02:00
a35b9dd9cc
Close accepted socket if sockname/peername has failed
...
Fixes #1834
2017-07-06 14:49:21 +03:00
c69720a1ab
Add integration test for set_room_affiliation
2017-07-06 13:33:13 +02:00
56fc0efbc8
Split ACME module into two
...
1. A communications module that handles all requets/responses and other low level stuff that have to do with the ACME CA
2. A head module that will do all the useful stuff
2017-07-04 11:44:22 +03:00
d3c477646f
Add support for command get_certificates, very crude
2017-07-03 13:37:32 +03:00
a58de70f06
Fix invalid argument in get_messages_susbset
...
This should fix #1818
2017-06-30 14:24:35 +02:00
800965a957
Avoid useless calls on simples subscriptions ( #1313 )
2017-06-29 15:24:18 +02:00
fcf672c50e
Add allow_local_users to mod_block_strangers ( #1804 , #1809 )
2017-06-29 14:55:24 +03:00
b66e369a1d
Fix Salt import from prosody SCRAMmed password ( #1803 )
2017-06-29 10:28:44 +02:00
9dd03c873c
Fix clone code in update-deps-release
2017-06-28 16:47:31 +02:00
e42bb47ce3
Update deps
2017-06-28 16:46:48 +02:00
dc7fa076d7
Fix problem with updating deps in rebar.config for non-tags
2017-06-28 16:36:59 +02:00
960cf495c6
Don't use asn1rt:decode, it's not available on R20
2017-06-28 14:51:45 +02:00
0f12804a49
Quote paths to allow spaces ( #1789 )
2017-06-28 11:39:05 +02:00
3c7c71cfa6
In offline export to SQL, first write all DELETE, later all INSERT ( #1509 )
2017-06-28 11:14:59 +02:00
aac190255b
Update fast_tls
2017-06-27 15:02:23 +02:00
85a08a087b
Improve update-deps-releases deps parsing
2017-06-27 14:56:00 +02:00
637d9b054b
Support get-cert, revoke-cert. Also cleaned some typespecs
2017-06-26 19:03:21 +03:00
1bfb0ab39c
Fix username in mam export ( #1510 )(thanks to themaverik)
2017-06-26 14:38:12 +02:00
4ef1cdec12
Write validator for mod_multicast's limits option
2017-06-26 13:39:50 +02:00
0534678028
Use YAML syntax for limits option in mod_multicast
2017-06-26 11:26:53 +02:00
70606d7f1a
Catch exception that may happen when sending data over websocket
...
This fixes #1667
2017-06-23 17:19:37 +02:00
bb39ecbc08
More explicit bosh configuration handler
...
I also updated default url from to match URL suggested by XEP-0156
2017-06-23 16:47:14 +02:00
54e6e1a5fb
Merge pull request #1793 from marcphilipp/bugfix/set_room_affiliation_master
...
Fix mod_muc_admin:set_room_affiliation
2017-06-22 18:28:12 +04:00
5bb7a0b0db
Don't let a receiver to crash if a controller is unavailable
...
Fixes #1796
2017-06-22 16:58:46 +03:00
330456bcf0
Indent using Emacs
2017-06-22 14:47:56 +03:00
396bd5eb3d
Removed some ?INFO_MSG
2017-06-22 11:38:40 +03:00
dd79dea81d
Support new_cert, make certificate request
2017-06-22 11:31:50 +03:00
976a8c9cc9
Fix mod_muc_admin:set_room_affiliation
2017-06-21 17:20:58 +02:00
a095477b4c
Fix outgoing_s2s_timeout description ( #1684 )
2017-06-21 16:30:51 +02:00
950aca380c
mod_client_state: Reset state on session resume
...
Don't restore the previous CSI state when a stream management session is
resumed.
2017-06-21 01:05:46 +02:00
985b0a1933
mod_stream_mgmt: Add missing function specs
2017-06-21 01:00:29 +02:00
a7841ed486
Improve API documentation generator
2017-06-20 14:45:57 +02:00
a11e833a98
Make ext_mod api return rescode
2017-06-20 14:45:31 +02:00
62ee051c6e
Fix invalid {args,result}_examples in mod_muc_admin
2017-06-19 16:31:07 +02:00
5424ead01d
Generate better errors when not being able to generate documentation
2017-06-19 16:30:45 +02:00
96d385bf82
Another tweak to md generator
2017-06-19 15:10:34 +02:00
8e2258b16a
Update markdown api document generator
2017-06-19 15:02:02 +02:00
dc4c00a78c
Add support for solving http-01 challenge
2017-06-18 13:20:47 +03:00
1d1250b056
Cleanup acme_challenge.erl, move types and records in ejabberd_acme.hrl
2017-06-17 19:06:39 +03:00
f87b46f454
Fix srg_user_add/del for non-Mnesia database backends ( #1780 )
2017-06-15 11:05:41 +02:00
133d2ae6d5
Derive the alg field of the JWS object using a erlang-jose library function rather than hardcoding
2017-06-15 11:47:29 +03:00
5418b37314
Add pubsub import from prosody/metronome
2017-06-15 09:56:05 +02:00
6353a06a5d
Catch exception from Elixir.ExUnit.Server.cases_loaded
2017-06-14 14:56:59 +02:00
58b9077b51
Fix OTP-17.5 support
2017-06-14 14:18:35 +02:00
10fcfa860a
Show operations to perform before asking to apply them
2017-06-14 14:05:41 +02:00
4fc3d511ce
Synchronize fork
2017-06-14 12:35:01 +03:00
032ce9e53c
Refactor get requests, Implement authorization handling functions
2017-06-14 12:12:43 +03:00
5f2dcc51ce
Bump xmpp version
2017-06-14 01:05:15 +02:00
0aa64381ff
Fix IP address parsing for mod_metrics
2017-06-13 16:54:29 +03:00
6c8b037422
Fix refactor bug on wait_status
2017-06-13 12:37:27 +02:00
d63ea000c7
Prepare package for 17.06-beta
2017-06-13 11:02:30 +02:00
5e148df0a9
Update esip and stun dependencies
2017-06-13 10:35:00 +02:00
4b1c59e199
Major Refactoring, Separated Logic from Requests
2017-06-12 21:35:43 +03:00
d8f05acb67
Add script for managing updates to deps
2017-06-12 19:23:41 +02:00
d6f4c99243
Remove luerl from floating_deps
2017-06-12 19:23:41 +02:00
c25aa8378f
Add new-authz, refactor the http requests that all used the same code
2017-06-12 15:31:48 +03:00
63b6e0d381
Switch access rule delete_old_users with protect_old_users ( #1772 )
2017-06-09 19:18:47 +02:00
911b8188d2
Refactor the http response handlers.
...
Encapsulate some dangerous calls with try catch.
2017-06-09 19:47:50 +03:00
167edacb5f
Make Stylistic Changes in order to conform to guidelines:
...
1. Remove trailing whitespace
2. Remove Macros
3. Handle all erroneous response codes the same way
4. Add specs
Also don't return nonces anymore when the http response is negative.
2017-06-09 18:53:54 +03:00
53d47483c8
Implement some basic account handling functions
2017-06-09 15:49:27 +03:00
8c1568ff93
Add more ipv6 loopback addresses
2017-06-09 14:38:34 +02:00
7b5895c90d
Allow api access on both ipv4 and 6 loopback addresses
...
This should fix issue #1769
2017-06-09 13:57:26 +02:00
115cb23bd8
Fix elixir tests on elixir 1.4
2017-06-09 12:59:47 +02:00
62806607bf
Add missing ,
2017-06-09 12:10:40 +02:00
b25b5c2f98
Improve export2sql explanation; remove obsolete and duplicated command
2017-06-09 12:02:49 +02:00
444c385f23
Update dependencies
2017-06-09 10:34:35 +02:00
ee8bbccb2a
Fix and document push_roster_all command
2017-06-08 19:54:34 +02:00
66237abd35
Merge pull request #1766 from IRog/master
...
fixing exec_iex bug with proper --name arguement
2017-06-08 10:41:26 +02:00
0973a8d6c1
fixing iex bug with proper --name arguement
2017-06-07 21:15:17 -07:00
fbead19c88
Update elixir
2017-06-07 17:09:06 +02:00
baf574d6c4
Update lager p1_mysql and p1_pgsql dependencies
2017-06-07 16:56:00 +02:00
e3c801f1f5
Update dependencies
2017-06-07 16:18:41 +02:00
f773edcb98
Override version of subdeps with version from main rebar.config
2017-06-07 16:06:28 +02:00
2a73068aac
Add missing space separator on EJABBERD_OPTS
2017-06-06 15:41:48 +02:00
926de60f5d
Support for new_cert
2017-06-05 17:10:37 +03:00
5971eb3da0
Merge pull request #1758 from reneklacan/fix-mix-warnings
...
Fix mix warnings
2017-06-04 14:25:31 +04:00
04fd5567a7
Fix mix warnings
2017-06-04 12:24:35 +02:00
4f8c132b53
Merge pull request #1759 from reneklacan/fix-version-to-be-semver
...
Fix version to be SemVer compatible
2017-06-04 14:18:39 +04:00
a98685e0bb
Fix version to be SemVer compatible
2017-06-04 03:01:51 +02:00
df5d673e63
Solve http-01 challenge
2017-06-03 12:34:15 +03:00
12733bd21b
Fix EJABBERD_OPTS
2017-06-02 17:56:57 +02:00
f6767ed061
Fix rooms list in WebAdmin ( #1753 )
2017-06-01 19:27:41 +02:00
de10a7a8ce
Respect INSTALLUSER when creating spool directory
2017-06-01 17:48:44 +02:00
5081a180fa
Create spool directory at start if not exists
2017-06-01 17:44:23 +02:00
a576f3a6d1
Remove use of getopt to support simpler shells
2017-06-01 12:10:06 +02:00
3201f8e513
Improve ejabberdctl parameters parsing
2017-06-01 11:48:11 +02:00
92003fa4dc
Minor ejabberdctl improvements
2017-06-01 08:04:11 +02:00
818d9c8c42
Merge branch 'joudinet-master'
2017-05-31 18:12:26 +02:00
cbe6553baa
Refactor ejabberdctl
2017-05-31 18:11:45 +02:00
5d3870faa3
Add --enable-system-deps configure option
2017-05-31 11:30:34 +02:00
2d8ce266bd
Add license files into lib and deps directories
2017-05-30 15:03:06 +02:00
0042f18c1f
Merge branch 'master' of https://github.com/joudinet/ejabberd into joudinet-master
2017-05-30 12:37:27 +02:00
0982a9bc3c
Parse correctly presence_broadcast option in change_room_option command
2017-05-29 12:49:53 +02:00
50327a0cfc
Fix case clause
...
Fixes #1746
2017-05-25 13:46:17 +03:00
5802062746
Cosmetic change: Fix indentation errors
2017-05-24 17:16:16 +02:00
69de1780a0
Introduce --enable-stun and --enable-sip configure options
...
STUN/TURN and SIP is not compiled by default anymore.
Use --enable-stun, --enable-sip or --enable-all to enable them.
2017-05-23 13:12:48 +03:00
6e8895f9e9
Get rid of sql_queries.erl
2017-05-23 12:25:13 +03:00
e93762a720
Deprecate misc:encode_base64/1 and misc:decode_base64/1
2017-05-23 10:43:26 +03:00
268065e5c4
Validate all certfiles on startup
2017-05-23 09:27:52 +03:00
d7878ef131
Implement cache for mod_announce
2017-05-22 16:14:28 +03:00
908bedeaa6
Describe command arguments and results in mod_muc_admin
2017-05-22 12:55:32 +02:00
504860f065
Don't leak with UDP sockets
2017-05-22 11:29:53 +03:00
3a96d72a7f
Implement cache for mod_private
2017-05-22 10:34:57 +03:00
d88e4d495f
Don't store messages via a single process
2017-05-21 23:21:13 +03:00
66a4e405e0
Improve mod_metrics
...
* Do not spawn a process per event
* Avoid UDP socket creation on every event
* Get rid of calls to str.erl module
* Add options 'ip' and 'port'
2017-05-21 14:24:57 +03:00
0a77b9f43e
Get rid of a workaround against old Erlang bug
2017-05-21 13:30:46 +03:00
470669fa6b
Get rid of db_type warning for mod_vcard_xupdate
2017-05-21 11:40:24 +03:00
af29fb21df
Get rid of detection of modules' db_type detection
...
The detection sometimes leads to errorneous warnings.
We need to improve it later. For now I just remove the
detection as it doesn't fully work anyway.
2017-05-21 11:33:16 +03:00
be50d57ddd
Declare ejabberd_oauth behaviour
2017-05-21 11:31:30 +03:00
35d19b32f4
Implement cache for mod_privacy/mod_blocking
2017-05-20 22:36:32 +03:00
654d907dcf
export_all is not needed here
2017-05-19 17:03:41 +02:00
b013c29c7e
Fix values put in args_examples
2017-05-19 16:56:37 +02:00
0ed23980a6
Get rid of Mnesia transaction in get_vcard/2
2017-05-18 21:24:47 +03:00
a78862e05e
The default 'iqdisc' is now 'no_queue'
2017-05-18 19:13:18 +03:00
bcb44ccb6f
Implement cache for mod_last
2017-05-18 13:21:17 +03:00
736a182544
?SQL_UPSERT returns 'ok' on success
2017-05-18 12:10:36 +03:00
97bb1250ba
Avoid erroneous usage of ?MODULE macro
2017-05-18 12:09:28 +03:00
b0b7ac101c
Fix function_clause after authentication refactoring
...
Fixes https://github.com/processone/ejabberd-contrib/issues/213
2017-05-18 09:51:04 +03:00
3e35d44b0f
Replace 'if_version_above' directive with 'if_have_fun'
2017-05-17 19:37:06 +03:00
6691c59a7a
Clean up database code related to mod_vcard_xupdate
2017-05-17 19:29:19 +03:00
1391d5a304
Use disc_only_copies for oauth_token Mnesia table
2017-05-17 17:42:22 +03:00
8f595b58a7
Increase gen_mod's supervisor shutdown time
2017-05-17 17:33:07 +03:00
5bdc6c0822
Get rid of deprecated option 'resume_timeout' in test config
2017-05-17 17:21:59 +03:00
1925b94131
Implement cache for mod_vcard and mod_vcard_xupdate
2017-05-17 17:13:34 +03:00
ddb043aa71
More account support(Update/Info)
2017-05-17 16:55:26 +03:00
fc794b680a
Add cache options to the validator
2017-05-17 16:03:41 +03:00
a71065fcda
Ciphers should be a binary string
2017-05-17 15:42:18 +03:00
7165196211
Get rid of unused variable
2017-05-17 15:24:32 +03:00
f782955c06
Implement cache for roster
2017-05-17 14:47:35 +03:00
3f13396d73
Fix use_cache/1 callback
2017-05-15 08:58:37 +03:00
88365ed507
New account functional, very crude
2017-05-15 01:41:09 +03:00
061d5f2380
Shut up dialyzer/xref if public_key:short_name_hash/1 is not available
2017-05-13 13:11:08 +03:00
2d17a2850c
Only validate certfiles if public_key:short_name_hash/1 is available
2017-05-12 17:51:17 +03:00
cc58ce6301
Introduce Certficate Manager
...
The major goal is to simplify certificate management in ejabberd.
Currently it requires some effort from a user to configure certficates,
especially in the situation where a lot of virtual domains are hosted.
The task is splitted in several sub-tasks:
* Implement basic certificate validator. The validator should check all
configured certificates for existence, validity, duration and so on. The
validator should not perform any actions in the case of errors except
logging an error message. This is actually implemented by this commit.
* All certificates should be configured inside a single section (something
like 'certfiles') where ejabberd should parse them, check the full-chain,
find the corresponding private keys and, if needed, resort chains and
split the certficates into separate files for easy to use by fast_tls.
* Options like 'domain_certfile', 'c2s_certfile' or 's2s_certfile' should
probably be deprecated, since the process of matching certificates with the
corresponding virtual hosts should be done automatically and these options
only introduce configuration errors without any meaningful purpose.
2017-05-12 16:27:09 +03:00
d3c8fb7705
Check presence of some files during option validation
2017-05-12 09:34:57 +03:00
9fe16a29e1
Gracefully process malformed passwords during password change
2017-05-11 17:15:23 +03:00
31a3cc7b10
Gracefully process malformed passwords during registration
2017-05-11 17:09:26 +03:00
a8dc5f80d1
Add 'access_remove' ACL to mod_register
2017-05-11 16:37:01 +03:00
81d9770d4f
Update Elixir tests for using new auth API
2017-05-11 16:15:18 +03:00
cdb191bb48
Rename is_user_exists -> user_exists
2017-05-11 15:49:06 +03:00
633b68db11
Use cache for authentication backends
...
The commit introduces the following API incompatibilities:
In ejabberd_auth.erl:
* dirty_get_registered_users/0 is renamed to get_users/0
* get_vh_registered_users/1 is renamed to get_users/1
* get_vh_registered_users/2 is renamed to get_users/2
* get_vh_registered_users_number/1 is renamed to count_users/1
* get_vh_registered_users_number/2 is renamed to count_users/2
In ejabberd_auth callbacks
* plain_password_required/0 is replaced by plain_password_required/1
where the argument is a virtual host
* store_type/0 is replaced by store_type/1 where the argument is
a virtual host
* set_password/3 is now an optional callback
* remove_user/3 callback is no longer needed
* remove_user/2 now should return `ok | {error, atom()}`
* is_user_exists/2 now must only be implemented for backends
with `external` store type
* check_password/6 is no longer needed
* check_password/4 now must only be implemented for backends
with `external` store type
* try_register/3 is now an optional callback and should return
`ok | {error, atom()}`
* dirty_get_registered_users/0 is no longer needed
* get_vh_registered_users/1 is no longer needed
* get_vh_registered_users/2 is renamed to get_users/2
* get_vh_registered_users_number/1 is no longer needed
* get_vh_registered_users_number/2 is renamed to count_users/2
* get_password_s/2 is no longer needed
* get_password/2 now must only be implemented for backends with
`plain` or `scram` store type
Additionally, the commit introduces two new callbacks:
* use_cache/1 where the argument is a virtual host
* cache_nodes/1 where the argument is a virtual host
New options are also introduced: `auth_use_cache`, `auth_cache_missed`,
`auth_cache_life_time` and `auth_cache_size`.
2017-05-11 14:37:21 +03:00
e890525788
Use misc:atom_to_binary/1 instead of the deprecated jlib.erl ( #1510 )
2017-05-10 12:05:52 +02:00
6b8c61b3a2
Update comment: aux.erl was renamed to misc.erl
2017-05-10 12:03:13 +02:00
4849ac9781
Use jid:encode/1 instead of the deprecated jid:to_string/1 ( #1510 )
2017-05-10 11:22:15 +02:00
cd18d3d8a7
Fix: update sql statement, added missing delimeter for sql queries
2017-05-10 11:22:11 +02:00
a0908ba393
Added export function for mam module
2017-05-10 11:22:07 +02:00
02dbe39b06
Examining jose functionality
2017-05-09 23:27:37 +03:00
67a00939db
Small improvements to the acme module
2017-05-08 20:29:58 +03:00
5d7a704ca5
Remove forgotten 'export_all'
2017-05-08 17:23:29 +03:00
cee90a886e
Don't list 'redis_pool_size' option multiple times
2017-05-08 17:22:34 +03:00
6b6d07745d
Split some functions in smaller ones
2017-05-08 16:29:01 +03:00
05362b9a7d
Very basic acme client, only stubs
2017-05-08 15:35:11 +03:00
bf2a2f291f
State that Erlang 17.5 or higher is only supported
2017-05-08 15:10:42 +03:00
8368a0850a
Don't call gen_mod:get_opt() outside of modules
2017-05-08 14:34:35 +03:00
01a2c9fe12
Add type specs for Module:opt_type/1
2017-05-08 12:59:28 +03:00
6aefd24eb3
LOG_PATH macro should be of string type
2017-05-06 09:42:06 +03:00
3241c2506b
Introduce 'sql_connect_timeout' option ( #1698 )
2017-05-05 16:25:10 +03:00
48d6ae1def
Introduce 'sql_query_timeout' option
...
Fixes #1698
2017-05-05 13:20:28 +03:00
f2dc8c0442
Emit deprecation warning for SM related listening options
2017-05-05 12:31:17 +03:00
b174e2c9c6
Improve validation of second-level options
2017-05-05 11:11:17 +03:00
fb17c1b99f
Make it possible to validate second-level options
2017-05-04 17:34:32 +03:00
e790e66f47
Fix elixir tests
2017-05-04 12:17:41 +02:00
c64e77a08c
Catch exceptions from acl:add_list in web admin
2017-05-04 12:01:22 +02:00
cf53d834e9
Introduce 'iqdisc' global option
2017-05-04 12:24:47 +03:00
a2a4a4970e
Validate module options on start_module/2
2017-05-04 09:09:10 +03:00
31fa36003f
Parse ldap_uids in mod_vcard_ldap like in eldap_utils ( #319 )
2017-05-03 23:32:56 +02:00
cd1c41e448
Merge pull request #1697 from pipo02mix/dockerfile-17-04
...
Update Dockerfile to be able to build 17.04 ejabberd version
2017-05-03 09:29:23 +02:00
54cc49bc70
Validate new options before module reloading
2017-05-01 14:01:12 +03:00
fe662c1a0a
Don't forget to delete digraph
2017-05-01 10:14:00 +03:00
fddd6110e0
Don't validate an option in gen_mod:get*opt() functions
...
The changes are very similar to those from previous commit:
* Now there is no need to pass validating function in
gen_mod:get_opt() and gen_mod:get_module_opt() functions,
because the modules' configuration keeps already validated values.
* New functions gen_mod:get_opt/2 and gen_mod:get_module_opt/3 are
introduced.
* Functions gen_mod:get_opt/4 and get_module_opt/5 are deprecated.
If the functions are still called, the "function" argument is
simply ignored.
* Validating callback Mod:listen_opt_type/1 is introduced to validate
listening options at startup.
2017-04-30 19:01:47 +03:00
2b63d07329
Merge branch 'new-option-validation'
2017-04-29 11:48:57 +03:00
b82b93f8f0
Don't validate an option in ejabberd_config:get_option() functions
...
The commit introduces the following changes:
* Now there is no need to pass validating function in
ejabberd_config:get_option() functions, because the configuration
keeps already validated values.
* New function ejabberd_config:get_option/1 is introduced
* Function ejabberd_config:get_option/3 is deprecated. If the function
is still called, the second argument (validating function) is simply
ignored.
* The second argument for ejabberd_config:get_option/2 is now
a default value, not a validating function.
2017-04-29 11:39:40 +03:00
7129aebe76
Don't re-define validation functions in multiple places
2017-04-28 13:23:32 +03:00
2bcf822637
Fix elixir tests
2017-04-28 10:08:09 +02:00
6658c0d386
Bump cache_tab version
2017-04-27 20:07:44 +03:00
0b93cb7ece
Store options using p1_options module
2017-04-27 19:44:58 +03:00
b51e2aa213
Merge pull request #1702 from skuroki/patch-1
...
Fix typo
2017-04-27 09:58:37 +02:00
d18d99e8ec
Bug requesting non-existent data with private_get command ( #1690 )
2017-04-26 23:14:30 +02:00
9b8364b6c8
Merge remote-tracking branch 'processone/pr/1699'
...
* processone/pr/1699:
Add support for HTTP File Upload, version 0.3.0
2017-04-26 21:18:16 +02:00
959419419f
Fix typo
2017-04-26 17:35:51 +09:00
2988d84cfb
Don't check result of jid.start
2017-04-26 09:50:49 +02:00
c0eb85ce53
Allow a room admin also to subscribe another JID
2017-04-26 01:30:12 +02:00
56a4bf8f3c
mod_stream_mgmt: Fix typo in variable name
2017-04-25 22:37:27 +02:00
9cc332d6b3
mod_stream_mgmt: Fix 'if_offline' detection
2017-04-25 22:32:03 +02:00
120682ec8b
Include original 'id' and 'type' attributes in offline event
2017-04-25 17:59:26 +03:00
a67b3dc6a6
Don't check result of jid.start
2017-04-25 16:54:01 +02:00
f4c98f635b
Don't check result of jid.start
2017-04-25 16:46:00 +02:00
069bf6dec6
Make sure only jabber:x:event tag is present in offline event
2017-04-25 17:21:24 +03:00
a59bef1afe
Update Dockerfile to be able to build 17.04 ejabberd version
...
Because the default installation prefix has changed in the new release, it is needed to add in the configure line of Docker file the argument --prefix=/
2017-04-25 09:35:07 +02:00
d0f3696596
randoms: Keep compatibility with Erlang/OTP 17
2017-04-24 23:51:01 +02:00
c923bb5c10
Avoid changing configuration on listener deletion
2017-04-23 16:42:54 +03:00
9a93acc62a
Improve Mnesia tables creation and transformation
2017-04-23 16:37:58 +03:00
8770fc98e1
Use round-robin algorithm when selecting worker from DB pool
2017-04-23 11:54:56 +03:00
18433e289f
Add clear_cache admin command
2017-04-22 11:33:39 +03:00
168712ebbd
Add support for HTTP File Upload, version 0.3.0
...
Support the current XEP-0363 version in addition to the previous
revisions.
2017-04-21 18:36:53 +02:00
44ae6bcc83
Fix elixir tests
2017-04-21 12:17:23 +02:00
02790b105e
Speedup Mnesia tables initialization
2017-04-21 12:27:15 +03:00
d88c08e074
Use new cache API in mod_shared_roster_ldap
2017-04-21 10:43:14 +03:00
9937cb48fd
Use new cache API in ejabberd_oauth
2017-04-21 09:02:10 +03:00
5444475b1d
Correct option validation
2017-04-20 18:55:16 +03:00
264a40f217
Use new cache API in mod_mam
2017-04-20 18:52:16 +03:00
a26f90a346
Use new cache API in mod_caps
2017-04-20 18:18:26 +03:00
ca9d04ba6b
Fix private_get command sending a proper xmlel ( #1683 )
2017-04-20 16:50:08 +02:00
4e86a71ab2
When getting user rooms, filter by the serverhost as expected ( #1683 )
2017-04-20 16:49:32 +02:00
3682888655
mod_stream_mgmt: Preserve stanza count on timeout
...
If a pending stream management session times out, call
ejabberd_c2s:process_terminated/2 *before* storing the incoming stanza
count. Without this change, the session table entry that holds the
stanza count was purged while closing the session.
2017-04-19 23:04:20 +02:00
3adf720bc1
Use #jid{} type for #muc_unsubscribe.jid
2017-04-19 22:18:23 +02:00
d7a999eaf5
Don't use jid:from_string as it's deprecated, see jid.erl line 43
2017-04-19 21:47:59 +02:00
64333f69ea
Don't try to load already loaded applications
2017-04-19 11:40:58 +03:00
b8a7720986
ejabberd_c2s: Don't close session on stream resume
...
Don't let ejabberd_c2s close the session and unset presence if a
'c2s_terminated' callback stops hook execution, as is done in
mod_stream_mgmt:c2s_terminated/2 on resumption.
Fixes #1680 .
2017-04-19 01:20:28 +02:00
7c9415356d
Function fix_from_to/2 should not crash when 'from' is undefined
...
Fixes #1678
2017-04-18 01:38:35 +03:00
c97aade33e
Merge pull request #1677 from getong/catch_lager_crash_log_not_run
...
lager_crash_log in some cases not run, catch it
2017-04-17 09:44:00 +04:00
ab751d290a
lager_crash_log in some cases not run, catch it
2017-04-17 12:07:23 +08:00
f496d22074
Improve logging message
2017-04-16 23:56:12 +03:00
86b680a3ad
Move compile_exprs() to misc module
2017-04-16 20:05:46 +03:00
78dba217bf
Speedup configuration options lookup
...
We now avoid excessive ETS lookups; instead, we use dynamically
compiled module 'ejabberd_options' keeping the configuration options
2017-04-16 15:29:10 +03:00
3b14b35252
Default config file should be ejabberd.yml
2017-04-16 01:26:33 +03:00
878c762cdf
Log human readable description when configuration file is not found
2017-04-16 01:22:55 +03:00
920f2678ac
Report configuration file location on startup
2017-04-16 01:02:46 +03:00
b6182e6fe8
Speedup loading of translation files
...
A dump of 'translations' ETS table is now stored on disc.
The table is only re-created when new/deleted/modified translation
files are detected; otherwise, the ETS table is restored from
the dump file on startup.
2017-04-16 00:29:55 +03:00
41fe062a8d
Lower log level for some messages
2017-04-15 15:47:00 +03:00
4c5f97bb9a
Add Riak as mod_proxy65 RAM backend
2017-04-15 15:38:48 +03:00
f9c24ab16d
Add Riak as mod_carboncopy RAM backend
2017-04-15 14:41:14 +03:00
72b536b52d
Add Riak as BOSH RAM backend
2017-04-15 13:52:36 +03:00
598c79ff86
Fix cleaning of Riak route table
2017-04-15 13:36:29 +03:00
da66eb5714
Add Riak as router RAM backend
2017-04-15 13:07:56 +03:00
c290b4284f
Fix closing of outbound S2S connections
2017-04-15 11:15:50 +03:00
fcb978248f
Add Riak as session manager RAM backend
2017-04-15 10:02:32 +03:00
5774edfe79
Improve ejabberd_c2s:close()
2017-04-15 08:30:41 +03:00
5c23187d2c
Make sure stream trailer is sent in the very end
2017-04-14 20:56:01 +03:00
0a7eb33772
Better process session close
2017-04-14 20:41:25 +03:00
9de075029b
Fix a typo
2017-04-14 20:40:39 +03:00
d110cbb6e2
Fix ejabberd_router:is_my_route/1
2017-04-14 20:34:00 +03:00
5f1f126613
Don't forget to disconnect
2017-04-14 20:32:26 +03:00
e40baf0bda
Use cache in front of Redis/SQL RAM backends
2017-04-14 13:57:52 +03:00
aa7d5df6a0
Bump xmpp dependency, it's required by previous commit
2017-04-14 09:47:25 +02:00
177d5fec86
Allow a room admin to unsubscribe another JID
2017-04-13 22:37:39 +02:00
0c0d79fd93
Travis CI: Update MySQL package
...
The "mysql-server-5.6" package is no longer available.
2017-04-11 13:52:10 +02:00
87ae2d7996
mod_muc_room: Replace deprecated function call
...
Use jid:decode/1 instead of jlib:string_to_jid/1.
2017-04-11 13:38:33 +02:00
b1acd1183f
Rename aux.erl as misc.erl
...
Thanks Microsoft Windows to not support some filenames
2017-04-11 12:13:58 +02:00
265aa54bc2
Use p1_utils 1.0.8
2017-04-11 08:11:29 +02:00
1e82db5655
New muc_register_nick command (thanks to Peter Marheine)( #1407 )
2017-04-10 12:23:14 +02:00
f2ca4cb3cd
Merge pull request #1666 from weiss/fix-csi
...
Let CSI keep latest stanzas of each given full JID
2017-04-07 15:10:39 +02:00
cf784772c9
Merge pull request #1664 from weiss/fix-routing
...
Fix routing of groupchat and headline messages
2017-04-07 15:10:26 +02:00
0567d528c6
Let ext_mod be aware of p1_utils includes
2017-04-07 12:51:43 +02:00
36e3f4bc2a
Generate ejabberd lib dir when not available in code server ( #1665 )
...
This is the case if running ejabberd from development directory
when code:lib_dir(ejabberd) returns {error, nad_name}.
2017-04-07 12:09:43 +02:00
2a6c50832e
Improve S2S examples ( #1583 )
2017-04-07 11:12:27 +02:00
d759875db8
Add more examples on config template ( #1583 )
2017-04-07 11:02:11 +02:00
1510ee0b3c
Merge pull request #1660 from michal800106/master
...
Fix order of starting supervisors.
2017-04-07 10:04:38 +02:00
3729acc5b0
Improve logging of Redis errors
2017-04-07 09:10:33 +03:00
9fa5f37f74
mod_client_state: Remove some empty lines
2017-04-06 23:00:53 +02:00
0ddd2e0ebf
mod_client_state: Queue stanzas of each full JID
...
Keep the latest stanzas of each given full JID, rather than dropping
them when stanzas from a different resource are received. This change
makes sure the recipient receives the latest status of all clients of
each contact. It also ensures the recipient will see the current list
of occupants of joined MUC rooms.
2017-04-06 22:19:00 +02:00
7827faae4b
mod_client_state: Don't keep track of queue size
...
Use maps:size/1 rather than keeping track of the size ourselves.
2017-04-06 21:01:26 +02:00
245fe04289
Improve type specs and return values
2017-04-06 20:56:46 +03:00
6876a37e61
Add Redis pool support
...
Fixes #1624
2017-04-06 17:56:37 +03:00
00c613b351
Set default prefix to /usr/local
2017-04-06 15:35:02 +02:00
81fe380de2
Fix order of starting supervisors.
...
ExtMod should be loaded before GenModSupervisor because ext_mod adds proper paths to ebin from modules (ejabberd-contrib).
Without this change you have to add -pa parameter with path to module's ebin.
2017-04-06 08:50:23 +02:00
179e8934cf
ejabberd_sm: Fix routing of headline messages
...
As per RFC 6121, silently drop headline messages sent to the bare JID of
an offline user or to the full JID of an unavailable resource.
2017-04-05 21:03:13 +02:00
8bfb6fdd4e
ejabberd_sm: Fix routing of groupchat messages
...
As per RFC 6121, don't (re)route groupchat messages sent to a bare JID
or to an unavailable resource.
2017-04-05 20:41:10 +02:00
89f81c89da
ejabberd_sm: Fix typo in debug message
2017-04-05 20:23:28 +02:00
ad948d33c0
Add description to feature-not-implemented error
2017-04-05 15:19:00 +03:00
6fa55e7c38
Set 'read_concurrency' for some ETS tables
2017-04-05 15:10:18 +03:00
2febbe5ffb
Don't misuse monotonic_time/0
2017-04-05 10:42:42 +03:00
578ecad93c
Disable mix tests
2017-04-04 17:02:15 +02:00
f5b0cd1793
Don't log warning on successful ping reply
2017-04-04 17:14:24 +03:00
3a0b4ad8da
Merge branch 'master' of github.com:processone/ejabberd
2017-04-04 09:53:45 +03:00
408f9b515e
Fix c2s connection close on demand
...
Fixes #1652
2017-04-04 09:52:42 +03:00
f45dc46856
Forget prepared SQL queries on database connect ( #1325 )
2017-04-03 16:42:41 +03:00
b75780b9cd
Always init pubsub_index when using mnesia
2017-04-03 12:13:20 +02:00
19614678e9
Change mnesia dir detection
2017-04-03 12:57:47 +03:00
55ea097bce
Remove obsolete mnesia migration calls
...
Now that plugins directly use ejabberd_mnesia and can include their own
transform handler, we don't need pubsub_migrate anymore.
People upgrading from 2.1.1x version must upgrade to 17.01 first.
pubsub_migrate module remains to support any manual process requiring it
2017-04-03 11:37:07 +02:00
9d9037856c
Improve redis related code
2017-04-02 11:56:09 +03:00
5087e9c2df
Use ejabberd_sql:abort/1 instead of exit/1
2017-03-31 19:10:07 +03:00
178a0a3e1b
Merge branch 'master' of github.com:processone/ejabberd
2017-03-31 19:08:16 +03:00
05ef009552
Add Redis as mod_proxy65 RAM backend
2017-03-31 19:07:56 +03:00
316da00345
Add ejabberd_sql:abort/1 and ejabberd_sql:restart/1
2017-03-31 17:37:24 +03:00
f449df161a
Add SQL as mod_proxy65 RAM backend
2017-03-31 08:16:28 +03:00
3e4ed83cb3
Raise bad_node instead of node_down for consistency reason
2017-03-30 17:51:37 +03:00
f5f353d90a
Do not duplicate enc_pid/dec_pid functions
2017-03-30 17:44:43 +03:00
bfde473c3b
Add missing jlib->aux convertion
2017-03-30 14:28:55 +02:00
c93bf732db
Refactor pubsub's get_last_items
2017-03-30 14:26:30 +02:00
7bcbea2108
Deprecate jlib.erl in favor of aux.erl
...
Since the main goal of jlib.erl is lost, all auxiliary functions
are now moved to aux.erl, and the whole jlib.erl is now deprecated.
2017-03-30 14:17:13 +03:00
997ac58329
Merge pull request #1646 from weiss/custom-headers
...
Add custom_headers option for ejabberd_http listeners
2017-03-30 12:47:42 +02:00
085b61eea5
Add Redis as mod_carboncopy RAM backend
2017-03-30 11:45:09 +03:00
31fd83b2ae
Add SQL as mod_carboncopy RAM backend
2017-03-30 10:31:51 +03:00
4b4c039fde
oauth_list_tokens and oauth_revoke_token work only in Mnesia ( #1644 )
2017-03-29 12:41:27 +02:00
0b3cf26406
Fix a typo
2017-03-29 13:20:15 +03:00
12e01a5119
Add SQL as mod_muc RAM backend
2017-03-29 12:58:01 +03:00
ba6c88cb90
Add Redis as mod_bosh RAM backend
2017-03-28 21:12:26 +03:00
e5815553cb
Add SQL as mod_bosh RAM backend
2017-03-28 20:33:57 +03:00
cba6e1b3ab
Add Redis as router RAM backend
2017-03-28 19:34:04 +03:00
0f864d9466
Mix needs include path to p1_utils
2017-03-28 16:08:10 +02:00
117f31125d
Add SQL as router RAM backend
2017-03-28 16:31:37 +03:00
510fde58d8
mod_http_upload: Don't add "Server" header line
...
Administrators can add the "Server" header line using the new listener
option "custom_headers", if desired.
2017-03-28 00:03:17 +02:00
191fc1b4e8
ejabberd_http: Expand @VERSION@ in custom headers
...
Let ejabberd_http expand the @VERSION@ keyword to the ejabberd version
if specified in the "custom_headers" listener option.
Closes #1414 .
2017-03-27 23:52:49 +02:00
41de5e78d0
ejabberd_http: Add "custom_headers" option
...
If the new listener option "custom_headers" is specified, include those
headers with the HTTP(S) response.
Closes #517 .
2017-03-27 23:19:11 +02:00
5b6d042de2
Fix PEP issues ( #1636 )
2017-03-27 16:24:24 +02:00
e30d41e5f0
Merge branch 'new_queue'
...
Conflicts:
rebar.config
src/mod_muc_admin.erl
2017-03-24 13:27:56 +03:00
e1f01f0c8a
Avoid PID collisions
...
Fixes #1470
2017-03-24 11:03:23 +03:00
e56c6545fa
Add inets in included_application for mix
2017-03-23 12:20:02 +01:00
cb0627e6b2
Expand ejabberd.yml.example by enabling mod_http_api with couple commands
2017-03-22 14:30:12 +01:00
6c0419db2b
Update mix dependencies
2017-03-22 11:59:39 +01:00
232cb3dd45
Update dependencies
2017-03-22 10:06:21 +01:00
430fc8eb62
Update docker files from latest Rafael's changes
2017-03-21 18:59:12 +01:00
e469b6ffb4
prosody2ejabberd: Fix offline message record type
...
mod_offline now expects a #message{} rather than an #xmlel{} record.
2017-03-21 18:35:07 +01:00
a1068df602
prosody2ejabberd: Fix message attribute removal
...
Actually remove the 'stamp' and 'stamp_legacy' attributes from imported
offline messages as intended.
2017-03-21 18:23:55 +01:00
f819272b88
Fix crash in mod_muc_admin, we operate on integers here not lists
2017-03-21 15:36:42 +01:00
9fb188afbc
Don't block contacts with subscription=to in mod_block_strangers ( #1609 )
2017-03-21 15:42:38 +03:00
70050b52ad
Use item creation date in rsm order ( #1516 )
2017-03-21 12:45:41 +01:00
44484fa4ae
Merge pull request #1626 from weiss/fix-scram-import
...
prosody2ejabberd: Fix SCRAM hash conversion
2017-03-21 15:44:29 +04:00
69b52196bd
Replace mod_http_bind by mod_bosh in config example
2017-03-21 11:15:01 +01:00
f7cb7ef014
Remove misleading sentence about s2s dialback
2017-03-20 21:48:31 +03:00
b9cd5ca07f
Resolve vars.config relative to to rebar.config.script
...
This fixes problem with missing deps in make rel - issue #1615
2017-03-20 18:28:49 +01:00
6017785e10
Fix compilation with mix ( #1588 )
2017-03-20 16:58:48 +01:00
186fda098c
Update mix deps
2017-03-20 16:26:16 +01:00
b6e1858ce6
Update xmpp and fast_tls versions
2017-03-20 15:33:55 +01:00
7ab4f32c1a
Revert "Bump OTP version to 19.3 in Travis config"
...
This reverts commit 7113f2b8ba
2017-03-20 14:08:58 +03:00
7113f2b8ba
Bump OTP version to 19.3 in Travis config
2017-03-20 13:49:23 +03:00
c526c02d92
Remove webtool from erlang.plt creation
2017-03-20 13:48:17 +03:00
f3ecba0445
Use new xdata compiler API
2017-03-20 09:57:11 +03:00
06f42bc749
Better log s2s auth failures when TLS is not available
2017-03-18 13:59:24 +03:00
72da5bd062
Log startup time
2017-03-18 10:24:42 +03:00
e56a76299c
Merge pull request #1617 from edwardchow33/patch-1
...
Fix wrong parameter values in mod_muc_admin
2017-03-18 02:40:14 +04:00
c5af421cee
Fixed wrong parameter values in mod_muc_admin
...
Corrected wrong parameter values passing to register_online_room(Room, Host, Pid) of mod_muc
2017-03-18 03:07:23 +08:00
91245141e9
Set translation callback on startup
2017-03-17 21:35:02 +03:00
2d67ff2249
Teach mod_http_fileserver ability to send 304 Not Modified
2017-03-17 11:58:40 +01:00
0ef6973457
prosody2ejabberd: Fix SCRAM hash conversion
...
Closes #1549 .
2017-03-16 23:15:08 +01:00
1aeaa794e1
Encode in base64 when getting scram data with import_prosody ( #1549 )
2017-03-15 11:42:26 +01:00
b932afb0cd
Use correct pid when registering local route
...
This fixes #1600
2017-03-15 10:27:22 +03:00
9a142eb807
Update cyrsasl_oauth to internal API changes
2017-03-14 17:25:09 +03:00
069d28b1ed
Get rid of p1_sha calls
2017-03-14 02:31:51 +03:00
301b1b7a7a
Fix handling of xmlrpc request without authentication structure
...
This is problem from issue #1602
2017-03-13 16:41:52 +01:00
113ed66f49
In module_install copy also deps/ebin and priv files (ejabberd-contrib#200)
2017-03-13 11:26:58 +01:00
a90c337297
Merge pull request #1603 from strugee/patch-1
...
Note how to apply s2s Access Rights in the example
2017-03-12 18:34:14 +04:00
071c1dcb64
Return 'closed' instead of 'einval' on closed sockets
2017-03-12 08:55:54 +03:00
c4ed1c2764
Note how to apply s2s Access Rights in the example
2017-03-10 23:53:01 -05:00
4b1bdb563e
Improve overloaded S2S queue processing
2017-03-10 20:21:04 +03:00
0822108fc8
Teach web admin about ip acl rules
2017-03-10 14:39:47 +01:00
02064ae12a
Add support for file-based queues
...
It's now possible to use files as internal packet queues.
The following options are introduced:
* queue_type: the option can be set to `ram` (default) or `file`.
The option can be set per virtual host.
* queue_dir: path to the directory where queues will be allocated.
The default is 'queue' directory inside Mnesia directory.
This is a global option and cannot be set per virtual host.
2017-03-10 15:12:43 +03:00
782caaa678
Improve formatting of erlang terms shown in web admin
2017-03-10 10:33:16 +01:00
ee849338dd
Include shared groups also when contact is is personal roster ( #1585 )
2017-03-09 19:21:45 +01:00
7e2380ab0c
Remove mod_pubsub from ejd2sql export, as it isn't implemented ( #1584 )
2017-03-08 16:23:01 +01:00
b0a950b6dd
Fix handling ejabberd_sql:sql_transaction result ( #1584 )
2017-03-08 16:22:13 +01:00
dd11ed82d7
Report more TLS errors
2017-03-08 08:27:54 +03:00
bdc278399d
Fix typo and spec
2017-03-07 22:21:44 +03:00
b71c4c0e52
Remove forgotten compile_all
2017-03-07 21:40:39 +03:00
d0a185f2d9
Report some TLS errors
2017-03-07 18:46:02 +03:00
0aa22e5149
Don't call deprecated jid functions from the test suite
2017-03-07 18:11:28 +03:00
8b29af629b
Best Practices for Use of SASL EXTERNAL with Certificates (XEP-0178) support
...
It is now possible for client connections to login using PKIX certificates.
This is disabled by default, to enable it:
- either set 'tls_verify: true' and 'cafile: /path/to/CAfile'
in the corresponding listener's section
- or set equivalent per-vhost options 'c2s_tls_verify' and 'c2s_cafile'
2017-03-07 14:20:50 +03:00
e5aac80cb4
Better handle errors in ejabberd_receiver calls
2017-03-02 16:02:44 +03:00
4e014b4c5c
Fix previous commit
2017-03-02 15:34:26 +03:00
cebdb87387
Revert "Remove relict mod_service_log"
...
This reverts commit 0d4e1abbd1
2017-03-02 15:30:34 +03:00
8e41bdc25e
Improve reporting of unavailable SASL mechanisms
2017-03-01 15:23:22 +03:00
28f4131d50
Resolve all addresses from SRV lookup
2017-03-01 14:37:35 +03:00
f6e2840947
External components must always provide 'to' attribute
2017-03-01 00:17:27 +03:00
c3ef56702a
Add s2s work-around for gmail.com
2017-02-28 20:15:05 +03:00
489385d565
Make sure all hooks are called with proper host in ejabberd_c2s
2017-02-28 16:47:31 +03:00
ce3317da7a
Fix bug in api_permission parsing
2017-02-28 13:36:34 +01:00
d6a9ef5bc1
Propagate the TRANSACTION_TIMEOUT to pgsql driver (EJAB-1266)
2017-02-28 12:19:07 +01:00
ac74b7dca1
Don't crash on malformed IP addresses
2017-02-28 13:11:49 +03:00
d81b07bd5f
Improve logging of outbound s2s auth failures
2017-02-28 12:13:35 +03:00
95a8f58314
Improve logging of dialback failures
2017-02-28 10:13:09 +03:00
f3594ec881
Resend stream header before calling handle_auth_success/2 callback
2017-02-28 10:12:11 +03:00
7a186e242d
Fix compilation on R17
2017-02-27 20:38:59 +01:00
b2e16ffb12
Fix parsing of acl/access rules inside oauth sections of api_permissions
...
This should fix problem reported in #1568
2017-02-27 20:23:37 +01:00
ac025ee6f2
Clarify new modules usage in the example config
2017-02-27 17:20:04 +03:00
b1b3aba439
Fix elixir tests
2017-02-27 13:05:08 +01:00
719b4d1183
Don't perform useless resourceprep
2017-02-27 13:58:57 +03:00
a098d1ec62
Update tests to ejabberd_commands changes
2017-02-27 10:45:39 +01:00
ac548f2e95
Update tests to cyrsasl modifications
2017-02-27 10:45:15 +01:00
6808865068
Return ok from start/2
2017-02-27 10:05:35 +01:00
7a9fa52e91
Change loglevel on configuration reload
2017-02-27 11:11:29 +03:00
d523357ba8
Invalidate access permissions on configuration reload
2017-02-27 09:55:54 +03:00
933351ab4c
Fix log message format
2017-02-26 16:27:26 +03:00
fadcc85553
Put more stuff under supervision
2017-02-26 15:10:59 +03:00
7decd58aaa
Don't fail on elements decoding
2017-02-26 11:53:41 +03:00
c1439ddd5b
Get rid of jid:to_string/1 and jid:from_string/1
2017-02-26 10:07:12 +03:00
603ec9cb19
Don't pass empty resource to jid:make()
2017-02-25 10:01:01 +03:00
485aae8134
Don't pass 'from' and 'to' along with stanza in hooks' arguments
2017-02-24 21:25:25 +03:00
039ac46963
Don't polute log with known content types
2017-02-24 20:57:24 +03:00
4892b01eb4
Get rid of unused variable warning
2017-02-24 17:48:17 +03:00
03e2b0f0bf
Remove previous options when the config gets reloaded
2017-02-24 17:03:11 +03:00
0124d292b5
Add gen_mod:is_loaded_elsewhere/2
2017-02-24 16:31:39 +03:00
b8fbac72ac
Restart listeners on configuration reload
2017-02-24 15:18:10 +03:00
e8c0e21f71
We don't like now()
2017-02-24 12:08:57 +01:00
a85a953e8e
Adapt get_last tests to new output
2017-02-24 12:08:57 +01:00
c950fc05f0
Update tests for changes in acl start code
2017-02-24 12:08:57 +01:00
0db99ccb4b
Improve config reloading support by ejabberd_auth
2017-02-24 14:06:47 +03:00
6aab450c16
Make sure that addr_re is always initialized when creating http state
2017-02-24 11:30:36 +01:00
c15d230a57
Return ejabberd_sm:stop/0 back
2017-02-24 12:39:44 +03:00
f310d7bb12
Make host header parser work correctly with ipv6 literal addresses
2017-02-24 10:25:26 +01:00
67d6ca9f10
Improve startup procedure
2017-02-24 12:05:47 +03:00
5b112c86bf
Fix a case clause and run c2s_filter_send on send_error/3
2017-02-24 07:57:57 +03:00
57181c0a76
get_last now always returns tuple with UTC XEP-0082 and status ( #1565 )
2017-02-23 23:27:57 +01:00
6314a96b05
Protect users from delete_old_users command using a fixed access rule ( #1462 )
2017-02-23 19:38:17 +01:00
4294ba6b52
Separate list of strings with \n for srg_get_info in mod_http_api ( #1500 )
2017-02-23 19:23:24 +01:00
519f3db6b6
Specify "ExecReload" command in systemd unit
...
Now that "ejabberdctl reload_config" works the way most admins would
expect, expose the command via systemd.
2017-02-23 18:16:56 +01:00
e7901f9d70
Prepare mix for 17.03
2017-02-23 18:14:29 +01:00
1030f041e3
Update dependencies
2017-02-23 18:13:10 +01:00
c76253cb0a
tools/hook_deps.sh: Search for escript in PATH
2017-02-23 17:38:56 +01:00
33e82de475
Merge pull request #1499 from weiss/offline-stanza-id
...
Include stanza ID with archived offline messages
2017-02-23 20:36:05 +04:00
b475df2250
Include stanza ID with archived offline messages
...
Fixes #1480 .
2017-02-23 16:55:35 +01:00
720741b725
Avoid orphan_item leak on affiliation/subscription removal ( #1563 )
2017-02-23 16:43:22 +01:00
bc9f178b6d
Fix pubsub MySQL schema
2017-02-23 16:04:29 +01:00
6cdead166b
Start/stop auth modules when host is added/deleted
2017-02-23 16:19:22 +03:00
0542c65a07
Stop all s2s connections via supervisor calls
2017-02-23 16:18:29 +03:00
f4081a363b
Fix elixir tests
2017-02-23 09:53:20 +01:00
a3ea6e7723
Improve reload_config admin command
2017-02-23 11:14:49 +03:00
7d68112265
Start/stop virtual hosts when reloading configuration file
2017-02-23 10:12:19 +03:00
ed34b04e9b
Remove unused macro
2017-02-22 20:48:51 +03:00
96a690f607
Merge branch 'master' of github.com:processone/ejabberd
2017-02-22 19:47:00 +03:00
3c4057ff55
Reload modules when reloading configuration file
2017-02-22 19:46:47 +03:00
ff67860cdb
Make sure all hooks are called with proper host
2017-02-22 19:45:12 +03:00
87b5e2500b
Fix match of itemid on get_cached_item, fixes 14e771d8
2017-02-22 17:44:47 +01:00
56df6e7ba8
Add missing NOT NULL restrictions
2017-02-22 15:47:36 +01:00
c0b346e0b8
Move archive tables into lite.sql for better comparison with other schemas
2017-02-22 15:44:03 +01:00
635dfa2eae
Re-enable "replaced" tests
2017-02-21 12:53:08 +03:00
6ffd5ffd0c
Test stream management queue overload
2017-02-21 12:38:03 +03:00
e11bcf9c43
Improve stream management tests
2017-02-21 09:19:51 +03:00
adbd174959
Rename mod_sm -> mod_stream_mgmt
2017-02-21 09:18:58 +03:00
1c34f89c19
Merge branch 'master' of github.com:processone/ejabberd
2017-02-21 08:46:28 +03:00
bbfd089b7e
Don't count resent stanzas
...
Thanks to Holger Weiß for an advise
2017-02-21 08:44:39 +03:00
1e679e6f84
Travis CI: Update MySQL APT repository key
...
The old key expired on February 16, 2017.
2017-02-20 21:17:34 +01:00
61cdee97fc
ejabberd_c2s: Don't drop 'user_send_packet' result
...
When handling a <session/> IQ, use the stanza returned by the
'user_send_packet' hook.
Thanks to Evgeniy for spotting this.
2017-02-20 13:07:34 +01:00
7d767fac7f
Support scrammed passwords in ejabberdctl import_prosody ( #1549 )
2017-02-20 12:47:56 +01:00
9426c67302
Fix s2s_dns_timeout issues
2017-02-20 10:42:16 +03:00
a664d6389e
Merge pull request #1555 from weiss/count-session-iq
...
Let ejabberd_c2s handle <session/> IQ
2017-02-20 10:21:15 +04:00
7c159e3881
Let ejabberd_c2s handle <session/> IQ
...
This fixes the counting of incoming stanzas for stream management.
2017-02-19 22:43:10 +01:00
70bfc5b4a8
Get rid of non-breaking space
2017-02-18 12:13:48 +03:00
940ca9311d
Fix some dialyzer warnings
2017-02-18 09:36:27 +03:00
b2de1d7438
Merge pull request #1553 from lemenkov/config_functions_deprecation
...
Mark local/global config functions as deprecated
2017-02-17 20:40:04 +04:00
1a2dd3680f
Mark local/global config functions as deprecated
...
See discussion in PR #1548 .
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-17 19:20:44 +03:00
68cc1e775c
Fix compilation when included as Elixir dependency ( #1526 )
2017-02-17 16:26:39 +01:00
a1e8d3c3dc
Commands documentation lack arguments when policy=user ( #1514 )
2017-02-17 12:37:42 +01:00
ae25fa994c
Merge pull request #1548 from lemenkov/use_get_option
...
Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2
2017-02-16 23:34:50 +04:00
009a5007ff
Use ejabberd_config:add_option/2 instead of ejabberd_config:add_local_option/2
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-16 20:47:47 +03:00
cb30f7733d
Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2
...
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-16 20:41:57 +03:00
eec63dbefe
Correct access_matches spec
2017-02-16 15:38:44 +01:00
218eeae797
Fix some dialyzer warnings
2017-02-16 14:18:36 +03:00
8b2d308498
Change routing API
...
Now 'From' and 'To' arguments must be omitted in functions
and structures related to routing.
The commit deprecates the following functions:
ejabberd_router:route/3 in favor of ejabberd_router:route/1
ejabberd_router:route_error/4 in favor of ejabberd_router:route_error/2
ejabberd_local:route_iq/4 in favor of ejabberd_local:route_iq/2
ejabberd_local:route_iq/5 in favor of ejabberd_local:route_iq/3
The format of {route, From, To, Packet} is changed in favor of {route, Packet}
2017-02-16 11:10:24 +03:00
26a5811744
Merge branch 'master' of github.com:processone/ejabberd
2017-02-16 00:23:00 +03:00
0d4e1abbd1
Remove relict mod_service_log
2017-02-16 00:22:48 +03:00
5b019ab48c
Disable undefined_function_calls xref_check
...
It looks like it will calling undefined function still will be catched
by xref_queries
2017-02-15 14:12:07 +01:00
f2b5153a8c
Report password change in the log
2017-02-14 17:10:16 +03:00
6fd89f5fe0
Attach IP metadata to every stanza received from stream
2017-02-14 17:09:25 +03:00
0b304731c5
Use newer p1_utils
2017-02-14 15:06:00 +01:00
63da351038
Fix handling of config.ctc files
2017-02-14 14:39:24 +01:00
cad02bb1b0
Add more check to make xref
2017-02-14 14:39:24 +01:00
f61c933a7a
Only use GEN_SERVER macro where appropriate
2017-02-14 15:39:57 +03:00
28f66ddd7c
Attach modules to gen_mod's supervisor
2017-02-14 12:39:26 +03:00
a1e45ab56c
Merge pull request #1539 from lemenkov/use_crypto_sha
...
RFE: Use crypto:hash/2 function
2017-02-14 11:38:05 +04:00
f664e39374
Improve modules start/stop procedures
2017-02-14 10:25:08 +03:00
e7733ce7d9
Use crypto:hash/2 function
...
Use crypto:hash/2 function instead of ones from p1_sha.
This function exists since commit
erlang/otp@208f9ad382 and also implemented
as NIF, so I believe it's safe to use it.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2017-02-13 18:42:50 +03:00
e1ba499bd6
Check result of gen_mod:start/2 callback ( #1534 )
2017-02-13 11:11:41 +03:00
fd885d0818
Apply SASLprep before storing/converting passwords
...
Fixes #996 and #1295
2017-02-12 10:06:30 +03:00
67c9de6461
Use p1_server behaviour in xmpp_stream layer
2017-02-08 17:16:18 +03:00
ca0dd09944
Accept "add_commands: admin" in commands section not only "add_commands: - admin"
...
This fixes issue reported in #1518 , and restores compatibility with
what older version were accepting and what is documented.
2017-02-06 21:40:37 +01:00
b703b4f022
Don't shadow binding in match
2017-02-06 11:38:51 +01:00
f30c9d49f7
Add TLS support for external components
2017-02-06 13:30:58 +03:00
af5457ba09
Make sure that api_permissions always have "console commands" section
...
If user didn't override it in config file, default version which allows
executing all commands will be added
2017-02-03 15:22:35 +01:00
a31154c035
Set subscribers nicks when recreating room (thanks to Girdhar Sojitra)( #1495 )
2017-01-31 19:18:39 +01:00
b2a2e0f135
Support non-JID lines in command create_rooms_file
2017-01-31 17:50:04 +01:00
85eb8f022c
Depend on fast_xml-1.1.20
2017-01-31 11:02:23 +01:00
589bc73838
Don't warn if custom schema is not available
2017-01-31 09:53:52 +01:00
649d3b753b
Merge pull request #1502 from lemenkov/ignore_output_val
...
No need to explicitly return ok here
2017-01-30 18:15:25 +04:00
c377708da1
No need to explicitly return ok here
...
No need to explicitly return ok here. Return value will be ignored
anyway.
Signed-off-by: Peter Lemenkov <lemenkov@redhat.com >
2017-01-30 14:52:04 +01:00
326e8da06d
Use newer version of epam
2017-01-29 14:51:03 +01:00
44a9ceac0b
More changes that are required from p1_pam -> epam
2017-01-29 14:35:22 +01:00
5c1168c33f
Change name of pam dep from p1_pam to epam
...
We need to use same name as .app file or rebar complains
2017-01-29 14:26:46 +01:00
dd458c637e
Floating deps should always be executed
...
This fixes problem with recognizing latest_deps configure option
2017-01-29 12:14:32 +01:00
2f3f6f8b71
Improve compilation with rebar3
2017-01-26 16:45:04 +01:00
11326692f2
Merge branch 'master' of github.com:processone/ejabberd
2017-01-26 10:59:31 +03:00
9d144bd495
Do not drop default TLS options
...
Fixes #1484
2017-01-26 10:58:26 +03:00
a284722fd0
Adapt to coveralls api change
2017-01-24 19:16:50 +01:00
c0a89e328a
Change OTP version from 19.1 to 19.2 in travis config
2017-01-24 10:39:40 +03:00
99fd621aed
Speedup features list when a lot of virtual hosts configured
2017-01-24 10:38:29 +03:00
5183f7724d
Fix tests
2017-01-23 20:43:35 +01:00
0c57044c59
Make mod_disco handle features of mod_ping
2017-01-23 22:33:46 +03:00
5e2c105396
Merge branch 'master' of github.com:processone/ejabberd
2017-01-23 21:52:35 +03:00
0ce3a3665a
Make sure only {exit, normal} is not catched when executing a hook
2017-01-23 21:52:25 +03:00
b0e72ece43
Adapt to new ejabberd_sm changes
2017-01-23 19:34:29 +01:00
8b5e6e4a13
Compatibility with R17 in mod_block_strangers
2017-01-23 19:04:22 +03:00
43bfa0efbc
Check message subject in mod_block_strangers
2017-01-23 17:10:28 +03:00
ca298c7c39
Update deps in mix.lock
2017-01-23 14:42:52 +01:00
48d8498dbb
Avoid using maps:get/2 to keep compatibility with OTP 17.5
2017-01-23 16:30:16 +03:00
19bec62eb5
Fix calling to mod_offline:store_packet
2017-01-23 15:00:46 +03:00
5e5a8bbdcf
Don't use maps:take it available in R19 only
2017-01-23 12:56:08 +01:00
7c2ccb2cb7
Add tool for checking which dependences need update
2017-01-23 12:24:25 +01:00
435e5e6263
Make test suite working again
2017-01-23 13:51:05 +03:00
e564f9ae31
Make a message is not bounced if it's archived
2017-01-21 13:47:47 +03:00
68cf45a8b9
Archive message before delivering it to offline storage ( #1348 )
2017-01-21 11:47:04 +03:00
94b23482a9
Send <compressed/> in correct order
2017-01-21 10:47:55 +03:00
1e968f5487
Merge pull request #1478 from weiss/multi-host-pubsub-cache
...
mod_pubsub: Fix last item cache for multiple hosts
2017-01-21 11:17:06 +04:00
14e771d871
mod_pubsub: Fix last item cache for multiple hosts
...
Don't let the last item cache intermix PubSub items of different virtual
domains.
2017-01-21 00:14:56 +01:00
56ef607904
Add stanza-id to every archived message ( #1477 )
2017-01-20 23:21:06 +03:00
17fe272dc5
Update copyright headers in new files
2017-01-20 19:56:19 +03:00
d5d906184f
Merge branch 'new_stream'
...
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
2017-01-20 19:35:46 +03:00
3b2c2b5c04
Prepare 17.01 for hex.pm
2017-01-20 12:19:55 +01:00
39cfee239d
Use xmpp 1.1.6
2017-01-20 11:51:56 +01:00
1f02567507
Make shim for mod_http_api admin_ip_access more robust
2017-01-20 10:19:09 +01:00
4f5d54f062
Try db migration only when mnesia is configured ( #1458 )
2017-01-20 09:26:13 +01:00
fc2b71a04e
Restore muc_invite_hook ( #1467 )
2017-01-19 18:24:29 +03:00
87b964a7f6
Make sure 'jabber:client' namespace is added to forwarded messages ( #1474 )
2017-01-19 18:03:07 +03:00
4cf83ca3a7
Restore multiple invitations support ( #1468 )
2017-01-19 17:26:08 +03:00
3d9997288d
Don't forget to convert muc#roomconfig_mam
2017-01-19 16:42:04 +03:00
527472f18c
Support legacy muc#roomconfig values ( #1469 )
2017-01-19 11:12:27 +03:00
d2b8569452
Fix typo
2017-01-18 17:11:08 +01:00
3482ee5c75
Reset table only if new def change from runtime
2017-01-18 17:02:03 +01:00
3029e84faf
Improve check of mnesia schema opearations
2017-01-18 16:53:36 +01:00
044e55b98e
Fix reporting dialback failures
2017-01-18 18:26:31 +03:00
60a09285b7
Don't attempt to resolve _jabber._tcp SRV record
2017-01-18 17:54:42 +03:00
ba47fd4649
Improve <delay/> tag insertion
2017-01-18 14:09:39 +03:00
2de2d00f14
Cope with malformed values in 'rosterusers' SQL table ( #1466 )
2017-01-18 11:59:46 +03:00
7b8c01da12
Better log bytestream termination
2017-01-17 23:06:55 +03:00
9021ba01ac
Use crypto:exor/2 instead of hand-crafted bxor
2017-01-17 22:37:44 +03:00
b8db0a8ed6
Reset XML stream before sending SASL <success/>
2017-01-17 22:06:26 +03:00
2a68591181
Remove wrong index setting
2017-01-17 16:23:45 +01:00
94ac777f93
Let ejabberd_mnesia handles copy_type
2017-01-17 15:05:14 +01:00
0ea6c1dcf6
Fix index processing ( #1461 )
2017-01-17 14:53:41 +01:00
2ce6d49a40
Speedup table setup, no io if EJABBERD_SCHEMA_PATH not set ( #1461 )
2017-01-17 14:22:12 +01:00
c7476875e6
Avoid stopping mod_offline before supervisor termination ( #1464 )
2017-01-17 14:31:00 +03:00
22ee16fd9d
Get rid of ejabberd_frontend_socket
2017-01-17 14:00:01 +03:00
c68ac1d5eb
Improve error reporting for forbidden servers
2017-01-17 13:38:05 +03:00
a23c76fb82
Drop only messages with <body/> in mod_block_strangers
2017-01-17 01:34:40 +03:00
fd4f5c0996
Stop hook on message drop in mod_block_strangers
2017-01-16 18:45:26 +03:00
b080b8f54d
Use user_receive_packet hook in mod_block_strangers
2017-01-16 18:40:30 +03:00
5a8dea1591
Remove stub in mob_block_strangers
2017-01-16 18:21:36 +03:00
a849b384f8
Merge branch 'new_stream' of github.com:processone/ejabberd into new_stream
2017-01-16 18:15:08 +03:00
fedfe5427c
Add mod_block_strangers
2017-01-16 18:14:14 +03:00
1176e1f096
Add script to check hook dependencies
2017-01-16 17:14:33 +03:00
22c25e4413
Don't allow raw elements in process_iq/3
2017-01-16 16:40:11 +03:00
557820707b
Implement database backend interface for mod_proxy65
2017-01-16 15:28:11 +03:00
0078a3b904
Correctly set gen_server's name
2017-01-16 11:43:35 +03:00
65d352d5de
Remove handle_event/1 callback
2017-01-16 11:34:49 +03:00
64997d9961
Add mod_sm and mod_s2s_dialback to example config
2017-01-16 10:12:46 +03:00
ce42b6be01
Add example api_permisions: definition to config template
...
Also expand default config to have rule for admin oauth
2017-01-13 16:53:48 +01:00
7606be93d5
Decode message before checking for expiration ( #1458 )
2017-01-13 14:20:25 +03:00
e2665c5da9
Usable size for Shared rosters members textarea (EJAB-1753)
2017-01-13 12:16:23 +01:00
32d548d99b
Fix configuration commands ( #1432 )
2017-01-13 13:36:28 +03:00
25ddb6c69d
Add forgotten -include_lib()
2017-01-13 13:28:55 +03:00
0baaad30b1
Implement database backend interface for MUC, BOSH and auth_anonyous
2017-01-13 12:03:39 +03:00
31491ebe16
Fix some corner cases while re-reading RFC6120
2017-01-13 11:35:47 +03:00
b10e10efae
Ignore unexpected events
2017-01-11 16:50:11 +03:00
02f96d0f41
Implement database backend interface for ejabberd_router
2017-01-11 16:25:43 +03:00
2129a33077
Fix attaching ejabberd_s2s_out process to a supervisor
2017-01-11 11:09:56 +03:00
5cfe57ece5
Add 'supervisor' listening option
...
If set to 'true' (this is the default), new processes spawned by
ejabberd_listener will be attached to the corresponding supervisor.
No such processes will be attached to a supervisor otherwise.
Setting this to 'false' will improve performance of high loaded
systems where new C2S/S2S processes are spawned very rapidly.
2017-01-11 10:56:04 +03:00
03667d0c73
Add SSL support for SQL connections
...
Currently only PostgreSQL is supported.
This requires p1_pgsql-1.1.2 and higher.
2017-01-10 17:40:38 +03:00
f2acf57412
update deps
2017-01-10 15:11:41 +01:00
efccee55e3
pubsub_subscription may is not used (migration is optional)
2017-01-10 13:53:23 +01:00
6ff81946cf
Fix migration of old pubsub database ( #1409 )
2017-01-10 12:10:11 +01:00
08d482b064
Allow old-stype mod_vcard_ldap in the config ( #1410 )
2017-01-10 11:29:01 +03:00
dd5389df23
Don't forget to advertise disco features
2017-01-10 11:25:12 +03:00
e01bece552
Make stream related calls module independent
2017-01-09 22:03:42 +03:00
3d0d9cb354
Fix typo in previous commit
2017-01-09 17:54:10 +01:00
afc7f5aa37
Simplify setting allow_subscription ( #1404 )
2017-01-09 15:56:25 +01:00
f14a966680
Set from/to in every routed packet
2017-01-09 17:51:08 +03:00
6c564775c4
Remove unused mod_ip_blacklist module
2017-01-09 17:22:31 +03:00
1e55e018e5
Adopt remaining code to support new hooks
2017-01-09 17:02:17 +03:00
9605e2b2a4
Fix problem with get_vcard command ( #1447 )
2017-01-06 16:13:57 +01:00
a910ab8171
Get nodes from ejabberd_cluster instead of mnesia
2017-01-03 17:21:02 +01:00
32e5781a6a
Cleanup file headers
2017-01-03 15:58:52 +01:00
f5290a8e44
Specify that process_rosteritems command works only with Mnesia storage
2017-01-03 01:38:56 +01:00
5fdd1c39fe
Update copyright date automatically ( #1442 )
2017-01-02 21:42:06 +01:00
769975f6d7
Remove mod_http_bind and migration code to mod_bosh
2017-01-02 15:53:25 +01:00
1bda40dac7
Fix cyrsasl test after recent changes
2017-01-02 13:36:21 +01:00
5ef60bf594
Correctly process errors from new cyrsasl API
2017-01-02 15:02:03 +03:00
666608544b
Improve return values in cyrsasl API
2017-01-02 14:55:06 +03:00
3dd2a614ac
Get rid of "jlib.hrl" header in some files
2017-01-02 14:45:52 +03:00
50682b98d6
Better cope with IPv6 domains
2016-12-31 17:43:40 +03:00
cf87c5664f
Reflect cyrsasl API changes in remaining code
2016-12-31 13:48:55 +03:00
247ca872f6
Improve return values in cyrsasl API
2016-12-31 13:47:35 +03:00
e7fe4dc474
More refactoring on session management
2016-12-30 00:00:36 +03:00
c6b5dd6c4f
Fix case clauses when using compression ( #1431 )(thanks to Evgeniy Khramtsov)
2016-12-29 15:18:42 +01:00
309bdfbe28
Add xmpp_stream_out behaviour and rewrite s2s/SM code
2016-12-28 09:47:11 +03:00
ed679279fd
Cleanup file headers
2016-12-27 10:57:50 +01:00
fad7612cf1
Allow subscriber to create room, then set allow_subscription=true ( #1404 )
2016-12-26 21:16:17 +01:00
df92d96d4f
Revert "Fix 'nodetree' configuration lookups for PEP"
...
This reverts commit 7ef8dfb4e0
2016-12-25 01:24:40 +01:00
7ef8dfb4e0
Fix 'nodetree' configuration lookups for PEP
2016-12-25 00:58:20 +01:00
b30b70db70
Prepare mix for 16.12
2016-12-22 20:41:01 +01:00
08f73a5aeb
Update deps
2016-12-22 15:10:57 +01:00
3811a61573
Extract correctly the text from #stanza_error ( #1425 )
2016-12-17 11:46:16 +01:00
cc14e223c6
Describe command arguments and results in ejabberd_admin
2016-12-12 13:19:17 +01:00
7f653cfe76
Rewrite ejabberd_service to use new XMPP stream API
2016-12-11 18:24:51 +03:00
5cc8e807df
Initial version of new XMPP stream behaviour (for review)
2016-12-11 15:03:37 +03:00
1a4f63f058
Copy recent make_opts function from mod_muc_room.erl
2016-12-09 13:07:48 +01:00
bcc04d93e1
Enforce pubsub node removal, revert previous commit ( #1320 )
...
This reverts commit 2976c2d921
2016-12-09 12:51:08 +01:00
2976c2d921
Enforce affiliation removal, remove corresponding items ( #1320 )
2016-12-09 11:35:51 +01:00
a50247c20d
Improve handling on acl rules in api_permissions
2016-12-08 18:08:54 +01:00
fdf69dcd0d
API call does not necessary use token, it could use basic auth
2016-12-08 16:28:47 +01:00
a3b12fd745
Recognize "- who:" not only "who:" syntax in api_permissions
2016-12-08 12:01:24 +01:00
8a7ea85a7e
Cleanup ext_mod and fix compilation path
2016-12-07 09:27:21 +01:00
a681874f67
Try to fix interminent failures in cyrsasl tests
2016-12-06 18:33:16 +01:00
1c8edd07a1
Update xmpp lib version and fix path when using deps.get and compile in same commande
2016-12-06 17:54:21 +01:00
1883a98d1c
Fix compilation of external module with new xmpp lib
2016-12-06 12:01:04 +01:00
0c2491d9ea
Remove obsolete remove_node api (use leave_cluster)
2016-12-05 14:17:57 +01:00
23f7075313
Fix reload_config
2016-12-02 16:29:46 +01:00
23786c95c9
Grab new version of xmpp dep
2016-12-02 16:28:14 +01:00
847376924e
Add password support in muc_subscribe ( #1306 )
2016-12-02 16:18:35 +01:00
d7e1f6d7b3
When unsubscribes, check if room should get closed ( #1396 )
2016-12-01 22:09:57 +01:00
34f2a8a4f2
Fix error formatting, which closed client connection ( #1389 )
2016-12-01 21:02:54 +01:00
68cf6845e1
Fix mod_http_api_mock_test on 19.1
2016-12-01 18:51:23 +01:00
294d58a393
Add more tests for digest-md5 cyrsasl
2016-12-01 18:51:23 +01:00
732eecac43
Move to latest Elixir version
2016-12-01 15:44:52 +01:00
a3c134c43b
We can now use dependencies published in hex.pm
2016-12-01 15:10:00 +01:00
309fd56fb4
Merge branch 'master' of github.com:processone/ejabberd
2016-12-01 15:05:09 +01:00
8618af4e34
Fixes pt-br translation (thanks to Rodrigues)( #1393 )
2016-11-30 16:51:42 +01:00
32f484a349
Fix typo introduced by 92db9ff changes
2016-11-30 13:50:46 +01:00
92db9ff105
Improve handling of mnesia schema
2016-11-30 11:09:17 +01:00
95a4b1b266
Cleanup admin_extra, add few functions
2016-11-30 10:31:36 +01:00
2cd70280d2
Merge branch 'docker' from Rafael Römhild
2016-11-30 10:30:19 +01:00
fc7e52df71
Adds optional post_install and pre_uninstall hooks (thanks Igor Manturov Jr.)( #1300 )
2016-11-28 17:15:57 +01:00
56b30ab598
Improve translation of some messages
2016-11-26 10:05:22 +03:00
3ac73f9607
Update dependencies
2016-11-25 13:02:31 +01:00
18609befa4
Merge branch 'master' of github.com:processone/ejabberd
2016-11-25 10:07:04 +01:00
ae297a4ae6
Merge branch 'ukutaht-enable-elixir-in-mix'
2016-11-25 10:05:28 +01:00
9432a16893
Merge branch 'enable-elixir-in-mix' of https://github.com/ukutaht/ejabberd into ukutaht-enable-elixir-in-mix
2016-11-25 10:05:01 +01:00
ca1b22bdd4
Use ejabberd_router:route_error/4 wherever possible
2016-11-25 11:41:24 +03:00
4d6eb31264
Use new version of xmpp in mix
2016-11-25 09:31:49 +01:00
e1539e5769
Get rid of compile warnings
2016-11-25 09:48:26 +03:00
993cbcb133
Use new version of xmpp
2016-11-25 09:39:09 +03:00
d554827ebc
Don't check for faked carbons
2016-11-24 20:16:07 +03:00
0f11b1be36
Don't forget to erase cache on user removal
2016-11-24 18:40:20 +03:00
28d0a1b9d2
Make compatible with rebar3
2016-11-24 14:23:20 +01:00
49f1275e20
Get rid of excessive (io)list_to_binary/1 calls
2016-11-24 15:06:06 +03:00
b14843d098
Add missing -callbacks
2016-11-24 12:44:21 +01:00
8f692f51d8
Merge pull request #1391 from weiss/mark-copies
...
Mark messages as copies by attaching metadata
2016-11-24 15:43:38 +04:00
560038c808
Use xmpp:put_meta/3 to update metadata
2016-11-24 10:47:26 +01:00
d12210f4e1
Use new versions of fast_xml and xmpp
2016-11-24 10:45:57 +01:00
9c3ebb7d22
Don't make ejabberd.service file executable
2016-11-24 07:59:27 +01:00
b6ddcf3e58
Makefile.in: Substitute all @variables@ in a line
...
There are now lines with multiple occurrences of the @ctlscriptpath@
variable in the ejabberd.service template.
2016-11-24 07:55:06 +01:00
cbda2e038e
Merge branch 'weiss-systemd-unit-improvements' ( #1346 )
2016-11-23 14:37:34 +01:00
6a4f2a78ff
Merge branch 'systemd-unit-improvements' of https://github.com/weiss/ejabberd into weiss-systemd-unit-improvements
2016-11-23 14:36:50 +01:00
12683b4aaf
Fix typo in copyright date
2016-11-23 14:36:11 +01:00
5d434c1aea
Move copyright definition to ejabberd.hrl
2016-11-23 15:51:48 +03:00
d364eab74b
Merge remote-tracking branch 'upstream/master'
2016-11-23 11:45:13 +01:00
6f2f1e87c9
Don't use deprecated functions from jlib.erl
2016-11-23 10:41:26 +03:00
3325e69ae6
Let mod_carboncopy mark copied messages
...
Carbon copies are now marked with a 'carbon_copy' flag. This makes it
easier to identify them.
2016-11-22 22:21:34 +01:00
114ca786ee
Let ejabberd_sm mark copied messages
...
When multiple resources have the same (highest) priority, ejabberd_sm
dispatches messages addressed to the bare JID (or to an unavailable
resource) to each of these resources. Such messages are now marked with
an 'sm_copy' flag for all but one of the resources. This makes it
easier for other modules to identify those duplicates.
Resolves #1356 .
2016-11-22 19:25:20 +01:00
ee8cc1dac2
Fix xref issue injected by fbfbb96
2016-11-22 17:51:21 +01:00
9ab169bc63
Fix get_roster issue injected by fbfbb96
2016-11-22 16:59:02 +01:00
24ef90c556
Fix vcard_ldap exports
2016-11-22 16:23:02 +01:00
c0e7b298db
Add missing export
2016-11-22 16:12:19 +01:00
cc63bcc997
Fix issues on import improvements
2016-11-22 16:01:08 +01:00
a2fb493f91
Add missing include file
2016-11-22 15:35:47 +01:00
ebadcf71c2
New bosh module
2016-11-22 15:26:15 +01:00
fbfbb96872
Improve ODBC import
2016-11-22 14:48:01 +01:00
577eeb642f
Add new xmpp repo as dependency in mix.exs
2016-11-22 14:43:10 +01:00
7ffab38b44
Remove now() from mod_offline.hrl
2016-11-22 13:15:43 +01:00
2786df651a
Add OTP 19.1 to Travis' testing platforms
2016-11-22 09:52:26 +03:00
c0b5c6e9d4
Fix logging in tests on R17
2016-11-21 22:04:25 +03:00
3189bb3bb9
Set 'sql_pool_size' to 1 by default for sqlite
2016-11-21 21:34:56 +03:00
404a7c3381
Remove bashismes from ejabberdctl
...
To avoid unecessary extra quoting, do not call commands with sh -c ''
and use the -- option from su to supply arguments.
Parse command line parameters is a bit tricky as the previous behavior
allows to mix options to ejabberdctl with unknown options given to
the next script (usually, the ctl). This is solved by relying on the
fact that for loop saves its argument, so we can flush its content
with set -- and re-add unknown options with set -- "$@" "$arg".
Finally, remove unecessary quotes in mnesia options and in the ping
command.
2016-11-21 15:25:58 +01:00
3908a80ac9
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 16:55:28 +03:00
1a02a2a51d
Set 'sql_pool_size' to 1 for sqlite tests
2016-11-21 16:55:18 +03:00
b8e8e4b971
Fix elixir tests
2016-11-21 12:50:51 +01:00
04fdf69737
Fix non-empty disco-nodes processing
2016-11-21 14:21:34 +03:00
e57de02e0f
Fix s2s test
2016-11-21 12:06:58 +01:00
c5e7b4738f
Fix handling mod_http_upload disco#info queries: need decoded elements
...
As reported in
https://www.ejabberd.im/forum/28605/ejabberd-modhttpupload-error-405-not-allowed
2016-11-21 12:06:11 +01:00
e6365979bd
Merge branch 'master' of github.com:processone/ejabberd
2016-11-21 12:14:37 +03:00
274303f248
Fix conference disco#items when running multiple virtual hosts
2016-11-21 12:14:24 +03:00
507e756b69
Do not send empty <after/> tag
2016-11-21 12:13:34 +03:00
3f91668c46
Log more data for failed s2s connection
2016-11-21 09:52:36 +01:00
c7ae916afc
Don't forget to start XMPP application
2016-11-21 10:23:09 +03:00
049a6d97f1
Fix RSM for conference disco#items
2016-11-20 18:08:49 +03:00
13c6039700
Use xmpp_util.erl from XMPP library
2016-11-19 13:57:25 +03:00
de7a143a2c
Transform ejabberd_commands on the start
2016-11-19 13:05:13 +03:00
9aff7e52a8
Switch to stand-alone XMPP library
2016-11-19 13:03:33 +03:00
d00a634025
Fix includes in eunit compilation flags
2016-11-18 14:02:47 +01:00
daab95e3b5
Fix elixir tests
2016-11-18 12:54:06 +01:00
45e77ea483
Remove useless NO_EXT_LIB flag
2016-11-18 12:25:01 +01:00
e69937d93a
Get rid of substitute_forwarded
2016-11-18 11:51:57 +01:00
f57f267c54
Merge branch 'master' of github.com:processone/ejabberd
...
Conflicts:
test/ejabberd_SUITE.erl
2016-11-18 13:39:10 +03:00
b8dcc911a3
Make common tests working again
2016-11-18 13:38:08 +03:00
995c97671d
Add auth to mod_http_fileserver
2016-11-17 12:59:46 +01:00
1c90b19d74
Fix typo
2016-11-16 18:24:12 +01:00
8ced3bdbe9
Remove obsolete/temp file
2016-11-16 14:18:51 +01:00
3cd174cb56
Ensure that presence_broadcast room option is stored ( #1380 )
2016-11-16 13:35:50 +01:00
e69ddd981f
Tell git to ignore the example file ejabberd.service
2016-11-16 13:12:57 +01:00
b1723c6e2d
Handle correctly p1_http:request result
2016-11-16 13:11:23 +01:00
5a01b5f1fc
add docker support
2016-11-16 11:48:50 +01:00
2929f5b5bc
Minor cosmetic changes on pubsub code
2016-11-15 18:35:20 +01:00
4d4ad922a2
Cosmetic validator changes
2016-11-15 18:14:21 +01:00
8df68266f2
Add missing verbs for RESTfull operation
2016-11-15 14:35:26 +01:00
2b93de6912
apply string optimizations
2016-11-15 14:32:22 +01:00
909e0eb5dd
Add configurable weight for commands
2016-11-15 14:18:34 +01:00
e75dd17e2c
Fix tests that use #forwarded
2016-11-15 10:02:21 +01:00
41794c57d6
Use new version of fast_xml
2016-11-15 10:02:21 +01:00
5ffc01db53
Fix types in check_password_hash
2016-11-15 10:02:21 +01:00
717159a98f
Make string args in http_api be list strings
2016-11-15 10:02:21 +01:00
309962fb8b
Use p1_http from p1_utils 1.0.6
2016-11-14 16:52:03 +01:00
3765210698
Fix IQ result processing
2016-11-13 16:56:05 +03:00
13d5da4da6
Add some copyright notices
2016-11-13 16:46:04 +03:00
75c15d3853
Make xref working again if elixir is disabled
2016-11-13 14:29:52 +03:00
ebefd0d8d6
Add more control for decoding IQ payloads
2016-11-13 14:17:21 +03:00
7e9f1a6dc1
Don't auto-decode forwarded payload
2016-11-13 13:41:04 +03:00
132033d01a
Remove unused header file
2016-11-13 10:57:53 +03:00
21d78ed7f4
Don't use jlib.hrl outside of jlib.erl
2016-11-13 10:56:36 +03:00
b8f22ff538
Deprecate most of the functions from jlib.erl
2016-11-13 10:44:53 +03:00
534e73f732
Uncomment forgotten block of code
2016-11-12 14:51:43 +03:00
de81c50199
Revert "Support to provide password when subscribing to a room ( #1306 )"
...
This reverts commit 566ac872fe
2016-11-12 14:47:29 +03:00
5d552c8463
Merge branch 'master' into xml-ng
2016-11-12 14:41:37 +03:00
78a44e0176
Merge branch 'master' into xml-ng
...
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
2016-11-12 13:27:15 +03:00
566ac872fe
Support to provide password when subscribing to a room ( #1306 )
2016-11-10 20:48:43 +01:00
42bede77a1
Merge branch 'master' of github.com:processone/ejabberd
2016-11-09 09:04:58 +01:00
35506f5470
Expose unregister API command
2016-11-09 09:04:52 +01:00
e841a6ec34
Add more tests for offline storage
2016-11-08 15:15:19 +03:00
e9dd3ffe9c
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
2016-11-07 10:11:40 +03:00
56c91d3c58
Add roster tests
2016-11-07 10:10:57 +03:00
bd060bc1bb
Support several groups separated by ; in add_rosteritem command
2016-11-04 18:45:27 +01:00
49d3b7ec1d
Throw error if room name or host has invalid characters ( #1360 )
2016-11-04 17:28:28 +01:00
5e723bc90e
Fix reading room jids from file for create and destroy_rooms_file commands
2016-11-04 16:54:31 +01:00
bab71f0832
Replace ctlscriptpath and produce ejabberd.service file ( #434 )
2016-11-04 16:35:59 +01:00
62db030942
Merge mod_opt_type from db sub-modules to main module mod_opt_type
2016-11-04 12:58:08 +01:00
2a63d0e95a
mod_mam: Use user JID for stanza ID 'by' attribute
...
Use the user (or room) JID instead of the server JID for the 'by'
attribute of <stanza-id/> and <archived/> tags. That's what the
examples in XEP-0313 v0.2 and XEP-0359 v0.3.0 suggest.
2016-11-01 08:47:08 +01:00
149cc9654f
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
2016-10-24 13:42:33 +02:00
9d977e484a
Use base64:mime_decode/1 for SASL packets
...
It will be now possible to accept SASL packets with only
single '=' character set as required by RFC6120
2016-10-22 13:09:11 +03:00
f6236d456d
Add more tests for privacy lists and blocking command
2016-10-22 13:01:45 +03:00
ed6bc9081b
Merge pull request #1349 from prasadvaidya/master
...
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:32:29 +02:00
cdafd3254b
Rollback minor change, to avoid redundant use of fail-safe function
2016-10-21 15:02:39 +05:30
509776a0d1
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:57:47 +05:30
2ab72bcd00
Nidx may be integer or binary, so use jlib:i2l instead
...
As reported in
https://www.ejabberd.im/forum/28580/erlang-function-integertobinary1-throwing-badargs-exception
2016-10-20 21:56:19 +02:00
0212559ca7
If a participant can change subject, let asubscriber too ( #1345 )
2016-10-20 20:35:00 +02:00
1bdbe54442
Let systemd stop ejabberd gracefully
...
Make sure the "ExecStop" command line blocks until ejabberd is actually
stopped. This prevents systemd from killing the ejabberd process(es)
immediately.
Also, let the "ExecStart" command line block until ejabberd's startup is
completed. This makes sure that services which depend on ejabberd
aren't started up too early.
2016-10-20 00:27:50 +02:00
a5e737157c
Increase file descriptor limit in systemd unit
...
16,000 file descriptors will only suffice for small setups.
2016-10-20 00:12:02 +02:00
0a3fcc9ade
Don't specify "ExecReload" command in systemd unit
...
The "reload_config" command doesn't work the way admins would typically
expect, so it shouldn't be exposed via systemd. Those who understand
the behavior can execute the command using ejabberdctl.
2016-10-19 23:37:26 +02:00
7621564839
Let systemd restart ejabberd on failure
...
The "RestartSec=5" setting has no effect if "Restart" is not also
specified.
2016-10-19 23:35:22 +02:00
686305bb21
Use "Type=forking" in systemd unit
...
ejabberd is not a "oneshot" process.
2016-10-19 23:32:07 +02:00
c3b62d2f75
Don't set "NoNewPrivileges" in systemd unit
...
The "NoNewPrivileges" setting breaks some PAM and extauth setups.
Fixes #1281 .
2016-10-19 23:29:46 +02:00
f56840a682
Don't let systemd hide /home and /tmp
...
Admins might expect ejabberd to be able to access data below /home or
/tmp. For example, they might use those locations to dump/restore
Mnesia backups, or as a document root for mod_http_fileserver or
mod_http_upload.
Fixes #1297 .
2016-10-19 23:11:26 +02:00
059a806bb0
Let mix be able to cope with configured deps
2016-10-19 13:57:19 +02:00
3ec68a4ecf
Merge pull request #1343 from gardenia/mod_muc_configurable_max_discoitems
...
New option max_rooms_discoitems instead of constant (#1236 )
2016-10-19 12:32:09 +02:00
3b876875e9
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
2016-10-18 21:59:34 +01:00
d19552f464
Fix randoms:uniform/1 return
...
Make sure randoms:uniform/1 returns values from the same interval
as deprecated random:uniform/1
2016-10-18 08:35:47 +03:00
4c5460f0bd
Get rid of compile warnings for random/crypto modules on R19
2016-10-18 08:17:21 +03:00
90acec8a2b
Merge pull request #1338 from marcphilipp/muc_invite_hook
...
Introduce muc_invite hook
2016-10-17 17:46:25 +02:00
305d4c05dc
Fix delete_old_messages command for SQL backends
2016-10-17 17:02:23 +02:00
67720c7713
Add more MUC tests
2016-10-17 13:37:23 +03:00
fd6f0f94b5
Convert ejabberd_xmlrpc to new api_permissions
2016-10-14 13:55:50 +02:00
a1faecc4c9
Introduce muc_invite hook
...
This adds a new hook that is triggered for each invite to an MUC room:
- muc_invite(RoomJID, RoomConfig, From, To, Reason) -> ok
where
- RoomJID = From = To = #jid (see jlib.h)
- RoomConfig = #config (see mod_muc_room.hrl)
- Reason = binary()
2016-10-14 12:52:59 +02:00
d97e777c9b
Always include <actions/> with ad-hoc responses
...
XEP-0050 says: "The result for each stage (other than the last) of a
command's execution SHOULD include an <actions/> element." Some clients
insist on this.
2016-10-13 22:34:29 +02:00
b693601dd1
Don't let MAM messages go into offline storage
2016-10-12 23:10:25 +02:00
4935ac8866
Merge pull request #1331 from weiss/send-message-omit-copies
...
Don't let "send_message" duplicate the message
2016-10-12 13:52:27 +02:00
ead7e21037
Ignore offline sessions in statistics
...
Offline sessions should not be counted when reporting the number of
connected resources.
Apart from that, this number is now also reported when using a
non-default session management backend.
2016-10-11 22:20:22 +02:00
0f67a8f98b
Update riakc to support r19
2016-10-10 10:57:04 +03:00
a915fd161e
Create room on configuration request as per XEP-0045, 10.1.3
2016-10-10 10:51:39 +03:00
dffcfe74d4
Don't let "send_message" duplicate the message
...
In the past, the "send_message" command sent a copy of the message to
each resource if the message was addressed to the bare JID of a local
online user. When message carbons are enabled, this creates duplicates;
and with MAM enabled, each copy is archived. Therefore, "send_message"
no longer creates copies of the message.
2016-10-10 00:17:17 +02:00
5c48263579
Enable elixir when ejabberd used as a mix dependency
2016-10-07 10:47:20 +01:00
6a3691ef7c
Add xdata generator and make some code using it
2016-10-07 10:31:03 +03:00
d701230555
Make map syntax compatible with Erlang/OTP 17
2016-10-07 00:36:47 +02:00
e54ba3db5b
XEP-0198: Cope with invalid 'from'/'to' attributes
...
Check whether the 'from' and 'to' attributes are valid before bouncing
or resending a stanza from the stream management queue. They might be
invalid in certain corner cases.
Thanks to Evgeniy for spotting this.
2016-10-06 23:20:45 +02:00
0ae84a646f
Disable one test for now, we may change how this part is handled
2016-10-06 11:17:10 +02:00
b01fbfadf3
Use correct field for oauth scope
2016-10-06 11:03:26 +02:00
438dbc8bda
Make handling of oauth clauses be more consistent with other rules
2016-10-06 10:59:43 +02:00
8accb8ee0c
Use proper default value for api_permissions
2016-10-06 10:59:43 +02:00
a78c3422cd
Fix typos in Czech translation ( #1318 )
2016-10-05 15:04:42 +02:00
695d22ef95
Initialize ejabberd_access_permissions in elixir tests
2016-10-05 13:54:29 +02:00
98e0123ca4
New api permissions framework
2016-10-05 13:21:11 +02:00
9cee3760db
ejabberd_sm: Clean up old offline session entries
...
If the number of offline sessions exceeds the 'max_user_sessions' limit,
remove the oldest entry from the table.
2016-10-02 22:01:03 +02:00
1de0bb83a0
PubSub: creation jid must be bare jid
2016-09-30 07:51:33 +03:00
7566e267a7
PubSub: fix error type on item deletion with insufficient priviledge
2016-09-30 07:51:17 +03:00
15ebb79160
PubSub: creation jid must be bare jid
2016-09-29 16:10:11 +02:00
767dba8f3b
PubSub: fix notification on subscription change
2016-09-29 12:00:59 +02:00
a42bf67957
PubSub: fix error type on item deletion with insufficient priviledge
2016-09-29 11:20:56 +02:00
6f538545b4
Fix 404 response formatting (thanks to Kaggggggga)( #1306 )
2016-09-28 11:03:46 +02:00
d4b4f35a0e
ejabberd_http: Handle missing POST data gracefully
...
Return a "bad request" error instead of crashing if receiving POST/PUT
data fails.
2016-09-27 23:22:30 +02:00
acab2270f1
Use inets instead of lhttpc in http_p1
2016-09-27 07:12:10 +03:00
ac6f701033
Add http_p1.erl, rest.erl, and oauth2 ReST backend for tokens.
2016-09-27 05:57:14 +03:00
d327119cf7
Text legacy IQ handler support
2016-09-25 10:17:03 +03:00
3112a7187f
Test anonymous auth
2016-09-25 09:57:56 +03:00
7100c67be6
Get rid of compile warnings in test suite
2016-09-25 08:38:41 +03:00
fa31e3ef23
Deprecate jlib:integer_to_binary/1 and jlib:binary_to_integer/1
2016-09-24 23:34:28 +03:00
58969fb854
Improve namespace handling
2016-09-24 14:17:21 +03:00
53209b9ab1
Add tests for s2s code
2016-09-23 12:30:33 +03:00
ceda073766
Add tests for external component
2016-09-21 10:45:11 +03:00
a4ec064455
Add more tests for C2S
2016-09-20 14:04:07 +03:00
e7787e2f33
mod_carboncopy: Don't copy MUC PMs
...
Carbon copies of private MUC message are generally not desired,
especially not when multiple clients joined the room with the same nick.
In this case, the MUC service usually sends PMs to all joined resources
anyway, so carbon-copying those PMs would create duplicates.
2016-09-19 22:46:36 +02:00
5bcfcf4c5e
When getting list of subscribed rooms, check all including temporary ones ( #1242 )
2016-09-19 13:46:01 +02:00
9fa92092bf
Revert "Fix getting of subscribed rooms: consider also temporary ones ( #1242 )"
...
This reverts commit f2cc81dfea
2016-09-19 12:54:19 +02:00
f2cc81dfea
Fix getting of subscribed rooms: consider also temporary ones ( #1242 )
2016-09-19 12:35:53 +02:00
8244c1fa8c
Store the Allow Subscription room option ( #1301 )
2016-09-19 12:35:32 +02:00
ed62d705d8
Don't worry about storage_type of the Acl mnesia table ( #1206 )
2016-09-19 11:59:40 +02:00
da291d804c
Use mnesia calls instead of ets for Acl and Access tables ( #1206 )
2016-09-19 11:56:22 +02:00
662b6f1020
Update riakc to support r19
2016-09-16 14:59:06 +02:00
27999a122f
node_mb_sql: Add missing (SQL-specific) functions
2016-09-15 23:02:04 +02:00
151668ac10
Fix dialyzer warnings for mod_mam
2016-09-13 16:56:34 +03:00
405a0a21c1
Merge pull request #1249 from weiss:push-requirements
2016-09-13 14:31:39 +02:00
c39501a48d
Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss-push-requirements
2016-09-13 14:29:14 +02:00
c3543e002d
Allow to create room with custom config
2016-09-13 11:52:59 +02:00
e987b88848
Make common tests working again
2016-09-13 12:30:05 +03:00
2f596b0e10
Expand parsing of json input to be able to handle update_roster command
2016-09-13 11:27:59 +02:00
054382f074
Add X-Admin and basic auth header to CORS allowed headers in http_api
2016-09-12 15:40:38 +02:00
96d05dad8f
Properly process OPTIONS header in http_api for all paths
2016-09-12 15:40:38 +02:00
1aca541639
Fix nick-to-jid mapping for MUC subscribers
2016-09-12 14:41:33 +03:00
d0761039ff
Support multiple room invitations ( #1285 )
2016-09-09 12:18:27 +02:00
fe1bf27ef3
Fix subscribed rooms list retreivement
2016-09-09 13:04:47 +03:00
d222fed228
XEP-0198: Cancel timer when waiting for resumption
...
If an ACK timer is active while going into the 'wait_for_resume' state,
cancel that timer.
2016-09-09 00:21:36 +02:00
8fd888eb2b
Revert "Don't log an [error] message if Elixir is missing"
...
This reverts commit 41386d718d4bd45bada7
2016-09-08 18:11:54 +02:00
41386d718d
Don't log an [error] message if Elixir is missing
...
The Elixir support is still optional.
Closes #1250 .
2016-09-08 17:59:40 +02:00
26a040e2d5
Fix typo on previous commit ( #1284 )
2016-09-08 16:32:16 +02:00
4bd45bada7
Start elixir config code only if elixir was enabled in configure script
2016-09-08 16:29:45 +02:00
ad39da0b0a
Full jid entity subscriptions should include bare jid records ( #1284 )
2016-09-08 16:27:16 +02:00
c29a48695d
Rename #error{} record to #stanza_error{}
2016-09-08 17:08:48 +03:00
36ab9cc2ea
Fix message routing from subscribers
2016-09-08 16:39:34 +03:00
5ec972b00f
Improve pubsub code
2016-09-08 15:49:27 +03:00
6c943aa293
Merge pull request #1287 from weiss/ack-timeout
...
New stream management option: ack_timeout
2016-09-08 12:45:16 +02:00
803270fc6b
Support for Elixir configuration file #1208
...
Contribution for Google Summer of code 2016 by Gabriel Gatu
2016-09-08 11:37:14 +02:00
e6f7233351
Support for publishing to hex.pm with latest Elixir mix
2016-09-08 10:52:43 +02:00
58a72bd395
Fix compilation with Elixir 1.3 / R19
2016-09-08 10:29:44 +02:00
d2621130a3
Typo
2016-09-08 10:27:14 +02:00
a8368278ec
Properly normalize resource_regexp acl rule
...
This fixes issue #1288 .
2016-09-08 08:45:10 +02:00
621f0e2b7c
New stream management option: ack_timeout
...
Close the connection if a stream management client fails to respond to
an acknowledgement request within 60 seconds. This number of seconds
can be changed with the new "ack_timeout" option, and the mechanism can
be disabled by specifying 'infinity'.
As a side effect of this change, a new acknowledgement is no longer
requested before the response to the previous request is received.
2016-09-07 23:16:54 +02:00
7a538bb88b
Enforce pathtype use with config path ( #1264 )
2016-09-07 17:38:35 +02:00
af0a493c66
Merge pull request #1253 from Amuhar/xep0356
2016-09-07 14:34:31 +02:00
f304149615
Create room on configuration request as per XEP-0045, 10.1.3
2016-09-07 11:15:19 +03:00
3803a8de3c
Link MUC subscription to bare JID
2016-09-07 10:33:37 +03:00
1edca899ff
Add SQL support for microblogging node plugin
2016-09-07 07:15:12 +02:00
c6afb9731b
Handle <subscriptions/> request to list MUC subscribers
2016-09-06 19:06:02 +03:00
5ec2874a96
Do not update muc_online_users table on MUC/Sub operations
2016-09-06 18:17:30 +03:00
417284a921
Add get_subscribers command to list MUC subscribers
2016-09-06 17:55:18 +03:00
af2999a783
node_mb: Call node_pep instead of node_hometree
2016-09-06 00:30:46 +02:00
48ce34987d
node_mb: Fix configuration documentation
...
A node plugin used in a 'pep_mapping' must explicitly be added to the
list of 'plugins'.
2016-09-06 00:08:43 +02:00
e29f47893f
mod_pubsub: Remove outdated comment
2016-09-06 00:05:54 +02:00
c770a54aac
Clean ejabberd_commands before tests
2016-09-05 17:18:27 +02:00
96a748d34f
ejabberd_oauth requiere working cache_tab, initialize it before tests
2016-09-05 16:42:05 +02:00
45eb49125b
Rewrite mod_pubsub to use XML codec
2016-08-30 09:48:08 +03:00
31592fe51f
Merge remote-tracking branch 'processone/pr/1262'
...
* processone/pr/1262:
Fixed typo in Stream Management option name
2016-08-22 22:35:17 +02:00
f1afea223b
Fixed typo in Stream Management option name
2016-08-23 02:21:09 +06:00
1bfa1c613b
Merge remote-tracking branch 'processone/pr/1261'
...
* processone/pr/1261:
Fixed #1260 Stream Management feature for the websocket connections
2016-08-22 21:22:08 +02:00
d5659735b3
Fixed #1260 Stream Management feature for the websocket connections
2016-08-23 00:59:39 +06:00
23d9fb0592
mod_muc_admin: Accept 'allow_subscription' option
...
Allow for setting the new 'allow_subscription' option using the
'change_room_option' command.
2016-08-22 01:17:32 +02:00
8dd2044a27
Merge pull request #1254 from lemenkov/remove_p1_xmlrpc
...
Remove no longer necessary p1_xmlrpc
2016-08-19 11:53:20 +02:00
e13edff6ae
Remove no longer necessary p1_xmlrpc
...
Ths module was superceded by fast_xml in commit
processone/ejabberd@dfc29ea03c . So let's remove it entirely to
avoid any confusion.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com >
2016-08-17 18:32:09 +03:00
8af85d913f
Erlang R17 has a Time limit in erlang:send_after ( #1246 )
2016-08-16 18:32:06 +02:00
20a510d877
mod_mam: Add 'store_mam_message' hook
...
The new 'store_mam_message' hook is invoked whenever a MAM message is
stored.
2016-08-15 23:28:36 +02:00
8821cf8b27
mod_offline: Add 'store_offline_message' hook
...
The new 'store_offline_message' hook is invoked whenever an offline
message is stored.
2016-08-15 22:30:08 +02:00
4d19fb518f
ejabberd_c2s: Add XEP-0198 resumption hooks
...
The new 'c2s_session_pending' and 'c2s_session_resumed' hooks are
invoked when a stream management session is pending and resumed,
respectively.
2016-08-15 21:49:58 +02:00
e7217e6320
Add functions to get/set some c2s state elements
2016-08-15 20:24:43 +02:00
5b4f347da8
Support sql backend in mod_shared_roster commands ( #1244 )
2016-08-15 15:53:35 +02:00
38666cfd58
Merge pull request #1245 from hamano/clean_redis_table
...
fix clean redis table
2016-08-15 15:12:20 +04:00
877d0752e2
fix clean redis table
2016-08-15 17:51:06 +09:00
0ab08f4eeb
Don't delete ejabberd_commands table, it's problematic in cluster ( #1210 )
2016-08-14 20:35:25 +02:00
4ee8af633b
Store announcements for offline users
...
Add a <store/> hint to announcements (unless they are explicitly sent to
online users). Without that hint, announcements weren't delivered to
offline users, since they are sent as messages of type "headline".
2016-08-13 00:07:27 +02:00
bf9d6b5534
Honor <store/> hint for any non-"error" message
...
XEP-0334 says: "A message containing the <store/> hint that is not of
type 'error' SHOULD be stored by the entity."
2016-08-12 21:13:10 +02:00
28dde294e5
mod_mam: Don't store messages of type "headline"
...
XEP-0313 says: "a server SHOULD include in a user archive all of the
messages a user sends or receives of type 'normal' or 'chat' that
contain a <body> element."
2016-08-12 20:38:17 +02:00
31faa4eb9a
Add more type specs
2016-08-12 13:17:42 +03:00
ffba664f2c
Add a requirement for full JID in subscribe_room command
2016-08-11 17:13:20 +03:00
50596dc4d3
Provide proper args_desc in oauth_issue_token command
2016-08-10 11:26:04 +02:00
e63fe5c216
Fix result type of subscribe_room command
2016-08-10 11:22:19 +02:00
1fc58ace2f
Add commands for MUC subscriptions management
2016-08-09 13:36:43 +03:00
522a186a38
Improve some type specs
2016-08-09 10:56:32 +03:00
c4b14d045a
Update to released version
2016-08-07 18:31:55 +02:00
9c6ee60f1a
Update moka dependency
2016-08-07 18:28:14 +02:00
efc744092b
We do not force yet access rules check on register command
2016-08-07 18:27:16 +02:00
a0c8012c66
Do not force command line to pass a credentials
2016-08-07 18:24:08 +02:00
b62aa3d2dc
mod_client_state: Let other modules filter stanzas
...
Don't stop execution of the 'csi_filter_stanza' hook if mod_client_state
won't queue the stanza.
2016-08-06 13:36:27 +02:00
91e26fbf7a
Add user's JID to CSI hook arguments
...
Add the JID of the CSI user to the arguments of the 'csi_filter_stanza'
and 'csi_flush_queue' hooks.
2016-08-05 23:47:18 +02:00
c2ef55a075
Cosmetic change: Set CSI state 'active' on resume
...
The CSI state is always set to 'active' when a stream management session
is resumed; so there's no need to apply the CSI state of the old c2s
process, first.
2016-08-05 20:09:52 +02:00
d969e917c6
Use newer samerlib/moka
2016-08-05 13:03:22 +02:00
4ff8d7918a
Change code to reflect recent changes in fxml_gen
2016-08-05 08:41:08 +03:00
9a5f0751be
mod_mam: Simplify "assume_mam_usage" option
...
The "assume_mam_usage" option now takes a boolean value. Setting it to
"true" has the same effect as "if_enabled" had before. The "on_request"
behavior is no longer offered, as it made the option (and its
documentation) overly complex.
2016-08-05 01:57:01 +02:00
b487ccfb34
Delete mod_configure2
...
The module doesn't work properly for many years and nobody reported
this, which means nobody is using it. Also, mod_configure does
the same (and more) in a standard compliant way (XEP-0133).
2016-08-04 16:45:33 +03:00
ca217dc105
Rewrite HTTP Bind and Web Admin code to use XML generator
2016-08-04 13:41:38 +03:00
8b81b9ecb1
Rewrite PIEFXIS code to use XML generator
2016-08-04 13:37:07 +03:00
cbdc106427
Rewrite jd2ejd to use XML generator
2016-08-04 12:34:12 +03:00
bc33a3873d
Rewrite multicast code to use XML generator
2016-08-04 11:49:17 +03:00
72b0fb49e8
Fix type convertion bug injected by 4ccc40b ( #1229 )
2016-08-04 09:49:23 +02:00
111aa83f5e
Add tokens cache to ejabberd_oauth
2016-08-04 01:59:28 +03:00
abb4446b51
Fix calls to undefined functions
2016-08-03 21:00:22 +03:00
a417fbf45b
Rewrite mod_irc to use XML generator
2016-08-03 20:57:05 +03:00
5d06c6acbf
Rewrite mod_configure to use XML generator
2016-08-03 10:34:54 +03:00
78fa9e08a5
XEP-0198: Handle timeouts during stream resumption
...
If session resumption failed because requesting the #state from the old
c2s process took too long, the new c2s process will usually receive the
response. Let the new process handle that case gracefully.
2016-08-03 02:28:46 +02:00
3c1e4f0dfd
XEP-0198: Increase timeout for stream resumption
...
During stream resumption, the #state is transferred from the old c2s
process to the new one. This is usually very fast, but under certain
conditions, it can take longer than five seconds.
2016-08-03 02:15:15 +02:00
4add262090
Add OAUTH SQL backend
2016-08-01 16:55:43 +03:00
76eba3647a
Implement gen_mod callback in ModPresenceDemo module
2016-08-01 15:46:14 +02:00
2ef58a33a9
Merge pull request #1223 from processone/expand_api
...
More API fixes and improvements
2016-08-01 15:36:47 +02:00
d02d7b2b6a
Remove compile warning
2016-08-01 15:35:54 +02:00
90ea3ca361
Improve error message when try to call api on api root
2016-08-01 15:29:47 +02:00
bf45c9eeee
Switch mix worker to transient
2016-08-01 14:09:16 +02:00
a9c6748ec7
Add missing comas in sql statement ( #1219 )
2016-08-01 10:55:02 +02:00
4982639d05
Fix error return expectation in command test
2016-08-01 09:28:54 +02:00
c5c394e929
Fix HTTP process return formatting
2016-08-01 08:58:49 +02:00
6ea7153e31
Improve error handling
2016-07-31 22:48:24 +02:00
c0272ae766
Rewrite mod_stats to use XML generator
2016-07-31 14:51:16 +03:00
e258462b6b
Improve vCard creation from LDAP result
2016-07-31 14:17:17 +03:00
0bcbd12776
Rewrite mod_mix to use XML generator
2016-07-31 08:51:47 +03:00
2a49f8cae7
Change name of result key for offline count to value
...
This is more user friendly and should be more consistent with other commands.
2016-07-30 20:12:04 +02:00
674a8039ef
Add support for sending back missing scope error to API ReST command calls
2016-07-30 18:51:54 +02:00
4bf8ce7681
Make s2s stats commands more robust
2016-07-30 18:50:58 +02:00
eb1d385d4e
Get rid of "jlib.hrl" dependency in mod_service_log
2016-07-30 18:42:17 +03:00
5cd1cf5096
Get rid of "jlib.hrl" dependency in some modules
2016-07-30 18:37:57 +03:00
792e6a7c1c
Rewrite mod_http_upload to use XML generator
2016-07-30 17:48:52 +03:00
19ad6e6145
Ensure ejabberdctl status result is in valid shell supported range
2016-07-30 13:18:39 +02:00
39640b67c7
Add support for rich error reporting for API
2016-07-30 13:08:30 +02:00
d2d3b961eb
Rewrite mod_sic to use XML generator
2016-07-30 13:30:29 +03:00
fb2603d3cd
Return 409 conflict error code on register if user already exists
2016-07-30 11:50:04 +02:00
4a49dfecf3
Merge pull request #1221 from processone/expand_api
...
Do not crash on check when we do not have JID
2016-07-30 10:55:39 +02:00
f19d2fdcff
Rewrite mod_shared_roster backends module to use XML generator
2016-07-30 08:39:30 +03:00
a093e9d441
Rewrite mod_shared_roster to use XML generator
2016-07-30 08:37:34 +03:00
42e6f72ee9
Do not crash on check when we do not have JID
2016-07-29 20:38:05 +02:00
9bf1bac7df
Rewrite mod_vcard_ldap to use XML generator
2016-07-29 17:39:13 +03:00
f91f2bc3d2
Rewrite several modules to use XML generator
2016-07-29 13:21:00 +03:00
3c58a93eb8
Merge pull request #1178 from candrews/patch-1
...
Harden the systemd unit
2016-07-29 11:33:32 +02:00
a080322055
Switch workers from temporary to transient
2016-07-29 11:18:42 +02:00
fd365b2893
Display data that is send to websocket connection in debug log level
...
This should help with detecting problems like in #1097
2016-07-28 16:20:28 +02:00
fad088a3c4
Merge pull request #1193 from gabrielgatu/support-elixir-module-installer
...
Fix issue #625 : Writing Elixir modules
2016-07-28 16:06:12 +02:00
91865c66c0
Start elixir application after ejabberd_app:start_apps()
2016-07-28 15:57:35 +02:00
7a74a4836a
Merge pull request #1211 from processone/expand_api
...
There is still work to do, be we reached a stable state and can merge up to this point.
2016-07-28 14:57:48 +02:00
b31ebd2ea0
Rewrite captcha to use XML generator
2016-07-28 15:10:41 +03:00
96e912b09a
Rewrite mod_register to use XML generator
2016-07-27 18:06:54 +03:00
8275e95a16
Swap variables in their correct places
2016-07-27 18:06:34 +03:00
1097d31d63
Fix type spec for set_from_to/3
2016-07-27 18:05:11 +03:00
c409ed2f2c
Rewrite S2S and ejabberd_service code to use XML generator
2016-07-27 10:45:08 +03:00
72445bb374
mod_http_upload_quota: Apply cosmetic changes
...
Use "fun f/1" syntax in place of "fun(X) -> f(X) end".
2016-07-27 00:28:47 +02:00
984c4cf6bd
Add 'allow_subscription' MUC configuration option
2016-07-26 14:37:28 +03:00
2a8005e47f
Add ability to run test with Elixir mix
2016-07-26 12:17:37 +02:00
7781f39b74
Clarify command module API
2016-07-26 12:15:03 +02:00
e5fd1ee4f6
Avoid starting several time the owner process
2016-07-26 12:12:48 +02:00
9ff7257287
Make jlib ETS table more resilient
2016-07-26 11:58:14 +02:00
12f74b4aa7
Fix list appending bug
2016-07-26 11:57:38 +02:00
fede85c9bd
Remove unused import
2016-07-26 11:53:34 +02:00
23858469b7
Get rid of "jlib.hrl" dependency in some files
2016-07-26 11:29:17 +03:00
c26d38a893
Remove jlib dependency from acl.erl
2016-07-26 10:01:59 +03:00
da310a5173
Rewrite mod_adhoc and mod_announce to use XML generator
2016-07-26 09:52:29 +03:00
839490b0d9
Add DB backend support for ejabberd_oauth
2016-07-25 20:08:30 +03:00
dbc0498279
Fix tests, command need to be properly added to list of exposed commands
2016-07-25 18:28:40 +02:00
c183092aa4
Simplify code for command policy group expansion
2016-07-25 18:28:05 +02:00
5d4f8bcf0d
Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)
2016-07-25 16:57:05 +02:00
179fcd9521
Rewrite mod_mam and mod_muc to use XML generator
2016-07-25 13:50:30 +03:00
d7ad99f147
Initial attempt on access on commands
...
May change and will require more work / test / refactor
2016-07-25 11:43:49 +02:00
4b0d71d402
Don't return error for blocked MUC PMs
...
If a message stanza is blocked as per XEP-0016 or XEP-0191 and the
stanza is marked as a private MUC message, don't return an error. This
makes sure users won't be kicked from MUC rooms when blocking other
participants.
2016-07-24 20:55:11 +02:00
b4a430541d
Return more user friendly, human readable error description
2016-07-24 14:10:12 +02:00
bfa61eaa46
Make default OAuth token TTL values more user friendly
2016-07-23 18:57:57 +02:00
68555ff466
Add support for checking access rules conformance for commands
2016-07-23 18:21:45 +02:00
caf2c20210
Error when not authorized should be 403
2016-07-23 18:21:45 +02:00
1485b56211
Move any access rules check to ACL module
2016-07-23 18:21:45 +02:00
2c70c572c8
Clean-up of error codes and format json structure
2016-07-23 18:21:45 +02:00
d4d1941133
XEP-0198: Log debug message when dropping stanza
...
Log a debug message when an unacknowledged message is neither resent nor
bounced because it's archived.
2016-07-23 01:23:24 +02:00
814b80c644
Preserve PID for offline sessions
...
Don't set the PID to 'undefined' when a session goes offline, as this
looses the information which node created the session table entry.
Fixes #1196 .
2016-07-23 01:08:05 +02:00
4332dddbc4
Support oauth password grant type
...
As in https://tools.ietf.org/html/rfc6749#section-4.3
2016-07-22 19:17:12 -03:00
57aeef74d5
stringprep might already be started
...
Depending on the way the test us ran
(full test suite or the elixir quicktest one)
the stringprep might already be loaded.
2016-07-22 19:15:56 -03:00
12b58b9870
Fix elixir test case: stringprep was required
2016-07-22 16:25:54 -03:00
caf7b54305
oauth: single jid field instead of username/password fields
2016-07-22 15:37:48 -03:00
c5d9d35e7b
Convert password provided by web form to UTF8 before passing it ( #375 )
2016-07-22 16:52:13 +02:00
ffbe97d988
Quote postgresql database name ( #1136 )
2016-07-22 16:33:40 +02:00
bdfef09c0f
Fix handling of complex values as arguments in http_api
2016-07-22 15:26:27 +02:00
dd38bef8b1
Merge pull request #1201 from xmppjingle/master
...
External Component Connection Hooks
2016-07-22 00:35:43 +04:00
6983dfa21f
External Component Hook
...
Changed Hook Trigger Event and included a Reason upon
component_disconnected/2 Hook
2016-07-21 14:03:01 -03:00
cbfab687e8
Oauth callback must pass expires_in as ttl instead of epoch
2016-07-20 14:47:11 -03:00
c2753cd51c
Use different version of elixir depending on erlang version
2016-07-20 10:12:00 +02:00
5458d8bfcb
Add else branch to if_version_{above,below}
2016-07-20 10:11:34 +02:00
7748dd4e5d
Make processing of if_* clauses in rebar.config recursive
2016-07-20 10:11:08 +02:00
0c0c6465ba
Fix test for changes in oauth expiry
2016-07-19 20:36:02 -03:00
b5a90be3cb
Merge branch 'master' of github.com:processone/ejabberd
2016-07-19 20:19:17 -03:00
1d317e8068
Let user choose the desired oauth token TTL
2016-07-19 20:18:07 -03:00
8f8c499cfa
mod_mam: Fix handling of result set page limit
...
Restore function clause for handling a client-specified result set page
limit that doesn't exceed mod_mam's upper threshold.
2016-07-19 21:23:30 +02:00
9fcb81dea9
mod_mam: Always limit result set page size
...
Limit the number of messages returned for a given MAM request even if
the client didn't specify an RSM set (not just if the client specified
an RSM set without a limit).
This is still not done for MAM v0.2 requests though, as that version of
the XEP doesn't require clients to support RSM.
2016-07-19 21:08:13 +02:00
5d90292849
Fix hooks de-registration
2016-07-19 15:33:17 +03:00
490a758050
Upgrade Elixir version to 1.2 in rebar config
...
This matches the version used in mix.exs
2016-07-19 13:05:01 +02:00
f79ac6874e
Lock relx version as newer version does not compile fine
2016-07-19 12:35:45 +02:00
655cbf6055
Make access rules in ejabberd_web_admin configurable
2016-07-19 11:27:45 +02:00
bc802a4049
Rewrite mod_blocking to use XML generator
2016-07-19 10:07:04 +03:00
a4a9dd7f03
Rewrite mod_offline to use XML generator
2016-07-19 07:56:14 +03:00
483ef09263
Fix command argument formatting
2016-07-19 00:51:04 -03:00
33e0283f0d
Add 'ejabberd:user' and 'ejabberd:admin' oauth scopes
...
'ejabberd:user' includes all commands defined with policy "user".
'ejabberd:admin' includes commands defined with policy "admin".
2016-07-19 00:24:06 -03:00
673a654c47
Fix ce0d1704c6
...
Original request was to allow ejabberd sysadmin to generate
tokens for specific users. JIDs must not be passed as argument
when requesting the tokens.
2016-07-18 20:25:23 -03:00
48c88b61b6
Merge remote-tracking branch 'processone/master'
2016-07-18 17:55:31 -03:00
fca2f24231
External Component Connection Hooks
2016-07-18 17:55:10 -03:00
8bc3dc9c49
jlib: Don't try to keep just one <delay/> tag
...
It seems unclear whether XEP-0203 really mandates that stanzas may not
have multiple <delay/> tags. Editing/removing existing tags doesn't
seem worth the effort, especially as we'd have to take more care which
tag to keep if the stanza already has more than one.
2016-07-18 22:31:08 +02:00
9a8e197d7e
Initial version based on XML generator
2016-07-18 15:01:32 +03:00
749033598d
Omit [info] message with number of queued stanzas
...
Just log a debug message if a stream management session times out and
some stanzas weren't acknowledged.
2016-07-10 22:21:57 +02:00
f6e960d326
Fix compilation error
2016-07-10 08:45:24 +03:00
786bd4f26c
Use hooks instead of direct calls to mod_mam
2016-07-09 12:43:01 +03:00
5f48d2641b
mod_http_upload_quota: Depend on mod_http_upload
...
mod_http_upload_quota uses mod_http_upload's "docroot" option, so the
mod_http_upload configuration must be parsed, first. Fixes #1025 .
2016-07-08 20:47:02 +02:00
1a62d4e04b
Update stringprep and iconv
2016-07-08 18:28:51 +02:00
6b38d19085
Do send last items only for subscription on current plugin type
2016-07-08 15:18:39 +02:00
661b041302
Rename MUC/Sub's namespace
2016-07-08 15:07:26 +03:00
368b202144
Handle MUC/Sub subscriptions list request
2016-07-08 15:07:10 +03:00
caaf02eaa0
Advertise MUC/Sub support in MUC service disco#info
2016-07-08 15:06:08 +03:00
32de9a56a5
Experimental MUC/Sub support
2016-07-08 15:05:50 +03:00
febbc2bb5a
Update dependencies
2016-07-08 11:40:28 +02:00
71f27ee7d4
Get rid of warnings
2016-07-07 12:17:38 +03:00
c718cbbd9f
Warn on cyclic modules dependencies
2016-07-07 11:34:17 +03:00
12c0d888b1
Revert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" ( #1183 )
...
This reverts commit 53f3a45803
2016-07-06 17:54:37 +02:00
4220a2b98c
Make modules loading in a dependent order ( #1191 )
2016-07-06 14:58:48 +03:00
de9f80f2ce
Add missing '/' for jid matching from commit e300f80
2016-07-06 10:06:17 +02:00
be3a4acb55
Fix missed escaping in node_flat_sql.erl
2016-07-05 17:45:37 +03:00
3820aaa421
Quote reserver 'type' keyword for pgsql to fix e300f80
2016-07-05 16:16:40 +02:00
e300f8095d
Fix use of like parameter in sql pubsub's requests
2016-07-05 15:43:59 +02:00
b31c0d9e2e
Support elixir module installer
2016-07-05 12:36:49 +02:00
8e04a7ef4d
mod_configure: Fix editing of access rules
2016-07-03 22:58:54 +02:00
16b1d8541a
Grab new p1_utils that has fix for R19
2016-07-01 21:41:12 +02:00
0737958b45
Fix compilation issues on R19
2016-07-01 21:20:10 +02:00
024124decb
Fix dependencies when using Elixir Mix
2016-06-30 11:35:42 +02:00
88ac1dc56b
Update dependencies
2016-06-30 11:33:38 +02:00
8be1d49961
mod_mam_mnesia: Force garbage collection
...
The VM fails to collect the garbage generated during MAM lookups
automatically, so mod_mam_mnesia's memory usage easily goes up to
several gigabytes if we don't force garbage collection.
2016-06-29 22:32:59 +02:00
10d4c16a97
mod_client_state: Throttle PEP stanzas by default
2016-06-29 22:22:49 +02:00
ce0d1704c6
Allow generation of oauth tokens from command line
...
Oauth tokens can be generated for commands (scopes) having admin|user|open
policy. Restricted commands are not available as those are only usable
from ejabberdctl command line.
Four new commands are available:
$ejabberdctl oauth_issue_token "stats;get_roster"
Generates a token authorized to call both stats and get_roster
commands. Note scopes must be separated by semicolon.
$ejabberdctl oauth_list_tokens
List tokens generated from the command line, with their scope
and expirity time.
$ejabberdctl oauth_list_scopes
List scopes available
$ejabberdctl oauth_revoke_token "Lbs7qdJfdKXOWzVrArgyckY055tE1xnt"
Revokes the given token
2016-06-29 00:22:28 -03:00
2e28d06744
Harden the systemd unit
...
Restrict capabilities, have a private tmp directory, private /dev, and don't accessing file system locations that really shouldn't be accessed.
2016-06-28 17:02:41 -04:00
3446aba753
Include correct version in stream:stream when reporting errors
...
This fixes issue #1174
2016-06-27 16:40:57 +02:00
75366ca2fd
Inline muc access rules
2016-06-24 15:12:58 +02:00
f56cff925c
acl: ACLName rule should match if any part of ACLName matches
2016-06-24 15:09:51 +02:00
94461948db
Update dependencies for 16.06x
2016-06-24 11:12:18 +02:00
0b438d09d1
Fix typo from d8bb5d9c
2016-06-23 17:31:32 +02:00
06bf8cb032
Prepare hex.pm release
2016-06-23 15:23:28 +02:00
1794dd19d0
mod_pubsub: Fix matching of set_node/1 result
...
nodetree_tree_sql:set_node/1 returns {result, NodeIdx} on success, not
{ok, NodeIdx}. Thanks to Christophe Romain for spotting this.
2016-06-23 14:23:24 +02:00
1b5c50a384
When convertion of xmlrpc argument to type fails, report it as error
2016-06-23 10:41:16 +02:00
a9b456ccb3
xref was broken when Elixir wasn't enabled
2016-06-23 10:23:02 +02:00
2ebdd8915e
Compile gen_mod early to help with undefined behaviour warnings
2016-06-23 10:22:01 +02:00
e54400a8e4
Merge pull request #1165 from weiss/default-blocking-list
...
mod_blocking_sql: Handle default list corner case
2016-06-23 10:44:47 +04:00
065f5272e6
mod_blocking_sql: Handle default list corner case
...
Handle the situation where a list of the name "Blocked contacts" was
created by an XEP-0016 client, but no default list exists.
2016-06-22 22:36:27 +02:00
751be3cca6
Add some tests for {shaper,access}_rules_validator
2016-06-22 16:52:45 +02:00
cd0244eb71
Merge pull request #1120 from anagromataf/feature/archive-id-in-message-carbons
...
Send unique stanza id and archived tag also in the message carbons
2016-06-22 15:47:27 +02:00
f029488260
Restore get_items conditions when not using RSM ( #1147 )
2016-06-22 13:12:40 +02:00
eeeb190680
Set HTTP/1.0 so github accepts the request ( #1157 )
2016-06-22 12:43:24 +02:00
95ff94b054
Fix PubSub RSM on get_items ( #1147 )
2016-06-22 12:25:41 +02:00
7744339347
Update supported xep version
2016-06-22 11:24:01 +02:00
2efa8677c9
Fix pgsql compatibility on delete_old_messages ( #1137 )
2016-06-22 11:21:11 +02:00
c928956d73
XEP-0198: Apply cosmetic changes
2016-06-21 23:17:17 +02:00
7ddeac38b6
XEP-0198: Also count stanzas when socket is closed
...
Don't forget to count stanzas received from the stream management client
that are processed right after the connection was lost.
2016-06-21 22:54:41 +02:00
3a8da27d86
Use {access,shaper}_rules_validator in other places where access rules are used
2016-06-21 13:18:24 +02:00
52d45604ba
Use new access_rules_validator in couple places
2016-06-21 12:28:53 +02:00
804190e4a8
Add acl:{access,shaper}_rules_validator for use in {mod_}opt_type()
2016-06-21 12:26:31 +02:00
4b9613e8fe
Allow {mod_}opt_type to transform values passed to it, and for better error reporting
2016-06-21 12:25:29 +02:00
b2f53fb962
Avoid cleanup on bag when disc_only, switch in memory ( #1161 )
2016-06-21 10:43:19 +02:00
c91c5aa352
Fix handling of queued stanzas on session timeout
...
Don't fail to resend or bounce unacknowledged stanzas if the stream
management session timed out.
Closes #1160 .
2016-06-19 23:32:15 +02:00
6f2b0179e7
Give more time to stop and kill epmd ( #882 )
2016-06-17 17:09:45 +02:00
8583958268
Use shorter jid acl in config template
2016-06-17 11:58:51 +02:00
d1425f0d78
Use new short access rules in config template
2016-06-16 11:13:07 +02:00
f1138baa80
Add test for more allowed access_rules
2016-06-16 11:12:16 +02:00
1fb1e8721b
Allow using shaper defined by name like in in s2s_shaper: fast
2016-06-16 11:04:01 +02:00
0a09f27373
Typo in option name
2016-06-16 11:00:38 +02:00
7b308e0d41
Add shorter version of some common access rules definitions
...
This add conversion of
- allow
to
- allow: all
and
- allow: acl_name
to
- allow:
- acl: acl_name
(this works also for deny, and number in shapers)
2016-06-15 19:23:55 +02:00
9004608181
Check password with jid:resourceprep when registering account ( #996 )
2016-06-14 23:35:47 +02:00
26bce5dee3
mod_mam: Fix "assume_mam_usage: if_enabled"
2016-06-14 16:40:46 +02:00
34cf693231
Recover ec6c58a which was reverted in 100827e (thanks to Alexey Shchepin)
2016-06-10 13:18:32 +02:00
0e61e57ed9
Preparing hex.pm release to fix lager bug
2016-06-10 11:02:45 +02:00
34cbed54cd
Force use of lager 3.0.2 at most.
...
Lager 3.2.0 has a bug that prevent it to work with ejabberd.
Lager 3.2.0 bug is fixed in https://github.com/basho/lager/commit/4c87abcd4f9d70a1136fff8f573dc7adcc833e43
2016-06-10 11:01:46 +02:00
4ccc40bce5
push_roster must convert read strings to binaries ( #1075 )
2016-06-08 21:16:30 +02:00
53f3a45803
Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)
2016-06-08 19:34:05 +02:00
858d880675
Allow again multiple fqdn values in configuration (EJAB-1578)
2016-06-08 19:28:17 +02:00
a4f213837e
Merge pull request #1125 from vthriller/roster-push
...
mod_roster should probably respect roster item changes introduced with roster_process_item hooks upon pushing
2016-06-08 13:57:52 +02:00
5173de503c
Produce mod_last entry on account creation ( processone/ejabberd-contrib#62 )
2016-06-08 13:02:20 +02:00
8a7b31ca63
When stopping ejabberd, stop modules after broadcasting c2s shutdown ( #1144 )
2016-06-07 18:41:38 +02:00
f8d2589ee5
Add tests for new acl functions
2016-06-06 17:12:39 +02:00
78d4200f05
mod_pubsub: Fix node configuration changes for SQL
...
nodetree_tree_sql:set_node/1 returns {ok, NodeIdx} rather than 'ok' on
success.
2016-06-06 00:18:24 +02:00
60803f5780
Simplify check for carbon-copied chat states
...
Let jlib:is_standalone_chat_state/1 unwrap carbon copies rather than
leaving this to the caller. We still export jlib:unwrap_carbon/1, as
this function might also be useful for other purposes.
2016-06-05 22:36:56 +02:00
5c3074c0fb
mod_client_state: Fix handling of chat states
...
Fix the check for chat states sent from other resources of the same
user.
2016-06-05 22:04:38 +02:00
4789ddf1ee
mod_client_state: Simplify handling of PEP stanzas
...
Let mod_client_state simply queue the most recent item of a given PEP
node (from a given contact) instead of also taking the payload namespace
into account.
2016-06-05 21:48:03 +02:00
41c3751fa1
Fix quicktest case
...
Missing initialization, required for ets table to exists
2016-06-05 16:35:51 -03:00
8305cc293b
XEP-0352: Pass chat states of other resources
...
Don't hold back (carbon copies of) chat states from other resources, as
they might be used to sync the state of conversations across clients.
E.g., if one client becomes active, another one might want to remove a
notification (immediately).
2016-06-03 21:52:11 +02:00
4d5eab6662
Unwrap carbon copies when checking for chat states
...
Detect standalone chat states that were carbon-copied.
2016-06-03 20:28:48 +02:00
3a1fc6fb66
Ignore <delay/> when checking for chat states
...
Ignore XEP-0203 elements when checking whether a message stanza is a
standalone chat state.
2016-06-03 19:02:26 +02:00
5c1db176a9
Fix "unused variable" warning
2016-06-03 12:58:20 +02:00
0503d899cf
Fix problem in dfee843 when non-occupant admin kicks an occupant ( #1135 )
2016-06-03 00:10:25 +02:00
0093326f7d
Fix ejabberd.ldif
2016-06-02 18:56:27 +03:00
9ef52b8c64
Fix a typo
2016-06-02 18:22:50 +03:00
d201f013b2
Stronger tests in the test suite, SQL updates and fixes
2016-06-02 18:09:58 +03:00
5352037680
Report in SQL when scram is enabled but the stored password isn't ( #1096 )
2016-06-01 20:48:52 +02:00
bbb90b9928
Ignore offline sessions
...
Let mod_admin_extra and mod_configure ignore offline sessions when
querying the session table.
2016-06-01 01:01:54 +02:00
9c27f31d72
Process cover information on travis only if cover support is enabled
2016-05-31 12:12:46 +02:00
e7843bf92b
Fix set_presence API
2016-05-31 11:47:08 +02:00
db240413ab
Disable cover analyzys on R17 as this causes problems with elixir tests
2016-05-31 11:29:19 +02:00
8e883a76e3
Update test after roster code reorganization
2016-05-31 00:09:26 +02:00
622bff23a4
Update test
2016-05-31 00:07:26 +02:00
be0dd51e51
Fix mod_http_api_test.exs
2016-05-30 23:06:29 +02:00
fc2b7018cc
More strict check for commands with policy user
2016-05-30 23:06:29 +02:00
17f87eb899
Fix tests
2016-05-30 23:06:29 +02:00
1ade88402c
Better code for setting up ejabberd app location
2016-05-30 23:06:29 +02:00
f252b9d489
Update acl tests to new internal access rules syntax
2016-05-30 14:36:17 +02:00
1d3959b5a2
Make tests run correctly even when ejabberd src in not in ejabberd-xxx dir
2016-05-30 14:35:53 +02:00
e81302dc79
Allow @ inside acl user{,_glob,_regexp} to pass both user and server in single string
2016-05-30 12:30:44 +02:00
9e68c4c0d9
Convert example config to use new syntax for access rules
2016-05-26 11:08:53 +02:00
1981e13326
Allow passing username and ip to ejabberd_comamnds, and use it in mod_http_api
2016-05-26 11:08:53 +02:00
fffae97940
Use acl:access_matches in c2s
2016-05-26 11:08:53 +02:00
49658e1655
New ACL infrastructure
2016-05-26 11:08:53 +02:00
c55319c81e
Do not call transform_terms multiple times on configs when merging them
2016-05-26 11:08:53 +02:00
13ead140f4
Copy lite.sql to place where tests expect it in failback mode
2016-05-26 11:08:53 +02:00
ca329826cb
Retrieve parenthesis for easy reading, lost in old commit 9deb294
2016-05-25 12:44:05 +02:00
14b53fbcb0
Merge pull request #1131 from weiss/failed-resume-h
...
XEP-0198: Indicate number of handled stanzas if resumption fails
2016-05-25 11:56:47 +04:00
b055c2a13a
Merge pull request #1126 from weiss/muc-send-affiliation
...
Notify on MUC affiliation changes of non-occupants
2016-05-25 11:55:06 +04:00
639e9fab4e
Merge pull request #1132 from weiss/publish-options
...
Add support for PubSub publishing options
2016-05-25 07:49:55 +00:00
c958fa2f06
Add support for PubSub publishing options
...
Add code necessary to support publishing options as described in
XEP-0060, #7.1.5. A node plugin that expects publishing options must
add <<"publish-options">> to the features/0 list and then handle the
publishing options handed over to the publish_item/7 call.
Signed-off-by: Christian Ulrich <christian@rechenwerk.net >
2016-05-25 08:40:12 +02:00
30e814dd4b
XEP-0198: Add 'h' attribute to <failed/> element
...
If a resume request is rejected because the session timed out, indicate
the number of handled stanzas as per version 1.5 of XEP-0198.
2016-05-24 22:20:58 +02:00
8c16fdf59f
mod_mam_mnesia: Clarify error message
2016-05-24 07:58:07 +02:00
a2f0e157bc
ejabberd_auth*: Fix indentation
2016-05-24 00:40:25 +02:00
2a9dd548b5
mod_mam_mnesia: Don't exceed table size limit
...
Don't write MAM messages into an Mnesia archive if the size of the table
comes close to the 2 GB limit for tables with disc-only copies. That
way, the table is at least not corrupted when the limit is reached.
2016-05-24 00:25:52 +02:00
3f3ecad981
mod_mam_mnesia: Use transactions when writing
...
Let mod_mam_mnesia use transactions when storing or deleting messages.
If old messages of a user are to be removed, delete the user's archive
and rewrite it from scratch, as that seems to be much faster than
removing individual records with delete_object/1.
Closes #1065 .
2016-05-24 00:08:23 +02:00
70452ba25a
mod_register: Only set timeout on success
...
Don't set the registration timeout if the password was rejected for
being too weak.
2016-05-23 23:27:42 +02:00
1b02c5fbf3
Merge remote-tracking branch 'processone/pr/1122'
...
* processone/pr/1122:
mod_client_state: Add function specifications
mod_client_state: Add "queue_pep" option
mod_client_state: Queue chat state notifications
Move CSI queue handling into mod_client_state
2016-05-20 09:57:07 +02:00
9d87a4a6d4
mod_muc_room: Notify on affiliation changes
...
Notify the current room occupants if the affiliation of a non-occupant
is changed as per example 195 of XEP-0045. In anonymous rooms, only
moderators are notified, though.
2016-05-20 01:28:16 +02:00
f6ba91ff97
mod_roster should probably respect roster item changes introduced with roster_process_item hooks upon pushing
2016-05-19 13:45:42 +03:00
420ae65590
mod_client_state: Add function specifications
...
Add function specifications and apply cosmetic changes to
mod_client_state.
2016-05-18 21:30:38 +02:00
8f72c27b88
mod_client_state: Add "queue_pep" option
...
If the new "queue_pep" option is enabled and the client is inactive, PEP
notifications are throttled in a similar way to presence stanzas and
chat states. Only the most recent notification of a given node and
payload type will be queued from a given contact.
2016-05-17 22:12:04 +02:00
4f009e64fc
mod_client_state: Queue chat state notifications
...
Queue standalone chat states instead of simply dropping them when the
client is inactive. Only the most recent chat state of a given client
is queued.
2016-05-17 20:55:45 +02:00
ba74c1c367
Move CSI queue handling into mod_client_state
...
Let mod_client_state handle the queueing of stanzas, not just their
classification. This simplifies the ejabberd_c2s code and gives
(custom) CSI modules more flexibility.
2016-05-17 19:27:18 +02:00
ba2680df61
Delete duplicated command export_sql, use export2sql instead ( #1118 )
2016-05-16 17:57:57 +02:00
2529acc36c
Send unique stanza id and archived tag also in the message carbons
...
- Change order of the hooks in mod_mam for sending and receiving packets. Messages are archived before a carbon copy is send to the other recourcces.
- Add archived tag and unique stanza id to the outgoing packet to have message carbons with the archive information.
- Add additional hook (in mod_mam) to strip the archive tag for outgoing packets after message carbons have been send.
2016-05-15 20:13:25 +02:00
ff199a323d
Fix jid:from_string/1 function specification
2016-05-15 16:19:13 +02:00
64bb371285
Fix a typo
2016-05-13 18:22:59 +03:00
9bd446e519
Less strict extauth.py
2016-05-13 17:56:52 +03:00
792f47b4bd
Update SQL escaping
2016-05-13 17:56:48 +03:00
be2a9e35ae
Fix C2S session data leak ( #1078 )
2016-05-09 14:18:47 +03:00
068db1a2d9
Handle Redis connection in a separate module
2016-05-09 08:36:30 +03:00
4717d64d7a
mod_client_state: Delete only the configured hooks
2016-05-08 16:45:31 +02:00
f7f40cf9a6
Let client retry HTTP upload on file size mismatch
...
Let the main mod_http_upload process look at the size of an HTTP upload
rather than performing this check in the ejabberd_http handler. This
way, the upload slot won't be invalidated if the size of the uploaded
file doesn't match the size requested for the slot. The PUT request is
still rejected, but the client now has a chance to retry the upload.
2016-05-08 15:36:51 +02:00
bcf07fd032
Avoid error bounces when testing stream management
...
The test suite sends messages to the server JID while checking whether
the stream management code counts outgoing stanzas correctly. We now
set type='headline' for those messages to avoid error bounces.
2016-05-06 16:37:17 +02:00
ff4a0e1808
XEP-0198: Use different error message for bounces
...
When stanzas are bounced from the stream management queue (because the
session timed out or was closed for some other reason), use a different
error message so that this situation can be distinguished from other
cases.
2016-05-06 14:12:22 +02:00
51238bff83
Bounce messages sent to server JID
...
If a message is sent to the server JID (without node part), generate an
error message rather than dropping the message silently.
2016-05-06 13:59:21 +02:00
86d5cf6d6c
Don't require ejabberd to be installed to run "make translations"
2016-05-06 13:47:02 +02:00
b2ffa1db96
Add missed jlib:term_to_expr and jlib:expr_to_term functions
2016-05-05 16:42:48 +03:00
0ea0ba3004
Update more SQL queries
2016-05-05 15:51:58 +03:00
d6700bdc5b
Merge remote-tracking branch 'processone/pr/1088'
...
* processone/pr/1088:
Process messages of unknown type consistently
2016-05-05 00:20:15 +02:00
13c6430341
Add missing odbc->sql in comment from commit 1aae8a9f
2016-05-04 09:11:18 +02:00
12a8d915cd
Merge remote-tracking branch 'processone/pr/1087'
...
* processone/pr/1087:
Return error when blocking last activity request
2016-05-04 00:16:56 +02:00
6cb60aaff5
Cosmetic change: Make variable names consistent
...
Use the same variable names in both mod_mam:select/8 clauses to avoid
confusion.
2016-05-03 19:12:57 +02:00
575ef9c619
Merge remote-tracking branch 'processone/pr/1102'
...
* processone/pr/1102:
Fix ejabberdctl.template duplication
2016-05-03 19:07:11 +02:00
5e5328da4a
Fix ejabberdctl.template duplication
2016-05-03 16:36:20 +02:00
6da07d78b5
Merge remote-tracking branch 'processone/pr/1086'
...
* processone/pr/1086:
Return error when blocking message to offline user
2016-05-02 21:08:06 +02:00
0c0ce17bc0
Add ability to configure server loglevel when running tests
2016-05-02 15:25:30 +02:00
8a6c51290a
Pass noauth when auth isn't provided
2016-05-02 15:07:00 +02:00
671bc4e573
Use MEDIUMTEXT type for muc_room.opts in MySQL schema
2016-05-02 15:06:40 +02:00
07196b6c62
Fix sender in case of explicit pep subscriptions
2016-05-02 15:04:14 +02:00
53e1100cc4
Don't halt program when include_config_file is missing/can't be read
2016-05-02 14:52:23 +02:00
47050db6b8
Don't forget to import mod_opt_type/1 in mod_metrics
2016-05-02 12:18:18 +03:00
d54f211514
Add mod_opt_type/1 callback to gen_mod behaviour
2016-05-01 22:09:40 +02:00
b46ed7044a
Cope with modules that don't export mod_opt_type/1
2016-05-01 22:06:15 +02:00
b202004862
ejabberdctl: Fix path to epmd
2016-05-01 21:29:59 +02:00
8700a3401e
Add tests for MUC MAM
2016-05-01 12:48:23 +03:00
82082f1799
Add behaviour to mod_vcard_xupdate DB modules
2016-05-01 11:03:20 +03:00
3493a87469
Fix typo in mod_mam:select() ( #1098 )
2016-04-30 21:37:18 +03:00
6a10916dda
Let shaper cope with low resolution system clock
...
We no longer rely on getting unique values from clock source, so we need
to handle cope with systems which does not have a microsecond resolution
on system clock (such as MS Windows)
2016-04-29 10:57:34 +02:00
36164d9446
Return error when blocking last activity request
...
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming last activity query was blocked by a privacy list (just as we
do for other IQ requests).
2016-04-25 09:33:47 +02:00
45321fa2e2
Process messages of unknown type consistently
...
If an incoming message sent to an unavailable resource has an unknown
type, handle it like messages of type "normal" (as mandated by RFC 6121,
section 5.2.2). The same is already done for messages of unknown type
sent to the bare JID of an offline user.
2016-04-25 01:13:41 +02:00
cebdfb6523
Return error when blocking message to offline user
...
As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message sent to an offline user was blocked by a privacy list.
The same is done for a message sent to an online user, so this avoids a
presence leak.
2016-04-24 22:00:15 +02:00
Paweł Chmielowski
