]> granicus.if.org Git - ejabberd/log
ejabberd
7 years agoFix ejabberd command privacy_set
Paweł Chmielowski [Thu, 4 Jan 2018 13:57:26 +0000 (14:57 +0100)]
Fix ejabberd command privacy_set

This fixes issue #2205

7 years agoMerge remote-tracking branch 'processone/pr/2203'
Holger Weiss [Wed, 3 Jan 2018 21:33:18 +0000 (22:33 +0100)]
Merge remote-tracking branch 'processone/pr/2203'

* processone/pr/2203:
  mod_proxy65: Expand @HOST@ keyword in 'hostname' option

7 years agomod_proxy65: Expand @HOST@ keyword in 'hostname' option
Marc Schink [Wed, 3 Jan 2018 16:16:23 +0000 (17:16 +0100)]
mod_proxy65: Expand @HOST@ keyword in 'hostname' option

7 years agoMake mysql and pgsql one of the default module for Mix
Mickael Remond [Fri, 29 Dec 2017 16:22:59 +0000 (17:22 +0100)]
Make mysql and pgsql one of the default module for Mix

7 years agoRegenerated mix.lock file
Mickael Remond [Fri, 29 Dec 2017 16:18:59 +0000 (17:18 +0100)]
Regenerated mix.lock file

7 years agoMerge branch 'master' of github.com:processone/ejabberd 17.12
Evgeniy Khramtsov [Thu, 28 Dec 2017 18:37:19 +0000 (21:37 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoRepair hosts check during certfiles validation
Evgeniy Khramtsov [Thu, 28 Dec 2017 18:36:57 +0000 (21:36 +0300)]
Repair hosts check during certfiles validation

7 years agoFix stun/esip mix deps
Christophe Romain [Thu, 28 Dec 2017 14:38:24 +0000 (15:38 +0100)]
Fix stun/esip mix deps

7 years agoReturn default certificate on domain mismatch
Evgeniy Khramtsov [Thu, 28 Dec 2017 14:24:23 +0000 (17:24 +0300)]
Return default certificate on domain mismatch

7 years agoLet mix pass compile ejabberd as dependency
Christophe Romain [Thu, 28 Dec 2017 14:16:29 +0000 (15:16 +0100)]
Let mix pass compile ejabberd as dependency

7 years agoUpdate mix spec
Christophe Romain [Thu, 28 Dec 2017 13:43:13 +0000 (14:43 +0100)]
Update mix spec

7 years agoUpdate stun and esip
Paweł Chmielowski [Thu, 28 Dec 2017 13:34:50 +0000 (14:34 +0100)]
Update stun and esip

7 years agoFix check_opt_range when no boundary is configured
Christophe Romain [Thu, 28 Dec 2017 12:51:26 +0000 (13:51 +0100)]
Fix check_opt_range when no boundary is configured

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Thu, 28 Dec 2017 11:01:39 +0000 (14:01 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoReturn send() result to the caller
Evgeniy Khramtsov [Thu, 28 Dec 2017 11:01:34 +0000 (14:01 +0300)]
Return send() result to the caller

7 years agoDon't force rsm when max_items is not defined (#2189)
Christophe Romain [Thu, 28 Dec 2017 10:48:54 +0000 (11:48 +0100)]
Don't force rsm when max_items is not defined (#2189)

7 years agoRevert "Include os_mon application"
Christophe Romain [Thu, 28 Dec 2017 09:32:21 +0000 (10:32 +0100)]
Revert "Include os_mon application"

This reverts commit 56241feb58efe0354f36bad2c02ed6616e14487e.
That was a mistake, breaking application start

7 years agoRevert "Start os_mon application"
Paweł Chmielowski [Wed, 27 Dec 2017 16:10:15 +0000 (17:10 +0100)]
Revert "Start os_mon application"

This reverts commit 82b3bbf360ecf9bb9e96dcd59fc631ecbdd5fc0d.

7 years agoFix a regression in xmpp_socket
Evgeniy Khramtsov [Wed, 27 Dec 2017 15:49:25 +0000 (18:49 +0300)]
Fix a regression in xmpp_socket

7 years agoStart os_mon application
Paweł Chmielowski [Wed, 27 Dec 2017 15:23:04 +0000 (16:23 +0100)]
Start os_mon application

7 years agoAdopt tests to changes introduced by b54e1e49ba6794725bead67d530b50ab89ce078b
Paweł Chmielowski [Wed, 27 Dec 2017 15:16:15 +0000 (16:16 +0100)]
Adopt tests to changes introduced by b54e1e49ba6794725bead67d530b50ab89ce078b

7 years agoUse bare jid when processing roster subscriptions
Paweł Chmielowski [Wed, 27 Dec 2017 15:14:03 +0000 (16:14 +0100)]
Use bare jid when processing roster subscriptions

7 years agoRename mnesiadb
Christophe Romain [Wed, 27 Dec 2017 11:42:55 +0000 (12:42 +0100)]
Rename mnesiadb

7 years agoAdd missing application building with mix
Christophe Romain [Wed, 27 Dec 2017 11:33:52 +0000 (12:33 +0100)]
Add missing application building with mix

7 years agoInclude os_mon application
Christophe Romain [Wed, 27 Dec 2017 11:28:13 +0000 (12:28 +0100)]
Include os_mon application

7 years agoPrepare mix for 17.12
Christophe Romain [Wed, 27 Dec 2017 10:42:37 +0000 (11:42 +0100)]
Prepare mix for 17.12

7 years agoMerge pull request #2188 from weiss/fix-acl-reload
Evgeny Khramtsov [Wed, 27 Dec 2017 06:34:19 +0000 (09:34 +0300)]
Merge pull request #2188 from weiss/fix-acl-reload

Forget old access/shaper rules and ACLs on reload

7 years agoUpdate the test suite to support new XMPP socket API
Evgeniy Khramtsov [Wed, 27 Dec 2017 05:55:14 +0000 (08:55 +0300)]
Update the test suite to support new XMPP socket API

7 years agoForget old access/shaper rules and ACLs on reload
Holger Weiss [Tue, 26 Dec 2017 18:37:11 +0000 (19:37 +0100)]
Forget old access/shaper rules and ACLs on reload

7 years agoAdd new schemas for SQLite and MySQL
Alexey Shchepin [Tue, 26 Dec 2017 17:48:15 +0000 (20:48 +0300)]
Add new schemas for SQLite and MySQL

7 years agoMerge branch 'no-more-ejabberd-receivers'
Evgeniy Khramtsov [Tue, 26 Dec 2017 16:02:54 +0000 (19:02 +0300)]
Merge branch 'no-more-ejabberd-receivers'

Conflicts:
rebar.config

7 years agoGet rid of ejabberd receiver
Evgeniy Khramtsov [Tue, 26 Dec 2017 15:55:57 +0000 (18:55 +0300)]
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.

7 years agoCleanup rebar.config
Christophe Romain [Tue, 26 Dec 2017 10:16:48 +0000 (11:16 +0100)]
Cleanup rebar.config

7 years agoRemove obsolete option
Christophe Romain [Tue, 26 Dec 2017 10:13:47 +0000 (11:13 +0100)]
Remove obsolete option

7 years agoUpdate dependencies
Christophe Romain [Tue, 26 Dec 2017 10:13:18 +0000 (11:13 +0100)]
Update dependencies

7 years agoRevert "Don't set twice"
Evgeniy Khramtsov [Mon, 25 Dec 2017 05:41:51 +0000 (08:41 +0300)]
Revert "Don't set  twice"

This reverts commit 6dca89f61689bf9d8ecf6e7a0ede66a4a5395e84.

7 years agoFix a typo in comment :)
Evgeniy Khramtsov [Sun, 24 Dec 2017 09:53:50 +0000 (12:53 +0300)]
Fix a typo in comment :)

7 years agoDon't set twice
Evgeniy Khramtsov [Sun, 24 Dec 2017 09:34:47 +0000 (12:34 +0300)]
Don't set  twice

7 years agoRely on Server Name Indication for incoming Direct-TLS connections
Evgeniy Khramtsov [Sun, 24 Dec 2017 09:27:51 +0000 (12:27 +0300)]
Rely on Server Name Indication for incoming Direct-TLS connections

This commit also deprecates `certfile` option for ejabberd_http
listener.

7 years agoDon't let privacy list prevent local roster update
Holger Weiss [Sat, 23 Dec 2017 21:45:01 +0000 (22:45 +0100)]
Don't let privacy list prevent local roster update

7 years agomod_muc_admin: Fix last timestamp retrieval
Holger Weiss [Fri, 22 Dec 2017 13:32:47 +0000 (14:32 +0100)]
mod_muc_admin: Fix last timestamp retrieval

7 years agoFix commands rooms_unused_list and _destroy
Badlop [Thu, 21 Dec 2017 16:00:43 +0000 (17:00 +0100)]
Fix commands rooms_unused_list and _destroy

7 years agoFix race between join_cluster and ejabberd_mnesia (#2079)
Christophe Romain [Thu, 21 Dec 2017 13:07:29 +0000 (14:07 +0100)]
Fix race between join_cluster and ejabberd_mnesia (#2079)

7 years agoDisable test for now
Paweł Chmielowski [Thu, 21 Dec 2017 10:49:33 +0000 (11:49 +0100)]
Disable test for now

7 years agoUpdate expected error type in test
Paweł Chmielowski [Thu, 21 Dec 2017 10:43:09 +0000 (11:43 +0100)]
Update expected error type in test

7 years agoLet mix aware of unpackaged hex.pm dependencies (#2170)
Christophe Romain [Thu, 21 Dec 2017 10:10:56 +0000 (11:10 +0100)]
Let mix aware of unpackaged hex.pm dependencies (#2170)

7 years agoAdd pubsub#multi-items to features list (#2162)
Christophe Romain [Wed, 20 Dec 2017 10:54:12 +0000 (11:54 +0100)]
Add pubsub#multi-items to features list (#2162)

7 years agoFix mix_sql features and options
Christophe Romain [Wed, 20 Dec 2017 10:53:18 +0000 (11:53 +0100)]
Fix mix_sql features and options

7 years agoMerge pull request #2164 from angelo-chan/master
badlop [Tue, 19 Dec 2017 22:10:20 +0000 (23:10 +0100)]
Merge pull request #2164 from angelo-chan/master

add muc_online_rooms_by_regex to mod_muc_admin to filter list online r…

7 years agoejabberd_sm: Fix get_session_sid/3
Holger Weiss [Tue, 19 Dec 2017 17:59:25 +0000 (18:59 +0100)]
ejabberd_sm: Fix get_session_sid/3

Let get_session_sid/3 cope with multiple session table entries for a
given resource.

7 years agoChange loglevel of TLS failures
Evgeniy Khramtsov [Tue, 19 Dec 2017 12:33:30 +0000 (15:33 +0300)]
Change loglevel of TLS failures

7 years agosend_direct_invitations accepts only user jids
Christophe Romain [Tue, 19 Dec 2017 09:24:07 +0000 (10:24 +0100)]
send_direct_invitations accepts only user jids

7 years agoSet disk_almost_full_threshold to 99%
Evgeniy Khramtsov [Tue, 19 Dec 2017 06:55:19 +0000 (09:55 +0300)]
Set disk_almost_full_threshold to 99%

7 years agoDon't crash on malformed IQ
Evgeniy Khramtsov [Tue, 19 Dec 2017 06:15:35 +0000 (09:15 +0300)]
Don't crash on malformed IQ

Fixes #2175

7 years agoLog a warning when a disk is almost full
Evgeniy Khramtsov [Mon, 18 Dec 2017 09:30:10 +0000 (12:30 +0300)]
Log a warning when a disk is almost full

7 years agoDisable default alarm handler
Evgeniy Khramtsov [Mon, 18 Dec 2017 09:15:49 +0000 (12:15 +0300)]
Disable default alarm handler

7 years agoHandle also process_memory_high_watermark alarm
Evgeniy Khramtsov [Mon, 18 Dec 2017 07:41:11 +0000 (10:41 +0300)]
Handle also process_memory_high_watermark alarm

7 years agoKill and restart lager when it's overloaded
Evgeniy Khramtsov [Sun, 17 Dec 2017 18:03:40 +0000 (21:03 +0300)]
Kill and restart lager when it's overloaded

7 years agoFix processing order
Evgeniy Khramtsov [Sun, 17 Dec 2017 17:19:44 +0000 (20:19 +0300)]
Fix processing order

7 years agoAvoid excessive logging of SQL failures
Evgeniy Khramtsov [Sun, 17 Dec 2017 16:46:55 +0000 (19:46 +0300)]
Avoid excessive logging of SQL failures

7 years agoRewrite ejabberd system monitor
Evgeniy Khramtsov [Sun, 17 Dec 2017 15:52:37 +0000 (18:52 +0300)]
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.

7 years agoMerge pull request #2167 from weiss/last-pep-items-to-owner
Evgeny Khramtsov [Thu, 14 Dec 2017 07:30:03 +0000 (10:30 +0300)]
Merge pull request #2167 from weiss/last-pep-items-to-owner

Send last PEP items to owner on initial presence

7 years agoSend last PEP items to owner on initial presence
Holger Weiss [Wed, 13 Dec 2017 17:59:06 +0000 (18:59 +0100)]
Send last PEP items to owner on initial presence

Closes #2112.

7 years agoMerge pull request #2158 from bowlofeggs/su-with-sh
Christophe Romain [Wed, 13 Dec 2017 15:04:25 +0000 (16:04 +0100)]
Merge pull request #2158 from bowlofeggs/su-with-sh

Use /bin/sh as the explicit shell when using su in ejabberdctl.

7 years agoOnly allow compression after SASL
Evgeniy Khramtsov [Wed, 13 Dec 2017 13:52:44 +0000 (16:52 +0300)]
Only allow compression after SASL

See XEP-0170 for details
Thanks to Vitaly Takmazov for spotting this

7 years agoPubSub: Add missing Nidx building records from sql result
Christophe Romain [Wed, 13 Dec 2017 10:35:36 +0000 (11:35 +0100)]
PubSub: Add missing Nidx building records from sql result

7 years agoadd muc_online_room_by_regex to mod_muc_admin to filter list online rooms
Angelo Chan [Wed, 13 Dec 2017 03:07:12 +0000 (11:07 +0800)]
add muc_online_room_by_regex to mod_muc_admin to filter list online rooms

7 years agomod_pubsub: Send last items on initial presence
Holger Weiss [Tue, 5 Dec 2017 22:10:12 +0000 (23:10 +0100)]
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.

7 years agoMerge pull request #2160 from weiss/publish-options
Christophe Romain [Tue, 12 Dec 2017 09:53:17 +0000 (10:53 +0100)]
Merge pull request #2160 from weiss/publish-options

Support pubsub#publish-options PRECONDITIONs

7 years agoSupport pubsub#publish-options PRECONDITIONs
Holger Weiss [Tue, 12 Dec 2017 00:04:14 +0000 (01:04 +0100)]
Support pubsub#publish-options PRECONDITIONs

Support PubSub publishing options that are specified as PRECONDITIONs as
per XEP-0060 v1.14.

7 years agoRevert removal of certfile option on http listener
Christophe Romain [Mon, 11 Dec 2017 10:00:24 +0000 (11:00 +0100)]
Revert removal of certfile option on http listener

7 years agoUpdate example configuration
Christophe Romain [Mon, 11 Dec 2017 09:27:48 +0000 (10:27 +0100)]
Update example configuration

7 years agoFix typos in mod_legacy_auth and mod_register
Evgeniy Khramtsov [Mon, 11 Dec 2017 07:00:16 +0000 (10:00 +0300)]
Fix typos in mod_legacy_auth and mod_register

7 years agoUse xmpp:try_subtag/2 wherever possible
Evgeniy Khramtsov [Mon, 11 Dec 2017 06:46:26 +0000 (09:46 +0300)]
Use xmpp:try_subtag/2 wherever possible

7 years agoUse /bin/sh as the explicit shell when using su in ejabberdctl.
Randy Barlow [Sun, 10 Dec 2017 17:52:22 +0000 (12:52 -0500)]
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>
7 years agoInclude <x/> tag in presence errors related to nick change
Evgeniy Khramtsov [Sat, 9 Dec 2017 20:13:20 +0000 (23:13 +0300)]
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.

7 years agoBetter process subtag decoding errors
Evgeniy Khramtsov [Sat, 9 Dec 2017 19:39:43 +0000 (22:39 +0300)]
Better process subtag decoding errors

7 years agoLog warning on empty wildcard paths
Evgeniy Khramtsov [Fri, 8 Dec 2017 09:50:10 +0000 (12:50 +0300)]
Log warning on empty wildcard paths

7 years agoDon't call pkix_is_self_signed/1 too frequently
Evgeniy Khramtsov [Thu, 7 Dec 2017 14:24:34 +0000 (17:24 +0300)]
Don't call pkix_is_self_signed/1 too frequently

7 years agoEat less memory during building certificates graph
Evgeniy Khramtsov [Thu, 7 Dec 2017 13:41:49 +0000 (16:41 +0300)]
Eat less memory during building certificates graph

7 years agoReplace s2s_cafile with ca_file in ejabberd.yml.example
Evgeniy Khramtsov [Thu, 7 Dec 2017 11:58:58 +0000 (14:58 +0300)]
Replace s2s_cafile with ca_file in ejabberd.yml.example

7 years agoSpeedup certificate chains creation and validation
Evgeniy Khramtsov [Thu, 7 Dec 2017 11:32:12 +0000 (14:32 +0300)]
Speedup certificate chains creation and validation

7 years agoCompile sql_pt early
Paweł Chmielowski [Thu, 7 Dec 2017 09:47:23 +0000 (10:47 +0100)]
Compile sql_pt early

7 years agoAvoid infinite loop between self-signed certs
Evgeniy Khramtsov [Wed, 6 Dec 2017 21:29:19 +0000 (00:29 +0300)]
Avoid infinite loop between self-signed certs

7 years agomod_muc_room: Fix typo
Holger Weiss [Wed, 6 Dec 2017 15:50:45 +0000 (16:50 +0100)]
mod_muc_room: Fix typo

Thanks to Evgeniy for spotting this.

7 years agoBump xmpp and fast_xml revisions
Evgeniy Khramtsov [Wed, 6 Dec 2017 15:36:04 +0000 (18:36 +0300)]
Bump xmpp and fast_xml revisions

7 years agoImprove code using new xmpp API
Evgeniy Khramtsov [Wed, 6 Dec 2017 14:21:57 +0000 (17:21 +0300)]
Improve code using new xmpp API

7 years agoUse ejabberd_cluster:send() in SM/C2S
Evgeniy Khramtsov [Wed, 6 Dec 2017 11:15:20 +0000 (14:15 +0300)]
Use ejabberd_cluster:send() in SM/C2S

7 years agomod_offline: Always ignore groupchat messages
Holger Weiss [Sat, 2 Dec 2017 20:35:09 +0000 (21:35 +0100)]
mod_offline: Always ignore groupchat messages

7 years agoSet executable permission on mac_listener when installing (#2138)
nosnilmot [Fri, 1 Dec 2017 16:28:31 +0000 (16:28 +0000)]
Set executable permission on mac_listener when installing (#2138)

7 years agomod_muc_room: Include 110 status on shutdown
Holger Weiss [Thu, 30 Nov 2017 22:58:01 +0000 (23:58 +0100)]
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.

7 years agomod_mam: Never store MUC messages in user archives
Holger Weiss [Thu, 30 Nov 2017 21:15:33 +0000 (22:15 +0100)]
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.

7 years agoWindows does not have /tmp, fallback to /home/chris/conf
Christophe Romain [Thu, 30 Nov 2017 14:32:09 +0000 (15:32 +0100)]
Windows does not have /tmp, fallback to /home/chris/conf

7 years agoFix num_subscribers on node metadata (#2122)
Christophe Romain [Thu, 30 Nov 2017 14:27:34 +0000 (15:27 +0100)]
Fix num_subscribers on node metadata (#2122)

7 years agoFix session table cleanup
Alexey Shchepin [Thu, 30 Nov 2017 10:31:23 +0000 (13:31 +0300)]
Fix session table cleanup

7 years agoAdd missed server_host column in pg.new.sql
Alexey Shchepin [Thu, 30 Nov 2017 10:08:04 +0000 (13:08 +0300)]
Add missed server_host column in pg.new.sql

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 27 Nov 2017 10:09:53 +0000 (13:09 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoAdapt test to changed error
Paweł Chmielowski [Mon, 27 Nov 2017 10:12:46 +0000 (11:12 +0100)]
Adapt test to changed error

7 years agoImprove muc#roominfo and muc#roomconfig forms
Evgeniy Khramtsov [Mon, 27 Nov 2017 10:07:10 +0000 (13:07 +0300)]
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.

7 years agoIntroduce option 'ca_file'
Evgeniy Khramtsov [Sun, 26 Nov 2017 15:10:25 +0000 (18:10 +0300)]
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"