]> granicus.if.org Git - ejabberd/log
ejabberd
10 years agoRemove duplicated code
Evgeniy Khramtsov [Wed, 29 Apr 2015 11:51:45 +0000 (14:51 +0300)]
Remove duplicated code

10 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

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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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.

10 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.

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

10 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)

10 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)

10 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

10 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)

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

10 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)

10 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)

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

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

10 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)

10 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)

10 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

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

10 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

10 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)

10 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

10 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

10 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

10 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)

10 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

10 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.

10 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.

10 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.

10 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

10 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.

10 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

10 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.

10 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

10 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)

10 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.

10 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

10 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.

10 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)

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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)

10 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

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

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

10 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

10 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

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

10 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.

10 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

10 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

10 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

10 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.

10 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.

10 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

10 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.

10 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

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

10 years agoFix asn1 module compilation with mix
Mickael Remond [Mon, 6 Apr 2015 10:29:11 +0000 (12:29 +0200)]
Fix asn1 module compilation with mix

This should solve building ejabberd as an Elixir dependency.

10 years agoFix type spec
Evgeniy Khramtsov [Mon, 6 Apr 2015 09:38:54 +0000 (12:38 +0300)]
Fix type spec

10 years agoMake sure Mnesia dir environment and log file are list, not binary
Mickael Remond [Mon, 6 Apr 2015 09:36:16 +0000 (11:36 +0200)]
Make sure Mnesia dir environment and log file are list, not binary

This is useful for Elixir configuration, as binary is the more natural data type.
Closes #514

10 years agoejabberd_websocket: Ignore case of header values
Holger Weiss [Sun, 5 Apr 2015 12:48:08 +0000 (14:48 +0200)]
ejabberd_websocket: Ignore case of header values

RFC 6455 says that the client's opening handshake includes an Upgrade
header field "containing the value 'websocket', treated as an ASCII
case-insensitive value."

Closes #510.

10 years agoejabberd can be embedded in an Elixir application
Mickael Remond [Sat, 4 Apr 2015 15:42:12 +0000 (17:42 +0200)]
ejabberd can be embedded in an Elixir application

10 years agoReplace crypto calls that will be removed in a future release
Badlop [Sat, 4 Apr 2015 12:09:58 +0000 (14:09 +0200)]
Replace crypto calls that will be removed in a future release

10 years agoReplace undefined value with empty one (processone/ejabberd-contrib#92)
Badlop [Sat, 4 Apr 2015 11:48:17 +0000 (13:48 +0200)]
Replace undefined value with empty one (processone/ejabberd-contrib#92)

10 years agoRemove unused case clauses to make dialyzer happy
Holger Weiss [Fri, 3 Apr 2015 18:37:42 +0000 (20:37 +0200)]
Remove unused case clauses to make dialyzer happy

10 years agoImprove srg_get_info result format (processone/ejabberd-contrib#92)
Badlop [Fri, 3 Apr 2015 10:16:11 +0000 (12:16 +0200)]
Improve srg_get_info result format (processone/ejabberd-contrib#92)

10 years agoFix output formatting in srg_get_info commend from mod_admin_extra
Paweł Chmielowski [Thu, 2 Apr 2015 14:55:51 +0000 (16:55 +0200)]
Fix output formatting in srg_get_info commend from mod_admin_extra

10 years agoFix problems with get_vcard* functions from mod_admin_extra
Paweł Chmielowski [Wed, 1 Apr 2015 14:32:34 +0000 (16:32 +0200)]
Fix problems with get_vcard* functions from mod_admin_extra

10 years agoDrop exmpp usage from mod_admin_extra
Paweł Chmielowski [Wed, 1 Apr 2015 13:44:49 +0000 (15:44 +0200)]
Drop exmpp usage from mod_admin_extra

10 years agoMerge pull request #493 from weiss/rfc-6121-routing
Evgeny Khramtsov [Wed, 1 Apr 2015 08:41:05 +0000 (11:41 +0300)]
Merge pull request #493 from weiss/rfc-6121-routing

Update ejabberd_sm's routing rules as per RFC 6121

10 years agoSwap 'mnesia' and 'internal' types correctly
Evgeniy Khramtsov [Mon, 30 Mar 2015 09:25:25 +0000 (12:25 +0300)]
Swap 'mnesia' and 'internal' types correctly

10 years agoThe 'default_db' option should impact ejabberd_auth as well
Evgeniy Khramtsov [Mon, 30 Mar 2015 09:18:18 +0000 (12:18 +0300)]
The 'default_db' option should impact ejabberd_auth as well

10 years agoAdd new 'default_db' option
Evgeniy Khramtsov [Mon, 30 Mar 2015 09:15:29 +0000 (12:15 +0300)]
Add new 'default_db' option

10 years agoFix lite.sql and convert binary to integer
Sergey Abramyan [Fri, 27 Mar 2015 19:14:29 +0000 (22:14 +0300)]
Fix lite.sql and convert binary to integer

10 years agoTry to fix more Dialyzer warnings
Badlop [Fri, 27 Mar 2015 14:55:57 +0000 (15:55 +0100)]
Try to fix more Dialyzer warnings

10 years agoEnsure set_presence changes are kept in state (thanks to Davide Colombo)(EJAB-1184)
Badlop [Fri, 27 Mar 2015 14:03:14 +0000 (15:03 +0100)]
Ensure set_presence changes are kept in state (thanks to Davide Colombo)(EJAB-1184)

10 years agoRemove tools/configure.erl as it's not used and can cause problem with make install
Paweł Chmielowski [Fri, 27 Mar 2015 12:22:50 +0000 (13:22 +0100)]
Remove tools/configure.erl as it's not used and can cause problem with make install

10 years agoFix even more dialyzer warnings
Badlop [Fri, 27 Mar 2015 11:28:11 +0000 (12:28 +0100)]
Fix even more dialyzer warnings

10 years agoFix set_presence command (ejabberd-contrib#61)
Badlop [Fri, 27 Mar 2015 10:43:39 +0000 (11:43 +0100)]
Fix set_presence command (ejabberd-contrib#61)

10 years agoFix more mod_admin_extra commands
Badlop [Thu, 26 Mar 2015 19:41:16 +0000 (20:41 +0100)]
Fix more mod_admin_extra commands

10 years agoFix problems in process_rosteritems command
Badlop [Thu, 26 Mar 2015 15:18:39 +0000 (16:18 +0100)]
Fix problems in process_rosteritems command

10 years agoAdd mod_admin_extra as a commented module
Badlop [Thu, 26 Mar 2015 12:59:36 +0000 (13:59 +0100)]
Add mod_admin_extra as a commented module

Previous commits were done with:
for i in `git log --reverse --date-order --format=%h mod_admin_extra.erl`; do git format-patch -1 $i; cat 00* >>patch; rm 00*; done
Then editing patch to remove unneeded files and fix path.

10 years agoDetect correctly when vCard does not exist (#21)
Badlop [Wed, 25 Mar 2015 12:56:04 +0000 (13:56 +0100)]
Detect correctly when vCard does not exist (#21)

10 years agoFix return error when requesting non-existing vcard value (#21)
Badlop [Mon, 23 Mar 2015 12:27:46 +0000 (13:27 +0100)]
Fix return error when requesting non-existing vcard value (#21)

10 years agoIgnore errors when retrieving status if the users just got offline
Mickaël Rémond [Fri, 20 Mar 2015 10:42:32 +0000 (11:42 +0100)]
Ignore errors when retrieving status if the users just got offline

Fix possible race condition.

10 years agomod_admin_extra: Let send_message omit subject
Holger Weiss [Wed, 11 Mar 2015 19:56:10 +0000 (20:56 +0100)]
mod_admin_extra: Let send_message omit subject

Let the send_message command omit the subject if the user either
specified an empty subject or a message type of "chat".