]> granicus.if.org Git - ejabberd/log
ejabberd
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

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

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

9 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

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

9 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

9 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

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

9 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

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

9 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

9 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

9 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

9 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

9 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

9 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

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

9 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

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

9 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

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

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

9 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

9 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

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

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

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

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

9 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".

9 years agoUpdate FSF address (solves #73)
Badlop [Wed, 25 Feb 2015 14:17:31 +0000 (15:17 +0100)]
Update FSF address (solves #73)

9 years agofix connected_users_info in mod_admin_extra
HAMANO Tsukasa [Wed, 25 Feb 2015 04:16:38 +0000 (13:16 +0900)]
fix connected_users_info in mod_admin_extra

9 years agomod_admin_extra: Fix private_get/private_set types
Holger Weiss [Tue, 24 Feb 2015 23:46:34 +0000 (00:46 +0100)]
mod_admin_extra: Fix private_get/private_set types

9 years agoSupport TEL XXX in set and get_vcard commands
Badlop [Tue, 17 Feb 2015 15:21:57 +0000 (16:21 +0100)]
Support TEL XXX in set and get_vcard commands

9 years agoChanged signature of user_sessions_info to take binaries rather than strings as it...
colm [Fri, 13 Feb 2015 23:15:02 +0000 (23:15 +0000)]
Changed signature of user_sessions_info to take binaries rather than strings as it doesn't match anything in mnesia if it searches it by string

9 years agoJoin three send_message_* commands in one (PR #68)
Badlop [Wed, 11 Feb 2015 17:48:43 +0000 (18:48 +0100)]
Join three send_message_* commands in one (PR #68)

9 years agoadd send_message_normal command
HAMANO Tsukasa [Tue, 10 Feb 2015 16:09:03 +0000 (01:09 +0900)]
add send_message_normal command

9 years agofix mod_admin_extra stats command
HAMANO Tsukasa [Tue, 27 Jan 2015 15:00:33 +0000 (00:00 +0900)]
fix mod_admin_extra stats command

9 years agomod_admin_extra: Fix stats(_host) argument types
Holger Weiss [Tue, 10 Jun 2014 20:37:16 +0000 (22:37 +0200)]
mod_admin_extra: Fix stats(_host) argument types

9 years agoUpdate kick_session to work with ejabberd master
Badlop [Wed, 7 May 2014 16:44:48 +0000 (18:44 +0200)]
Update kick_session to work with ejabberd master

9 years agoBinary conversions
Sonny Scroggin [Fri, 2 May 2014 20:01:36 +0000 (15:01 -0500)]
Binary conversions

9 years agoMore binary conversions
Sonny Scroggin [Wed, 2 Apr 2014 02:17:08 +0000 (21:17 -0500)]
More binary conversions

9 years agoUpdate add_roster_item and get_roster to ejabberd 13
Badlop [Wed, 2 Apr 2014 09:23:04 +0000 (11:23 +0200)]
Update add_roster_item and get_roster to ejabberd 13

9 years agoFix get_vcard and set_vcard when using option module_resource (issue #21)
Badlop [Tue, 25 Mar 2014 17:17:14 +0000 (18:17 +0100)]
Fix get_vcard and set_vcard when using option module_resource (issue #21)

9 years agoFix add_rosteritem, delete_rosteritem, and get_roster
Sonny Scroggin [Tue, 25 Mar 2014 16:15:53 +0000 (11:15 -0500)]
Fix add_rosteritem, delete_rosteritem, and get_roster

9 years agoUpdate get_vcard and set_vcard to ejabberd 13 (fixes issue #21)
Badlop [Mon, 24 Mar 2014 18:01:43 +0000 (19:01 +0100)]
Update get_vcard and set_vcard to ejabberd 13 (fixes issue #21)

9 years agomod_admin_extra: for support in ejabberd-v13.x changed args from string to binary...
Rahul Gautam [Tue, 18 Mar 2014 08:01:31 +0000 (13:31 +0530)]
mod_admin_extra: for support in ejabberd-v13.x changed args from string to binary : all changes tested with ejabberdv13.12

9 years agoFix command change_password (fixes #16)
Badlop [Sun, 16 Mar 2014 19:49:01 +0000 (20:49 +0100)]
Fix command change_password (fixes #16)

9 years agoHandle error when requesting information of a non-existing shared roster (fixes #14)
Badlop [Wed, 5 Mar 2014 11:12:47 +0000 (12:12 +0100)]
Handle error when requesting information of a non-existing shared roster (fixes #14)

9 years agoFixes srg_* commands (fixes #147)
Badlop [Mon, 3 Mar 2014 11:31:17 +0000 (12:31 +0100)]
Fixes srg_* commands (fixes #147)

9 years agoFix srg_create when calling ejabberd_regexp (fixes issue #12)
Badlop [Fri, 28 Feb 2014 17:38:40 +0000 (18:38 +0100)]
Fix srg_create when calling ejabberd_regexp (fixes issue #12)

9 years agoAdd get_last to ejabberdctl for last user activity (thanks to lehrblogger)
Badlop [Wed, 7 Aug 2013 11:36:42 +0000 (13:36 +0200)]
Add get_last to ejabberdctl for last user activity (thanks to lehrblogger)

The logic for determining the response is borrowed from here:
https://github.com/processone/ejabberd/blob/6d811f5178e000def445e12deaa0d587004efc67/src/web/ejabberd_web_admin.erl#L1583-L1601

9 years agoInitial import from ejabberd-modules SVN
Badlop [Mon, 15 Apr 2013 10:03:14 +0000 (12:03 +0200)]
Initial import from ejabberd-modules SVN

9 years agoMake sure that we send each time <close> before closing websocket connection
Paweł Chmielowski [Wed, 25 Mar 2015 16:08:43 +0000 (17:08 +0100)]
Make sure that we send each time <close> before closing websocket connection

9 years agoIf command crashes, return restuple with error and explanation (ejabberd-contrib...
Badlop [Wed, 25 Mar 2015 12:56:42 +0000 (13:56 +0100)]
If command crashes, return restuple with error and explanation (ejabberd-contrib #21)

9 years agoDon't bother with filtering out PEP error messages
Holger Weiss [Wed, 25 Mar 2015 01:02:08 +0000 (02:02 +0100)]
Don't bother with filtering out PEP error messages

Now that ejabberd_sm won't deliver error messages that were sent to bare
JIDs anymore, PEP error messages should no longer arrive.

9 years agoRoute headlines sent to bare JIDs to all resources
Holger Weiss [Wed, 25 Mar 2015 00:17:35 +0000 (01:17 +0100)]
Route headlines sent to bare JIDs to all resources

As per RFC 6121, deliver headline messages that were sent to a bare JID
to all resources with a non-negative priority, not just to those with
the highest priority.  If no such resource is available, discard them
silently.

9 years agoDon't route error/groupchat messages to bare JIDs
Holger Weiss [Tue, 24 Mar 2015 23:52:49 +0000 (00:52 +0100)]
Don't route error/groupchat messages to bare JIDs

As per RFC 6121, drop error messages that were sent to bare JIDs, and
return an error if a groupchat message was sent to a bare JID.

9 years agoUpdate routing for unavailable resources
Holger Weiss [Tue, 24 Mar 2015 23:13:05 +0000 (00:13 +0100)]
Update routing for unavailable resources

As per RFC 6121, don't reroute non-chat messages sent to unavailable
resources.

9 years agoReturn error when incoming message is blocked
Holger Weiss [Tue, 24 Mar 2015 22:10:47 +0000 (23:10 +0100)]
Return error when incoming message is blocked

As per XEP-0016 and XEP-0191, return a service-unavailable error when an
incoming message was blocked by a privacy list.  This lets the user
appear offline to the contact.

9 years agoFix "IP address not available" error message
Holger Weiss [Tue, 24 Mar 2015 16:32:57 +0000 (17:32 +0100)]
Fix "IP address not available" error message

9 years agoAdd support for ciphers and protocol_options in ejabberd_http
Alexey Shchepin [Tue, 24 Mar 2015 15:13:55 +0000 (18:13 +0300)]
Add support for ciphers and protocol_options in ejabberd_http

9 years agoexport CONTRIB_MODULES_PATH (thanks to sezuan)(#489)
Christophe Romain [Tue, 24 Mar 2015 15:00:56 +0000 (16:00 +0100)]
export CONTRIB_MODULES_PATH (thanks to sezuan)(#489)

9 years agoMake R16B03-1 the minimal reguired otp version
Christophe Romain [Mon, 23 Mar 2015 13:54:29 +0000 (14:54 +0100)]
Make R16B03-1 the minimal reguired otp version

9 years agoAvoid crypto:hmac/3 call for R15B compatibility
Holger Weiss [Sat, 21 Mar 2015 21:56:23 +0000 (22:56 +0100)]
Avoid crypto:hmac/3 call for R15B compatibility

9 years agoFix compilation on Erlang R15B
Holger Weiss [Sat, 21 Mar 2015 21:06:38 +0000 (22:06 +0100)]
Fix compilation on Erlang R15B

9 years agoRemove duplicate CREATE INDEX in mysql.sql
Alexey Shchepin [Sat, 21 Mar 2015 20:41:27 +0000 (23:41 +0300)]
Remove duplicate CREATE INDEX in mysql.sql

9 years agoStart ext_mod before module as it's setup contrib path
Christophe Romain [Fri, 20 Mar 2015 14:06:02 +0000 (15:06 +0100)]
Start ext_mod before module as it's setup contrib path

9 years agoRemoved deprecated calls to crypto:sha_mac in scram.erl
Alexey Shchepin [Fri, 20 Mar 2015 10:57:27 +0000 (13:57 +0300)]
Removed deprecated calls to crypto:sha_mac in scram.erl

9 years agoAdd ejabberd_auth_odbc:convert_to_scram/1 15.03
Alexey Shchepin [Mon, 9 Mar 2015 13:38:16 +0000 (16:38 +0300)]
Add ejabberd_auth_odbc:convert_to_scram/1

9 years agoAdd SCRAM support to ejabberd_auth_odbc
Alexey Shchepin [Tue, 17 Feb 2015 20:26:31 +0000 (23:26 +0300)]
Add SCRAM support to ejabberd_auth_odbc

9 years agoAdd a missed SQL index on privacy_list_data table
Alexey Shchepin [Wed, 18 Mar 2015 15:46:46 +0000 (18:46 +0300)]
Add a missed SQL index on privacy_list_data table

9 years agoAdded MySQL support for delete_old_messages (offline) command.
Jerome Sautret [Fri, 13 Mar 2015 17:29:57 +0000 (18:29 +0100)]
Added MySQL support for delete_old_messages (offline) command.

9 years agoFix mod_offline termination
Evgeniy Khramtsov [Thu, 12 Mar 2015 09:12:22 +0000 (12:12 +0300)]
Fix mod_offline termination

9 years agoExplicitly set standard_conforming_strings to off with PostreSQL
Alexey Shchepin [Mon, 9 Mar 2015 13:37:35 +0000 (16:37 +0300)]
Explicitly set standard_conforming_strings to off with PostreSQL

9 years agoReport TLS errors
Evgeniy Khramtsov [Tue, 3 Mar 2015 10:32:04 +0000 (13:32 +0300)]
Report TLS errors

9 years agoFix epmd not in PATH (#484)
Christophe Romain [Wed, 18 Mar 2015 21:26:06 +0000 (22:26 +0100)]
Fix epmd not in PATH (#484)

9 years agoUpdate 'rsm_in' record element types
Holger Weiss [Tue, 17 Mar 2015 23:28:10 +0000 (00:28 +0100)]
Update 'rsm_in' record element types

The jlib:rsm_decode/1 function sets the 'max' and/or 'index' elements of
the returned 'rsm_in' record to 'error' if the parsed strings cannot be
converted to integer values.

9 years agoAdd missing list_to_binary call
Christophe Romain [Fri, 13 Mar 2015 16:59:19 +0000 (17:59 +0100)]
Add missing list_to_binary call

9 years agoAdd contributed modules code path on start
Christophe Romain [Fri, 13 Mar 2015 11:20:25 +0000 (12:20 +0100)]
Add contributed modules code path on start

9 years agoRename module function to keep them grouped on help
Christophe Romain [Fri, 13 Mar 2015 10:54:32 +0000 (11:54 +0100)]
Rename module function to keep them grouped on help

9 years agoMerge pull request #473 from weiss/escape-space-in-options
Christophe Romain [Fri, 13 Mar 2015 10:41:26 +0000 (11:41 +0100)]
Merge pull request #473 from weiss/escape-space-in-options

ejabberdctl: Escape whitespace in ERL_OPTIONS

9 years agoejabberdctl: Escape whitespace in ERL_OPTIONS
Holger Weiss [Fri, 13 Mar 2015 10:40:23 +0000 (11:40 +0100)]
ejabberdctl: Escape whitespace in ERL_OPTIONS

If ERL_OPTIONS="-opt arg" is specified, make sure the space character
between "-opt" and "arg" is retained.

Fixes #143.

9 years agoImprove module structure
Evgeniy Khramtsov [Fri, 13 Mar 2015 10:05:16 +0000 (13:05 +0300)]
Improve module structure

9 years agoDo not fail on badly formed SQL results
Evgeniy Khramtsov [Sat, 9 Nov 2013 14:56:28 +0000 (00:56 +1000)]
Do not fail on badly formed SQL results

9 years agoFix unblock all when Riak is used as a backend
Evgeniy Khramtsov [Fri, 13 Mar 2015 09:47:08 +0000 (12:47 +0300)]
Fix unblock all when Riak is used as a backend

9 years agoExtra arguments to cluster scripts are not mandatory
Christophe Romain [Fri, 13 Mar 2015 08:56:51 +0000 (09:56 +0100)]
Extra arguments to cluster scripts are not mandatory

9 years agoRemove trailing space to get correct arguments
Christophe Romain [Fri, 13 Mar 2015 08:47:12 +0000 (09:47 +0100)]
Remove trailing space to get correct arguments

This allows to remove any argument to joincluster/leavecluster scripts
when no parameters has been added after the ctl command.

9 years agoejabberdctl: Escape whitespace in ERL_OPTIONS
Holger Weiss [Fri, 13 Mar 2015 08:27:55 +0000 (09:27 +0100)]
ejabberdctl: Escape whitespace in ERL_OPTIONS

If ERL_OPTIONS="-opt arg" is specified, make sure the space character
between "-opt" and "arg" is retained.

Fixes #143.

9 years agoReplace bashism in ejabberdctl
Holger Weiss [Thu, 12 Mar 2015 18:29:41 +0000 (19:29 +0100)]
Replace bashism in ejabberdctl

9 years agoUpdate sockmod() type after adding websocket support
Paweł Chmielowski [Thu, 12 Mar 2015 12:14:30 +0000 (13:14 +0100)]
Update sockmod() type after adding websocket support

9 years agoRemove unused clause
Christophe Romain [Thu, 12 Mar 2015 12:15:07 +0000 (13:15 +0100)]
Remove unused clause