]> granicus.if.org Git - ejabberd/log
ejabberd
6 years agoFix MySQL error server_host used in key specification without a key length
phejman [Mon, 5 Feb 2018 11:33:59 +0000 (12:33 +0100)]
Fix MySQL error server_host used in key specification without a key length

6 years agoImprove log message when module startup has failed
Evgeniy Khramtsov [Fri, 2 Feb 2018 10:16:14 +0000 (13:16 +0300)]
Improve log message when module startup has failed

6 years agoAnother try to fix travis
Paweł Chmielowski [Wed, 31 Jan 2018 16:54:32 +0000 (17:54 +0100)]
Another try to fix travis

6 years agoProperly escape string in travis config
Paweł Chmielowski [Wed, 31 Jan 2018 16:10:05 +0000 (17:10 +0100)]
Properly escape string in travis config

6 years agoPrint something when doing tests in travis, as not doing that get us killed
Paweł Chmielowski [Wed, 31 Jan 2018 16:03:18 +0000 (17:03 +0100)]
Print something when doing tests in travis, as not doing that get us killed

6 years agoDon't run tests in verbose mode on travis
Paweł Chmielowski [Wed, 31 Jan 2018 15:10:09 +0000 (16:10 +0100)]
Don't run tests in verbose mode on travis

6 years agoFix compilation ordering in mix by s/-behavior/-behaviour/
Paweł Chmielowski [Wed, 31 Jan 2018 13:57:43 +0000 (14:57 +0100)]
Fix compilation ordering in mix by s/-behavior/-behaviour/

6 years agoFix mod_roster start invocation in elixir tests
Paweł Chmielowski [Wed, 31 Jan 2018 08:34:54 +0000 (09:34 +0100)]
Fix mod_roster start invocation in elixir tests

6 years agoFix elixir tests
Paweł Chmielowski [Tue, 30 Jan 2018 18:45:12 +0000 (19:45 +0100)]
Fix elixir tests

6 years agoUse correct default when getting list of modules from config
Paweł Chmielowski [Tue, 30 Jan 2018 18:44:27 +0000 (19:44 +0100)]
Use correct default when getting list of modules from config

6 years agoRemove line left from debugging
Paweł Chmielowski [Tue, 30 Jan 2018 17:37:17 +0000 (18:37 +0100)]
Remove line left from debugging

6 years agoStart ejabberd_config earlier
Paweł Chmielowski [Tue, 30 Jan 2018 17:24:47 +0000 (18:24 +0100)]
Start ejabberd_config earlier

6 years agoDisable riak in travis
Paweł Chmielowski [Tue, 30 Jan 2018 14:31:07 +0000 (15:31 +0100)]
Disable riak in travis

6 years agoRun tests only on backends enabled by configure
Paweł Chmielowski [Tue, 30 Jan 2018 14:16:52 +0000 (15:16 +0100)]
Run tests only on backends enabled by configure

6 years agoMatch all possible values in mod_privilege checks, or we get crashes
Paweł Chmielowski [Tue, 30 Jan 2018 12:10:22 +0000 (13:10 +0100)]
Match all possible values in mod_privilege checks, or we get crashes

6 years agoFix exception in mod_privilege:process_presence_in
Paweł Chmielowski [Tue, 30 Jan 2018 11:52:38 +0000 (12:52 +0100)]
Fix exception in mod_privilege:process_presence_in

This should fix problem reported in issue #2248

6 years agoBump sqlite deps version
Paweł Chmielowski [Tue, 30 Jan 2018 11:51:38 +0000 (12:51 +0100)]
Bump sqlite deps version

6 years agoFix elixir tests
Paweł Chmielowski [Mon, 29 Jan 2018 17:28:02 +0000 (18:28 +0100)]
Fix elixir tests

6 years agoFix processing of ldap_memberattr_format_re option
Paweł Chmielowski [Mon, 29 Jan 2018 16:25:31 +0000 (17:25 +0100)]
Fix processing of ldap_memberattr_format_re option

This makes sure that "" value is handled as before options processing
overhaul.

This fixed ldap shared roster testcase

6 years agoDon't return undefined from ejabberd_config:get_myhosts()
Paweł Chmielowski [Mon, 29 Jan 2018 10:05:59 +0000 (11:05 +0100)]
Don't return undefined from ejabberd_config:get_myhosts()

6 years agoUse named functions instead of carrying self as argument
Paweł Chmielowski [Mon, 29 Jan 2018 09:02:20 +0000 (10:02 +0100)]
Use named functions instead of carrying self as argument

6 years agoRestore original return value to ejabberd_config:add_option
Paweł Chmielowski [Mon, 29 Jan 2018 08:39:36 +0000 (09:39 +0100)]
Restore original return value to ejabberd_config:add_option

6 years agoejabberdctl: Omit redundant erl option
Holger Weiss [Mon, 29 Jan 2018 00:16:20 +0000 (01:16 +0100)]
ejabberdctl: Omit redundant erl option

The "-detached" flag implies "-noinput".

6 years agomod_caps: Only store CAPS if contact is subscribed
Holger Weiss [Mon, 29 Jan 2018 00:07:38 +0000 (01:07 +0100)]
mod_caps: Only store CAPS if contact is subscribed

If a user is subscribed to a contact but not vice versa, don't store the
contact's CAPS.  This makes sure no PEP items are leaked to the contact.

6 years agomod_caps: Fix indentation
Holger Weiss [Sun, 28 Jan 2018 23:02:15 +0000 (00:02 +0100)]
mod_caps: Fix indentation

6 years agoImprove logging of idle s2s connections
Evgeniy Khramtsov [Sun, 28 Jan 2018 08:10:22 +0000 (11:10 +0300)]
Improve logging of idle s2s connections

6 years agoFind and fix typos using 'codespell'
Evgeniy Khramtsov [Sat, 27 Jan 2018 16:35:38 +0000 (19:35 +0300)]
Find and fix typos using 'codespell'

6 years agoFix a typo in call to create_captcha()
Evgeniy Khramtsov [Fri, 26 Jan 2018 19:56:49 +0000 (22:56 +0300)]
Fix a typo in call to create_captcha()

Thanks to Paul Schaub for spotting this

6 years agoIntroduce option 'captcha' for mod_block_strangers
Evgeniy Khramtsov [Fri, 26 Jan 2018 12:02:06 +0000 (15:02 +0300)]
Introduce option 'captcha' for mod_block_strangers

When the option is set to `true`, the module will generate
CAPTCHA challenges for incoming subscription requests. The option
also implies that option `drop` is set to `true`. Note that
the module won't generate CAPTCHA challenges for messages: they
will still be rejected if `drop` is set to `true`.

Fixes #2246

6 years agoFix more tests
Paweł Chmielowski [Thu, 25 Jan 2018 17:43:34 +0000 (18:43 +0100)]
Fix more tests

6 years agoAdopt tests to changes in xmpp
Paweł Chmielowski [Thu, 25 Jan 2018 17:23:47 +0000 (18:23 +0100)]
Adopt tests to changes in xmpp

6 years agoSwitch to newer fast_xml and xmpp and update record fields in the code
Evgeniy Khramtsov [Thu, 25 Jan 2018 17:02:47 +0000 (20:02 +0300)]
Switch to newer fast_xml and xmpp and update record fields in the code

6 years agoHandle ignore from xmpp_socket callback start
Paweł Chmielowski [Wed, 24 Jan 2018 16:32:09 +0000 (17:32 +0100)]
Handle ignore from xmpp_socket callback start

This should help with issue #2244

6 years agoReduce log level for unexpected XML input
Holger Weiss [Wed, 24 Jan 2018 11:04:52 +0000 (12:04 +0100)]
Reduce log level for unexpected XML input

Log a warning rather than an error when, for example, a client sends a
stanza before opening the stream.

6 years agomod_block_strangers: Bounce groupchat to bare JID
Holger Weiss [Wed, 24 Jan 2018 10:49:31 +0000 (11:49 +0100)]
mod_block_strangers: Bounce groupchat to bare JID

If a blocked message is of type 'groupchat', address the error message
to the bare JID (rather than sending it as MUC PM).

6 years agoFix a typo in mod_caps
Evgeniy Khramtsov [Tue, 23 Jan 2018 20:20:10 +0000 (23:20 +0300)]
Fix a typo in mod_caps

6 years agoFix tag used in luerl dependency
Paweł Chmielowski [Tue, 23 Jan 2018 08:37:46 +0000 (09:37 +0100)]
Fix tag used in luerl dependency

6 years agoMerge branch 'mod-default-options'
Evgeniy Khramtsov [Tue, 23 Jan 2018 08:00:00 +0000 (11:00 +0300)]
Merge branch 'mod-default-options'

6 years agoIntroduce new gen_mod callback: mod_options/1
Evgeniy Khramtsov [Tue, 23 Jan 2018 07:54:52 +0000 (10:54 +0300)]
Introduce new gen_mod callback: mod_options/1

The callback is supposed to provide known options and their default
values, as long as the documentation. Passing default values into
get_mod functions is now deprecated: all defaults should be provided
by the Mod:mod_options/1 callback.

6 years agoMove luerl as optional tools dependency
Christophe Romain [Mon, 22 Jan 2018 16:42:27 +0000 (17:42 +0100)]
Move luerl as optional tools dependency

6 years agoRemove deps override on mix
Christophe Romain [Mon, 22 Jan 2018 16:42:02 +0000 (17:42 +0100)]
Remove deps override on mix

6 years agoMerge remote-tracking branch 'processone/pr/2238'
Holger Weiss [Sun, 21 Jan 2018 14:05:05 +0000 (15:05 +0100)]
Merge remote-tracking branch 'processone/pr/2238'

* processone/pr/2238:
  Fix typo /this/it/

6 years agoFix typo /this/it/
Licaon_Kter [Sun, 21 Jan 2018 13:44:30 +0000 (13:44 +0000)]
Fix typo /this/it/

6 years agoUpdate 'pubsub_node' column name for DB export
Holger Weiss [Fri, 19 Jan 2018 12:10:14 +0000 (13:10 +0100)]
Update 'pubsub_node' column name for DB export

The 'type' column has been renamed in commit
44700d91ba270a251b512c0b7ad8e4c4d8962ad2.

6 years agoDo not try to start ezlib application too frequently
Evgeniy Khramtsov [Tue, 16 Jan 2018 15:06:31 +0000 (18:06 +0300)]
Do not try to start ezlib application too frequently

This may overload Erlang applicaton controller

6 years agoReturn debug message back
Evgeniy Khramtsov [Tue, 16 Jan 2018 14:57:21 +0000 (17:57 +0300)]
Return debug message back

6 years agoSync mix and rebar for eimp dep
Christophe Romain [Tue, 16 Jan 2018 10:45:29 +0000 (11:45 +0100)]
Sync mix and rebar for eimp dep

6 years agoImprove validation of 'convert' option
Evgeniy Khramtsov [Mon, 15 Jan 2018 22:06:20 +0000 (01:06 +0300)]
Improve validation of 'convert' option

6 years agoInclude acme deps in release, fixes f2c3fe8ac
Christophe Romain [Mon, 15 Jan 2018 21:21:24 +0000 (22:21 +0100)]
Include acme deps in release, fixes f2c3fe8ac

6 years agoUse correct name of new rebar command
Paweł Chmielowski [Mon, 15 Jan 2018 14:21:04 +0000 (15:21 +0100)]
Use correct name of new rebar command

6 years agoCall configure on deps in separate rebar command that compile
Paweł Chmielowski [Mon, 15 Jan 2018 11:31:47 +0000 (12:31 +0100)]
Call configure on deps in separate rebar command that compile

This way we rebar.config.script can use vars detected by configure

6 years agoUse override syntax that rebar3 accepts
Paweł Chmielowski [Mon, 15 Jan 2018 10:56:13 +0000 (11:56 +0100)]
Use override syntax that rebar3 accepts

6 years agoGet rid of a call to misc:have_eimp()
Evgeniy Khramtsov [Mon, 15 Jan 2018 10:14:51 +0000 (13:14 +0300)]
Get rid of a call to misc:have_eimp()

6 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 15 Jan 2018 10:00:19 +0000 (13:00 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

6 years agoAlways build eimp dependency
Evgeniy Khramtsov [Mon, 15 Jan 2018 09:54:57 +0000 (12:54 +0300)]
Always build eimp dependency

Even if no suitable C graphics libraries are detected
at compile time, the package is still usable because it
provides `eimp:get_type/1` which is used by mod_avatar.

6 years agoDon't report errors when trying to remove not existing files in make install
Paweł Chmielowski [Mon, 15 Jan 2018 09:38:36 +0000 (10:38 +0100)]
Don't report errors when trying to remove not existing files in make install

6 years agoCopy sh_to_ask function from xmerl_regexp.erl
Paweł Chmielowski [Mon, 15 Jan 2018 09:31:06 +0000 (10:31 +0100)]
Copy sh_to_ask function from xmerl_regexp.erl

This way we don't need to include xmerl application in our docker container

6 years agoMerge pull request #2221 from licaon-kter/patch-1
Evgeny Khramtsov [Sun, 14 Jan 2018 06:54:22 +0000 (09:54 +0300)]
Merge pull request #2221 from licaon-kter/patch-1

Fix example config macro names

6 years agoFix example config macro names
Licaon_Kter [Sat, 13 Jan 2018 21:38:01 +0000 (21:38 +0000)]
Fix example config macro names

These were missed in https://github.com/processone/ejabberd/commit/c26b56679e06ef8b88734030de11c6b885f9bb78#diff-19e0c10699732f76181f70cfbec95d38 I guess.

6 years agoImprove logging of failed s2s EXTERNAL authentication
Evgeniy Khramtsov [Sat, 13 Jan 2018 10:01:40 +0000 (13:01 +0300)]
Improve logging of failed s2s EXTERNAL authentication

6 years agoFix detection of rebar3
Paweł Chmielowski [Fri, 12 Jan 2018 16:12:46 +0000 (17:12 +0100)]
Fix detection of rebar3

Looks like sometimes rebar3 report version that can't be split to 3 fields
by '.', we need only first one so don't match the rest

6 years agoImprove resolving of system deps
Paweł Chmielowski [Fri, 12 Jan 2018 15:15:52 +0000 (16:15 +0100)]
Improve resolving of system deps

This version is able to search for know alternative names of deps and
helps with running tests when using system deps

6 years agoAdd mix dependencies for acme support
Christophe Romain [Fri, 12 Jan 2018 11:28:31 +0000 (12:28 +0100)]
Add mix dependencies for acme support

6 years agoNote about direct-tls connections in example config
Evgeniy Khramtsov [Fri, 12 Jan 2018 07:27:33 +0000 (10:27 +0300)]
Note about direct-tls connections in example config

7 years agoInclude newly releases fast_tls/esip/stun in mix.lock 18.01
Paweł Chmielowski [Thu, 11 Jan 2018 13:38:54 +0000 (14:38 +0100)]
Include newly releases fast_tls/esip/stun in mix.lock

7 years agoUpdate mix.lock
Paweł Chmielowski [Thu, 11 Jan 2018 10:20:07 +0000 (11:20 +0100)]
Update mix.lock

7 years agoUpdate deps
Paweł Chmielowski [Thu, 11 Jan 2018 10:11:01 +0000 (11:11 +0100)]
Update deps

7 years agoRemove old docker specs
Christophe Romain [Thu, 11 Jan 2018 09:19:56 +0000 (10:19 +0100)]
Remove old docker specs

7 years agoPrepare mix for 18.01
Christophe Romain [Wed, 10 Jan 2018 22:06:06 +0000 (23:06 +0100)]
Prepare mix for 18.01

7 years agoUpdate mix deps
Christophe Romain [Wed, 10 Jan 2018 17:14:52 +0000 (18:14 +0100)]
Update mix deps

7 years agoHandle error case from code:lib_dir in ResolveDepPath in rebar.config.script
Paweł Chmielowski [Wed, 10 Jan 2018 15:34:01 +0000 (16:34 +0100)]
Handle error case from code:lib_dir in ResolveDepPath in rebar.config.script

7 years agoUpdate mix deps
Christophe Romain [Wed, 10 Jan 2018 11:07:19 +0000 (12:07 +0100)]
Update mix deps

7 years agoUpdate deps again
Paweł Chmielowski [Wed, 10 Jan 2018 10:55:26 +0000 (11:55 +0100)]
Update deps again

7 years agoUpdate mix deps
Christophe Romain [Wed, 10 Jan 2018 10:48:53 +0000 (11:48 +0100)]
Update mix deps

7 years agoUpdate deps
Paweł Chmielowski [Wed, 10 Jan 2018 10:31:19 +0000 (11:31 +0100)]
Update deps

7 years agoFix indentation in commented example
Christophe Romain [Wed, 10 Jan 2018 10:24:09 +0000 (11:24 +0100)]
Fix indentation in commented example

7 years agoReport fs not suported on SunOS (#2204)
Christophe Romain [Wed, 10 Jan 2018 09:58:47 +0000 (10:58 +0100)]
Report fs not suported on SunOS (#2204)

7 years agoSend privileges if at least one of them is set, don't require all to be set
Paweł Chmielowski [Tue, 9 Jan 2018 14:50:16 +0000 (15:50 +0100)]
Send privileges if at least one of them is set, don't require all to be set

7 years agoCreate CODE_OF_CONDUCT.md
Mickaël Rémond [Tue, 9 Jan 2018 13:17:55 +0000 (14:17 +0100)]
Create CODE_OF_CONDUCT.md

7 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Mon, 8 Jan 2018 10:45:21 +0000 (13:45 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoIgnore result of sending stream trailer in test suite
Evgeniy Khramtsov [Mon, 8 Jan 2018 10:45:08 +0000 (13:45 +0300)]
Ignore result of sending stream trailer in test suite

7 years agoDelete old .so and executable files before installing new one
Paweł Chmielowski [Mon, 8 Jan 2018 10:11:42 +0000 (11:11 +0100)]
Delete old .so and executable files before installing new one

This fixes crash for people who have live ejabberd installed in make install
target directory, by ensuring that loaded binaries aren't replaced in memory
with new content.

7 years agoMake all install target rules as .PHONY
Paweł Chmielowski [Mon, 8 Jan 2018 09:56:53 +0000 (10:56 +0100)]
Make all install target rules as .PHONY

7 years agoRefactor code for installing binaries
Paweł Chmielowski [Mon, 8 Jan 2018 09:56:32 +0000 (10:56 +0100)]
Refactor code for installing binaries

7 years agoProcess 'name' option for all route-registering modules
Evgeniy Khramtsov [Mon, 8 Jan 2018 08:29:17 +0000 (11:29 +0300)]
Process 'name' option for all route-registering modules

The option allows to set arbitrary text for disco#info identity name.
Previously, option 'name' was supported by mod_proxy65 and mod_http_upload
only. Now, all the following modules support this option as well:
- mod_disco
- mod_irc
- mod_muc
- mod_multicast
- mod_pubsub
- mod_vcard

Example:
```
modules:
  ...
  mod_disco:
    name: "Cool XMPP Server"
  ...
```

7 years agoUpdate copyright dates in header files
Evgeniy Khramtsov [Sat, 6 Jan 2018 11:01:45 +0000 (14:01 +0300)]
Update copyright dates in header files

7 years agoDon't display copyright dates in vCards of services
Evgeniy Khramtsov [Sat, 6 Jan 2018 10:55:24 +0000 (13:55 +0300)]
Don't display copyright dates in vCards of services

Copyright dates in vCards may paritally disclose server version,
which is not always desired

7 years agoUse TLS defaults from fast_tls
Evgeniy Khramtsov [Sat, 6 Jan 2018 10:46:02 +0000 (13:46 +0300)]
Use TLS defaults from fast_tls

7 years agoUpdate copyright dates
Evgeniy Khramtsov [Fri, 5 Jan 2018 20:18:58 +0000 (23:18 +0300)]
Update copyright dates

7 years agoRefer to new fast_tls version
Evgeniy Khramtsov [Fri, 5 Jan 2018 14:56:32 +0000 (17:56 +0300)]
Refer to new fast_tls version

7 years agoReturn `true` or `false` from send() callback
Evgeniy Khramtsov [Fri, 5 Jan 2018 09:15:28 +0000 (12:15 +0300)]
Return `true` or `false` from send() callback

Fixes #2209

7 years agoMerge pull request #2202 from weiss/bounce-to-stranger
Evgeny Khramtsov [Fri, 5 Jan 2018 08:43:18 +0000 (11:43 +0300)]
Merge pull request #2202 from weiss/bounce-to-stranger

mod_block_strangers: Bounce an error message

7 years agoFix ejabberd command privacy_set
Paweł Chmielowski [Thu, 4 Jan 2018 13:57:26 +0000 (14:57 +0100)]
Fix ejabberd command privacy_set

This fixes issue #2205

7 years agoMerge remote-tracking branch 'processone/pr/2203'
Holger Weiss [Wed, 3 Jan 2018 21:33:18 +0000 (22:33 +0100)]
Merge remote-tracking branch 'processone/pr/2203'

* processone/pr/2203:
  mod_proxy65: Expand @HOST@ keyword in 'hostname' option

7 years agomod_proxy65: Expand @HOST@ keyword in 'hostname' option
Marc Schink [Wed, 3 Jan 2018 16:16:23 +0000 (17:16 +0100)]
mod_proxy65: Expand @HOST@ keyword in 'hostname' option

7 years agomod_block_strangers: Bounce an error message
Holger Weiss [Tue, 2 Jan 2018 23:38:50 +0000 (00:38 +0100)]
mod_block_strangers: Bounce an error message

Return a stanza error when a message is rejected, in order to make
legitimate users aware of the issue.

Closes #2197.

7 years agoMake mysql and pgsql one of the default module for Mix
Mickael Remond [Fri, 29 Dec 2017 16:22:59 +0000 (17:22 +0100)]
Make mysql and pgsql one of the default module for Mix

7 years agoRegenerated mix.lock file
Mickael Remond [Fri, 29 Dec 2017 16:18:59 +0000 (17:18 +0100)]
Regenerated mix.lock file

7 years agoMerge branch 'master' of github.com:processone/ejabberd 17.12
Evgeniy Khramtsov [Thu, 28 Dec 2017 18:37:19 +0000 (21:37 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

7 years agoRepair hosts check during certfiles validation
Evgeniy Khramtsov [Thu, 28 Dec 2017 18:36:57 +0000 (21:36 +0300)]
Repair hosts check during certfiles validation