]> granicus.if.org Git - ejabberd/log
ejabberd
8 years agoMerge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss...
Christophe Romain [Tue, 13 Sep 2016 12:29:14 +0000 (14:29 +0200)]
Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss-push-requirements

8 years agoAllow to create room with custom config
Christophe Romain [Tue, 13 Sep 2016 09:52:59 +0000 (11:52 +0200)]
Allow to create room with custom config

8 years agoExpand parsing of json input to be able to handle update_roster command
Paweł Chmielowski [Thu, 4 Aug 2016 14:04:43 +0000 (16:04 +0200)]
Expand parsing of json input to be able to handle update_roster command

8 years agoAdd X-Admin and basic auth header to CORS allowed headers in http_api
Paweł Chmielowski [Mon, 12 Sep 2016 13:39:00 +0000 (15:39 +0200)]
Add X-Admin and basic auth header to CORS allowed headers in http_api

8 years agoProperly process OPTIONS header in http_api for all paths
Paweł Chmielowski [Mon, 12 Sep 2016 13:38:27 +0000 (15:38 +0200)]
Properly process OPTIONS header in http_api for all paths

8 years agoFix nick-to-jid mapping for MUC subscribers
Evgeniy Khramtsov [Mon, 12 Sep 2016 11:41:33 +0000 (14:41 +0300)]
Fix nick-to-jid mapping for MUC subscribers

8 years agoSupport multiple room invitations (#1285)
Badlop [Fri, 9 Sep 2016 10:17:54 +0000 (12:17 +0200)]
Support multiple room invitations (#1285)

8 years agoFix subscribed rooms list retreivement
Evgeniy Khramtsov [Fri, 9 Sep 2016 10:04:47 +0000 (13:04 +0300)]
Fix subscribed rooms list retreivement

8 years agoXEP-0198: Cancel timer when waiting for resumption
Holger Weiss [Thu, 8 Sep 2016 22:21:36 +0000 (00:21 +0200)]
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.

8 years agoRevert "Don't log an [error] message if Elixir is missing"
Holger Weiss [Thu, 8 Sep 2016 16:11:54 +0000 (18:11 +0200)]
Revert "Don't log an [error] message if Elixir is missing"

This reverts commit 41386d718dbc5f6e846baaac568ba1cae5eb7ec4.  The issue
was fixed with commit 4bd45bada70fc233bb87bc7ab099fc2407cea30b.

8 years agoDon't log an [error] message if Elixir is missing
Holger Weiss [Thu, 8 Sep 2016 15:59:40 +0000 (17:59 +0200)]
Don't log an [error] message if Elixir is missing

The Elixir support is still optional.

Closes #1250.

8 years agoFix typo on previous commit (#1284)
Christophe Romain [Thu, 8 Sep 2016 14:31:59 +0000 (16:31 +0200)]
Fix typo on previous commit (#1284)

8 years agoStart elixir config code only if elixir was enabled in configure script
Paweł Chmielowski [Thu, 8 Sep 2016 14:29:19 +0000 (16:29 +0200)]
Start elixir config code only if elixir was enabled in configure script

8 years agoFull jid entity subscriptions should include bare jid records (#1284)
Christophe Romain [Thu, 8 Sep 2016 14:27:16 +0000 (16:27 +0200)]
Full jid entity subscriptions should include bare jid records (#1284)

8 years agoFix message routing from subscribers
Evgeniy Khramtsov [Thu, 8 Sep 2016 13:39:34 +0000 (16:39 +0300)]
Fix message routing from subscribers

8 years agoMerge pull request #1287 from weiss/ack-timeout
Paweł Chmielowski [Thu, 8 Sep 2016 10:45:16 +0000 (12:45 +0200)]
Merge pull request #1287 from weiss/ack-timeout

New stream management option: ack_timeout

8 years agoSupport for Elixir configuration file #1208
gabrielgatu [Thu, 8 Sep 2016 09:34:42 +0000 (11:34 +0200)]
Support for Elixir configuration file #1208

Contribution for Google Summer of code 2016 by Gabriel Gatu

8 years agoSupport for publishing to hex.pm with latest Elixir mix
Mickael Remond [Thu, 8 Sep 2016 08:52:43 +0000 (10:52 +0200)]
Support for publishing to hex.pm with latest Elixir mix

8 years agoFix compilation with Elixir 1.3 / R19
Mickael Remond [Thu, 8 Sep 2016 08:29:44 +0000 (10:29 +0200)]
Fix compilation with Elixir 1.3 / R19

8 years agoTypo
Paweł Chmielowski [Thu, 8 Sep 2016 08:27:14 +0000 (10:27 +0200)]
Typo

8 years agoProperly normalize resource_regexp acl rule
Paweł Chmielowski [Thu, 8 Sep 2016 06:44:49 +0000 (08:44 +0200)]
Properly normalize resource_regexp acl rule

This fixes issue #1288.

8 years agoNew stream management option: ack_timeout
Holger Weiss [Wed, 7 Sep 2016 21:16:54 +0000 (23:16 +0200)]
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.

8 years agoEnforce pathtype use with config path (#1264)
Christophe Romain [Wed, 7 Sep 2016 15:38:04 +0000 (17:38 +0200)]
Enforce pathtype use with config path (#1264)

8 years agoMerge pull request #1253 from Amuhar/xep0356
Christophe Romain [Wed, 7 Sep 2016 12:34:31 +0000 (14:34 +0200)]
Merge pull request #1253 from Amuhar/xep0356

8 years agoCreate room on configuration request as per XEP-0045, 10.1.3
Evgeniy Khramtsov [Wed, 7 Sep 2016 08:15:19 +0000 (11:15 +0300)]
Create room on configuration request as per XEP-0045, 10.1.3

8 years agoLink MUC subscription to bare JID
Evgeniy Khramtsov [Wed, 7 Sep 2016 07:33:37 +0000 (10:33 +0300)]
Link MUC subscription to bare JID

8 years agoAdd SQL support for microblogging node plugin
Holger Weiss [Wed, 7 Sep 2016 05:15:12 +0000 (07:15 +0200)]
Add SQL support for microblogging node plugin

8 years agoHandle <subscriptions/> request to list MUC subscribers
Evgeniy Khramtsov [Tue, 6 Sep 2016 16:06:02 +0000 (19:06 +0300)]
Handle <subscriptions/> request to list MUC subscribers

8 years agoDo not update muc_online_users table on MUC/Sub operations
Evgeniy Khramtsov [Tue, 6 Sep 2016 15:17:30 +0000 (18:17 +0300)]
Do not update muc_online_users table on MUC/Sub operations

8 years agoAdd get_subscribers command to list MUC subscribers
Evgeniy Khramtsov [Tue, 6 Sep 2016 14:55:18 +0000 (17:55 +0300)]
Add get_subscribers command to list MUC subscribers

8 years agonode_mb: Call node_pep instead of node_hometree
Holger Weiss [Mon, 5 Sep 2016 22:30:46 +0000 (00:30 +0200)]
node_mb: Call node_pep instead of node_hometree

8 years agonode_mb: Fix configuration documentation
Holger Weiss [Mon, 5 Sep 2016 22:08:43 +0000 (00:08 +0200)]
node_mb: Fix configuration documentation

A node plugin used in a 'pep_mapping' must explicitly be added to the
list of 'plugins'.

8 years agomod_pubsub: Remove outdated comment
Holger Weiss [Mon, 5 Sep 2016 22:05:54 +0000 (00:05 +0200)]
mod_pubsub: Remove outdated comment

8 years agoClean ejabberd_commands before tests
Paweł Chmielowski [Mon, 5 Sep 2016 15:18:27 +0000 (17:18 +0200)]
Clean ejabberd_commands before tests

8 years agoejabberd_oauth requiere working cache_tab, initialize it before tests
Paweł Chmielowski [Mon, 5 Sep 2016 14:42:05 +0000 (16:42 +0200)]
ejabberd_oauth requiere working cache_tab, initialize it before tests

8 years agoMerge remote-tracking branch 'processone/pr/1262'
Holger Weiss [Mon, 22 Aug 2016 20:35:17 +0000 (22:35 +0200)]
Merge remote-tracking branch 'processone/pr/1262'

* processone/pr/1262:
  Fixed typo in  Stream Management option name

8 years agoFixed typo in Stream Management option name
Igor Manturov Jr [Mon, 22 Aug 2016 20:21:09 +0000 (02:21 +0600)]
Fixed typo in  Stream Management option name

8 years agoMerge remote-tracking branch 'processone/pr/1261'
Holger Weiss [Mon, 22 Aug 2016 19:22:08 +0000 (21:22 +0200)]
Merge remote-tracking branch 'processone/pr/1261'

* processone/pr/1261:
  Fixed #1260 Stream Management feature for the websocket connections

8 years agoFixed #1260 Stream Management feature for the websocket connections
Igor Manturov Jr [Mon, 22 Aug 2016 18:59:39 +0000 (00:59 +0600)]
Fixed #1260 Stream Management feature for the websocket connections

8 years agomod_muc_admin: Accept 'allow_subscription' option
Holger Weiss [Sun, 21 Aug 2016 23:17:32 +0000 (01:17 +0200)]
mod_muc_admin: Accept 'allow_subscription' option

Allow for setting the new 'allow_subscription' option using the
'change_room_option' command.

8 years agoMerge pull request #1254 from lemenkov/remove_p1_xmlrpc
badlop [Fri, 19 Aug 2016 09:53:20 +0000 (11:53 +0200)]
Merge pull request #1254 from lemenkov/remove_p1_xmlrpc

Remove no longer necessary p1_xmlrpc

8 years agoRemove no longer necessary p1_xmlrpc
Peter Lemenkov [Wed, 17 Aug 2016 15:29:24 +0000 (18:29 +0300)]
Remove no longer necessary p1_xmlrpc

Ths module was superceded by fast_xml in commit
processone/ejabberd@dfc29ea03ca91e1eb5387d93612e2ac4b4b496da. So let's remove it entirely to
avoid any confusion.

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
8 years agoErlang R17 has a Time limit in erlang:send_after (#1246)
Badlop [Tue, 16 Aug 2016 16:32:06 +0000 (18:32 +0200)]
Erlang R17 has a Time limit in erlang:send_after (#1246)

8 years agomod_mam: Add 'store_mam_message' hook
Holger Weiss [Mon, 15 Aug 2016 21:28:36 +0000 (23:28 +0200)]
mod_mam: Add 'store_mam_message' hook

The new 'store_mam_message' hook is invoked whenever a MAM message is
stored.

8 years agomod_offline: Add 'store_offline_message' hook
Holger Weiss [Mon, 15 Aug 2016 20:30:08 +0000 (22:30 +0200)]
mod_offline: Add 'store_offline_message' hook

The new 'store_offline_message' hook is invoked whenever an offline
message is stored.

8 years agoejabberd_c2s: Add XEP-0198 resumption hooks
Holger Weiss [Mon, 15 Aug 2016 19:49:58 +0000 (21:49 +0200)]
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.

8 years agoAdd functions to get/set some c2s state elements
Holger Weiss [Mon, 15 Aug 2016 18:24:43 +0000 (20:24 +0200)]
Add functions to get/set some c2s state elements

8 years agoSupport sql backend in mod_shared_roster commands (#1244)
Badlop [Mon, 15 Aug 2016 13:53:35 +0000 (15:53 +0200)]
Support sql backend in mod_shared_roster commands (#1244)

8 years agoMerge pull request #1245 from hamano/clean_redis_table
Evgeny Khramtsov [Mon, 15 Aug 2016 11:12:20 +0000 (15:12 +0400)]
Merge pull request #1245 from hamano/clean_redis_table

fix clean redis table

8 years agofix clean redis table
HAMANO Tsukasa [Mon, 15 Aug 2016 08:51:06 +0000 (17:51 +0900)]
fix clean redis table

8 years agoDon't delete ejabberd_commands table, it's problematic in cluster (#1210)
Badlop [Sun, 14 Aug 2016 18:35:25 +0000 (20:35 +0200)]
Don't delete ejabberd_commands table, it's problematic in cluster (#1210)

8 years agoStore announcements for offline users
Holger Weiss [Fri, 12 Aug 2016 22:07:27 +0000 (00:07 +0200)]
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".

8 years agoHonor <store/> hint for any non-"error" message
Holger Weiss [Fri, 12 Aug 2016 19:13:10 +0000 (21:13 +0200)]
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."

8 years agomod_mam: Don't store messages of type "headline"
Holger Weiss [Fri, 12 Aug 2016 18:38:17 +0000 (20:38 +0200)]
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."

8 years agoAdd a requirement for full JID in subscribe_room command
Evgeniy Khramtsov [Thu, 11 Aug 2016 14:13:20 +0000 (17:13 +0300)]
Add a requirement for full JID in subscribe_room command

8 years agoProvide proper args_desc in oauth_issue_token command
Paweł Chmielowski [Tue, 9 Aug 2016 17:22:51 +0000 (19:22 +0200)]
Provide proper args_desc in oauth_issue_token command

8 years agoFix result type of subscribe_room command
Paweł Chmielowski [Wed, 10 Aug 2016 09:16:20 +0000 (11:16 +0200)]
Fix result type of subscribe_room command

8 years agoAdd commands for MUC subscriptions management
Evgeniy Khramtsov [Tue, 9 Aug 2016 10:36:43 +0000 (13:36 +0300)]
Add commands for MUC subscriptions management

8 years agoUpdate to released version
Mickael Remond [Sun, 7 Aug 2016 16:31:55 +0000 (18:31 +0200)]
Update to released version

8 years agoUpdate moka dependency
Mickael Remond [Sun, 7 Aug 2016 16:28:14 +0000 (18:28 +0200)]
Update moka dependency

8 years agoWe do not force yet access rules check on register command
Mickael Remond [Sun, 7 Aug 2016 16:27:16 +0000 (18:27 +0200)]
We do not force yet access rules check on register command

8 years agoDo not force command line to pass a credentials
Mickael Remond [Sun, 7 Aug 2016 16:24:08 +0000 (18:24 +0200)]
Do not force command line to pass a credentials

8 years agomod_client_state: Let other modules filter stanzas
Holger Weiss [Sat, 6 Aug 2016 11:36:27 +0000 (13:36 +0200)]
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.

8 years agoAdd user's JID to CSI hook arguments
Holger Weiss [Fri, 5 Aug 2016 21:47:18 +0000 (23:47 +0200)]
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.

8 years agoCosmetic change: Set CSI state 'active' on resume
Holger Weiss [Fri, 5 Aug 2016 18:09:52 +0000 (20:09 +0200)]
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.

8 years agoUse newer samerlib/moka
Paweł Chmielowski [Fri, 5 Aug 2016 11:03:22 +0000 (13:03 +0200)]
Use newer samerlib/moka

8 years agomod_mam: Simplify "assume_mam_usage" option
Holger Weiss [Thu, 4 Aug 2016 23:57:01 +0000 (01:57 +0200)]
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.

8 years agoFix type convertion bug injected by 4ccc40b (#1229) 16.08
Christophe Romain [Thu, 4 Aug 2016 07:49:23 +0000 (09:49 +0200)]
Fix type convertion bug injected by 4ccc40b (#1229)

8 years agoAdd tokens cache to ejabberd_oauth
Alexey Shchepin [Wed, 3 Aug 2016 22:58:56 +0000 (01:58 +0300)]
Add tokens cache to ejabberd_oauth

8 years agoXEP-0198: Handle timeouts during stream resumption
Holger Weiss [Wed, 3 Aug 2016 00:28:46 +0000 (02:28 +0200)]
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.

8 years agoXEP-0198: Increase timeout for stream resumption
Holger Weiss [Wed, 3 Aug 2016 00:15:15 +0000 (02:15 +0200)]
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.

8 years agoAdd OAUTH SQL backend
Alexey Shchepin [Mon, 1 Aug 2016 13:53:25 +0000 (16:53 +0300)]
Add OAUTH SQL backend

8 years agoImplement gen_mod callback in ModPresenceDemo module
Mickael Remond [Mon, 1 Aug 2016 13:46:14 +0000 (15:46 +0200)]
Implement gen_mod callback in ModPresenceDemo module

8 years agoMerge pull request #1223 from processone/expand_api
Mickaël Rémond [Mon, 1 Aug 2016 13:36:47 +0000 (15:36 +0200)]
Merge pull request #1223 from processone/expand_api

More API fixes and improvements

8 years agoRemove compile warning
Mickael Remond [Mon, 1 Aug 2016 13:35:54 +0000 (15:35 +0200)]
Remove compile warning

8 years agoImprove error message when try to call api on api root expand_api
Mickael Remond [Mon, 1 Aug 2016 13:29:47 +0000 (15:29 +0200)]
Improve error message when try to call api on api root

8 years agoSwitch mix worker to transient
Christophe Romain [Mon, 1 Aug 2016 12:09:16 +0000 (14:09 +0200)]
Switch mix worker to transient

8 years agoAdd missing comas in sql statement (#1219)
Christophe Romain [Mon, 1 Aug 2016 08:55:02 +0000 (10:55 +0200)]
Add missing comas in sql statement (#1219)

8 years agoFix error return expectation in command test
Mickael Remond [Mon, 1 Aug 2016 07:28:54 +0000 (09:28 +0200)]
Fix error return expectation in command test

8 years agoFix HTTP process return formatting
Mickael Remond [Mon, 1 Aug 2016 06:58:49 +0000 (08:58 +0200)]
Fix HTTP process return formatting

8 years agoImprove error handling
Mickael Remond [Sun, 31 Jul 2016 20:48:24 +0000 (22:48 +0200)]
Improve error handling

8 years agoChange name of result key for offline count to value
Mickael Remond [Sat, 30 Jul 2016 18:12:04 +0000 (20:12 +0200)]
Change name of result key for offline count to value

This is more user friendly and should be more consistent with other commands.

8 years agoAdd support for sending back missing scope error to API ReST command calls
Mickael Remond [Sat, 30 Jul 2016 16:51:54 +0000 (18:51 +0200)]
Add support for sending back missing scope error to API ReST command calls

8 years agoMake s2s stats commands more robust
Mickael Remond [Sat, 30 Jul 2016 16:50:58 +0000 (18:50 +0200)]
Make s2s stats commands more robust

8 years agoEnsure ejabberdctl status result is in valid shell supported range
Mickael Remond [Sat, 30 Jul 2016 11:18:39 +0000 (13:18 +0200)]
Ensure ejabberdctl status result is in valid shell supported range

8 years agoAdd support for rich error reporting for API
Mickael Remond [Sat, 30 Jul 2016 11:08:30 +0000 (13:08 +0200)]
Add support for rich error reporting for API

8 years agoReturn 409 conflict error code on register if user already exists
Mickael Remond [Sat, 30 Jul 2016 09:50:04 +0000 (11:50 +0200)]
Return 409 conflict error code on register if user already exists

8 years agoMerge pull request #1221 from processone/expand_api
Mickaël Rémond [Sat, 30 Jul 2016 08:55:39 +0000 (10:55 +0200)]
Merge pull request #1221 from processone/expand_api

Do not crash on check when we do not have JID

8 years agoDo not crash on check when we do not have JID
Mickael Remond [Fri, 29 Jul 2016 18:38:05 +0000 (20:38 +0200)]
Do not crash on check when we do not have JID

8 years agoMerge pull request #1178 from candrews/patch-1
Christophe Romain [Fri, 29 Jul 2016 09:33:32 +0000 (11:33 +0200)]
Merge pull request #1178 from candrews/patch-1

Harden the systemd unit

8 years agoSwitch workers from temporary to transient
Christophe Romain [Fri, 29 Jul 2016 09:18:42 +0000 (11:18 +0200)]
Switch workers from temporary to transient

8 years agoDisplay data that is send to websocket connection in debug log level
Paweł Chmielowski [Thu, 28 Jul 2016 14:20:13 +0000 (16:20 +0200)]
Display data that is send to websocket connection in debug log level

This should help with detecting problems like in #1097

8 years agoMerge pull request #1193 from gabrielgatu/support-elixir-module-installer
Christophe Romain [Thu, 28 Jul 2016 14:06:12 +0000 (16:06 +0200)]
Merge pull request #1193 from gabrielgatu/support-elixir-module-installer

Fix issue #625: Writing Elixir modules

8 years agoStart elixir application after ejabberd_app:start_apps()
gabrielgatu [Thu, 28 Jul 2016 13:57:35 +0000 (15:57 +0200)]
Start elixir application after ejabberd_app:start_apps()

8 years agoMerge pull request #1211 from processone/expand_api
Mickaël Rémond [Thu, 28 Jul 2016 12:57:48 +0000 (14:57 +0200)]
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.

8 years agomod_http_upload_quota: Apply cosmetic changes
Holger Weiss [Tue, 26 Jul 2016 22:28:47 +0000 (00:28 +0200)]
mod_http_upload_quota: Apply cosmetic changes

Use "fun f/1" syntax in place of "fun(X) -> f(X) end".

8 years agoAdd 'allow_subscription' MUC configuration option
Evgeniy Khramtsov [Tue, 26 Jul 2016 11:37:28 +0000 (14:37 +0300)]
Add 'allow_subscription' MUC configuration option

8 years agoAdd ability to run test with Elixir mix
Mickael Remond [Tue, 26 Jul 2016 10:17:37 +0000 (12:17 +0200)]
Add ability to run test with Elixir mix

8 years agoClarify command module API
Mickael Remond [Tue, 26 Jul 2016 10:15:03 +0000 (12:15 +0200)]
Clarify command module API

8 years agoAvoid starting several time the owner process
Mickael Remond [Tue, 26 Jul 2016 10:12:48 +0000 (12:12 +0200)]
Avoid starting several time the owner process