]>
granicus.if.org Git - ejabberd/log
Holger Weiss [Mon, 28 Apr 2014 23:11:08 +0000 (01:11 +0200)]
Let ejabberdctl accept binary string arguments
Don't print the following message if an ejabberd command expects binary
string arguments: "This command cannot be executed using ejabberdctl.
Try ejabberd_xmlrpc."
Evgeny Khramtsov [Mon, 28 Apr 2014 05:58:44 +0000 (09:58 +0400)]
Merge pull request #184 from weiss/properly-abort-s2s-in
Fix handling of certificate verification errors for incoming s2s connections
Holger Weiss [Sun, 27 Apr 2014 22:17:05 +0000 (00:17 +0200)]
Don't mess with s2s out when aborting s2s in
Don't try to look up and close outgoing connections to a given server
when aborting incoming connections from that server due to certificate
verification errors. The ejabberd_s2s:find_connection/2 call actually
created one or more *new* connections if less than 'max_s2s_connections'
connections were found. Then, no more than one of those possibly new
connections were stopped by the ejabberd_s2s_out:stop_connection/1 call.
It's not really necessary to bother with outgoing connections at all,
here.
Holger Weiss [Sat, 26 Apr 2014 22:28:42 +0000 (00:28 +0200)]
Send stream trailer before closing s2s connection
When aborting an incoming s2s connection due to certificate verification
errors, send a stream trailer before closing the socket.
badlop [Wed, 23 Apr 2014 15:06:46 +0000 (17:06 +0200)]
Merge pull request #176 from hamano/devel
added error handling in mod_pubsub_odbc.
HAMANO Tsukasa [Wed, 23 Apr 2014 14:35:34 +0000 (23:35 +0900)]
added error handling in mod_pubsub_odbc.
badlop [Wed, 23 Apr 2014 13:10:20 +0000 (15:10 +0200)]
Merge pull request #174 from weiss/fix-s2s-in-auth
Fix certificate authentication for incoming s2s connections
Holger Weiss [Wed, 23 Apr 2014 09:45:17 +0000 (11:45 +0200)]
Verify host name before offering SASL EXTERNAL
Prior to this commit, ejabberd handled certificate authentication for
incoming s2s connections like this:
1. Verify the certificate without checking the host name. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, compare the authorization
identity against the certificate host name(s). On failure, abort the
connection unconditionally.
ejabberd now does this instead:
1. Verify the certificate and compare the certificate host name(s)
against the 'from' attribute of the stream header. On failure,
behave according to 's2s_use_starttls'. On success:
2. Offer SASL EXTERNAL.
3. If the remote server chooses SASL EXTERNAL, ignore the authorization
identity (if any) and consider the peer authenticated.
The old behavior was suggested by previous versions of XEP-0178, the new
behavior is suggested by the current version 1.1.
Holger Weiss [Tue, 22 Apr 2014 20:12:04 +0000 (22:12 +0200)]
Fix extraction of host names from certificates
badlop [Tue, 22 Apr 2014 11:53:23 +0000 (13:53 +0200)]
Merge pull request #162 from weiss/enable-carbons
Enable mod_carboncopy in example configuration
badlop [Tue, 22 Apr 2014 11:52:11 +0000 (13:52 +0200)]
Merge pull request #161 from weiss/fix-carbons
Let mod_carboncopy take care of messages sent to bare/unavailable JIDs
badlop [Tue, 22 Apr 2014 10:52:22 +0000 (12:52 +0200)]
Merge pull request #173 from weiss/force-configure-regeneration
Always regenerate the configure script when running ./autogen.sh
Holger Weiss [Fri, 18 Apr 2014 10:13:17 +0000 (12:13 +0200)]
Force regeneration of configure script
As the version string is auto-generated from the git-describe(1) output,
the configure script may need to be regenerated even if configure.ac
wasn't modified.
badlop [Thu, 17 Apr 2014 17:55:51 +0000 (19:55 +0200)]
Merge pull request #172 from weiss/accept-extauth-cache-false
Don't log an error when "extauth_cache: false" is specified
Holger Weiss [Wed, 16 Apr 2014 12:15:14 +0000 (14:15 +0200)]
Accept "extauth_cache: false"
Don't log a "configuration problem" message if "extauth_cache: false" is
explicitly specified, as that's a valid configuration setting as per the
documentation.
badlop [Wed, 16 Apr 2014 08:03:07 +0000 (10:03 +0200)]
Merge pull request #171 from weiss/update-doc-url
Update a URL in the guide
badlop [Wed, 16 Apr 2014 08:02:12 +0000 (10:02 +0200)]
Merge pull request #170 from weiss/fix-doc-typos
Fix two small typos in the guide
Holger Weiss [Tue, 15 Apr 2014 22:31:15 +0000 (00:31 +0200)]
Update a URL in the guide
Holger Weiss [Tue, 15 Apr 2014 22:25:11 +0000 (00:25 +0200)]
Fix two small typos in the guide
Paweł Chmielowski [Tue, 15 Apr 2014 14:58:06 +0000 (16:58 +0200)]
Fix compilation on pre-R17
Paweł Chmielowski [Tue, 15 Apr 2014 14:16:12 +0000 (16:16 +0200)]
Fix loading translation files on R17
Alexey Shchepin [Tue, 15 Apr 2014 15:01:21 +0000 (19:01 +0400)]
Merge pull request #160 from runcom/protocol_options
Add option to specify openssl options
badlop [Tue, 15 Apr 2014 14:41:48 +0000 (16:41 +0200)]
Merge pull request #167 from weiss/fix-modules-doc
Remove outdated comment from guide
badlop [Tue, 15 Apr 2014 14:40:48 +0000 (16:40 +0200)]
Merge pull request #168 from weiss/carbons-doc
Mention mod_carboncopy in documentation
Holger Weiss [Mon, 14 Apr 2014 23:29:00 +0000 (01:29 +0200)]
Mention mod_carboncopy in documentation
Holger Weiss [Mon, 14 Apr 2014 23:21:41 +0000 (01:21 +0200)]
Remove outdated comment from guide
badlop [Sat, 12 Apr 2014 14:42:05 +0000 (16:42 +0200)]
Merge pull request #165 from weiss/fix-access-doc
Fix the description of the access rules syntax in the Guide
Holger Weiss [Fri, 11 Apr 2014 12:00:10 +0000 (14:00 +0200)]
Fix description of access rules syntax
badlop [Fri, 11 Apr 2014 11:35:46 +0000 (13:35 +0200)]
Merge pull request #146 from jamielinux/master
Update FSF address
Evgeniy Khramtsov [Wed, 9 Apr 2014 09:12:20 +0000 (13:12 +0400)]
Pretty print accepted transport address
Holger Weiss [Tue, 8 Apr 2014 21:38:04 +0000 (23:38 +0200)]
Enable mod_carboncopy in example configuration
XEP-0280 seems to be quite popular these days.
Holger Weiss [Tue, 8 Apr 2014 21:32:30 +0000 (23:32 +0200)]
Carbons: Handle unavailable resource like bare JID
As the session manager handles messages sent to unavailable resources
just like messages sent to bare JIDs, mod_carboncopy must do that, too.
That is, forward them only to those carbon-copy-enabled resources that
don't have a top priority, in order to avoid duplicates.
Antonio Murdaca [Tue, 1 Apr 2014 19:57:33 +0000 (21:57 +0200)]
Add option to specify openssl options
Holger Weiss [Mon, 7 Apr 2014 20:10:08 +0000 (22:10 +0200)]
Carbons: Also forward messages sent to bare JIDs
Don't ignore messages sent to bare JIDs, but forward them to all
carbon-copy-enabled resources that don't have the highest priority.
Badlop [Mon, 7 Apr 2014 14:26:50 +0000 (16:26 +0200)]
Update Hebrew translation (thanks to Isratine Citizen)
badlop [Mon, 7 Apr 2014 11:29:37 +0000 (13:29 +0200)]
Merge pull request #159 from weiss/update-gitignore
Update the gitignore(5) file
badlop [Mon, 7 Apr 2014 11:28:41 +0000 (13:28 +0200)]
Merge pull request #158 from weiss/fix-lang-type
Fix a type error
badlop [Mon, 7 Apr 2014 11:27:31 +0000 (13:27 +0200)]
Merge pull request #157 from weiss/fix-mod-update
Fix badarg issue on module update web site
badlop [Mon, 7 Apr 2014 10:39:22 +0000 (12:39 +0200)]
Merge pull request #156 from hamano/devel
mod_register_web: check same acl as mod_register.
Holger Weiss [Sat, 5 Apr 2014 22:56:36 +0000 (00:56 +0200)]
Let Git ignore the "ebin" directory
Holger Weiss [Sat, 5 Apr 2014 22:56:09 +0000 (00:56 +0200)]
Let Git ignore files generated by "make install"
Holger Weiss [Sat, 5 Apr 2014 22:39:51 +0000 (00:39 +0200)]
Fix a type error
Holger Weiss [Sat, 5 Apr 2014 21:23:44 +0000 (23:23 +0200)]
Fix badarg issue on module update web site
HAMANO Tsukasa [Thu, 3 Apr 2014 19:07:29 +0000 (04:07 +0900)]
mod_register_web: check same acl as mod_register.
Badlop [Mon, 31 Mar 2014 14:51:47 +0000 (16:51 +0200)]
Fix user_resources command, and ejabberd_xmlrpc parsing auth details in call
Badlop [Wed, 26 Mar 2014 15:43:40 +0000 (16:43 +0100)]
New Bash completion script for ejabberdctl, experimental (EJAB-1042)
Badlop [Wed, 26 Mar 2014 15:39:35 +0000 (16:39 +0100)]
Small change in ejabberd_ctl output format to support bash completion
Badlop [Wed, 26 Mar 2014 15:01:37 +0000 (16:01 +0100)]
Provide meaningful text to user when admin kicks session (EJAB-1455)
Evgeniy Khramtsov [Tue, 25 Mar 2014 05:52:39 +0000 (09:52 +0400)]
Fix service_info options processing
Evgeniy Khramtsov [Wed, 21 Aug 2013 01:42:56 +0000 (11:42 +1000)]
Remove annyoing warnings
Badlop [Mon, 24 Mar 2014 18:40:55 +0000 (19:40 +0100)]
Fix ACLs syntax change (thanks to jokker23)(issue #140)
badlop [Sun, 16 Mar 2014 19:59:49 +0000 (20:59 +0100)]
Merge pull request #149 from iulianlaz/carboncopy-fix-msg-back-to-original-sender
#148 Carbon copy sends message back to original sender solved
Badlop [Thu, 13 Mar 2014 11:29:21 +0000 (12:29 +0100)]
Update copyright dates to 2014 (EJAB-1679)
Badlop [Wed, 12 Mar 2014 16:26:27 +0000 (17:26 +0100)]
Provide header with latin-1 encoding in translations to work with Erlang/OTP R17
iulianlaz [Thu, 6 Mar 2014 08:40:38 +0000 (08:40 +0000)]
#148 Carbon copy sends message back to original sender solved
Evgeniy Khramtsov [Fri, 28 Feb 2014 11:36:46 +0000 (15:36 +0400)]
Merge branch 'master' of github.com:processone/ejabberd
Evgeniy Khramtsov [Fri, 28 Feb 2014 11:32:05 +0000 (15:32 +0400)]
Regenerate XMPP codec
Badlop [Wed, 26 Feb 2014 17:01:47 +0000 (18:01 +0100)]
Support XEP-0321: Remote Roster Management (EJAB-1381)
Badlop [Wed, 26 Feb 2014 16:26:46 +0000 (17:26 +0100)]
Convert DB details to string when calling odbc:connect/2 (EJAB-1681)
Badlop [Wed, 26 Feb 2014 16:18:12 +0000 (17:18 +0100)]
Don't provide current password in webinterface (github issue #137)
badlop [Mon, 24 Feb 2014 11:46:09 +0000 (12:46 +0100)]
Merge pull request #145 from weiss/fix-configure-flag
Fix --enable-transient_supervisors flag
badlop [Mon, 24 Feb 2014 11:40:10 +0000 (12:40 +0100)]
Merge pull request #144 from weiss/fix-supervisor-start
Add missing parenthesis
Jamie Nguyen [Sat, 22 Feb 2014 10:27:40 +0000 (10:27 +0000)]
Update FSF address
Holger Weiss [Fri, 21 Feb 2014 22:34:48 +0000 (23:34 +0100)]
Fix --{enable,disable}-transient_supervisors flag
Fix configure's --{enable,disable}-transient_supervisors option: Make
sure it's enabled with --enable and disabled with --disable, not the
other way round. This also makes --disable the default setting, as
documented.
Holger Weiss [Fri, 21 Feb 2014 22:33:13 +0000 (23:33 +0100)]
Add missing parenthesis
Badlop [Fri, 14 Feb 2014 15:22:14 +0000 (16:22 +0100)]
When occupant changes nick, include status 110 in stanzas sent to him
Badlop [Thu, 23 Jan 2014 16:29:24 +0000 (17:29 +0100)]
Fixing mod_carboncopy sends carbons of carbons (fixes #107)
badlop [Thu, 23 Jan 2014 14:56:18 +0000 (06:56 -0800)]
Merge pull request #134 from mrjameshamilton/patch-1
Fixed parameter order in call to restore_room/3
mrjameshamilton [Thu, 23 Jan 2014 14:39:52 +0000 (14:39 +0000)]
Fixed parameter order in call to restore_room/3
Alexey Shchepin [Tue, 21 Jan 2014 11:40:03 +0000 (13:40 +0200)]
Clear SASL state after finishing auth
Alexey Shchepin [Tue, 21 Jan 2014 09:54:18 +0000 (11:54 +0200)]
Fix for the previous commit
Alexey Shchepin [Mon, 20 Jan 2014 14:06:05 +0000 (16:06 +0200)]
Use 'to' field only in the first client stream initialization
Badlop [Thu, 2 Jan 2014 15:31:28 +0000 (16:31 +0100)]
Add some ejabberd_xmlrpc documentation, and link to full details
Badlop [Thu, 2 Jan 2014 15:10:19 +0000 (16:10 +0100)]
Fix auth verification in ejabberd_xmlrpc (thanks to Vicis)
Badlop [Thu, 2 Jan 2014 14:03:05 +0000 (15:03 +0100)]
Fix example configuration option 'add' to 'append_host_config'
Evgeniy Khramtsov [Tue, 10 Dec 2013 07:40:43 +0000 (17:40 +1000)]
Fix some type specs and errors
Evgeniy Khramtsov [Tue, 10 Dec 2013 11:25:12 +0000 (21:25 +1000)]
Add ejabberd_xmlrpc
Christophe Romain [Thu, 5 Dec 2013 13:19:55 +0000 (14:19 +0100)]
remove version.tex file which is auto-generated
Badlop [Wed, 4 Dec 2013 13:55:21 +0000 (14:55 +0100)]
Add access rule to mod_roster (EJAB-72)
Christophe Romain [Tue, 3 Dec 2013 09:51:01 +0000 (10:51 +0100)]
bind values for get_parentnodes_tree
Christophe Romain [Tue, 3 Dec 2013 09:34:59 +0000 (10:34 +0100)]
fix use of virtual nodetree
badlop [Mon, 2 Dec 2013 10:02:44 +0000 (02:02 -0800)]
Merge pull request #119 from Mikhail-D/patch-1
Create mssql2012.sql
Mikhail-D [Mon, 2 Dec 2013 08:29:52 +0000 (00:29 -0800)]
Create mssql2012.sql
replace sp_dboption with new instructions
Alexey Shchepin [Thu, 28 Nov 2013 17:39:11 +0000 (19:39 +0200)]
Support for OpenSSL ciphers list in ejabberd_c2s, ejabberd_s2s_in and ejabberd_s2s_out
Badlop [Thu, 14 Nov 2013 18:29:16 +0000 (19:29 +0100)]
add Pubsub data migration from mnesia to odbc (EJAB-1126)
By calling:
ejd2odbc:export_pubsub("localhost","/tmp/aa.txt").
it will generate SQL files like these:
/tmp/pubsub_item.txt
/tmp/pubsub_node.txt
/tmp/pubsub_state.txt
Conflicts:
src/ejabberd_admin.erl
src/ejd2odbc.erl
Evgeniy Khramtsov [Wed, 6 Nov 2013 16:43:24 +0000 (02:43 +1000)]
Correctly convert ACLs into YAML representation
Evgeniy Khramtsov [Tue, 5 Nov 2013 10:05:12 +0000 (20:05 +1000)]
Do not use functions from crypto module wherever possible
Evgeniy Khramtsov [Tue, 5 Nov 2013 09:15:08 +0000 (19:15 +1000)]
Fix some type errors
Evgeniy Khramtsov [Sat, 2 Nov 2013 00:30:19 +0000 (10:30 +1000)]
Do not try to start STUN application during config checks
Evgeniy Khramtsov [Wed, 23 Oct 2013 02:22:17 +0000 (12:22 +1000)]
Avoid case clause crash when loading permanent rooms
Evgeniy Khramtsov [Wed, 23 Oct 2013 01:55:29 +0000 (11:55 +1000)]
Get rid of deprecated MySQL variable 'table_type'
Evgeniy Khramtsov [Tue, 22 Oct 2013 10:12:12 +0000 (20:12 +1000)]
Check libyaml presence at configure time
Badlop [Wed, 9 Oct 2013 14:05:45 +0000 (16:05 +0200)]
Enumerate convert_to_yaml command in list of commands
Badlop [Tue, 1 Oct 2013 21:23:01 +0000 (23:23 +0200)]
Fix display ACLs in WebAdmin
Christophe Romain [Fri, 27 Sep 2013 09:19:22 +0000 (11:19 +0200)]
update default version to 13.10
Badlop [Thu, 26 Sep 2013 15:19:56 +0000 (17:19 +0200)]
Fix handling of format_status arguments (thanks to Nbaronov)
Badlop [Thu, 26 Sep 2013 14:41:57 +0000 (16:41 +0200)]
Fix bypass for tls-required (thanks to Zeha)
Evgeniy Khramtsov [Tue, 24 Sep 2013 08:40:32 +0000 (18:40 +1000)]
Fix roster version support
Evgeniy Khramtsov [Sun, 22 Sep 2013 10:18:56 +0000 (20:18 +1000)]
Better web-handlers detection
Evgeniy Khramtsov [Thu, 19 Sep 2013 09:00:08 +0000 (19:00 +1000)]
Merge branch 'master' of github.com:processone/ejabberd