]> granicus.if.org Git - ejabberd/log
ejabberd
8 years agoUpdate SQL escaping
Alexey Shchepin [Thu, 12 May 2016 15:32:13 +0000 (18:32 +0300)]
Update SQL escaping

8 years agoFix C2S session data leak (#1078)
Evgeniy Khramtsov [Mon, 9 May 2016 11:18:47 +0000 (14:18 +0300)]
Fix C2S session data leak (#1078)

8 years agoHandle Redis connection in a separate module
Evgeniy Khramtsov [Mon, 9 May 2016 05:36:30 +0000 (08:36 +0300)]
Handle Redis connection in a separate module

8 years agomod_client_state: Delete only the configured hooks
Holger Weiss [Sun, 8 May 2016 14:45:31 +0000 (16:45 +0200)]
mod_client_state: Delete only the configured hooks

8 years agoLet client retry HTTP upload on file size mismatch
Holger Weiss [Sun, 8 May 2016 13:36:51 +0000 (15:36 +0200)]
Let client retry HTTP upload on file size mismatch

Let the main mod_http_upload process look at the size of an HTTP upload
rather than performing this check in the ejabberd_http handler.  This
way, the upload slot won't be invalidated if the size of the uploaded
file doesn't match the size requested for the slot.  The PUT request is
still rejected, but the client now has a chance to retry the upload.

8 years agoAvoid error bounces when testing stream management
Holger Weiss [Fri, 6 May 2016 14:37:17 +0000 (16:37 +0200)]
Avoid error bounces when testing stream management

The test suite sends messages to the server JID while checking whether
the stream management code counts outgoing stanzas correctly.  We now
set type='headline' for those messages to avoid error bounces.

8 years agoXEP-0198: Use different error message for bounces
Holger Weiss [Fri, 6 May 2016 12:12:22 +0000 (14:12 +0200)]
XEP-0198: Use different error message for bounces

When stanzas are bounced from the stream management queue (because the
session timed out or was closed for some other reason), use a different
error message so that this situation can be distinguished from other
cases.

8 years agoBounce messages sent to server JID
Holger Weiss [Fri, 6 May 2016 11:59:21 +0000 (13:59 +0200)]
Bounce messages sent to server JID

If a message is sent to the server JID (without node part), generate an
error message rather than dropping the message silently.

8 years agoDon't require ejabberd to be installed to run "make translations"
Badlop [Fri, 6 May 2016 11:47:02 +0000 (13:47 +0200)]
Don't require ejabberd to be installed to run "make translations"

8 years agoAdd missed jlib:term_to_expr and jlib:expr_to_term functions
Alexey Shchepin [Thu, 5 May 2016 13:42:48 +0000 (16:42 +0300)]
Add missed jlib:term_to_expr and jlib:expr_to_term functions

8 years agoUpdate more SQL queries
Alexey Shchepin [Wed, 4 May 2016 18:01:05 +0000 (21:01 +0300)]
Update more SQL queries

8 years agoMerge remote-tracking branch 'processone/pr/1088'
Holger Weiss [Wed, 4 May 2016 22:20:15 +0000 (00:20 +0200)]
Merge remote-tracking branch 'processone/pr/1088'

* processone/pr/1088:
  Process messages of unknown type consistently

8 years agoAdd missing odbc->sql in comment from commit 1aae8a9f
Christophe Romain [Wed, 4 May 2016 07:11:18 +0000 (09:11 +0200)]
Add missing odbc->sql in comment from commit 1aae8a9f

8 years agoMerge remote-tracking branch 'processone/pr/1087'
Holger Weiss [Tue, 3 May 2016 22:16:56 +0000 (00:16 +0200)]
Merge remote-tracking branch 'processone/pr/1087'

* processone/pr/1087:
  Return error when blocking last activity request

8 years agoCosmetic change: Make variable names consistent
Holger Weiß [Tue, 3 May 2016 17:12:57 +0000 (19:12 +0200)]
Cosmetic change: Make variable names consistent

Use the same variable names in both mod_mam:select/8 clauses to avoid
confusion.

8 years agoMerge remote-tracking branch 'processone/pr/1102'
Holger Weiss [Tue, 3 May 2016 17:07:11 +0000 (19:07 +0200)]
Merge remote-tracking branch 'processone/pr/1102'

* processone/pr/1102:
  Fix ejabberdctl.template duplication

8 years agoFix ejabberdctl.template duplication
Matthias Rieber [Tue, 3 May 2016 14:36:20 +0000 (16:36 +0200)]
Fix ejabberdctl.template duplication

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

* processone/pr/1086:
  Return error when blocking message to offline user

8 years agoAdd ability to configure server loglevel when running tests
Paweł Chmielowski [Fri, 8 Apr 2016 09:36:15 +0000 (11:36 +0200)]
Add ability to configure server loglevel when running tests

8 years agoPass noauth when auth isn't provided
Christophe Romain [Wed, 6 Apr 2016 10:43:07 +0000 (12:43 +0200)]
Pass noauth when auth isn't provided

8 years agoUse MEDIUMTEXT type for muc_room.opts in MySQL schema
Juan Pablo Carlino [Tue, 29 Mar 2016 18:58:15 +0000 (15:58 -0300)]
Use MEDIUMTEXT type for muc_room.opts in MySQL schema

8 years agoFix sender in case of explicit pep subscriptions
Christophe Romain [Fri, 25 Mar 2016 16:52:08 +0000 (17:52 +0100)]
Fix sender in case of explicit pep subscriptions

8 years agoDon't halt program when include_config_file is missing/can't be read
Paweł Chmielowski [Fri, 29 Jan 2016 13:49:27 +0000 (14:49 +0100)]
Don't halt program when include_config_file is missing/can't be read

8 years agoDon't forget to import mod_opt_type/1 in mod_metrics
Evgeniy Khramtsov [Mon, 2 May 2016 09:18:18 +0000 (12:18 +0300)]
Don't forget to import mod_opt_type/1 in mod_metrics

8 years agoAdd mod_opt_type/1 callback to gen_mod behaviour
Holger Weiss [Sun, 1 May 2016 20:09:40 +0000 (22:09 +0200)]
Add mod_opt_type/1 callback to gen_mod behaviour

8 years agoCope with modules that don't export mod_opt_type/1
Holger Weiss [Sun, 1 May 2016 20:06:15 +0000 (22:06 +0200)]
Cope with modules that don't export mod_opt_type/1

8 years agoejabberdctl: Fix path to epmd
Holger Weiss [Sun, 1 May 2016 19:29:59 +0000 (21:29 +0200)]
ejabberdctl: Fix path to epmd

8 years agoAdd tests for MUC MAM
Evgeniy Khramtsov [Sun, 1 May 2016 09:48:23 +0000 (12:48 +0300)]
Add tests for MUC MAM

8 years agoAdd behaviour to mod_vcard_xupdate DB modules
Evgeniy Khramtsov [Sun, 1 May 2016 08:03:20 +0000 (11:03 +0300)]
Add behaviour to mod_vcard_xupdate DB modules

8 years agoFix typo in mod_mam:select() (#1098)
Evgeniy Khramtsov [Sat, 30 Apr 2016 18:37:18 +0000 (21:37 +0300)]
Fix typo in mod_mam:select() (#1098)

8 years agoLet shaper cope with low resolution system clock
Christophe Romain [Fri, 29 Apr 2016 08:57:34 +0000 (10:57 +0200)]
Let shaper cope with low resolution system clock

We no longer rely on getting unique values from clock source, so we need
to handle cope with systems which does not have a microsecond resolution
on system clock (such as MS Windows)

8 years agoAdd pubsub subscribe/unsubscribe hook 16.04
Christophe Romain [Thu, 28 Apr 2016 13:57:55 +0000 (15:57 +0200)]
Add pubsub subscribe/unsubscribe hook

8 years agoBetter formatting of configuration problem log message
Evgeniy Khramtsov [Thu, 28 Apr 2016 06:03:05 +0000 (09:03 +0300)]
Better formatting of configuration problem log message

8 years agoUpdate esip and stun to match Fast TLS version
Mickael Remond [Wed, 27 Apr 2016 14:22:47 +0000 (16:22 +0200)]
Update esip and stun to match Fast TLS version

8 years agoUse fast_tls 1.0.3
Christophe Romain [Wed, 27 Apr 2016 14:18:24 +0000 (16:18 +0200)]
Use fast_tls 1.0.3

8 years agoImprove detection of databases supported by modules (#1092)
Evgeniy Khramtsov [Wed, 27 Apr 2016 14:10:50 +0000 (17:10 +0300)]
Improve detection of databases supported by modules (#1092)

8 years agoForce ERL_PATH for elixir
Christophe Romain [Wed, 27 Apr 2016 10:32:01 +0000 (12:32 +0200)]
Force ERL_PATH for elixir

8 years agoUpdate stun and esip dependencies
Mickael Remond [Wed, 27 Apr 2016 10:19:55 +0000 (12:19 +0200)]
Update stun and esip dependencies

8 years agoPrepare 16.04 release
Mickael Remond [Wed, 27 Apr 2016 09:59:05 +0000 (11:59 +0200)]
Prepare 16.04 release

8 years agoWe now use fast_tls 1.0.2
Mickael Remond [Wed, 27 Apr 2016 09:54:50 +0000 (11:54 +0200)]
We now use fast_tls 1.0.2

8 years agoGet rid of "internal" DB type. This also fixes #1092
Evgeniy Khramtsov [Wed, 27 Apr 2016 06:44:32 +0000 (09:44 +0300)]
Get rid of "internal" DB type. This also fixes #1092

8 years agoSCRIPT_DIR needed for release
Christophe Romain [Mon, 25 Apr 2016 13:26:23 +0000 (15:26 +0200)]
SCRIPT_DIR needed for release

8 years agoRemove useless variable and quote EPMD and SPOOL_DIR
Christophe Romain [Mon, 25 Apr 2016 12:26:04 +0000 (14:26 +0200)]
Remove useless variable and quote EPMD and SPOOL_DIR

8 years agoFix use of pubsub node plugin when configured with default_node_config
Christophe Romain [Mon, 25 Apr 2016 07:44:46 +0000 (09:44 +0200)]
Fix use of pubsub node plugin when configured with default_node_config

8 years agoReturn error when blocking last activity request
Holger Weiss [Mon, 25 Apr 2016 07:33:47 +0000 (09:33 +0200)]
Return error when blocking last activity request

As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming last activity query was blocked by a privacy list (just as we
do for other IQ requests).

8 years agoProcess messages of unknown type consistently
Holger Weiss [Sun, 24 Apr 2016 23:13:41 +0000 (01:13 +0200)]
Process messages of unknown type consistently

If an incoming message sent to an unavailable resource has an unknown
type, handle it like messages of type "normal" (as mandated by RFC 6121,
section 5.2.2).  The same is already done for messages of unknown type
sent to the bare JID of an offline user.

8 years agoFix error text for message bounces
Holger Weiss [Sun, 24 Apr 2016 22:53:48 +0000 (00:53 +0200)]
Fix error text for message bounces

8 years agoDrop headline messages sent to offline resources
Holger Weiss [Sun, 24 Apr 2016 22:02:12 +0000 (00:02 +0200)]
Drop headline messages sent to offline resources

Don't bounce an error when a message of type "headline" is sent to an
unavailable resource.  This is consistent with how headline messages
sent to the bare JID of an offline user are dropped, and it avoids a
presence leak.

8 years agoDon't omit bounces for messages of type "result"
Holger Weiss [Sun, 24 Apr 2016 20:47:53 +0000 (22:47 +0200)]
Don't omit bounces for messages of type "result"

8 years agoReturn error when blocking message to offline user
Holger Weiss [Sun, 24 Apr 2016 20:00:15 +0000 (22:00 +0200)]
Return error when blocking message to offline user

As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message sent to an offline user was blocked by a privacy list.
The same is done for a message sent to an online user, so this avoids a
presence leak.

8 years agoMatch namespace when checking for chat states
Holger Weiss [Sun, 24 Apr 2016 15:16:28 +0000 (17:16 +0200)]
Match namespace when checking for chat states

When checking for standalone chat states, match the namespace rather
than the names of the elements defined in the current XEP-0085 revision.

8 years agoFix check for standalone chat state notifications
Holger Weiss [Sun, 24 Apr 2016 15:09:56 +0000 (17:09 +0200)]
Fix check for standalone chat state notifications

Ignore whitespace (and other XML CDATA) when checking whether a message
stanza is a standalone chat state notification.

8 years agoMerge pull request #931 from cclam0827/dev/mod_ping
badlop [Fri, 22 Apr 2016 11:07:03 +0000 (13:07 +0200)]
Merge pull request #931 from cclam0827/dev/mod_ping

change mod_ping Timers using maps instead of dict

8 years agoSet default value for pubsub#itemreply option
Holger Weiss [Thu, 21 Apr 2016 21:47:07 +0000 (23:47 +0200)]
Set default value for pubsub#itemreply option

8 years agoFix node ping command
Christophe Romain [Thu, 21 Apr 2016 10:16:21 +0000 (12:16 +0200)]
Fix node ping command

8 years agoUse UUID for ctl node name (#1021)
Christophe Romain [Thu, 21 Apr 2016 10:00:51 +0000 (12:00 +0200)]
Use UUID for ctl node name (#1021)

8 years agoAccept commands: add_commands syntax (along commands: - add_commands)
Paweł Chmielowski [Thu, 21 Apr 2016 09:15:53 +0000 (11:15 +0200)]
Accept commands: add_commands syntax (along commands: - add_commands)

8 years agoRename odbc to sql everywhere
Evgeniy Khramtsov [Wed, 20 Apr 2016 09:27:32 +0000 (12:27 +0300)]
Rename odbc to sql everywhere

8 years agoRename ejabberd_sm_odbc -> ejabberd_sm_sql
Evgeniy Khramtsov [Wed, 20 Apr 2016 06:10:34 +0000 (09:10 +0300)]
Rename ejabberd_sm_odbc -> ejabberd_sm_sql

8 years agoFix hometree root check (#1070)
Christophe Romain [Tue, 19 Apr 2016 13:18:32 +0000 (15:18 +0200)]
Fix hometree root check (#1070)

8 years agoSpecify type of second terminate/2 parameter
Holger Weiss [Tue, 19 Apr 2016 07:15:09 +0000 (09:15 +0200)]
Specify type of second terminate/2 parameter

8 years agoUse erlang 18.3 in travis tests
Paweł Chmielowski [Mon, 18 Apr 2016 12:25:41 +0000 (14:25 +0200)]
Use erlang 18.3 in travis tests

8 years agoRemove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest
Badlop [Fri, 15 Apr 2016 13:35:57 +0000 (15:35 +0200)]
Remove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest

8 years agoClean mod_carboncopy.erl from DB specific code
Evgeniy Khramtsov [Fri, 15 Apr 2016 12:48:56 +0000 (15:48 +0300)]
Clean mod_carboncopy.erl from DB specific code

8 years agoAdd mod_mam header file
Evgeniy Khramtsov [Fri, 15 Apr 2016 12:13:38 +0000 (15:13 +0300)]
Add mod_mam header file

8 years agoMerge branch 'move-db-code'
Evgeniy Khramtsov [Fri, 15 Apr 2016 12:12:12 +0000 (15:12 +0300)]
Merge branch 'move-db-code'

8 years agoClean mod_mam.erl from DB specific code
Evgeniy Khramtsov [Fri, 15 Apr 2016 12:11:31 +0000 (15:11 +0300)]
Clean mod_mam.erl from DB specific code

8 years agoClean mod_offline.erl from DB specific code
Evgeniy Khramtsov [Fri, 15 Apr 2016 10:44:33 +0000 (13:44 +0300)]
Clean mod_offline.erl from DB specific code

8 years agoClean mod_blocking.erl from DB specific code
Evgeniy Khramtsov [Thu, 14 Apr 2016 11:17:20 +0000 (14:17 +0300)]
Clean mod_blocking.erl from DB specific code

8 years agoClean mod_privacy.erl from DB specific code
Evgeniy Khramtsov [Thu, 14 Apr 2016 11:16:32 +0000 (14:16 +0300)]
Clean mod_privacy.erl from DB specific code

8 years agoClean mod_irc.erl from DB specific code
Evgeniy Khramtsov [Thu, 14 Apr 2016 09:18:04 +0000 (12:18 +0300)]
Clean mod_irc.erl from DB specific code

8 years agoClean mod_shared_roster.erl from DB specific code
Evgeniy Khramtsov [Thu, 14 Apr 2016 08:45:43 +0000 (11:45 +0300)]
Clean mod_shared_roster.erl from DB specific code

8 years agoClean mod_roster.erl from DB specific code
Evgeniy Khramtsov [Thu, 14 Apr 2016 07:58:32 +0000 (10:58 +0300)]
Clean mod_roster.erl from DB specific code

8 years agoClean mod_muc.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 18:07:32 +0000 (21:07 +0300)]
Clean mod_muc.erl from DB specific code

8 years agoClean mod_vcard.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 14:37:52 +0000 (17:37 +0300)]
Clean mod_vcard.erl from DB specific code

8 years agoClean mod_private.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 11:09:34 +0000 (14:09 +0300)]
Clean mod_private.erl from DB specific code

8 years agoClean mod_announce.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 10:04:04 +0000 (13:04 +0300)]
Clean mod_announce.erl from DB specific code

8 years agoClean mod_caps.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 08:41:04 +0000 (11:41 +0300)]
Clean mod_caps.erl from DB specific code

8 years agoClean mod_vcard_xupdate.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 08:06:59 +0000 (11:06 +0300)]
Clean mod_vcard_xupdate.erl from DB specific code

8 years agoAdd preliminary tests on ACL module and prepare clean-up / refactor
Mickaël Rémond [Wed, 13 Apr 2016 07:45:56 +0000 (09:45 +0200)]
Add preliminary tests on ACL module and prepare clean-up / refactor

8 years agoClean mod_last.erl from DB specific code
Evgeniy Khramtsov [Wed, 13 Apr 2016 06:59:39 +0000 (09:59 +0300)]
Clean mod_last.erl from DB specific code

8 years agoMake it possible to get DB backend of a module
Evgeniy Khramtsov [Wed, 13 Apr 2016 06:56:10 +0000 (09:56 +0300)]
Make it possible to get DB backend of a module

8 years agoSynchronizing master changes
Mickael Remond [Tue, 12 Apr 2016 08:34:24 +0000 (10:34 +0200)]
Synchronizing master changes

8 years agoFix typo in error message
Mickael Remond [Tue, 12 Apr 2016 08:27:43 +0000 (10:27 +0200)]
Fix typo in error message

8 years agoDisable TLS compression for s2s by default
Holger Weiss [Mon, 11 Apr 2016 20:50:11 +0000 (22:50 +0200)]
Disable TLS compression for s2s by default

TLS compression is not recommended, and it's already disabled by default
for c2s connections and for ejabberd_http.

8 years agoprocess2/2 is needed by mod_rest to provide its own AccessCommands
Badlop [Mon, 11 Apr 2016 15:21:44 +0000 (17:21 +0200)]
process2/2 is needed by mod_rest to provide its own AccessCommands

See processone/ejabberd-contrib#161

8 years agoUpdate check_password tests are the command now is fixed
Badlop [Mon, 11 Apr 2016 11:39:35 +0000 (13:39 +0200)]
Update check_password tests are the command now is fixed

8 years agoMerge pull request #1064 from sezuan/fix_check_password
badlop [Mon, 11 Apr 2016 11:38:22 +0000 (13:38 +0200)]
Merge pull request #1064 from sezuan/fix_check_password

Fix check_password

8 years agoFix check_password
Matthias Rieber [Sun, 10 Apr 2016 13:37:36 +0000 (15:37 +0200)]
Fix check_password

8 years agoAllow testing user pattern directly in access rules
Mickael Remond [Fri, 8 Apr 2016 17:45:25 +0000 (19:45 +0200)]
Allow testing user pattern directly in access rules

8 years agoSwitch to varchar(64) in mysql user.server/salt as text can't have default values
Paweł Chmielowski [Fri, 8 Apr 2016 15:50:33 +0000 (17:50 +0200)]
Switch to varchar(64) in mysql user.server/salt as text can't have default values

8 years agoAdd TODO to improve ACL
Mickael Remond [Fri, 8 Apr 2016 10:55:35 +0000 (12:55 +0200)]
Add TODO to improve ACL

8 years ago'serverkey' and 'salt' should have empty string as default
Evgeniy Khramtsov [Fri, 8 Apr 2016 10:02:08 +0000 (13:02 +0300)]
'serverkey' and 'salt' should have empty string as default

8 years agoMake sure that ejabberd_sm sid are unique
Paweł Chmielowski [Fri, 8 Apr 2016 08:46:21 +0000 (10:46 +0200)]
Make sure that ejabberd_sm sid are unique

8 years agoSend stream trailer at the very end
Evgeniy Khramtsov [Fri, 8 Apr 2016 08:49:50 +0000 (11:49 +0300)]
Send stream trailer at the very end

8 years agoGenerate shorted jid for anonymous connections
Paweł Chmielowski [Thu, 7 Apr 2016 14:47:30 +0000 (16:47 +0200)]
Generate shorted jid for anonymous connections

8 years agoAdd tests for anonymous and digest-md5 auth
Paweł Chmielowski [Thu, 7 Apr 2016 14:47:01 +0000 (16:47 +0200)]
Add tests for anonymous and digest-md5 auth

8 years agoAdd tests on Access rules returning values
Mickael Remond [Thu, 7 Apr 2016 11:04:58 +0000 (13:04 +0200)]
Add tests on Access rules returning values

8 years agoAdd test when mixing ip / user rules
Mickael Remond [Thu, 7 Apr 2016 10:35:29 +0000 (12:35 +0200)]
Add test when mixing ip / user rules

8 years agoStart of tests for cyrsasl module
Paweł Chmielowski [Thu, 7 Apr 2016 10:28:19 +0000 (12:28 +0200)]
Start of tests for cyrsasl module