Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity
6,926 Commits 7 Branches 109 Tags 66 MiB
74e8c0376f
Commit Graph

128 Commits

Author SHA1 Message Date
Alexey Shchepin
cf975da8f2 Update several commands for recent ejabberd_commands changes 2015-09-28 15:29:25 +03:00
Evgeniy Khramtsov
6740b1f0e1 Rename idna.erl to ejabberd_idna.erl (#702) 2015-09-02 16:02:46 +03:00
Evgeniy Khramtsov
6177ae3ffb Improve S2S certificate checks 2015-08-20 01:04:56 +03:00
Evgeniy Khramtsov
b570070834 Fix case clause during S2S certificate checks 2015-08-19 23:47:45 +03:00
Badlop
6631078884 Document a few more supported protocols 2015-06-22 13:11:37 +02:00
Evgeniy Khramtsov
fb6267f38e Add config validation at startup 2015-06-01 15:38:27 +03:00
Badlop
5a35405cd5 Update copyright dates to 2015 (EJAB-1733) 2015-01-08 17:34:43 +01:00
Holger Weiss
49bdbf2895 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.
 2014-04-28 01:42:02 +02:00
badlop
285c4c17cf Merge pull request #146 from jamielinux/master 
Update FSF address
 2014-04-11 13:35:46 +02:00
Badlop
633d47f784 Update copyright dates to 2014 (EJAB-1679) 2014-03-13 12:30:57 +01:00
Jamie Nguyen
8538997d61 Update FSF address 2014-02-22 10:27:40 +00:00
Evgeniy Khramtsov
91a74e3e27 Change configuration file format to YAML 2013-08-21 22:17:59 +10:00
Evgeniy Khramtsov
f9390f3e9a Fix some dialyzer warnings 2013-06-24 20:04:56 +10:00
Evgeniy Khramtsov
4d8f770624 Switch to rebar build tool 
Use dynamic Rebar configuration
Make iconv dependency optional
Disable transient_supervisors compile option
Add hipe compilation support
Only compile ibrowse and lhttpc when needed
Make it possible to generate an OTP application release
Add --enable-debug compile option
Add --enable-all compiler option
Add --enable-tools configure option
Add --with-erlang configure option.
Add --enable-erlang-version-check configure option.
Add lager support
Improve the test suite
 2013-06-13 11:11:02 +02:00
Badlop
9deb294328 Accumulated patch to binarize and indent code 2013-03-14 10:33:02 +01:00
Alexey Shchepin
0ae400533c Update copyright dates 2013-01-24 16:25:13 +02:00
Alexey Shchepin
b1e2538488 Update copyright dates 2012-02-23 17:52:34 +02:00
Pablo Polvorin
cf973f27bb Prevent overload of incomming s2s connections 
Three changes were introduced:

1) ejabberd_s2s_in now uses p1_fsm instead of gen_fsm.  And uses
   the {max_queue, N} option to kill the process if its input
   queue grows too much.
2) If a ejabberd_s2s_in process is overload and killed, the server
   that originated that connection is not allowed to connect back
   to us for X seconds (set to 60seconds on the source)
3) The list of blocked (both statically and dynamically by the above
   method) host is now also checked for hosts authenticating by
   starttls+sasl. Previusly it was only used during dialback.
 2011-12-02 15:30:20 -03:00
Christophe Romain
fd52f2cb7d update copyright up to 2011 2011-02-14 13:50:55 +01:00
Christopher tofu Zorn
f2231a2282 expose find_connection for routing in other modules (if needed) 2010-11-29 20:05:39 +01:00
Badlop
a5230c46c2 Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319) 
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
 2010-10-14 21:15:40 +02:00
Evgeniy Khramtsov
e569087d83 now using mnesia:async_dirty when cleaning table from failed node 2010-02-19 16:38:18 +09:00
Badlop
7b76fdcde7 Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 
SVN Revision: 2891
 2010-01-12 16:11:32 +00:00
Evgeniy Khramtsov
311bf4dbb1 fixes allow_host/2 on subdomains. added hook s2s_allow_host: the hook should return deny or allow 
SVN Revision: 2738
 2009-11-13 16:19:46 +00:00
Badlop
b5964c2a5f Added API function to get current S2S connections with information 
get_info_s2s_connections(Type) returns a list of incoming (or outgoing)
S2S connections with information for each one including IP address,
port number, TLS options... (thanks to Juan Pablo Carlino)

SVN Revision: 2088
 2009-05-19 09:38:17 +00:00
Badlop
fec3742aaa Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2057
 2009-05-06 16:54:43 +00:00
Badlop
f09509502e * doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842) 
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text

SVN Revision: 1804
 2009-01-12 14:44:42 +00:00
Badlop
3bfe585364 * src/ejabberd_sm.erl: Update from ctl to commands (EJAB-694) 
* src/ejabberd_s2s.erl: Likewise

SVN Revision: 1639
 2008-10-12 12:04:10 +00:00
Badlop
c3bda4aaee * doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708) 
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise

SVN Revision: 1499
 2008-07-31 11:18:49 +00:00
Mickaël Rémond
5e9576ffa3 * src/ejabberd_s2s.erl: Added s2s_send_packet and s2s_receive_packet hooks (EJAB-635). 
* src/ejabberd_s2s_in.erl: Likewise.

SVN Revision: 1342
 2008-05-22 10:53:49 +00:00
Badlop
ee6aae8211 * src/ejabberd_s2s_out.erl: Fix long timeout when reconnecting s2s 
after a remote server crash (EJAB-540)
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1296
 2008-04-18 12:19:45 +00:00
Christophe Romain
b2bd9759c8 Rewrite io:format calls to loglevel macros (EJAB-555) 
SVN Revision: 1239
 2008-03-21 14:44:16 +00:00
Mickaël Rémond
320c266276 * src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on successful connection (EJAB-566) 
* src/ejabberd_s2s_out.erl: Likewise

SVN Revision: 1235
 2008-03-17 10:16:21 +00:00
Mickaël Rémond
295da9cf02 * src/ejabberd_s2s.erl: API improvement: Added s2s_connect_hook (EJAB-566). 
SVN Revision: 1232
 2008-03-15 09:35:33 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Mickaël Rémond
56fe3579bb * Applied copyright update patch 1. 
SVN Revision: 1110
 2007-12-24 11:41:41 +00:00
Badlop
d625fc80fc * src/acl.erl and other 64 files: Remove Erlang module attribute 
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)

SVN Revision: 1044
 2007-12-06 22:12:27 +00:00
Mickaël Rémond
2100ea63ca * Making sure SVN properties are correctly set. 
SVN Revision: 970
 2007-11-15 10:33:18 +00:00
Jérôme Sautret
96ded4535d * src/ejabberd_s2s.erl: don't use the resource of the sender to choose 
a s2s connection to ensure that a muc room always uses the same
connection

Merge branch 'ejabberd_s2s'

Conflicts:

.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl

SVN Revision: 963
 2007-10-30 17:38:40 +00:00
Alexey Shchepin
f82b84158e * src/ejabberd_s2s.erl: Max number of connections and max number 
of connections per node now can be specified via
max_s2s_connections and max_s2s_connections_per_node acl rules

SVN Revision: 950
 2007-09-25 16:32:18 +00:00
Mickaël Rémond
31449bc720 * src/ejabberd_s2s.erl: open all missing connections if needed. 
SVN Revision: 945
 2007-09-14 14:20:43 +00:00
Mickaël Rémond
f6d376a4fc * src/ejabberd_s2s.erl: untabify 
SVN Revision: 944
 2007-09-14 14:20:30 +00:00
Mickaël Rémond
5a0b8288d4 * src/ejabberd_s2s.erl: don't check blacklist for services. 
SVN Revision: 943
 2007-09-14 14:20:15 +00:00
Mickaël Rémond
de63c622c2 * src/ejabberd_s2s.erl: Fixed merge conflict (duplicate functions). 
SVN Revision: 942
 2007-09-14 14:20:01 +00:00
Mickaël Rémond
b3fb9d9100 Try to open all s2s connections at the same time, to guarantee the right order of the packets. 
SVN Revision: 941
 2007-09-14 14:19:48 +00:00
Mickaël Rémond
653e6c1791 Comment. 
SVN Revision: 938
 2007-09-14 14:19:07 +00:00
Mickaël Rémond
78e6eb58d4 max_s2s_connexions_number local parameter added. 
SVN Revision: 937
 2007-09-14 14:18:51 +00:00
Mickaël Rémond
9fc203ee6d open up to 3 s2s outgoing connection per domain pair 
SVN Revision: 928
 2007-09-14 14:15:44 +00:00
Mickaël Rémond
799ff1d883 * src/ejabberd_s2s_in.erl: Add s2s whitelist / blacklist support on incoming s2s connections (EJAB-283) 
* src/ejabberd_s2s.erl: Likewise

SVN Revision: 820
 2007-07-19 21:17:13 +00:00
Mickaël Rémond
944ef9bbc2 * src/ejabberd_s2s.erl: Fixed typo. 
SVN Revision: 819
 2007-07-18 18:42:00 +00:00
Mickaël Rémond
9da2c78eb4 * src/ejabberd_s2s.erl: Implements s2s hosts whitelist / blacklist 
* src/ejabberd.cfg.example: Likewise

SVN Revision: 818
 2007-07-18 17:42:53 +00:00
Mickaël Rémond
abadd82c66 * src/ejabberd_s2s_out.erl: Make s2s connections more robust 
* src/ejabberd_s2s.erl: Likewise

SVN Revision: 817
 2007-07-18 16:26:50 +00:00
Alexey Shchepin
2810c2b300 * src/ejabberd_s2s.erl: Added remove_connection/3 
* src/ejabberd_s2s_out.erl: Bugfix: remove only own s2s record

SVN Revision: 812
 2007-07-15 07:28:47 +00:00
Alexey Shchepin
77282b0e1a * src/ejabberd_s2s.erl: Don't bounce packets with "error" and 
"result" type

SVN Revision: 747
 2007-03-17 23:02:06 +00:00
Alexey Shchepin
3d7090f62c * src/ejabberd_s2s.erl: Fixed spelling 
SVN Revision: 746
 2007-03-17 22:53:42 +00:00
Alexey Shchepin
829f30e63b * src/ejabberd_s2s.erl: Don't start s2s process for existing 
connection in case of race condition

SVN Revision: 745
 2007-03-17 22:17:03 +00:00
Alexey Shchepin
0d5e433b91 * src/ejabberd_s2s.erl: Confirm to RFC3920 section 10.3 (thanks to 
Jerome Sautret)

SVN Revision: 726
 2007-02-18 17:58:47 +00:00
Mickaël Rémond
30371b2483 * src/ejabberd_s2s.erl: More precise message for the new s2s 
statistic command.

SVN Revision: 642
 2006-09-26 11:08:44 +00:00
Alexey Shchepin
3ab30f34fb * src/ejabberd_s2s.erl: Added incoming-s2s-number and 
outgoing-s2s-number ejabberdctl commands

SVN Revision: 633
 2006-09-25 13:36:41 +00:00
Alexey Shchepin
50f44530d2 * src/odbc/pg.sql: Fixed syntax error 
* src/ejabberd_router.erl: Updated to use gen_server behaviour
* src/ejabberd_sm.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* src/gen_iq_handler.erl: Likewise

* src/ejabberd_sup.erl: Added supervisor for ejabberd_receiver
* src/ejabberd_receiver.erl: Updated

SVN Revision: 495
 2006-01-29 04:38:31 +00:00
Alexey Shchepin
bbfd58a822 * src/ejabberd_s2s_out.erl: Fixed invalid behaviour upon 
connecting to host with invalid domain
* src/ejabberd_s2s.erl: Likewise

SVN Revision: 433
 2005-11-12 03:42:12 +00:00
Alexey Shchepin
2f7f3d9b00 * src/aclocal.m4: Fixed headers detecting in AM_WITH_OPENSSL 
(thanks to Leif Johansson)

* src/ejabberd_auth.erl: Added support for ldap_rootdn and
ldap_password options (thanks to Stefan de Konink)
* src/mod_vcard_ldap.erl: Likewise

* src/ejabberd_router.erl: Now possible to route packet via
function call instead of message sending
* src/ejabberd_sm.erl: Added function route/3, use it in route
table
* src/ejabberd_local.erl: Likewise
* src/ejabberd_s2s.erl: Likewise

* (all): Fixed spelling of word "authentication"

* src/*/Makefile.in: Replaced erlc with @ERLC@

SVN Revision: 285
 2004-11-05 21:14:31 +00:00
Alexey Shchepin
90e48213e0 * src/ejabberd_s2s.erl: More verbose error handling 
SVN Revision: 218
 2004-03-16 14:34:20 +00:00
Alexey Shchepin
4413036585 * src/ejabberd_s2s.erl: Partially rewrited 
* src/mod_roster.erl: Removed debugging code

SVN Revision: 184
 2003-12-13 21:36:53 +00:00
Alexey Shchepin
23b3779b20 * src/ejabberd_listener.erl: Fixed starting of SSL connection 
* src/ejabberd_s2s_in.erl: Partially rewriten

* src/ejabberd_router.erl: More verbose error report
* src/ejabberd_local.erl: Likewise
* src/ejabberd_sm.erl: Likewise

* src/ejabberd_s2s_out.erl: Updated to be compatible with R9C

* src/ejabberd_c2s.erl: Minor fix

SVN Revision: 164
 2003-10-29 20:09:09 +00:00
Alexey Shchepin
61875f80b3 * (all): Changed JID storage format, added support for stringprep 
* src/stringprep/: Added support for Unicode normalization form KC

* src/stringprep/: Added support for case convertion to multiple
characters

* src/cyrsasl_digest.erl: Temporary removed "auth-int" QOP

SVN Revision: 144
 2003-10-07 20:31:44 +00:00
Alexey Shchepin
ca5d88c368 * (all): Reorganized supervision tree 
SVN Revision: 125
 2003-07-20 20:35:35 +00:00
Alexey Shchepin
1834fb3a72 * src/ejabberd_s2s_out.erl: Close connection after key 
verification

* src/ejabberd_c2s.erl: start replaced with start_link
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise

* src/ejabberd_listener.erl: Now uses proc_lib to spawn listeners,
removed 3rd parameter in listener configuration (assumed to equal
start_link)

* src/ejabberd.rel: Updated

* doc/guide.tex: Small changes

* doc/Makefile: Added implicit charset specification to hevea

SVN Revision: 124
 2003-07-14 18:06:03 +00:00
Alexey Shchepin
ee15945cd7 * src/ejabberd_s2s.erl: Added error catching for do_route/3 
* src/ejabberd_local.erl: Likewise for do_route/4

* src/msgs/ru.msg: Updated

* src/mod_muc/mod_muc_room.erl: New option to allow to view list
of participants for non-ones via disco#items

* src/mod_muc/mod_muc_room.erl: Store room subject with
configuration options

SVN Revision: 109
 2003-05-15 18:16:13 +00:00
Alexey Shchepin
6599d1ecc5 *** empty log message *** 
SVN Revision: 55
 2003-02-01 20:21:28 +00:00
Alexey Shchepin
aed24c637f *** empty log message *** 
SVN Revision: 51
 2003-01-26 20:16:53 +00:00
Alexey Shchepin
f0427ecab5 *** empty log message *** 
SVN Revision: 46
 2003-01-21 20:36:55 +00:00
Alexey Shchepin
bacbeeaaa4 *** empty log message *** 
SVN Revision: 44
 2003-01-19 20:17:56 +00:00
Alexey Shchepin
319c52ad8f *** empty log message *** 
SVN Revision: 35
 2003-01-10 19:44:35 +00:00
Alexey Shchepin
0a9a6261f8 *** empty log message *** 
SVN Revision: 29
 2003-01-05 20:24:59 +00:00
Alexey Shchepin
083e2b75d0 *** empty log message *** 
SVN Revision: 28
 2003-01-04 20:09:25 +00:00
Alexey Shchepin
496c041b28 *** empty log message *** 
SVN Revision: 16
 2002-12-13 20:58:27 +00:00
Alexey Shchepin
6c96829311 *** empty log message *** 
SVN Revision: 13
 2002-12-07 20:27:26 +00:00