]> granicus.if.org Git - ejabberd/log
ejabberd
8 years agoGet rid of "jlib.hrl" dependency in some modules
Evgeniy Khramtsov [Sat, 30 Jul 2016 15:37:57 +0000 (18:37 +0300)]
Get rid of "jlib.hrl" dependency in some modules

8 years agoRewrite mod_http_upload to use XML generator
Evgeniy Khramtsov [Sat, 30 Jul 2016 14:48:52 +0000 (17:48 +0300)]
Rewrite mod_http_upload to use XML generator

8 years agoRewrite mod_sic to use XML generator
Evgeniy Khramtsov [Sat, 30 Jul 2016 10:30:29 +0000 (13:30 +0300)]
Rewrite mod_sic to use XML generator

8 years agoRewrite mod_shared_roster backends module to use XML generator
Evgeniy Khramtsov [Sat, 30 Jul 2016 05:39:30 +0000 (08:39 +0300)]
Rewrite mod_shared_roster backends module to use XML generator

8 years agoRewrite mod_shared_roster to use XML generator
Evgeniy Khramtsov [Sat, 30 Jul 2016 05:37:34 +0000 (08:37 +0300)]
Rewrite mod_shared_roster to use XML generator

8 years agoRewrite mod_vcard_ldap to use XML generator
Evgeniy Khramtsov [Fri, 29 Jul 2016 14:39:13 +0000 (17:39 +0300)]
Rewrite mod_vcard_ldap to use XML generator

8 years agoRewrite several modules to use XML generator
Evgeniy Khramtsov [Fri, 29 Jul 2016 10:21:00 +0000 (13:21 +0300)]
Rewrite several modules to use XML generator

8 years agoRewrite captcha to use XML generator
Evgeniy Khramtsov [Thu, 28 Jul 2016 12:10:41 +0000 (15:10 +0300)]
Rewrite captcha to use XML generator

8 years agoRewrite mod_register to use XML generator
Evgeniy Khramtsov [Wed, 27 Jul 2016 15:06:54 +0000 (18:06 +0300)]
Rewrite mod_register to use XML generator

8 years agoSwap variables in their correct places
Evgeniy Khramtsov [Wed, 27 Jul 2016 15:06:34 +0000 (18:06 +0300)]
Swap variables in their correct places

8 years agoFix type spec for set_from_to/3
Evgeniy Khramtsov [Wed, 27 Jul 2016 15:05:11 +0000 (18:05 +0300)]
Fix type spec for set_from_to/3

8 years agoRewrite S2S and ejabberd_service code to use XML generator
Evgeniy Khramtsov [Wed, 27 Jul 2016 07:45:08 +0000 (10:45 +0300)]
Rewrite S2S and ejabberd_service code to use XML generator

8 years agoGet rid of "jlib.hrl" dependency in some files
Evgeniy Khramtsov [Tue, 26 Jul 2016 08:29:17 +0000 (11:29 +0300)]
Get rid of "jlib.hrl" dependency in some files

8 years agoRemove jlib dependency from acl.erl
Evgeniy Khramtsov [Tue, 26 Jul 2016 07:01:59 +0000 (10:01 +0300)]
Remove jlib dependency from acl.erl

8 years agoRewrite mod_adhoc and mod_announce to use XML generator
Evgeniy Khramtsov [Tue, 26 Jul 2016 06:52:29 +0000 (09:52 +0300)]
Rewrite mod_adhoc and mod_announce to use XML generator

8 years agoRewrite mod_mam and mod_muc to use XML generator
Evgeniy Khramtsov [Mon, 25 Jul 2016 10:50:30 +0000 (13:50 +0300)]
Rewrite mod_mam and mod_muc to use XML generator

8 years agoFix hooks de-registration
Evgeniy Khramtsov [Tue, 19 Jul 2016 12:33:17 +0000 (15:33 +0300)]
Fix hooks de-registration

8 years agoRewrite mod_blocking to use XML generator
Evgeniy Khramtsov [Tue, 19 Jul 2016 07:07:04 +0000 (10:07 +0300)]
Rewrite mod_blocking to use XML generator

8 years agoRewrite mod_offline to use XML generator
Evgeniy Khramtsov [Tue, 19 Jul 2016 04:56:14 +0000 (07:56 +0300)]
Rewrite mod_offline to use XML generator

8 years agoInitial version based on XML generator
Evgeniy Khramtsov [Mon, 18 Jul 2016 12:01:32 +0000 (15:01 +0300)]
Initial version based on XML generator

8 years agoOmit [info] message with number of queued stanzas
Holger Weiss [Sun, 10 Jul 2016 20:21:57 +0000 (22:21 +0200)]
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.

8 years agoFix compilation error
Evgeniy Khramtsov [Sun, 10 Jul 2016 05:45:24 +0000 (08:45 +0300)]
Fix compilation error

8 years agoUse hooks instead of direct calls to mod_mam
Evgeniy Khramtsov [Sat, 9 Jul 2016 09:43:01 +0000 (12:43 +0300)]
Use hooks instead of direct calls to mod_mam

8 years agomod_http_upload_quota: Depend on mod_http_upload
Holger Weiss [Fri, 8 Jul 2016 18:47:02 +0000 (20:47 +0200)]
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.

8 years agoUpdate stringprep and iconv
Mickael Remond [Fri, 8 Jul 2016 16:28:51 +0000 (18:28 +0200)]
Update stringprep and iconv

8 years agoDo send last items only for subscription on current plugin type
Christophe Romain [Fri, 8 Jul 2016 13:18:39 +0000 (15:18 +0200)]
Do send last items only for subscription on current plugin type

8 years agoRename MUC/Sub's namespace
Evgeniy Khramtsov [Thu, 7 Jul 2016 13:42:41 +0000 (16:42 +0300)]
Rename MUC/Sub's namespace

8 years agoHandle MUC/Sub subscriptions list request
Evgeniy Khramtsov [Thu, 7 Jul 2016 11:53:15 +0000 (14:53 +0300)]
Handle MUC/Sub subscriptions list request

8 years agoAdvertise MUC/Sub support in MUC service disco#info
Evgeniy Khramtsov [Thu, 7 Jul 2016 10:32:30 +0000 (13:32 +0300)]
Advertise MUC/Sub support in MUC service disco#info

8 years agoExperimental MUC/Sub support
Evgeniy Khramtsov [Sun, 26 Jun 2016 06:08:37 +0000 (09:08 +0300)]
Experimental MUC/Sub support

8 years agoUpdate dependencies
Mickael Remond [Fri, 8 Jul 2016 09:40:28 +0000 (11:40 +0200)]
Update dependencies

8 years agoGet rid of warnings
Evgeniy Khramtsov [Thu, 7 Jul 2016 09:17:38 +0000 (12:17 +0300)]
Get rid of warnings

8 years agoWarn on cyclic modules dependencies
Evgeniy Khramtsov [Thu, 7 Jul 2016 08:34:17 +0000 (11:34 +0300)]
Warn on cyclic modules dependencies

8 years agoRevert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" (#1183)
Badlop [Wed, 6 Jul 2016 15:54:37 +0000 (17:54 +0200)]
Revert "Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)" (#1183)

This reverts commit 53f3a4580312ee503bfec1e2e14444ecad931fdd.

8 years agoMake modules loading in a dependent order (#1191)
Evgeniy Khramtsov [Wed, 6 Jul 2016 11:58:48 +0000 (14:58 +0300)]
Make modules loading in a dependent order (#1191)

8 years agoAdd missing '/' for jid matching from commit e300f80
Christophe Romain [Wed, 6 Jul 2016 08:06:17 +0000 (10:06 +0200)]
Add missing '/' for jid matching from commit e300f80

8 years agoFix missed escaping in node_flat_sql.erl
Alexey Shchepin [Tue, 5 Jul 2016 14:45:37 +0000 (17:45 +0300)]
Fix missed escaping in node_flat_sql.erl

8 years agoQuote reserver 'type' keyword for pgsql to fix e300f80
Christophe Romain [Tue, 5 Jul 2016 14:16:40 +0000 (16:16 +0200)]
Quote reserver 'type' keyword for pgsql to fix e300f80

8 years agoFix use of like parameter in sql pubsub's requests
Christophe Romain [Tue, 5 Jul 2016 13:43:59 +0000 (15:43 +0200)]
Fix use of like parameter in sql pubsub's requests

8 years agomod_configure: Fix editing of access rules
Holger Weiss [Sun, 3 Jul 2016 20:58:54 +0000 (22:58 +0200)]
mod_configure: Fix editing of access rules

8 years agoGrab new p1_utils that has fix for R19
Paweł Chmielowski [Fri, 1 Jul 2016 19:41:12 +0000 (21:41 +0200)]
Grab new p1_utils that has fix for R19

8 years agoFix compilation issues on R19
Paweł Chmielowski [Fri, 1 Jul 2016 19:18:55 +0000 (21:18 +0200)]
Fix compilation issues on R19

8 years agoFix dependencies when using Elixir Mix
Mickael Remond [Thu, 30 Jun 2016 09:35:42 +0000 (11:35 +0200)]
Fix dependencies when using Elixir Mix

8 years agoUpdate dependencies
Mickael Remond [Thu, 30 Jun 2016 09:33:38 +0000 (11:33 +0200)]
Update dependencies

8 years agomod_mam_mnesia: Force garbage collection
Holger Weiss [Wed, 29 Jun 2016 20:32:59 +0000 (22:32 +0200)]
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.

8 years agomod_client_state: Throttle PEP stanzas by default
Holger Weiss [Wed, 29 Jun 2016 20:22:49 +0000 (22:22 +0200)]
mod_client_state: Throttle PEP stanzas by default

8 years agoAllow generation of oauth tokens from command line 16.06
Pablo Polvorin [Wed, 29 Jun 2016 03:22:28 +0000 (00:22 -0300)]
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

8 years agoInclude correct version in stream:stream when reporting errors
Paweł Chmielowski [Mon, 27 Jun 2016 14:40:57 +0000 (16:40 +0200)]
Include correct version in stream:stream when reporting errors

This fixes issue #1174

8 years agoInline muc access rules
Paweł Chmielowski [Fri, 24 Jun 2016 13:12:58 +0000 (15:12 +0200)]
Inline muc access rules

8 years agoacl: ACLName rule should match if any part of ACLName matches
Paweł Chmielowski [Fri, 24 Jun 2016 13:09:51 +0000 (15:09 +0200)]
acl: ACLName rule should match if any part of ACLName matches

8 years agoUpdate dependencies for 16.06x
Christophe Romain [Fri, 24 Jun 2016 09:12:18 +0000 (11:12 +0200)]
Update dependencies for 16.06x

8 years agoFix typo from d8bb5d9c
Christophe Romain [Thu, 23 Jun 2016 15:31:32 +0000 (17:31 +0200)]
Fix typo from d8bb5d9c

8 years agoPrepare hex.pm release
Christophe Romain [Thu, 23 Jun 2016 13:23:28 +0000 (15:23 +0200)]
Prepare hex.pm release

8 years agomod_pubsub: Fix matching of set_node/1 result
Holger Weiss [Thu, 23 Jun 2016 12:23:24 +0000 (14:23 +0200)]
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.

8 years agoWhen convertion of xmlrpc argument to type fails, report it as error
Paweł Chmielowski [Thu, 16 Jun 2016 08:24:50 +0000 (10:24 +0200)]
When convertion of xmlrpc argument to type fails, report it as error

8 years agoxref was broken when Elixir wasn't enabled
Jerome Sautret [Fri, 13 May 2016 13:12:28 +0000 (15:12 +0200)]
xref was broken when Elixir wasn't enabled

8 years agoCompile gen_mod early to help with undefined behaviour warnings
Paweł Chmielowski [Thu, 5 May 2016 14:37:25 +0000 (16:37 +0200)]
Compile gen_mod early to help with undefined behaviour warnings

8 years agoMerge pull request #1165 from weiss/default-blocking-list
Evgeny Khramtsov [Thu, 23 Jun 2016 06:44:47 +0000 (10:44 +0400)]
Merge pull request #1165 from weiss/default-blocking-list

mod_blocking_sql: Handle default list corner case

8 years agomod_blocking_sql: Handle default list corner case
Holger Weiss [Wed, 22 Jun 2016 20:36:27 +0000 (22:36 +0200)]
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.

8 years agoAdd some tests for {shaper,access}_rules_validator
Paweł Chmielowski [Wed, 22 Jun 2016 14:52:37 +0000 (16:52 +0200)]
Add some tests for {shaper,access}_rules_validator

8 years agoMerge pull request #1120 from anagromataf/feature/archive-id-in-message-carbons
Christophe Romain [Wed, 22 Jun 2016 13:47:27 +0000 (15:47 +0200)]
Merge pull request #1120 from anagromataf/feature/archive-id-in-message-carbons

Send unique stanza id and archived tag also in the message carbons

8 years agoRestore get_items conditions when not using RSM (#1147)
Christophe Romain [Wed, 22 Jun 2016 11:12:40 +0000 (13:12 +0200)]
Restore get_items conditions when not using RSM (#1147)

8 years agoSet HTTP/1.0 so github accepts the request (#1157)
Badlop [Wed, 22 Jun 2016 10:42:57 +0000 (12:42 +0200)]
Set HTTP/1.0 so github accepts the request (#1157)

8 years agoFix PubSub RSM on get_items (#1147)
Christophe Romain [Wed, 22 Jun 2016 10:25:41 +0000 (12:25 +0200)]
Fix PubSub RSM on get_items (#1147)

8 years agoUpdate supported xep version
Christophe Romain [Wed, 22 Jun 2016 09:24:01 +0000 (11:24 +0200)]
Update supported xep version

8 years agoFix pgsql compatibility on delete_old_messages (#1137)
Christophe Romain [Wed, 22 Jun 2016 09:21:11 +0000 (11:21 +0200)]
Fix pgsql compatibility on delete_old_messages (#1137)

8 years agoXEP-0198: Apply cosmetic changes
Holger Weiss [Tue, 21 Jun 2016 21:17:17 +0000 (23:17 +0200)]
XEP-0198: Apply cosmetic changes

8 years agoXEP-0198: Also count stanzas when socket is closed
Holger Weiss [Tue, 21 Jun 2016 20:54:41 +0000 (22:54 +0200)]
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.

8 years agoUse {access,shaper}_rules_validator in other places where access rules are used
Paweł Chmielowski [Tue, 21 Jun 2016 11:18:24 +0000 (13:18 +0200)]
Use {access,shaper}_rules_validator in other places where access rules are used

8 years agoUse new access_rules_validator in couple places
Paweł Chmielowski [Tue, 21 Jun 2016 10:28:53 +0000 (12:28 +0200)]
Use new access_rules_validator in couple places

8 years agoAdd acl:{access,shaper}_rules_validator for use in {mod_}opt_type()
Paweł Chmielowski [Tue, 21 Jun 2016 10:26:31 +0000 (12:26 +0200)]
Add acl:{access,shaper}_rules_validator for use in {mod_}opt_type()

8 years agoAllow {mod_}opt_type to transform values passed to it, and for better error reporting
Paweł Chmielowski [Tue, 21 Jun 2016 10:25:29 +0000 (12:25 +0200)]
Allow {mod_}opt_type to transform values passed to it, and for better error reporting

8 years agoAvoid cleanup on bag when disc_only, switch in memory (#1161)
Christophe Romain [Tue, 21 Jun 2016 08:43:19 +0000 (10:43 +0200)]
Avoid cleanup on bag when disc_only, switch in memory (#1161)

8 years agoFix handling of queued stanzas on session timeout
Holger Weiss [Sun, 19 Jun 2016 21:32:15 +0000 (23:32 +0200)]
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.

8 years agoGive more time to stop and kill epmd (#882)
Christophe Romain [Fri, 17 Jun 2016 15:09:45 +0000 (17:09 +0200)]
Give more time to stop and kill epmd (#882)

8 years agoUse shorter jid acl in config template
Christophe Romain [Fri, 17 Jun 2016 09:58:51 +0000 (11:58 +0200)]
Use shorter jid acl in config template

8 years agoUse new short access rules in config template
Paweł Chmielowski [Thu, 16 Jun 2016 09:13:07 +0000 (11:13 +0200)]
Use new short access rules in config template

8 years agoAdd test for more allowed access_rules
Paweł Chmielowski [Thu, 16 Jun 2016 09:12:16 +0000 (11:12 +0200)]
Add test for more allowed access_rules

8 years agoAllow using shaper defined by name like in in s2s_shaper: fast
Paweł Chmielowski [Thu, 16 Jun 2016 09:04:01 +0000 (11:04 +0200)]
Allow using shaper defined by name like in in s2s_shaper: fast

8 years agoTypo in option name
Paweł Chmielowski [Thu, 16 Jun 2016 09:00:38 +0000 (11:00 +0200)]
Typo in option name

8 years agoAdd shorter version of some common access rules definitions
Paweł Chmielowski [Wed, 15 Jun 2016 17:20:27 +0000 (19:20 +0200)]
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)

8 years agoCheck password with jid:resourceprep when registering account (#996)
Badlop [Tue, 14 Jun 2016 21:35:47 +0000 (23:35 +0200)]
Check password with jid:resourceprep when registering account (#996)

8 years agomod_mam: Fix "assume_mam_usage: if_enabled"
Holger Weiss [Tue, 14 Jun 2016 14:40:46 +0000 (16:40 +0200)]
mod_mam: Fix "assume_mam_usage: if_enabled"

8 years agoRecover ec6c58a which was reverted in 100827e (thanks to Alexey Shchepin)
Badlop [Fri, 10 Jun 2016 11:18:32 +0000 (13:18 +0200)]
Recover ec6c58a which was reverted in 100827e (thanks to Alexey Shchepin)

8 years agoPreparing hex.pm release to fix lager bug
Mickael Remond [Fri, 10 Jun 2016 09:02:45 +0000 (11:02 +0200)]
Preparing hex.pm release to fix lager bug

8 years agoForce use of lager 3.0.2 at most.
Mickael Remond [Fri, 10 Jun 2016 09:01:46 +0000 (11:01 +0200)]
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

8 years agopush_roster must convert read strings to binaries (#1075)
Badlop [Wed, 8 Jun 2016 19:16:30 +0000 (21:16 +0200)]
push_roster must convert read strings to binaries (#1075)

8 years agoRecover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)
Badlop [Wed, 8 Jun 2016 17:34:05 +0000 (19:34 +0200)]
Recover fix of 907e239 lost in 9deb294 (thanks to Alexey Shchepin)

8 years agoAllow again multiple fqdn values in configuration (EJAB-1578)
Badlop [Wed, 8 Jun 2016 17:28:17 +0000 (19:28 +0200)]
Allow again multiple fqdn values in configuration (EJAB-1578)

8 years agoMerge pull request #1125 from vthriller/roster-push
badlop [Wed, 8 Jun 2016 11:57:52 +0000 (13:57 +0200)]
Merge pull request #1125 from vthriller/roster-push

mod_roster should probably respect roster item changes introduced with roster_process_item hooks upon pushing

8 years agoProduce mod_last entry on account creation (processone/ejabberd-contrib#62)
Badlop [Wed, 8 Jun 2016 11:02:02 +0000 (13:02 +0200)]
Produce mod_last entry on account creation (processone/ejabberd-contrib#62)

8 years agoWhen stopping ejabberd, stop modules after broadcasting c2s shutdown (#1144)
Badlop [Tue, 7 Jun 2016 16:41:38 +0000 (18:41 +0200)]
When stopping ejabberd, stop modules after broadcasting c2s shutdown (#1144)

8 years agoAdd tests for new acl functions
Paweł Chmielowski [Mon, 6 Jun 2016 15:12:29 +0000 (17:12 +0200)]
Add tests for new acl functions

8 years agomod_pubsub: Fix node configuration changes for SQL
Holger Weiss [Sun, 5 Jun 2016 22:18:24 +0000 (00:18 +0200)]
mod_pubsub: Fix node configuration changes for SQL

nodetree_tree_sql:set_node/1 returns {ok, NodeIdx} rather than 'ok' on
success.

8 years agoSimplify check for carbon-copied chat states
Holger Weiss [Sun, 5 Jun 2016 20:36:56 +0000 (22:36 +0200)]
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.

8 years agomod_client_state: Fix handling of chat states
Holger Weiss [Sun, 5 Jun 2016 20:04:38 +0000 (22:04 +0200)]
mod_client_state: Fix handling of chat states

Fix the check for chat states sent from other resources of the same
user.

8 years agomod_client_state: Simplify handling of PEP stanzas
Holger Weiss [Sun, 5 Jun 2016 19:48:03 +0000 (21:48 +0200)]
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.

8 years agoFix quicktest case
Pablo Polvorin [Sun, 5 Jun 2016 19:35:14 +0000 (16:35 -0300)]
Fix quicktest case

Missing initialization, required for ets table to exists

8 years agoXEP-0352: Pass chat states of other resources
Holger Weiss [Fri, 3 Jun 2016 19:52:11 +0000 (21:52 +0200)]
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).

8 years agoUnwrap carbon copies when checking for chat states
Holger Weiss [Fri, 3 Jun 2016 18:28:48 +0000 (20:28 +0200)]
Unwrap carbon copies when checking for chat states

Detect standalone chat states that were carbon-copied.