]>
granicus.if.org Git - ejabberd/log
Evgeny Khramtsov [Tue, 6 May 2014 19:50:49 +0000 (23:50 +0400)]
Merge pull request #166 from weiss/xep-0198
Add support for XEP-0198: Stream Management
Holger Weiss [Tue, 6 May 2014 19:41:29 +0000 (21:41 +0200)]
Merge remote-tracking branch 'processone/master' into xep-0198
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
Christophe Romain [Tue, 6 May 2014 11:29:35 +0000 (13:29 +0200)]
Fix PEP broadcasting issue on ODBC (EJAB-1680)
Christophe Romain [Tue, 6 May 2014 10:37:44 +0000 (12:37 +0200)]
Fix PEP broadcasting issue (EJAB-1680)
Evgeny Khramtsov [Tue, 6 May 2014 09:13:56 +0000 (13:13 +0400)]
Merge pull request #198 from weiss/add-travis-support
Add Travis CI configuration file
Holger Weiss [Tue, 6 May 2014 05:27:10 +0000 (07:27 +0200)]
XEP-0198: Use "mgmt_" prefix for all #state fields
Prefix all ejabberd_c2s #state fields that are used for stream
management with "mgmt_".
Holger Weiss [Mon, 5 May 2014 20:42:15 +0000 (22:42 +0200)]
Add Travis CI configuration
Christophe Romain [Mon, 5 May 2014 16:42:49 +0000 (18:42 +0200)]
Merge branch 'master' of github.com:processone/ejabberd
Christophe Romain [Mon, 5 May 2014 16:16:48 +0000 (18:16 +0200)]
remove compilation warnings
Badlop [Mon, 5 May 2014 15:55:45 +0000 (17:55 +0200)]
Recompile the ejabberd Guide html
Christophe Romain [Mon, 5 May 2014 15:35:38 +0000 (17:35 +0200)]
avoid sending duplicated events
Christophe Romain [Mon, 5 May 2014 11:51:02 +0000 (13:51 +0200)]
avoid sending empty events
Badlop [Mon, 5 May 2014 15:46:52 +0000 (17:46 +0200)]
Document that ejabberd compilation requires pkg-config
Christophe Romain [Mon, 5 May 2014 11:49:02 +0000 (13:49 +0200)]
store item when persist_item=false and cache_last_item=false but need last_item
Evgeny Khramtsov [Mon, 5 May 2014 12:38:16 +0000 (16:38 +0400)]
Merge pull request #195 from Iperity/master
Fix small bug in presence_based_delivery implementation
Nathan Bruning [Mon, 5 May 2014 12:14:03 +0000 (14:14 +0200)]
Fix small bug in presence_based_delivery implementation
Badlop [Mon, 5 May 2014 11:50:52 +0000 (13:50 +0200)]
Temporary room not destroyed when the last participant is expulsed (EJAB-520)
Badlop [Mon, 5 May 2014 11:13:35 +0000 (13:13 +0200)]
extauth_cache can have value 0
Holger Weiss [Sun, 4 May 2014 23:11:14 +0000 (01:11 +0200)]
XEP-0198: Don't log protocol issues
There are corner cases where certain clients acknowledge more stanzas
than they received. Nothing really bad will happen in those cases, and
server administrators can't do anything about such issues anyway.
Holger Weiss [Sun, 4 May 2014 22:02:55 +0000 (00:02 +0200)]
XEP-0198: Accept stream elements in pending state
Due to timing issues, ejabberd_c2s might receive stream elements from
the client while the session is waiting for stream resumption. Those
elements are now accepted.
Holger Weiss [Sun, 4 May 2014 21:08:42 +0000 (23:08 +0200)]
XEP-0198: Log message when waiting for resumption
Log an informational message when a session goes into the pending state
(waiting for resumption) after the connection was lost. Administrators
may well be interested in this state change when looking into issues.
Evgeniy Khramtsov [Sun, 4 May 2014 19:11:05 +0000 (23:11 +0400)]
Make it possible to get/set vCards for MUC rooms
Evgeny Khramtsov [Sun, 4 May 2014 08:00:59 +0000 (12:00 +0400)]
Merge pull request #194 from weiss/mysql-user-at-localhost
test/README: Create MySQL test user on localhost
Holger Weiss [Sat, 3 May 2014 23:02:22 +0000 (01:02 +0200)]
test/README: Create MySQL test user on 'localhost'
Suggest specifying 'localhost' as host name part of the MySQL test
account name. Otherwise, the anonymous user that is usually created by
default for 'localhost' would take precedence for local connections due
to the more specific host name.
Evgeniy Khramtsov [Sat, 3 May 2014 13:55:03 +0000 (17:55 +0400)]
Do not crash on version downgrade
Evgeniy Khramtsov [Sat, 3 May 2014 13:36:47 +0000 (17:36 +0400)]
Assume udp_recv/5 now returns new options
Evgeniy Khramtsov [Sat, 3 May 2014 10:11:58 +0000 (14:11 +0400)]
Assume tcp_init/2 and udp_init/2 now return new options
Evgeniy Khramtsov [Fri, 2 May 2014 13:27:46 +0000 (17:27 +0400)]
Always enable SIP at compile time
Evgeniy Khramtsov [Fri, 2 May 2014 11:20:27 +0000 (15:20 +0400)]
Remove unused function
Evgeniy Khramtsov [Fri, 2 May 2014 11:18:57 +0000 (15:18 +0400)]
Forking support
Evgeniy Khramtsov [Fri, 2 May 2014 09:09:25 +0000 (13:09 +0400)]
Remove empty line
Evgeniy Khramtsov [Fri, 2 May 2014 06:51:08 +0000 (10:51 +0400)]
Some cleanup
Evgeniy Khramtsov [Thu, 1 May 2014 20:42:09 +0000 (00:42 +0400)]
Fix CSeq comparison
Evgeniy Khramtsov [Thu, 1 May 2014 19:58:05 +0000 (23:58 +0400)]
Optimize request processing
Evgeniy Khramtsov [Thu, 1 May 2014 19:35:36 +0000 (23:35 +0400)]
Do not proxy stray responses statelessly (as per RFC 6026)
Evgeniy Khramtsov [Thu, 1 May 2014 17:58:11 +0000 (21:58 +0400)]
Don't use erlang:integer_to_binary/1
Evgeniy Khramtsov [Thu, 1 May 2014 17:52:47 +0000 (21:52 +0400)]
Rewrite 'Contact' headers in REGISTER requests
Evgeniy Khramtsov [Thu, 1 May 2014 16:58:14 +0000 (20:58 +0400)]
Check for 'max_user_sessions' option
Evgeniy Khramtsov [Thu, 1 May 2014 16:43:51 +0000 (20:43 +0400)]
Process gen_server timeouts correctly
Evgeniy Khramtsov [Thu, 1 May 2014 12:31:03 +0000 (16:31 +0400)]
Move some code in a separate function
Evgeniy Khramtsov [Thu, 1 May 2014 11:51:58 +0000 (15:51 +0400)]
Multiple REGISTER bindings support
Evgeniy Khramtsov [Thu, 1 May 2014 09:27:35 +0000 (13:27 +0400)]
Locate sessions by proxy processes directly
Evgeny Khramtsov [Thu, 1 May 2014 06:44:49 +0000 (10:44 +0400)]
Merge pull request #192 from hamano/fix_ejabberd_system_monitor_error
fix ejabberd_system_monitor:s2s_out_info/1 error
HAMANO Tsukasa [Thu, 1 May 2014 06:12:04 +0000 (15:12 +0900)]
fix ejabberd_system_monitor:s2s_out_info/1 error
Evgeny Khramtsov [Wed, 30 Apr 2014 17:49:54 +0000 (21:49 +0400)]
Merge pull request #178 from hamano/devel
undefined ejabberd_socket:get_conn_type/1
Evgeniy Khramtsov [Wed, 30 Apr 2014 15:20:38 +0000 (19:20 +0400)]
SIP support
Conflicts:
configure
configure.ac
doc/guide.tex
Badlop [Wed, 30 Apr 2014 14:02:20 +0000 (16:02 +0200)]
Fix error reporting in previous commit
Badlop [Wed, 30 Apr 2014 13:59:44 +0000 (15:59 +0200)]
Fix formatting string argument (thanks to Locojay)(github #129)
Evgeny Khramtsov [Wed, 30 Apr 2014 13:02:39 +0000 (17:02 +0400)]
Merge pull request #191 from hamano/added_get_random_pid_error_handling
fix error handling when sql calling with unknown host.
badlop [Wed, 30 Apr 2014 10:42:43 +0000 (12:42 +0200)]
Merge pull request #190 from hamano/mod_register_web_response_404
mod_register_web should response 404 instead of process crash.
badlop [Wed, 30 Apr 2014 10:41:12 +0000 (12:41 +0200)]
Merge pull request #187 from weiss/fix-ejabberdctl-output
Let ejabberdctl accept binary string arguments
HAMANO Tsukasa [Wed, 30 Apr 2014 06:32:07 +0000 (15:32 +0900)]
fix error handling when sql calling with unknown host.
HAMANO Tsukasa [Wed, 30 Apr 2014 04:39:17 +0000 (13:39 +0900)]
mod_register_web should response 404 instead of process crash.
Evgeny Khramtsov [Wed, 30 Apr 2014 03:55:27 +0000 (07:55 +0400)]
Merge pull request #189 from weiss/markdown-readme
Convert README to Markdown
Holger Weiss [Tue, 29 Apr 2014 21:54:14 +0000 (23:54 +0200)]
Convert README to Markdown
Use Markdown syntax for the README file and add a README.md symlink, so
that a certain popular Git hosting site renders it nicely.
Evgeny Khramtsov [Tue, 29 Apr 2014 20:38:18 +0000 (00:38 +0400)]
Merge pull request #177 from weiss/log-tls-sasl-external
Log TLS status for outgoing s2s with SASL EXTERNAL
Evgeny Khramtsov [Tue, 29 Apr 2014 20:36:08 +0000 (00:36 +0400)]
Merge pull request #181 from weiss/check-tls-before-auth
Check TLS state before requesting SASL EXTERNAL for outgoing s2s connections
Evgeny Khramtsov [Tue, 29 Apr 2014 20:08:24 +0000 (00:08 +0400)]
Merge pull request #185 from weiss/verify-cert-for-s2s-out
Support certificate verification for outgoing s2s connections
Evgeny Khramtsov [Tue, 29 Apr 2014 11:41:41 +0000 (15:41 +0400)]
Merge pull request #186 from weiss/add-disconnect-command
New ejabberd command: disconnect_user/2
Holger Weiss [Tue, 29 Apr 2014 09:56:28 +0000 (11:56 +0200)]
Translate disconnect_user/2 string sent to client
Holger Weiss [Tue, 29 Apr 2014 09:41:24 +0000 (11:41 +0200)]
Avoid #state.lang type errors in corner cases
If #state.lang is used before being initialized to some binary string,
the translation code would crash.
Evgeny Khramtsov [Tue, 29 Apr 2014 09:12:08 +0000 (13:12 +0400)]
Merge pull request #188 from weiss/update-readme
Update README: XEP-0227 code no longer uses exmpp
Evgeny Khramtsov [Tue, 29 Apr 2014 09:06:53 +0000 (13:06 +0400)]
Merge pull request #182 from hamano/register_account_acl
fix checking acl in mod_register_web
Evgeny Khramtsov [Tue, 29 Apr 2014 09:05:58 +0000 (13:05 +0400)]
Merge pull request #179 from hamano/added_get_random_pid_error_handling
added get_random_pid/1 error handling
Holger Weiss [Tue, 29 Apr 2014 08:17:00 +0000 (10:17 +0200)]
Update README: XEP-0227 code no longer uses exmpp
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."
Holger Weiss [Mon, 28 Apr 2014 22:50:43 +0000 (00:50 +0200)]
New ejabberd command: disconnect_user/2
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 23:42:02 +0000 (01:42 +0200)]
Support certificate verification for outgoing s2s
Handle "s2s_use_starttls: required_trusted" the same way for outgoing
s2s connections as for incoming connections. That is, check the remote
server's certificate (including the host name) and abort the connection
if verification fails.
Holger Weiss [Sun, 27 Apr 2014 23:01:30 +0000 (01:01 +0200)]
XEP-0198: Turn some warnings into info messages
Don't log warnings on events that will happen during normal operation.
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.
HAMANO Tsukasa [Thu, 24 Apr 2014 09:15:39 +0000 (18:15 +0900)]
fix checking acl in mod_register_web
Holger Weiss [Thu, 24 Apr 2014 09:04:10 +0000 (11:04 +0200)]
Check TLS state before requesting SASL EXTERNAL
Make sure a remote server can't circumvent "s2s_use_starttls: required"
by offering SASL EXTERNAL authentication over a non-TLS connection.
HAMANO Tsukasa [Thu, 24 Apr 2014 06:34:41 +0000 (15:34 +0900)]
added get_random_pid/1 error handling
HAMANO Tsukasa [Thu, 24 Apr 2014 03:42:22 +0000 (12:42 +0900)]
undefined ejabberd_socket:get_conn_type/1
Holger Weiss [Wed, 23 Apr 2014 21:28:13 +0000 (23:28 +0200)]
Log TLS status for outgoing s2s with SASL EXTERNAL
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