]> granicus.if.org Git - ejabberd/log
ejabberd
9 years agoFix function specification
Holger Weiss [Wed, 20 May 2015 10:13:15 +0000 (12:13 +0200)]
Fix function specification

9 years agoRemove obsolete doc and win32 files (EJAB-1738)
Christophe Romain [Wed, 20 May 2015 09:43:29 +0000 (11:43 +0200)]
Remove obsolete doc and win32 files (EJAB-1738)

9 years agoDo not bounce normal messages sent to unavailable resource
Evgeniy Khramtsov [Tue, 19 May 2015 07:51:49 +0000 (10:51 +0300)]
Do not bounce normal messages sent to unavailable resource

9 years agoSimplify XEP-0203 (Delayed Delivery) code a bit
Holger Weiss [Mon, 18 May 2015 19:26:51 +0000 (21:26 +0200)]
Simplify XEP-0203 (Delayed Delivery) code a bit

Now that XEP-0091 support is removed, the XEP-0203 code can be
simplified a little further.  This doesn't change the behavior.

9 years agoCall integer_to_binary using jlib (#554)
Christophe Romain [Mon, 18 May 2015 15:30:25 +0000 (17:30 +0200)]
Call integer_to_binary using jlib (#554)

9 years agoRemove XEP-0091 tags from test suite
Holger Weiss [Mon, 18 May 2015 12:38:57 +0000 (14:38 +0200)]
Remove XEP-0091 tags from test suite

9 years agoRemove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849)
Badlop [Mon, 18 May 2015 10:38:07 +0000 (12:38 +0200)]
Remove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849)

9 years agoRevert "Fix EJABBERD_OPTS quoting for Elixir"
Holger Weiss [Sun, 17 May 2015 22:48:56 +0000 (00:48 +0200)]
Revert "Fix EJABBERD_OPTS quoting for Elixir"

This reverts commit 2a15453d98425c72ae24e9da4d56ad295a57be1d.

The commit broke the case where 'log_rotate_date' is set to "$D0", for
example.

9 years agoMerge pull request #571 from sezuan/fix_export_term
Evgeny Khramtsov [Sun, 17 May 2015 19:44:14 +0000 (22:44 +0300)]
Merge pull request #571 from sezuan/fix_export_term

fixed erl_prettypr in encode_term

9 years agofixed erl_prettypr in encode_term
Matthias Rieber [Sun, 17 May 2015 17:15:52 +0000 (19:15 +0200)]
fixed erl_prettypr in encode_term

9 years agoNew command get_room_options (#567)
Badlop [Fri, 15 May 2015 15:47:10 +0000 (17:47 +0200)]
New command get_room_options (#567)

9 years agoFix indentation
Holger Weiss [Fri, 15 May 2015 13:50:43 +0000 (15:50 +0200)]
Fix indentation

9 years agoLoad config snippets for modules installed with ext_mod (EJAB-1741)
Paweł Chmielowski [Fri, 15 May 2015 10:30:15 +0000 (12:30 +0200)]
Load config snippets for modules installed with ext_mod (EJAB-1741)

9 years agoExport modules_dir/0
Paweł Chmielowski [Fri, 15 May 2015 10:27:59 +0000 (12:27 +0200)]
Export modules_dir/0

9 years agoAllow run joincluster as non root when ejabberd installed as root (#497)
Christophe Romain [Wed, 13 May 2015 13:54:28 +0000 (15:54 +0200)]
Allow run joincluster as non root when ejabberd installed as root (#497)

9 years agoMerge pull request #503 from weiss/fix-quoting-for-elixir
Christophe Romain [Wed, 13 May 2015 13:46:40 +0000 (15:46 +0200)]
Merge pull request #503 from weiss/fix-quoting-for-elixir

Fix EJABBERD_OPTS quoting for Elixir

9 years agoFix setting 'description' with change_room_option command (#567)
Badlop [Tue, 12 May 2015 15:37:39 +0000 (17:37 +0200)]
Fix setting 'description' with change_room_option command (#567)

9 years agoMerge pull request #560 from benlangfeld/feature/dev-vm
Mickaël Rémond [Tue, 12 May 2015 07:52:12 +0000 (09:52 +0200)]
Merge pull request #560 from benlangfeld/feature/dev-vm

Point out availability of development environment

9 years agoNew max_users_presence mod_muc option (thanks to anhcoi123)(#562)
Badlop [Fri, 8 May 2015 11:09:13 +0000 (13:09 +0200)]
New max_users_presence mod_muc option (thanks to anhcoi123)(#562)

9 years agoFix check_password_hash argument parsing (#559)
Badlop [Fri, 8 May 2015 10:04:04 +0000 (12:04 +0200)]
Fix check_password_hash argument parsing (#559)

9 years agoTry to support access_commands in YAML (ejabberd-contrib#45)
Badlop [Thu, 7 May 2015 16:34:05 +0000 (18:34 +0200)]
Try to support access_commands in YAML (ejabberd-contrib#45)

9 years agoRevert "Add private and roster local handlers (EJAB-682)" due to #556
Badlop [Thu, 7 May 2015 15:07:49 +0000 (17:07 +0200)]
Revert "Add private and roster local handlers (EJAB-682)" due to #556

This reverts commit 2e194bd997132f4fde5959b54e6bfe269d4de433.

9 years agoDon't announce register feature once user is authenticated (#41)
Badlop [Thu, 7 May 2015 09:41:59 +0000 (11:41 +0200)]
Don't announce register feature once user is authenticated (#41)

9 years agoMerge pull request #561 from weiss/muc-mark-private
Evgeny Khramtsov [Wed, 6 May 2015 10:56:13 +0000 (13:56 +0300)]
Merge pull request #561 from weiss/muc-mark-private

Tag private MUC messages with muc#user namespace

9 years agoTag private MUC messages with muc#user namespace
Holger Weiss [Tue, 5 May 2015 20:00:05 +0000 (22:00 +0200)]
Tag private MUC messages with muc#user namespace

Make it possible for clients to identify private MUC messages.  One use
case would be to filter out undesired carbon copies of those.

9 years agoPoint out availability of development environment
Ben Langfeld [Tue, 5 May 2015 12:24:31 +0000 (09:24 -0300)]
Point out availability of development environment

9 years agoSimplify internal code of get_last and set_last commands
Badlop [Tue, 5 May 2015 10:54:20 +0000 (12:54 +0200)]
Simplify internal code of get_last and set_last commands

9 years agoImprove get_last command to provide also last activity status
Badlop [Tue, 5 May 2015 10:46:21 +0000 (12:46 +0200)]
Improve get_last command to provide also last activity status

9 years agoFix set_last command to work with recent ejabberd (#555)
Badlop [Tue, 5 May 2015 10:45:53 +0000 (12:45 +0200)]
Fix set_last command to work with recent ejabberd (#555)

9 years agoRemove duplicated code
Evgeniy Khramtsov [Wed, 29 Apr 2015 11:51:45 +0000 (14:51 +0300)]
Remove duplicated code

9 years agoImprove module install code, allows better error checking
Christophe Romain [Wed, 29 Apr 2015 11:30:03 +0000 (13:30 +0200)]
Improve module install code, allows better error checking

9 years agoNew command get_user_rooms
Badlop [Wed, 29 Apr 2015 11:21:41 +0000 (13:21 +0200)]
New command get_user_rooms

9 years agoFix fetching from git@github url and allow compilation from ejabberd sources
Christophe Romain [Wed, 29 Apr 2015 08:19:15 +0000 (10:19 +0200)]
Fix fetching from git@github url and allow compilation from ejabberd sources

9 years agoMerge pull request #549 from joudinet/master
Christophe Romain [Tue, 28 Apr 2015 15:34:57 +0000 (17:34 +0200)]
Merge pull request #549 from joudinet/master

ejabberdctl: define mnesia options

9 years agoMerge pull request #547 from weiss/fix-account-jid-disco
badlop [Mon, 27 Apr 2015 17:39:32 +0000 (19:39 +0200)]
Merge pull request #547 from weiss/fix-account-jid-disco

Fix service discovery handling for account JIDs

9 years agoejabberdctl: define mnesia options
Johan Oudinet [Mon, 27 Apr 2015 15:25:07 +0000 (17:25 +0200)]
ejabberdctl: define mnesia options

In addition to factorize how the mnesia dir option is given to erl
commands, it allows one to set extra mnesia options via the
MNESIA_OPTIONS environment variable.

9 years agoRely on core routine for handling affiliation changes (thanks to Ben Langfeld)
Badlop [Mon, 27 Apr 2015 15:00:22 +0000 (17:00 +0200)]
Rely on core routine for handling affiliation changes (thanks to Ben Langfeld)

This ensures that all of the usual stanzas and such go out

9 years agomod_disco: Apply minor readability improvements
Holger Weiss [Sun, 26 Apr 2015 14:36:17 +0000 (16:36 +0200)]
mod_disco: Apply minor readability improvements

9 years agomod_disco: Omit 'roster_get' call if possible
Holger Weiss [Sun, 26 Apr 2015 14:32:03 +0000 (16:32 +0200)]
mod_disco: Omit 'roster_get' call if possible

As a small optimization, avoid running the 'roster_get' hook in the
(common) case where a client requests service discovery information for
its own bare JID.

9 years agoFix service disco handling for bare account JIDs
Holger Weiss [Sun, 26 Apr 2015 14:22:09 +0000 (16:22 +0200)]
Fix service disco handling for bare account JIDs

Don't swap the sending and receiving JIDs while checking whether the
client that requested service discovery information for a bare account
JID is a subscribed contact.

9 years agoFix validating function for iqdisc
Evgeniy Khramtsov [Thu, 23 Apr 2015 11:59:18 +0000 (14:59 +0300)]
Fix validating function for iqdisc

9 years agoAllow bypassing script interraction (#516) 15.04
Christophe Romain [Thu, 23 Apr 2015 08:14:08 +0000 (10:14 +0200)]
Allow bypassing script interraction (#516)

9 years agoImprove purge_offline filter and speed (#543)
Christophe Romain [Wed, 22 Apr 2015 16:11:39 +0000 (18:11 +0200)]
Improve purge_offline filter and speed (#543)

9 years agoAdd publish_only to affiliation type spec
Christophe Romain [Wed, 22 Apr 2015 16:10:35 +0000 (18:10 +0200)]
Add publish_only to affiliation type spec

9 years agoAdd private and roster local handlers to get listed in disco#info (EJAB-682)
Badlop [Wed, 22 Apr 2015 11:27:25 +0000 (13:27 +0200)]
Add private and roster local handlers to get listed in disco#info (EJAB-682)

9 years agoRemove obsolete release notes
Christophe Romain [Wed, 22 Apr 2015 10:21:48 +0000 (12:21 +0200)]
Remove obsolete release notes

9 years agoAllow to modify host when registering account in web (#291)
Badlop [Wed, 22 Apr 2015 09:01:13 +0000 (11:01 +0200)]
Allow to modify host when registering account in web (#291)

9 years agoAdd support for publish-only (#30)
Christophe Romain [Tue, 21 Apr 2015 15:23:59 +0000 (17:23 +0200)]
Add support for publish-only (#30)

9 years agoFix typo, oups...
Christophe Romain [Tue, 21 Apr 2015 14:13:23 +0000 (16:13 +0200)]
Fix typo, oups...

9 years agoremove deferred Collection shim header
Christophe Romain [Tue, 21 Apr 2015 14:11:00 +0000 (16:11 +0200)]
remove deferred Collection shim header

9 years agoOwner can subscribe to its node (#454)
Christophe Romain [Tue, 21 Apr 2015 13:14:39 +0000 (15:14 +0200)]
Owner can subscribe to its node (#454)

9 years agoFixed node type (thanks to saczawap) (#435)
Christophe Romain [Tue, 21 Apr 2015 13:02:20 +0000 (15:02 +0200)]
Fixed node type (thanks to saczawap) (#435)

9 years agoPubSub improvements
Christophe Romain [Wed, 8 Apr 2015 15:12:05 +0000 (17:12 +0200)]
PubSub improvements

This commit contains
- code cleanup
- use of db_type instead of old mod_pubsub_odbc
- some minor optimizations
- some minor bugfixes

9 years agoImprove join/leave cluster scripts
Christophe Romain [Tue, 21 Apr 2015 11:32:14 +0000 (13:32 +0200)]
Improve join/leave cluster scripts

9 years agoMerge pull request #540 from weiss/queue-error-stanza
Christophe Romain [Tue, 21 Apr 2015 09:19:49 +0000 (11:19 +0200)]
Merge pull request #540 from weiss/queue-error-stanza

Add privacy error stanza to XEP-0198 queue

9 years agoFix LDAP substrings filter (EJAB-1715)
Evgeniy Khramtsov [Tue, 21 Apr 2015 08:49:41 +0000 (11:49 +0300)]
Fix LDAP substrings filter (EJAB-1715)

9 years agoAdd privacy error stanza to XEP-0198 queue
Holger Weiss [Mon, 20 Apr 2015 20:03:18 +0000 (22:03 +0200)]
Add privacy error stanza to XEP-0198 queue

9 years agoFixed error replying on blocked messages
Alexey Shchepin [Mon, 20 Apr 2015 14:01:56 +0000 (17:01 +0300)]
Fixed error replying on blocked messages

9 years agoMake s2s port configurable in test runner
Paweł Chmielowski [Mon, 20 Apr 2015 14:16:30 +0000 (16:16 +0200)]
Make s2s port configurable in test runner

9 years agoRemove load_config command because is superseded by reload_config (#532)
Badlop [Mon, 20 Apr 2015 13:56:37 +0000 (15:56 +0200)]
Remove load_config command because is superseded by reload_config (#532)

9 years agoMerge pull request #536 from weiss/fail2ban-whitelist
Evgeny Khramtsov [Sat, 18 Apr 2015 09:28:36 +0000 (12:28 +0300)]
Merge pull request #536 from weiss/fail2ban-whitelist

Add mod_fail2ban option to whitelist IP addresses

9 years agomod_fail2ban: Add 'access' option for whitelisting
Holger Weiss [Sat, 18 Apr 2015 09:08:05 +0000 (11:08 +0200)]
mod_fail2ban: Add 'access' option for whitelisting

Closes #535.

9 years agocyrsasl_scram: Return user name with error message
Holger Weiss [Fri, 17 Apr 2015 18:21:11 +0000 (20:21 +0200)]
cyrsasl_scram: Return user name with error message

Let ejabberd_c2s run the 'c2s_auth_result' hook (which needs the user
name) on SCRAM authentication failure.

9 years agoejabberd_s2s_out: Remove Erlang/OTP version check
Holger Weiss [Thu, 16 Apr 2015 21:51:16 +0000 (23:51 +0200)]
ejabberd_s2s_out: Remove Erlang/OTP version check

The version check won't work for Erlang/OTP >= 17; and it's no longer
needed, as we don't support versions older than R16 anyway.

9 years agoCSI test: Simplify and improve readability
Holger Weiss [Thu, 16 Apr 2015 21:20:14 +0000 (23:20 +0200)]
CSI test: Simplify and improve readability

9 years agoCSI test: Fix race when slave becomes active again
Holger Weiss [Thu, 16 Apr 2015 06:45:17 +0000 (08:45 +0200)]
CSI test: Fix race when slave becomes active again

Make sure the server processed the slave's active request after the
previous test stanzas were received by the slave and before the final
Chat State notification is sent by the master.

9 years agoUpdate get_password_s description with SCRAM return values
Badlop [Wed, 15 Apr 2015 09:50:10 +0000 (11:50 +0200)]
Update get_password_s description with SCRAM return values

9 years agoRevert "Hook on group message"
Badlop [Wed, 15 Apr 2015 09:49:49 +0000 (11:49 +0200)]
Revert "Hook on group message"

This reverts commit b81250d667c846d30499b5284585597a35c96631.

9 years agoMake sure that server processed our inactive request before processing further in...
Paweł Chmielowski [Thu, 19 Feb 2015 11:28:31 +0000 (12:28 +0100)]
Make sure that server processed our inactive request before processing further in testing

9 years agoMerge pull request #426 from hairyhum/master
badlop [Wed, 15 Apr 2015 09:04:29 +0000 (11:04 +0200)]
Merge pull request #426 from hairyhum/master

Migration of scram passwords with piefxis (riak and internal only)

9 years agoRemove http_poll module
Paweł Chmielowski [Wed, 15 Apr 2015 08:47:10 +0000 (10:47 +0200)]
Remove http_poll module

For couple years browsers did limit ability to change cookies from js
for different domains, this made http_poll connections practically not
usuable. I don't think this module is used at all so it's time to put it
to rest.

9 years agoEnable websocket connection in default config file
Paweł Chmielowski [Wed, 15 Apr 2015 08:33:25 +0000 (10:33 +0200)]
Enable websocket connection in default config file

9 years agoDon't forget gen_tcp:listen/2 options
Holger Weiss [Tue, 14 Apr 2015 18:22:34 +0000 (20:22 +0200)]
Don't forget gen_tcp:listen/2 options

Fixes #530.

9 years agoFix nick logging in mod_muc_log plaintext (#522)
Badlop [Tue, 14 Apr 2015 13:46:43 +0000 (15:46 +0200)]
Fix nick logging in mod_muc_log plaintext (#522)

9 years agoClean multicast routing code detected by xref
Badlop [Fri, 10 Apr 2015 14:02:45 +0000 (16:02 +0200)]
Clean multicast routing code detected by xref

9 years agoAdd ability to configure parameters used by "make test" with test/config.ctc
Paweł Chmielowski [Thu, 9 Apr 2015 15:14:30 +0000 (17:14 +0200)]
Add ability to configure parameters used by "make test" with test/config.ctc

9 years agoGive better error messages for tests failing on #...{} = recv() lines
Paweł Chmielowski [Thu, 9 Apr 2015 14:39:52 +0000 (16:39 +0200)]
Give better error messages for tests failing on #...{} = recv() lines

9 years agoShow received input and expected input in ?recv* macros in case of failure
Paweł Chmielowski [Wed, 4 Feb 2015 13:42:03 +0000 (14:42 +0100)]
Show received input and expected input in ?recv* macros in case of failure

Throwing catch clause error is not that good for finding out what happened

9 years agoFix problem with pushing bufferend #xmlel-s to receiver in websocket code
Paweł Chmielowski [Thu, 9 Apr 2015 11:35:37 +0000 (13:35 +0200)]
Fix problem with pushing bufferend #xmlel-s to receiver in websocket code

9 years agoFix bug when sorting the list of rooms in WebAdmin
Badlop [Wed, 8 Apr 2015 13:34:08 +0000 (15:34 +0200)]
Fix bug when sorting the list of rooms in WebAdmin

9 years agoRemove hack with binary to integer conversion
Evgeniy Khramtsov [Wed, 8 Apr 2015 13:11:06 +0000 (16:11 +0300)]
Remove hack with binary to integer conversion

9 years agoMerge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Wed, 8 Apr 2015 12:31:41 +0000 (15:31 +0300)]
Merge branch 'master' of github.com:processone/ejabberd

9 years agoAdd virtual host support for SQLite
Evgeniy Khramtsov [Wed, 8 Apr 2015 12:31:28 +0000 (15:31 +0300)]
Add virtual host support for SQLite

9 years agoCopy multicast code from ejabberd-contrib to provide XEP-0033 (#521)
Badlop [Wed, 8 Apr 2015 12:01:16 +0000 (14:01 +0200)]
Copy multicast code from ejabberd-contrib to provide XEP-0033 (#521)

9 years agoAdd SQLite3 library checks at the configure script
Evgeniy Khramtsov [Wed, 8 Apr 2015 11:49:14 +0000 (14:49 +0300)]
Add SQLite3 library checks at the configure script

9 years agoDisable awkward trap_exit flag
Evgeniy Khramtsov [Wed, 8 Apr 2015 11:40:28 +0000 (14:40 +0300)]
Disable awkward trap_exit flag

9 years agoEnable FOREIGN KEYS by default
Evgeniy Khramtsov [Wed, 8 Apr 2015 11:39:47 +0000 (14:39 +0300)]
Enable FOREIGN KEYS by default

9 years agoMake sure SQLite always returns binaries
Evgeniy Khramtsov [Wed, 8 Apr 2015 11:38:04 +0000 (14:38 +0300)]
Make sure SQLite always returns binaries

9 years agoMerge pull request #486 from saa/sqlite_support
Evgeny Khramtsov [Wed, 8 Apr 2015 11:34:56 +0000 (14:34 +0300)]
Merge pull request #486 from saa/sqlite_support

Add SQLite support

9 years agoAdd mod_muc_admin contrib.
Jerome Sautret [Tue, 7 Apr 2015 14:30:34 +0000 (16:30 +0200)]
Add mod_muc_admin contrib.

9 years agoejabberd_listener: Remove Erlang/OTP version check
Holger Weiss [Tue, 7 Apr 2015 07:47:05 +0000 (09:47 +0200)]
ejabberd_listener: Remove Erlang/OTP version check

We don't support Erlang/OTP versions older than R16 anyway.

9 years agoMerge pull request #518 from liudanking/master
Evgeny Khramtsov [Tue, 7 Apr 2015 07:34:18 +0000 (10:34 +0300)]
Merge pull request #518 from liudanking/master

fix otp version check in ejabberd_listener.erl listen_tcp/5

9 years agoExplicitly start crypto with start
Mickael Remond [Tue, 7 Apr 2015 07:03:37 +0000 (09:03 +0200)]
Explicitly start crypto with start

This is to please Elixir / Phoenix enviroment

9 years agofix otp version check in listen_tcp/5
liudan [Tue, 7 Apr 2015 01:28:35 +0000 (09:28 +0800)]
fix otp version check in listen_tcp/5

9 years agoDon't call send_element/2 if previous call failed
Holger Weiss [Mon, 6 Apr 2015 20:34:48 +0000 (22:34 +0200)]
Don't call send_element/2 if previous call failed

Be sure not to try sending data over a TCP socket that is no longer
usable.

9 years agoFix problem with c2s buffering on old style websocket connections
Paweł Chmielowski [Mon, 6 Apr 2015 15:54:45 +0000 (17:54 +0200)]
Fix problem with c2s buffering on old style websocket connections

Old style websocket do use binaries for transferring data to C2S, so when
we buffer that data we need to handle it different than list of #xml structs
used by new style connections.

This fixes github issue #515.

9 years agoMerge pull request #513 from weiss/ignore-header-case
Paweł Chmielowski [Mon, 6 Apr 2015 15:49:51 +0000 (17:49 +0200)]
Merge pull request #513 from weiss/ignore-header-case

ejabberd_websocket: Ignore case of HTTP header values

9 years agoExplicitely start crypto module
Mickael Remond [Mon, 6 Apr 2015 11:46:09 +0000 (13:46 +0200)]
Explicitely start crypto module

Without explicit start, it causes issue when embedding ejabberd into other apps.

9 years agoFix compilation result for asn1 files
Mickael Remond [Mon, 6 Apr 2015 10:39:21 +0000 (12:39 +0200)]
Fix compilation result for asn1 files

9 years agoRemove unused variable
Mickael Remond [Mon, 6 Apr 2015 10:31:32 +0000 (12:31 +0200)]
Remove unused variable