]> granicus.if.org Git - ejabberd/log
ejabberd
5 years agoFix pubsub compliance XEP-0060 § 7.1.3.6 (#2864)
Christophe Romain [Tue, 7 May 2019 14:22:45 +0000 (16:22 +0200)]
Fix pubsub compliance XEP-0060 § 7.1.3.6 (#2864)

5 years agoMerge branch 'master' of github.com:processone/ejabberd
Mickael Remond [Tue, 7 May 2019 12:09:22 +0000 (14:09 +0200)]
Merge branch 'master' of github.com:processone/ejabberd

5 years agoPut back the presence and s2s tests in the no_db section.
Mickael Remond [Tue, 7 May 2019 12:09:11 +0000 (14:09 +0200)]
Put back the presence and s2s tests in the no_db section.

Tests are skipped anyway. This reverts ecce31830486023b9227c21d323f1cab825c1b47

5 years agoRaise api hook right before performing the call
Christophe Romain [Tue, 7 May 2019 09:46:04 +0000 (11:46 +0200)]
Raise api hook right before performing the call

5 years agoMake anonymous auth don't {de}register user when there are other resources
Paweł Chmielowski [Tue, 7 May 2019 09:02:53 +0000 (11:02 +0200)]
Make anonymous auth don't {de}register user when there are other resources

This should fix issue reported in #2878

5 years agoWhen applying limit of max msgs in spool check only spool size
Paweł Chmielowski [Tue, 7 May 2019 07:58:14 +0000 (09:58 +0200)]
When applying limit of max msgs in spool check only spool size

5 years agoRemove compiler warnings
Paweł Chmielowski [Mon, 6 May 2019 18:03:10 +0000 (20:03 +0200)]
Remove compiler warnings

5 years agoTest offline:use_mam_for_storage, mam:user_mucsub_from_muc_archive used together
Paweł Chmielowski [Mon, 6 May 2019 17:19:10 +0000 (19:19 +0200)]
Test offline:use_mam_for_storage, mam:user_mucsub_from_muc_archive used together

5 years agoDo not store mucsub wrapped messages with no-store hint in offline storage
Paweł Chmielowski [Mon, 6 May 2019 17:17:30 +0000 (19:17 +0200)]
Do not store mucsub wrapped messages with no-store hint in offline storage

We already don't store those messages in mam and we don't store messages
that aren't wrapped with that hint in offline, so it make sense to extend
it also to mucsub messages.

5 years agoHandle get_subscribed_rooms call from mod_muc_room pid
Paweł Chmielowski [Mon, 6 May 2019 17:15:48 +0000 (19:15 +0200)]
Handle get_subscribed_rooms call from mod_muc_room pid

Previously sometimes we tried to post message to all online rooms, and
if that was called from muc room pid, we were not able to process that
message for that room and send response, and this did lead to timeout.

5 years agoDo not declare mod_muc as dependency of mod_mam to prevent loop in deps
Paweł Chmielowski [Mon, 6 May 2019 10:21:49 +0000 (12:21 +0200)]
Do not declare mod_muc as dependency of mod_mam to prevent loop in deps

5 years agos2s test depend on Mnesia configuration
Mickael Remond [Mon, 6 May 2019 10:00:36 +0000 (12:00 +0200)]
s2s test depend on Mnesia configuration

5 years agoElixir mix build need to use xmpp 1.3.3
Mickael Remond [Mon, 6 May 2019 09:59:52 +0000 (11:59 +0200)]
Elixir mix build need to use xmpp 1.3.3

5 years agoRemove deprecated calls
Mickael Remond [Fri, 3 May 2019 13:58:24 +0000 (15:58 +0200)]
Remove deprecated calls

5 years agoct_formatter is not needed anymore as Elixir tests have been removed
Mickael Remond [Fri, 3 May 2019 13:54:22 +0000 (15:54 +0200)]
ct_formatter is not needed anymore as Elixir tests have been removed

5 years agoUse stable xmpp version
Mickael Remond [Fri, 3 May 2019 13:48:12 +0000 (15:48 +0200)]
Use stable xmpp version

5 years agoMake some standard admin command to get Mnesia info
Mickael Remond [Fri, 3 May 2019 12:59:24 +0000 (14:59 +0200)]
Make some standard admin command to get Mnesia info

5 years agoFix bug that appears when importing privacy from Prosody (#2872)
Badlop [Thu, 2 May 2019 19:10:21 +0000 (21:10 +0200)]
Fix bug that appears when importing privacy from Prosody (#2872)

5 years agoStore imported room in the correct ServerHost (#2874)
Badlop [Thu, 2 May 2019 18:22:46 +0000 (20:22 +0200)]
Store imported room in the correct ServerHost (#2874)

5 years agoSet from/to in activity marker messages
Paweł Chmielowski [Thu, 2 May 2019 11:19:54 +0000 (13:19 +0200)]
Set from/to in activity marker messages

5 years agoFix typo and remove forgotten log from 492da2ba
Christophe Romain [Thu, 2 May 2019 10:05:20 +0000 (12:05 +0200)]
Fix typo and remove forgotten log from 492da2ba

5 years agoMerge pull request #2869 from rstgroup/fix-elixir-umbrella-compilation
Mickaël Rémond [Thu, 2 May 2019 09:53:35 +0000 (11:53 +0200)]
Merge pull request #2869 from rstgroup/fix-elixir-umbrella-compilation

Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency

5 years agoRemove logging from REST lib
Christophe Romain [Thu, 2 May 2019 09:40:53 +0000 (11:40 +0200)]
Remove logging from REST lib

5 years agoAlways store ActivityMarker messages
Paweł Chmielowski [Thu, 2 May 2019 09:12:47 +0000 (11:12 +0200)]
Always store ActivityMarker messages

5 years agoDon't issue count/message fetch queries for offline from mam when not needed
Paweł Chmielowski [Thu, 2 May 2019 09:12:22 +0000 (11:12 +0200)]
Don't issue count/message fetch queries for offline from mam when not needed

5 years agoRemove Elixir tests entry points as they were removed in december:
Mickael Remond [Wed, 1 May 2019 09:51:17 +0000 (11:51 +0200)]
Remove Elixir tests entry points as they were removed in december:
https://github.com/processone/ejabberd/commit/51cbbf313f478a01cd732a7ee1e21ff356402d0e#diff-098f6bcd4621d373cade4e832627b4f6

5 years agoSqlite doesn't recognize concat() so use || on it instead
Paweł Chmielowski [Tue, 30 Apr 2019 16:33:12 +0000 (18:33 +0200)]
Sqlite doesn't recognize concat() so use || on it instead

5 years agoCleaner test cleanup
Paweł Chmielowski [Tue, 30 Apr 2019 15:35:25 +0000 (17:35 +0200)]
Cleaner test cleanup

5 years agoFix room state cleanup from db on change of persistent option change
Paweł Chmielowski [Tue, 30 Apr 2019 15:34:49 +0000 (17:34 +0200)]
Fix room state cleanup from db on change of persistent option change

5 years agoAdd tests for user mucsub mam from muc mam
Paweł Chmielowski [Tue, 30 Apr 2019 11:41:54 +0000 (13:41 +0200)]
Add tests for user mucsub mam from muc mam

5 years agoMake get_subscribed_rooms work even for non-persistant rooms
Paweł Chmielowski [Tue, 30 Apr 2019 11:41:03 +0000 (13:41 +0200)]
Make get_subscribed_rooms work even for non-persistant rooms

This will store info about non-persistant rooms in db, but rooms with that
that option enabled will not be restored on server restart.

This will save info about room only on subscribers change.

5 years agoFix escaping for sql part of mamsub from muc mam
Paweł Chmielowski [Tue, 30 Apr 2019 11:36:31 +0000 (13:36 +0200)]
Fix escaping for sql part of mamsub from muc mam

5 years agoDeprecate some listening options
Evgeny Khramtsov [Tue, 30 Apr 2019 08:14:14 +0000 (11:14 +0300)]
Deprecate some listening options

Those are: captcha, register, web_admin, http_bind and xmlrpc
The option `request_handlers` should be used instead, e.g.:

listen:
  ...
  -
    module: ejabberd_http
    request_handlers:
      "/admin": ejabberd_web_admin
      "/bosh": mod_bosh
      "/captcha": ejabberd_captcha
      "/register": mod_register_web
      "/": ejabberd_xmlrpc

5 years agoProvide a suggestion when unknown request handler is detected
Evgeny Khramtsov [Tue, 30 Apr 2019 07:31:03 +0000 (10:31 +0300)]
Provide a suggestion when unknown request handler is detected

5 years agoProvide a suggestion when unknown command is detected
Evgeny Khramtsov [Tue, 30 Apr 2019 07:05:06 +0000 (10:05 +0300)]
Provide a suggestion when unknown command is detected

5 years agoRename ejabberd_config:similar_option/2 -> misc:best_match/2
Evgeny Khramtsov [Tue, 30 Apr 2019 06:36:38 +0000 (09:36 +0300)]
Rename ejabberd_config:similar_option/2 -> misc:best_match/2

5 years agoProvide a suggestion when unknown module is detected
Evgeny Khramtsov [Mon, 29 Apr 2019 18:15:52 +0000 (21:15 +0300)]
Provide a suggestion when unknown module is detected

5 years agoProvide a suggestion when unknown option is detected
Evgeny Khramtsov [Mon, 29 Apr 2019 17:57:59 +0000 (20:57 +0300)]
Provide a suggestion when unknown option is detected

5 years agoDisable offline_from_mam tests on riak since it doesn't support mam
Paweł Chmielowski [Mon, 29 Apr 2019 16:31:07 +0000 (18:31 +0200)]
Disable offline_from_mam tests on riak since it doesn't support mam

5 years agoImprove code for directory deletion
Evgeny Khramtsov [Mon, 29 Apr 2019 15:50:54 +0000 (18:50 +0300)]
Improve code for directory deletion

5 years agoFix offline from mam on mnesia
Paweł Chmielowski [Mon, 29 Apr 2019 15:25:06 +0000 (17:25 +0200)]
Fix offline from mam on mnesia

5 years agoAdd tests for offline with mam storage
Paweł Chmielowski [Mon, 29 Apr 2019 14:40:47 +0000 (16:40 +0200)]
Add tests for offline with mam storage

5 years agoProperly handle infinity as max number of message in mam offline storage
Paweł Chmielowski [Mon, 29 Apr 2019 14:37:21 +0000 (16:37 +0200)]
Properly handle infinity as max number of message in mam offline storage

5 years agoSort messages by stanza_id when using mam storage in mod_offline
Paweł Chmielowski [Mon, 29 Apr 2019 14:32:19 +0000 (16:32 +0200)]
Sort messages by stanza_id when using mam storage in mod_offline

5 years agoReturn correct value from count_offline_messages with mam storage option
Paweł Chmielowski [Mon, 29 Apr 2019 14:31:37 +0000 (16:31 +0200)]
Return correct value from count_offline_messages with mam storage option

5 years agoMake mod_offline put msg ignored by mam in spool when mam storage is on
Paweł Chmielowski [Mon, 29 Apr 2019 14:30:45 +0000 (16:30 +0200)]
Make mod_offline put msg ignored by mam in spool when mam storage is on

5 years agoAdd tests for offline use_mam_for_storage
Paweł Chmielowski [Mon, 29 Apr 2019 09:35:18 +0000 (11:35 +0200)]
Add tests for offline use_mam_for_storage

5 years agoRemove TLS options from the example config
Evgeny Khramtsov [Sun, 28 Apr 2019 14:50:52 +0000 (17:50 +0300)]
Remove TLS options from the example config

The purpose is two-fold:

- To simplify the example config.
- To avoid old TLS configuration to be persistent across
  server updates: this might bring security problems, because
  what's considered "modern" now might be insecure in the future.

5 years agoRemove OMEMO related configuration from force_node_config section
Evgeny Khramtsov [Sun, 28 Apr 2019 14:45:41 +0000 (17:45 +0300)]
Remove OMEMO related configuration from force_node_config section

This doesn't work reliably and takes a lot of effort to change it back

5 years agoAdd mod_offline option for fetching data from mam instead of from spool table
Paweł Chmielowski [Fri, 26 Apr 2019 17:59:06 +0000 (19:59 +0200)]
Add mod_offline option for fetching data from mam instead of from spool table

This commit introduces `use_mam_for_storage` option that take boolean
argument. Enabling it will make mod_offline not use spool table for storing
offline message, but instead will use mam archive to retrieve messages
stored when offline.

Enabling this option have couple drawback currently, only messages that
were stored in mam will be available, most of flexible message retrieval
queries don't work (those that allow retrieval/deletion of messages by id).

5 years agoReturn "Bad request" error when origin in websocket connection doesn't match
Paweł Chmielowski [Fri, 26 Apr 2019 13:29:43 +0000 (15:29 +0200)]
Return "Bad request" error when origin in websocket connection doesn't match

This also allow websocket_origin option to accept multiple values instead
of just single one.

5 years agoAllow non-moderator subscribers to get list of room subscribers
Paweł Chmielowski [Thu, 25 Apr 2019 12:52:29 +0000 (14:52 +0200)]
Allow non-moderator subscribers to get list of room subscribers

5 years agoFix #2540 Ejabberd doesnt compile as mix umbrella project dependency
Paweł Dorofiejczyk [Thu, 25 Apr 2019 11:31:08 +0000 (13:31 +0200)]
Fix #2540 Ejabberd doesnt compile as mix umbrella project dependency

5 years agoUse binary framing in MQTT WebSockets
Evgeny Khramtsov [Thu, 25 Apr 2019 11:30:42 +0000 (14:30 +0300)]
Use binary framing in MQTT WebSockets

5 years agoMerge pull request #2868 from rstgroup/fix-rfc-6455-violation
Evgeny Khramtsov [Wed, 24 Apr 2019 15:21:58 +0000 (18:21 +0300)]
Merge pull request #2868 from rstgroup/fix-rfc-6455-violation

Fix #2821 RFC6454 violation on websocket connection when validating Origin

5 years agoFix RFC6454 violation on websocket connection when validating Origin header
Paweł Dorofiejczyk [Wed, 24 Apr 2019 14:59:54 +0000 (16:59 +0200)]
Fix RFC6454 violation on websocket connection when validating Origin header

5 years agoCatch potential exceptions in gen_mod:wait_for_process
Paweł Chmielowski [Wed, 24 Apr 2019 11:46:09 +0000 (13:46 +0200)]
Catch potential exceptions in gen_mod:wait_for_process

Seems that at ejabberd shutdown, process may terminate before that function
is called, and in that case erlang:monitor throws exception.

5 years agoReformat try_set_password/4 function
Evgeny Khramtsov [Tue, 23 Apr 2019 18:25:10 +0000 (21:25 +0300)]
Reformat try_set_password/4 function

5 years agoDon't call to mod_register when it's not loaded
Evgeny Khramtsov [Tue, 23 Apr 2019 18:05:21 +0000 (21:05 +0300)]
Don't call to mod_register when it's not loaded

Fixes #2828

5 years agoAdd WebSockets support to mod_mqtt
Evgeny Khramtsov [Tue, 23 Apr 2019 16:18:22 +0000 (19:18 +0300)]
Add WebSockets support to mod_mqtt

Example configuration:

listen:
  ...
  -
    port: 5280
    module: ejabberd_http
    request_handlers:
      "/mqtt": mod_mqtt

modules:
  ...
  mod_mqtt: {}

5 years agoFix handling of list arguments on pgsql
Paweł Chmielowski [Tue, 23 Apr 2019 15:46:14 +0000 (17:46 +0200)]
Fix handling of list arguments on pgsql

5 years agoSupport other socket modules for MQTT
Evgeny Khramtsov [Tue, 23 Apr 2019 13:22:27 +0000 (16:22 +0300)]
Support other socket modules for MQTT

5 years agoMove websocket options
Evgeny Khramtsov [Tue, 23 Apr 2019 13:21:06 +0000 (16:21 +0300)]
Move websocket options

5 years agoImprove request_handlers validator
Evgeny Khramtsov [Tue, 23 Apr 2019 13:19:26 +0000 (16:19 +0300)]
Improve request_handlers validator

5 years agoBump pkix version
Evgeny Khramtsov [Fri, 19 Apr 2019 13:26:58 +0000 (16:26 +0300)]
Bump pkix version

5 years agoCorrectly support cache tags in ejabberd_auth
Evgeny Khramtsov [Fri, 19 Apr 2019 12:42:24 +0000 (15:42 +0300)]
Correctly support cache tags in ejabberd_auth

5 years agoAllow returning HTTP headers in REST responses
Evgeny Khramtsov [Fri, 19 Apr 2019 12:16:47 +0000 (15:16 +0300)]
Allow returning HTTP headers in REST responses

5 years agoUse new ets_cache api in ejabberd_auth
Evgeny Khramtsov [Fri, 19 Apr 2019 12:08:41 +0000 (15:08 +0300)]
Use new ets_cache api in ejabberd_auth

5 years agoAdd hook room_destroyed called when room gets destroyed
Paweł Chmielowski [Wed, 17 Apr 2019 15:23:21 +0000 (17:23 +0200)]
Add hook room_destroyed called when room gets destroyed

5 years agoChange implementation of misc:unique_timestamp()
Paweł Chmielowski [Tue, 16 Apr 2019 09:20:55 +0000 (11:20 +0200)]
Change implementation of misc:unique_timestamp()

5 years agoHandle cdata in initial data probe of ws module
Paweł Chmielowski [Tue, 16 Apr 2019 08:56:11 +0000 (10:56 +0200)]
Handle cdata in initial data probe of ws module

5 years agoMake misc:unique_timestamp not overflow microsecond part.
Paweł Chmielowski [Tue, 16 Apr 2019 08:24:28 +0000 (10:24 +0200)]
Make misc:unique_timestamp not overflow microsecond part.

This should fix issue #2860

5 years agoAdd hooks for tracking mucsub subscriptions changes
Paweł Chmielowski [Mon, 15 Apr 2019 10:02:43 +0000 (12:02 +0200)]
Add hooks for tracking mucsub subscriptions changes

5 years agoFeed whole image to eimp:identify/1
Evgeny Khramtsov [Sun, 14 Apr 2019 14:05:16 +0000 (17:05 +0300)]
Feed whole image to eimp:identify/1

Fixes #2859

5 years agoFix syntax in Elixir config file
Mickael Remond [Fri, 12 Apr 2019 08:40:46 +0000 (10:40 +0200)]
Fix syntax in Elixir config file

5 years agoHandle correctly case where ExtraUsername is empty
Paweł Chmielowski [Thu, 11 Apr 2019 10:00:13 +0000 (12:00 +0200)]
Handle correctly case where ExtraUsername is empty

5 years agoWhen making mucsub message from mam archive check for subject
Paweł Chmielowski [Tue, 9 Apr 2019 09:16:27 +0000 (11:16 +0200)]
When making mucsub message from mam archive check for subject

5 years agoUse xml:lang from stanza when it's missing in <command/> element
Evgeny Khramtsov [Sat, 6 Apr 2019 15:27:28 +0000 (18:27 +0300)]
Use xml:lang from stanza when it's missing in <command/> element

Thanks to Philipp Hörist for spotting this

5 years agoAdd 'sessionid' attribute when required
Evgeny Khramtsov [Sat, 6 Apr 2019 13:52:22 +0000 (16:52 +0300)]
Add 'sessionid' attribute when required

Fixes #2852

5 years agoUpdate mod_muc_riak
Evgeny Khramtsov [Wed, 3 Apr 2019 13:04:58 +0000 (16:04 +0300)]
Update mod_muc_riak

5 years agoUpdate mod_mam dependencies
Evgeny Khramtsov [Wed, 3 Apr 2019 12:01:20 +0000 (15:01 +0300)]
Update mod_mam dependencies

5 years agoDecrease ugliness of the ugly code
Evgeny Khramtsov [Wed, 3 Apr 2019 11:50:56 +0000 (14:50 +0300)]
Decrease ugliness of the ugly code

5 years agoChange mucsub API for database backends
Evgeny Khramtsov [Wed, 3 Apr 2019 11:20:37 +0000 (14:20 +0300)]
Change mucsub API for database backends

5 years agoAdd ext_mod paths before checking config (processone/ejabberd-contrib#263)
Badlop [Wed, 3 Apr 2019 10:50:28 +0000 (12:50 +0200)]
Add ext_mod paths before checking config (processone/ejabberd-contrib#263)

5 years agoReturn proper error message for duplicate or missing args in http_api call
Paweł Chmielowski [Wed, 3 Apr 2019 10:04:36 +0000 (12:04 +0200)]
Return proper error message for duplicate or missing args in http_api call

5 years agoLog message when trying to execute http_api command with extra arguments
Paweł Chmielowski [Wed, 3 Apr 2019 09:50:15 +0000 (11:50 +0200)]
Log message when trying to execute http_api command with extra arguments

5 years agoFormating fix
Paweł Chmielowski [Wed, 3 Apr 2019 09:48:59 +0000 (11:48 +0200)]
Formating fix

5 years agoMake http_api command execution exception catcher log also command and args
Paweł Chmielowski [Wed, 3 Apr 2019 09:33:07 +0000 (11:33 +0200)]
Make http_api command execution exception catcher log also command and args

5 years agocache_size not applied to mod_roster on reload_config (#2769)
Badlop [Tue, 2 Apr 2019 17:52:07 +0000 (19:52 +0200)]
cache_size not applied to mod_roster on reload_config (#2769)

5 years agoFix previous commit
Evgeny Khramtsov [Tue, 2 Apr 2019 06:58:12 +0000 (09:58 +0300)]
Fix previous commit

Fixes #2847

5 years agoRename listening callback from start/2 to start/3
Evgeny Khramtsov [Mon, 1 Apr 2019 13:53:28 +0000 (16:53 +0300)]
Rename listening callback from start/2 to start/3

This will prevent conflicts in callback names in mod_mqtt
Old callback function is still supported.

5 years agoFix issue with creating HostMatch in mod_mam_sql
Paweł Chmielowski [Mon, 1 Apr 2019 08:56:03 +0000 (10:56 +0200)]
Fix issue with creating HostMatch in mod_mam_sql

This fixes issue #2844

5 years agoUse xmpp:get_subtags/2
Evgeny Khramtsov [Mon, 1 Apr 2019 07:47:29 +0000 (10:47 +0300)]
Use xmpp:get_subtags/2

5 years agoDon't use deprecated gen_mod:db_type
Paweł Chmielowski [Fri, 29 Mar 2019 17:41:51 +0000 (18:41 +0100)]
Don't use deprecated gen_mod:db_type

5 years agoFix issue with mam tests
Paweł Chmielowski [Fri, 29 Mar 2019 16:18:30 +0000 (17:18 +0100)]
Fix issue with mam tests

Too much copy/paste...

5 years agoImplement mod_muc_sql:select_with_mucsub
Paweł Chmielowski [Fri, 29 Mar 2019 15:11:50 +0000 (16:11 +0100)]
Implement mod_muc_sql:select_with_mucsub

This allows us to limit number of issued queries required by
user_mucsub_from_muc_archive option

5 years agoMake misc:add_delay_info properly handle multiple delay tags in element
Paweł Chmielowski [Fri, 29 Mar 2019 10:25:35 +0000 (11:25 +0100)]
Make misc:add_delay_info properly handle multiple delay tags in element

5 years agoAdd option user_mucsub_from_muc_archive to mod_muc
Paweł Chmielowski [Thu, 28 Mar 2019 16:42:25 +0000 (17:42 +0100)]
Add option user_mucsub_from_muc_archive to mod_muc

This option disable storing separate mucsub message for each individual
subscriber but instead when user fetches archive virtual mucsub messages
are generated from muc archives.

5 years agoInclude id in mucsub notification message
Paweł Chmielowski [Thu, 28 Mar 2019 13:43:22 +0000 (14:43 +0100)]
Include id in mucsub notification message

5 years agoAdd 'config' tag to the reload_config command
Badlop [Wed, 27 Mar 2019 10:51:43 +0000 (11:51 +0100)]
Add 'config' tag to the reload_config command