]> granicus.if.org Git - ejabberd/log
ejabberd
6 years agoIntroduce new mod_muc option: access_register
Evgeniy Khramtsov [Tue, 24 Apr 2018 09:29:59 +0000 (12:29 +0300)]
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).

6 years agoGet rid of useless memory/disk usage warnings
Evgeniy Khramtsov [Tue, 24 Apr 2018 09:12:48 +0000 (12:12 +0300)]
Get rid of useless memory/disk usage warnings

6 years agoFix get_affiliation/2
Evgeniy Khramtsov [Tue, 24 Apr 2018 09:07:10 +0000 (12:07 +0300)]
Fix get_affiliation/2

6 years agoUse httpc directly instead of using p1_http wrapper
Paweł Chmielowski [Mon, 23 Apr 2018 15:40:44 +0000 (17:40 +0200)]
Use httpc directly instead of using p1_http wrapper

6 years agoUse correct headers in rest calls
Paweł Chmielowski [Mon, 23 Apr 2018 10:29:50 +0000 (12:29 +0200)]
Use correct headers in rest calls

6 years agoAdd stubs for affiliation-specific backend callbacks
Evgeniy Khramtsov [Mon, 23 Apr 2018 08:35:43 +0000 (11:35 +0300)]
Add stubs for affiliation-specific backend callbacks

6 years agoUse correct db backend for remove_mam_for_user_with_peer
Paweł Chmielowski [Fri, 20 Apr 2018 12:06:23 +0000 (14:06 +0200)]
Use correct db backend for remove_mam_for_user_with_peer

6 years agoFix mnesia call in mam archive management function
Paweł Chmielowski [Fri, 20 Apr 2018 11:36:54 +0000 (13:36 +0200)]
Fix mnesia call in mam archive management function

6 years agoAdd commands for cleaning up mam archive
Paweł Chmielowski [Fri, 20 Apr 2018 11:27:39 +0000 (13:27 +0200)]
Add commands for cleaning up mam archive

6 years agoFix type of rest:url/2
Christophe Romain [Thu, 19 Apr 2018 11:21:33 +0000 (13:21 +0200)]
Fix type of rest:url/2

6 years agoFix deprecated call injected by 265c7b62
Christophe Romain [Wed, 18 Apr 2018 12:16:56 +0000 (14:16 +0200)]
Fix deprecated call injected by 265c7b62

6 years agoAdd flexibility on rest url config
Christophe Romain [Wed, 18 Apr 2018 11:16:08 +0000 (13:16 +0200)]
Add flexibility on rest url config

6 years agomod_push_keepalive: Reset timeout on messages only
Holger Weiss [Mon, 16 Apr 2018 22:27:07 +0000 (00:27 +0200)]
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.

6 years agomod_push: Optionally include message sender/body
Holger Weiss [Mon, 16 Apr 2018 21:18:03 +0000 (23:18 +0200)]
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.

6 years agomod_http_upload*: Remove empty lines after specs
Holger Weiss [Mon, 16 Apr 2018 16:22:54 +0000 (18:22 +0200)]
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.

6 years agomod_http_upload*: Add function specifications
Holger Weiss [Mon, 16 Apr 2018 16:17:28 +0000 (18:17 +0200)]
mod_http_upload*: Add function specifications

6 years agomod_push: Add function specification
Holger Weiss [Mon, 16 Apr 2018 16:14:07 +0000 (18:14 +0200)]
mod_push: Add function specification

6 years agomod_push: Add/adjust debug messages
Holger Weiss [Mon, 16 Apr 2018 16:12:46 +0000 (18:12 +0200)]
mod_push: Add/adjust debug messages

6 years agoUpdate MUC MAM tests
Evgeniy Khramtsov [Mon, 16 Apr 2018 13:10:44 +0000 (16:10 +0300)]
Update MUC MAM tests

6 years agoCarefully validate options list
Evgeniy Khramtsov [Mon, 16 Apr 2018 12:48:06 +0000 (15:48 +0300)]
Carefully validate options list

6 years agoDon't crash on invalid module's sub-options
Evgeniy Khramtsov [Mon, 16 Apr 2018 08:06:57 +0000 (11:06 +0300)]
Don't crash on invalid module's sub-options

Fixes #2387

6 years agomod_push: Don't notify on stream errors
Holger Weiss [Sun, 15 Apr 2018 23:08:56 +0000 (01:08 +0200)]
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.

6 years agoMerge branch 'muc-self-presence'
Evgeniy Khramtsov [Sat, 14 Apr 2018 15:32:12 +0000 (18:32 +0300)]
Merge branch 'muc-self-presence'

6 years agoClear fast_tls cache on configuration reload
Evgeniy Khramtsov [Fri, 13 Apr 2018 08:10:20 +0000 (11:10 +0300)]
Clear fast_tls cache on configuration reload

6 years agomod_roster: Use 'lserver' for configuration lookup
Holger Weiss [Thu, 12 Apr 2018 22:12:07 +0000 (00:12 +0200)]
mod_roster: Use 'lserver' for configuration lookup

6 years agoFix notification payload generated by pubsub
Paweł Chmielowski [Thu, 12 Apr 2018 16:02:32 +0000 (18:02 +0200)]
Fix notification payload generated by pubsub

6 years agoPass access option from websocket to c2s
Paweł Chmielowski [Thu, 12 Apr 2018 15:42:59 +0000 (17:42 +0200)]
Pass access option from websocket to c2s

This fixes issue #2223

6 years agoFix csi tests
Paweł Chmielowski [Thu, 12 Apr 2018 15:08:27 +0000 (17:08 +0200)]
Fix csi tests

6 years agoNew schema support for tests. (#2355)
a-iv [Thu, 12 Apr 2018 13:42:43 +0000 (18:42 +0500)]
New schema support for tests. (#2355)

6 years agoImprove pubsub#itemreply implementation (#2325)
Christophe Romain [Thu, 12 Apr 2018 13:38:12 +0000 (15:38 +0200)]
Improve pubsub#itemreply implementation (#2325)

6 years agoUpdate the xmpp dependency to support 'parent' attribute
Evgeniy Khramtsov [Wed, 11 Apr 2018 06:34:06 +0000 (09:34 +0300)]
Update the xmpp dependency to support 'parent' attribute

Fixes #2375

6 years agoFix illegal match on previous commit
Christophe Romain [Tue, 10 Apr 2018 13:02:03 +0000 (15:02 +0200)]
Fix illegal match on previous commit

6 years agoImprove fix for #2288, don't mask errors on get_item
Christophe Romain [Tue, 10 Apr 2018 12:47:18 +0000 (14:47 +0200)]
Improve fix for #2288, don't mask errors on get_item

6 years agogen_mod: Support global module processes
Holger Weiss [Wed, 4 Apr 2018 16:25:19 +0000 (18:25 +0200)]
gen_mod: Support global module processes

6 years agogen_mod: Remove frontend process support
Holger Weiss [Wed, 4 Apr 2018 16:22:59 +0000 (18:22 +0200)]
gen_mod: Remove frontend process support

ejabberd doesn't support frontend processes anymore.

6 years agoImprove mod_multicast
Paweł Chmielowski [Wed, 4 Apr 2018 10:05:37 +0000 (12:05 +0200)]
Improve mod_multicast

6 years agomod_http_upload: Accept characters of any script
Holger Weiss [Tue, 3 Apr 2018 19:00:15 +0000 (21:00 +0200)]
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.

6 years agoRemove old hex conversion functions
Holger Weiss [Mon, 2 Apr 2018 22:21:33 +0000 (00:21 +0200)]
Remove old hex conversion functions

Depend on list_to_integer/2 and integer_to_list/2 being available.

6 years agoMove ejabberd_http:url_encode/1 to 'misc' module
Holger Weiss [Mon, 2 Apr 2018 22:12:43 +0000 (00:12 +0200)]
Move ejabberd_http:url_encode/1 to 'misc' module

6 years agoFix Code format when logging a MUC room kick/ban
Badlop [Mon, 2 Apr 2018 11:51:19 +0000 (13:51 +0200)]
Fix Code format when logging a MUC room kick/ban

6 years agomod_client_state: Add 'csi_activity' hook
Holger Weiss [Sun, 1 Apr 2018 15:13:04 +0000 (17:13 +0200)]
mod_client_state: Add 'csi_activity' hook

Closes #2358.

6 years agoMerge pull request #2357 from Pouriya-Jahanbakhsh/component-send-packet-hook
Evgeny Khramtsov [Fri, 30 Mar 2018 18:51:03 +0000 (21:51 +0300)]
Merge pull request #2357 from Pouriya-Jahanbakhsh/component-send-packet-hook

feat: add hook for sending packet from component

6 years agofix: run 'component_send_packet' hook in global mode
Pouriya Jahanbakhsh [Fri, 30 Mar 2018 18:49:33 +0000 (23:19 +0430)]
fix: run 'component_send_packet' hook in global mode

6 years agofeat: add hook for sending packet from component
Pouriya Jahanbakhsh [Fri, 30 Mar 2018 17:01:30 +0000 (21:31 +0430)]
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}.

6 years agoDon't produce a crash dump during intentional exit
Evgeniy Khramtsov [Thu, 29 Mar 2018 09:14:31 +0000 (12:14 +0300)]
Don't produce a crash dump during intentional exit

Also halt faster without relying on timeouts for buffers flushing

6 years agoRemove unused variable
Evgeniy Khramtsov [Thu, 29 Mar 2018 07:34:09 +0000 (10:34 +0300)]
Remove unused variable

6 years agoMerge pull request #2351 from rom1dep/config-order_c2s-direct
Evgeny Khramtsov [Thu, 29 Mar 2018 05:32:13 +0000 (08:32 +0300)]
Merge pull request #2351 from rom1dep/config-order_c2s-direct

config: move section about direct-tls for c2s just under regular c2s config

6 years agoconfig: move section about direct-tls for c2s just under regular c2s config (to ease...
Romain DEP. [Wed, 28 Mar 2018 21:17:43 +0000 (23:17 +0200)]
config: move section about direct-tls for c2s just under regular c2s config (to ease parameters comparison)

6 years agoAdd support for PATCH http method
Mickael Remond [Wed, 28 Mar 2018 15:34:47 +0000 (17:34 +0200)]
Add support for PATCH http method

This is needed to improve out APIs.

6 years agoFix process_discoitems_result in mod_multicast
Paweł Chmielowski [Wed, 28 Mar 2018 09:23:28 +0000 (11:23 +0200)]
Fix process_discoitems_result in mod_multicast

6 years agoUpdate eimp
Paweł Chmielowski [Mon, 26 Mar 2018 14:16:59 +0000 (16:16 +0200)]
Update eimp

6 years agoFix returning value from mod_vcard_ldap's search() callback
Evgeniy Khramtsov [Sun, 25 Mar 2018 07:53:46 +0000 (10:53 +0300)]
Fix returning value from mod_vcard_ldap's search() callback

Fixes #2335

6 years agoGet rid of 'fs' package dependency in mix 18.03
Christophe Romain [Fri, 23 Mar 2018 13:48:17 +0000 (14:48 +0100)]
Get rid of 'fs' package dependency in mix

6 years agoGet rid of 'fs' package dependency
Evgeniy Khramtsov [Fri, 23 Mar 2018 13:40:26 +0000 (16:40 +0300)]
Get rid of 'fs' package dependency

Certificates auto-reloading will be fixed later.
For now to reload certificates call `reload-config` ejabberd command.

6 years agoClarify the statement about mod_http_upload thumbnails
Evgeniy Khramtsov [Fri, 23 Mar 2018 13:19:13 +0000 (16:19 +0300)]
Clarify the statement about mod_http_upload thumbnails

6 years agoForce node config for bookmarks
Evgeniy Khramtsov [Fri, 23 Mar 2018 13:16:27 +0000 (16:16 +0300)]
Force node config for bookmarks

6 years agoSet empty least as a default for force_node_config
Evgeniy Khramtsov [Fri, 23 Mar 2018 13:09:18 +0000 (16:09 +0300)]
Set empty least as a default for force_node_config

6 years agoMove force_node_config defaults into ejabberd.yml.example
Evgeniy Khramtsov [Fri, 23 Mar 2018 13:08:12 +0000 (16:08 +0300)]
Move force_node_config defaults into ejabberd.yml.example

6 years agoUpdate mix deps
Paweł Chmielowski [Fri, 23 Mar 2018 12:27:58 +0000 (13:27 +0100)]
Update mix deps

6 years agoUpdate mix.exs version
Christophe Romain [Fri, 23 Mar 2018 11:56:17 +0000 (12:56 +0100)]
Update mix.exs version

6 years agoFetch 'registration_watchers' option from the correct module
Evgeniy Khramtsov [Fri, 23 Mar 2018 06:42:55 +0000 (09:42 +0300)]
Fetch 'registration_watchers' option from the correct module

Fixes #2337

6 years agoUpdate deps
Paweł Chmielowski [Thu, 22 Mar 2018 15:15:19 +0000 (16:15 +0100)]
Update deps

6 years agoRemove items of unregistered user (#2129)
Christophe Romain [Thu, 22 Mar 2018 10:59:24 +0000 (11:59 +0100)]
Remove items of unregistered user (#2129)

6 years agoAccept atoms in api_permission command lists and commands with numbers in them
Paweł Chmielowski [Wed, 21 Mar 2018 11:53:46 +0000 (12:53 +0100)]
Accept atoms in api_permission command lists and commands with numbers in them

6 years agoAdd option --enable-group=xxx (thanks to andreabenini)(#1429)
Badlop [Tue, 20 Mar 2018 22:37:42 +0000 (23:37 +0100)]
Add option --enable-group=xxx (thanks to andreabenini)(#1429)

6 years agoIf mod_last is disabled, return error instead of crashing (#2330)
Badlop [Tue, 20 Mar 2018 21:18:43 +0000 (22:18 +0100)]
If mod_last is disabled, return error instead of crashing (#2330)

6 years agoReport meaningful error when luerl is not available
Evgeniy Khramtsov [Mon, 19 Mar 2018 17:09:35 +0000 (20:09 +0300)]
Report meaningful error when luerl is not available

6 years agoSet -protocol() directive for mod_avatar
Evgeniy Khramtsov [Mon, 19 Mar 2018 16:23:15 +0000 (19:23 +0300)]
Set -protocol() directive for mod_avatar

6 years agoAvoid logging IP addresses in mod_register when it's not desired
Evgeniy Khramtsov [Mon, 19 Mar 2018 15:23:52 +0000 (18:23 +0300)]
Avoid logging IP addresses in mod_register when it's not desired

Fixes #2326

6 years agoApply some dirty hacks for mod_shared_roster
Evgeniy Khramtsov [Mon, 19 Mar 2018 09:32:43 +0000 (12:32 +0300)]
Apply some dirty hacks for mod_shared_roster

Probably this fixes #1846

6 years agoHardcode ACL rules used by ejabberd_web_admin
Evgeniy Khramtsov [Mon, 19 Mar 2018 09:29:07 +0000 (12:29 +0300)]
Hardcode ACL rules used by ejabberd_web_admin

6 years agoImprove result of XEP-0060 §6.5.9.12 (#2288)
Christophe Romain [Sat, 17 Mar 2018 09:55:14 +0000 (10:55 +0100)]
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

6 years agoFix result of XEP-0060 §6.5.9.12 (#2288)
Christophe Romain [Fri, 16 Mar 2018 16:48:42 +0000 (17:48 +0100)]
Fix result of XEP-0060 §6.5.9.12 (#2288)

6 years agoAdd transient notification condition (#2267)
Christophe Romain [Fri, 16 Mar 2018 16:26:51 +0000 (17:26 +0100)]
Add transient notification condition (#2267)

6 years agoRefactor publish_item conditions (#2267)
Christophe Romain [Fri, 16 Mar 2018 16:17:53 +0000 (17:17 +0100)]
Refactor publish_item conditions (#2267)

6 years agoFulfill all requirements of XEP-0398 v0.2.0
Evgeniy Khramtsov [Fri, 16 Mar 2018 09:10:57 +0000 (12:10 +0300)]
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

6 years agoAdd 'new_sql_schema' config option, --enable-new-sql-schema now sets its default...
Alexey Shchepin [Thu, 15 Mar 2018 14:55:05 +0000 (17:55 +0300)]
Add 'new_sql_schema' config option, --enable-new-sql-schema now sets its default value to true (#2239)

6 years agoGet rid of catch-all in mod_pubsub
Evgeniy Khramtsov [Tue, 13 Mar 2018 19:10:58 +0000 (22:10 +0300)]
Get rid of catch-all in mod_pubsub

6 years agoPreserve modules order
Evgeniy Khramtsov [Tue, 13 Mar 2018 15:18:53 +0000 (18:18 +0300)]
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.

6 years agoMerge pull request #2314 from oxpa/mod_admin_extra_hashes
badlop [Mon, 12 Mar 2018 14:20:53 +0000 (15:20 +0100)]
Merge pull request #2314 from oxpa/mod_admin_extra_hashes

allow using hashes from "crypto" applications in mod_admin_extra

6 years agoReturn errors in admin#add-user command response stanza (#2321)
Badlop [Mon, 12 Mar 2018 12:32:24 +0000 (13:32 +0100)]
Return errors in admin#add-user command response stanza (#2321)

6 years agoIntroduce force_node_config for mod_pubsub
Evgeniy Khramtsov [Sun, 11 Mar 2018 13:52:23 +0000 (16:52 +0300)]
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

6 years agoAdd mod_fail2ban to the example config
Evgeniy Khramtsov [Sat, 10 Mar 2018 18:41:55 +0000 (21:41 +0300)]
Add mod_fail2ban to the example config

6 years agoStrip duplicates from module's options
Evgeniy Khramtsov [Wed, 7 Mar 2018 14:46:16 +0000 (17:46 +0300)]
Strip duplicates from module's options

6 years agomod_stream_mgmt: Clean up on timed out resumption
Holger Weiss [Tue, 6 Mar 2018 20:03:31 +0000 (21:03 +0100)]
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.

6 years agoDon't forget to remove mgmt_force_enqueue flag
Evgeniy Khramtsov [Tue, 6 Mar 2018 13:18:03 +0000 (16:18 +0300)]
Don't forget to remove mgmt_force_enqueue flag

6 years agomod_push_keepalive: Preserve timeout on resumption
Holger Weiss [Mon, 5 Mar 2018 00:10:12 +0000 (01:10 +0100)]
mod_push_keepalive: Preserve timeout on resumption

Don't forget to carry over the original XEP-0198 resumption timeout
value while resuming.

6 years agoMerge branch 'master' into muc-self-presence muc-self-presence
Evgeniy Khramtsov [Sat, 3 Mar 2018 18:09:27 +0000 (21:09 +0300)]
Merge branch 'master' into muc-self-presence

6 years agoRevert "Support for default values in default_room_opts"
Evgeniy Khramtsov [Sat, 3 Mar 2018 18:08:05 +0000 (21:08 +0300)]
Revert "Support for default values in default_room_opts"

This reverts commit 5054a9933f29d6cc8a88486c624987b1b9f05b17.
The commit is plain wrong: similar options are not required to
be in pair.

6 years agoSimplify ejabberd_sup code
Evgeniy Khramtsov [Sat, 3 Mar 2018 15:05:12 +0000 (18:05 +0300)]
Simplify ejabberd_sup code

6 years agoallow using hashes from "crypto" applications in mod_admin_extra
oxpa [Fri, 2 Mar 2018 13:10:30 +0000 (04:10 -0900)]
allow using hashes from "crypto" applications in mod_admin_extra

6 years agoFix: mod_offline:store_offline_msg/1 expects a message, not list (#2312)
Badlop [Fri, 2 Mar 2018 10:43:50 +0000 (11:43 +0100)]
Fix: mod_offline:store_offline_msg/1 expects a message, not list (#2312)

6 years agoSimplify result of get_room_affiliation command (#2301)
Badlop [Thu, 1 Mar 2018 18:45:16 +0000 (19:45 +0100)]
Simplify result of get_room_affiliation command (#2301)

6 years agoMerge pull request #2301 from tsaqova/ejabberd_commands_get_room_affiliation
badlop [Thu, 1 Mar 2018 18:37:55 +0000 (19:37 +0100)]
Merge pull request #2301 from tsaqova/ejabberd_commands_get_room_affiliation

add ejabberd_command to get affiliation of a user in MUC room

6 years agoIncrease log level for DIGEST-MD5 FQDN
Evgeniy Khramtsov [Wed, 28 Feb 2018 18:43:43 +0000 (21:43 +0300)]
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.

6 years agoMerge pull request #2311 from nosnilmot/validate-listen-opts
Evgeny Khramtsov [Wed, 28 Feb 2018 16:37:57 +0000 (19:37 +0300)]
Merge pull request #2311 from nosnilmot/validate-listen-opts

Validate additional listen opts

6 years agoValidate additional listen opts
Stu Tomlinson [Wed, 28 Feb 2018 16:14:35 +0000 (16:14 +0000)]
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.

6 years agoadd ejabberd_command to get affiliation of a user in MUC room
Yusro Tsaqova [Sun, 25 Feb 2018 09:28:14 +0000 (16:28 +0700)]
add ejabberd_command to get affiliation of a user in MUC room

6 years agoSupport for default values in default_room_opts
Badlop [Mon, 26 Feb 2018 16:22:04 +0000 (17:22 +0100)]
Support for default values in default_room_opts

6 years agoUse length on fields in mysql indexes
Paweł Chmielowski [Mon, 26 Feb 2018 08:43:04 +0000 (09:43 +0100)]
Use length on fields in mysql indexes