145 commits

Author	SHA1	Message	Date
Kim Alvefur	9693f85d1b	Merge 0.10->trunk	2015-09-25 18:03:44 +02:00
Kim Alvefur	d71ec76461	mod_s2s: Account for connections that time out in connection count measure	2015-09-25 15:16:25 +02:00
Kim Alvefur	b415f80bd6	Merge 0.10->trunk	2015-09-24 20:15:19 +02:00
Kim Alvefur	7dda205176	mod_c2s, mod_s2s: Close incoming connections if there are no features to offer on incomplete streams (fixes #285)	2015-09-24 20:05:23 +02:00
Kim Alvefur	068e6374d0	Merge 0.10->trunk	2015-05-13 22:33:40 +02:00
Kim Alvefur	cedc24858c	Merge 0.9->0.10	2015-05-13 22:31:59 +02:00
Kim Alvefur	ecb35aa0e9	mod_s2s: Mark stream as opened directly after opening stream, prevents session.close opening it again	2015-05-13 21:56:22 +02:00
Kim Alvefur	5298b58b13	mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data after session was closed	2015-05-13 21:55:08 +02:00
Matthew Wild	daec51c435	Merge 0.10->trunk	2015-05-06 19:26:53 +01:00
Kim Alvefur	80bafb7200	mod_s2s: Fire read timeout event on correct virtualhost for incoming connections	2015-05-06 13:35:34 +02:00
Kim Alvefur	43702241ec	Merge 0.10->trunk	2015-04-26 00:07:36 +02:00
Kim Alvefur	48652fb9d3	mod_c2s, mod_s2s: Collect statistics on number of connections	2015-04-26 00:06:11 +02:00
Kim Alvefur	1be7952fe2	mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a top level error)	2015-04-05 16:47:49 +02:00
Kim Alvefur	603d0df6e2	Merge 0.9->0.10 again	2015-03-27 00:27:29 +01:00
Matthew Wild	bfbcd081de	mod_s2s: to/from attributes are required on s2s stream headers. Set them to '' when not available. Fixes #468.	2015-03-24 16:03:37 +00:00
Kim Alvefur	fd494572e7	mod_s2s: Capitalize log message	2014-10-10 00:56:53 +02:00
Matthew Wild	899b6d53ae	net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent)	2014-08-29 11:54:34 +01:00
Kim Alvefur	4bc9e05c11	mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream error instead of throwing an unhandled error	2014-09-02 17:24:25 +02:00
Matthew Wild	933bb5a869	mod_c2s, mod_s2s: Log received invalid stream headers	2014-08-23 09:29:17 +01:00
Kim Alvefur	ef0bac2fe0	mod_s2s: Reset stream ID when resetting stream [compliance]	2014-08-27 13:20:08 +02:00
Kim Alvefur	306092e0a7	mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double stream headers on policy failures	2014-08-26 21:50:08 +02:00
Matthew Wild	4d822c8eaf	Merge 0.9->0.10	2014-10-14 10:59:27 +01:00
Kim Alvefur	fb8f6cc1fb	mod_s2s: Close s2s connections that can not proceed due to mod_dialback not being present	2014-09-23 19:41:10 +02:00
Kim Alvefur	ccb4b3e493	core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from stanza_router	2014-09-09 15:05:46 +02:00
Kim Alvefur	c80b30a71c	Merge 0.9->0.10	2014-09-02 22:33:11 +02:00
Matthew Wild	878efeecd5	Merge 0.9->0.10	2014-08-28 09:23:24 +01:00
Kim Alvefur	4a1babcbea	mod_s2s: Remove unused locals	2014-07-25 21:12:21 +02:00
Kim Alvefur	bd17040999	mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into new plugin	2014-07-25 20:41:54 +02:00
Kim Alvefur	1440be730c	mod_dialback: Short-circuit dialback auth if certificate is considered valid	2014-07-04 21:48:25 +02:00
Kim Alvefur	309f146764	mod_s2s: Fire a 's2s-created' event when new s2s connections are initialized	2014-05-24 11:17:26 +02:00
Kim Alvefur	a9cb63cf36	mod_s2s: Remove redundant setting of session.direction	2014-05-22 22:49:43 +02:00
Kim Alvefur	b4934b66b9	mod_s2s: Move filter initialization to common place	2014-05-22 22:48:06 +02:00
Kim Alvefur	6eef30829c	mod_s2s: Decide on log function once	2014-05-22 22:45:58 +02:00
Kim Alvefur	13d11d6735	mod_s2s: Follow XMPP Core on when a stream is to be considered ready	2014-04-22 21:56:06 +02:00
Kim Alvefur	5d015f7fb0	mod_s2s: Replace open_stream() with function that only adds s2s/dialback attributes to stream header	2014-04-18 07:51:41 +02:00
Kim Alvefur	3e9c8c8384	mod_s2s: Revert e626ee2fe106 change, it broke Dialback	2014-04-10 16:49:59 +02:00
Kim Alvefur	e06966ee43	mod_c2s, mod_s2s, mod_component, util.xmppstream: Move all session:open_stream() functions to util.xmppstream	2014-04-10 13:13:07 +02:00
Matthew Wild	e60a10abca	Merge 0.9->0.10	2014-01-12 06:19:37 -05:00
Florian Zeitz	92ee981cd1	mod_s2s: Include IP in log messages, if host is unavailable	2014-01-05 22:21:50 +01:00
Kim Alvefur	5178a1e79f	mod_c2s, mod_s2s: Set session.encrypted as session.secure does not allways mean encrypted (eg consider_bosh_secure)	2013-10-07 12:43:00 +02:00
Kim Alvefur	938d568ac4	mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way	2013-08-14 15:00:36 +02:00
Kim Alvefur	1764b9fba3	mod_s2s: Captitalize log messages that begin with a stream direction	2013-08-14 14:53:50 +02:00
Florian Zeitz	1d833bb807	Remove all trailing whitespace	2013-08-09 17:48:21 +02:00
Kim Alvefur	132f38d70a	Merge 0.9->trunk	2013-08-06 14:35:03 +02:00
Kim Alvefur	a316833b30	mod_admin_telnet, mod_s2s: Fix reporting of certificate chain validation details	2013-08-06 14:32:31 +02:00
Kim Alvefur	bb9aa809b1	mod_s2s: Improve policy check	2013-08-05 20:47:38 +02:00
Kim Alvefur	47ec51ca07	mod_s2s: Log certificate identity validation result	2013-08-04 17:33:00 +02:00
Kim Alvefur	0c6c0e9c29	mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with some details	2013-08-02 15:12:24 +02:00
Kim Alvefur	74d66c5aef	mod_s2s: Add missing global hook for read-timeout	2013-06-26 13:35:38 +02:00
Kim Alvefur	4c9866805e	mod_c2s, mod_s2s: Fire an event on read timeouts	2013-06-11 21:36:15 +02:00