From 14399e3d57fbdf7211dc6960d22ebc853e3249a0 Mon Sep 17 00:00:00 2001 From: Badlop Date: Mon, 3 Aug 2009 19:33:42 +0000 Subject: [PATCH] Support XEP-0199 Ping (thanks to Brian Cully and Evgeniy Khramtsov)(EJAB-974) SVN Revision: 2419 --- doc/guide.html | 227 ++++++++++++++++++++---------------- doc/guide.tex | 42 ++++++- src/ejabberd.cfg.example | 1 + src/ejabberd_c2s.erl | 4 + src/ejabberd_local.erl | 128 +++++++++++++++------ src/mod_ping.erl | 243 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 514 insertions(+), 131 deletions(-) create mode 100644 src/mod_ping.erl diff --git a/doc/guide.html b/doc/guide.html index 0acf8f5c6..bf4ed09ff 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -148,72 +148,73 @@ BLOCKQUOTE.figure DIV.center DIV.center HR{display:none;}
  • 3.3.9  mod_muc
  • 3.3.10  mod_muc_log
  • 3.3.11  mod_offline -
  • 3.3.12  mod_privacy -
  • 3.3.13  mod_private -
  • 3.3.14  mod_proxy65 -
  • 3.3.15  mod_pubsub -
  • 3.3.16  mod_register -
  • 3.3.17  mod_roster -
  • 3.3.18  mod_service_log -
  • 3.3.19  mod_shared_roster -
  • 3.3.20  mod_stats -
  • 3.3.21  mod_time -
  • 3.3.22  mod_vcard -
  • 3.3.23  mod_vcard_ldap -
  • 3.3.24  mod_version +
  • 3.3.12  mod_ping +
  • 3.3.13  mod_privacy +
  • 3.3.14  mod_private +
  • 3.3.15  mod_proxy65 +
  • 3.3.16  mod_pubsub +
  • 3.3.17  mod_register +
  • 3.3.18  mod_roster +
  • 3.3.19  mod_service_log +
  • 3.3.20  mod_shared_roster +
  • 3.3.21  mod_stats +
  • 3.3.22  mod_time +
  • 3.3.23  mod_vcard +
  • 3.3.24  mod_vcard_ldap +
  • 3.3.25  mod_version
    • -
  • Chapter 4  Managing an ejabberd Server +
  • Chapter 4  Managing an ejabberd Server -
  • Chapter 5  Securing ejabberd +
  • Chapter 5  Securing ejabberd -
  • Chapter 6  Clustering +
  • Chapter 6  Clustering -
  • Chapter 7  Debugging +
  • Chapter 7  Debugging -
  • Appendix A  Internationalization and Localization -
  • Appendix B  Release Notes -
  • Appendix C  Acknowledgements -
  • Appendix D  Copyright Information +
  • Appendix A  Internationalization and Localization +
  • Appendix B  Release Notes +
  • Appendix C  Acknowledgements +
  • Appendix D  Copyright Information

    • Chapter 1  Introduction

    ejabberd is a free and open source instant messaging server written in Erlang.

    ejabberd is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.

    ejabberd is designed to be a rock-solid and feature rich XMPP server.

    ejabberd is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.

    @@ -492,7 +493,7 @@ There are two ways to register a Jabber account:
    1. Using ejabberdctl (see section 4.1): 
      ejabberdctl register admin1 example.org FgT5bk3
-
    2. Using a Jabber client and In-Band Registration (see section 3.3.16). +
    3. Using a Jabber client and In-Band Registration (see section 3.3.17).
  • Edit the ejabberd configuration file to give administration rights to the Jabber account you created: 
    {acl, admins, {user, "admin1", "example.org"}}.
@@ -1786,6 +1787,7 @@ all entries end with a comma:
 mod_muc_logMulti-User Chat room loggingmod_muc
 mod_offlineOffline message storage (XEP-0160) 
 mod_offline_odbcOffline message storage (XEP-0160)supported DB (*)
+mod_pingXMPP Ping and periodic keepalives (XEP-0199) 
 mod_privacyBlocking Communication (XMPP IM) 
 mod_privacy_odbcBlocking Communication (XMPP IM)supported DB (*)
 mod_privatePrivate XML Storage (XEP-0049) 
@@ -2506,7 +2508,8 @@ top link will be the default <a href="/">Home</a>.
  ]}.

    • 3.3.11  mod_offline

    -

    This module implements offline message storage. This means that all messages +

    This module implements offline message storage (XEP-0160). +This means that all messages sent to an offline user will be stored on the server until that user comes online again. Thus it is very similar to how email works. Note that ejabberdctl has a command to delete expired messages @@ -2535,8 +2538,36 @@ and all the other users up to 100. {mod_offline, [ {access_max_user_messages, max_user_offline_messages} ]}, ... ]}. +

    +

    3.3.12  mod_ping

    +

    This module implements support for XMPP Ping (XEP-0199) and periodic keepalives. +When this module is enabled ejabberd responds correctly to +ping requests, as defined in the protocol.

    Configuration options: +

    +{send_pings, true | false}
    +If this option is set to true, the server sends pings to connected clients +that are not active in a given interval ping_interval. +This is useful to keep client connections alive or checking availability. +By default this option is disabled. +
    {ping_interval, Seconds}
    +How often to send pings to connected clients, if the previous option is enabled. +If a client connection does not send or receive any stanza in this interval, +a ping request is sent to the client. +The default value is 60 seconds. +
    {timeout_action, none | kill}
    +What to do when a client does not answer to a server ping request in less than 32 seconds. +The default is to do nothing. +

    This example enables Ping responses, configures the module to send pings +to client connections that are inactive for 4 minutes, +and if a client does not answer to the ping in less than 32 seconds, its connection is closed: +

    {modules,
+ [
+  ...
+  {mod_ping,  [{send_pings, true}, {ping_interval, 240}, {timeout_action, kill}]},
+  ...
+ ]}.

    -

    3.3.12  mod_privacy

    +

    3.3.13  mod_privacy

    This module implements Blocking Communication (also known as Privacy Rules) as defined in section 10 from XMPP IM. If end users have support for it in their Jabber client, they will be able to: @@ -2564,7 +2595,7 @@ subscription type (or globally). iqdisc

    This specifies the processing discipline for Blocking Communication (jabber:iq:privacy) IQ queries (see section 3.3.2).

    -

    3.3.13  mod_private

    +

    3.3.14  mod_private

    This module adds support for Private XML Storage (XEP-0049):

    Using this method, Jabber entities can store private data on the server and @@ -2576,7 +2607,7 @@ of client-specific preferences; another is Bookmark Storage ( This specifies the processing discipline for Private XML Storage (jabber:iq:private) IQ queries (see section 3.3.2).

    -

    3.3.14  mod_proxy65

    +

    3.3.15  mod_proxy65

    This module implements SOCKS5 Bytestreams (XEP-0065). It allows ejabberd to act as a file transfer proxy between two XMPP clients.

    Options: @@ -2631,7 +2662,7 @@ The simpliest configuration of the module: ... ]}.

    -

    3.3.15  mod_pubsub

    +

    3.3.16  mod_pubsub

    This module offers a Publish-Subscribe Service (XEP-0060). The functionality in mod_pubsub can be extended using plugins. The plugin that implements PEP (Personal Eventing via Pubsub) (XEP-0163) @@ -2677,7 +2708,7 @@ The following example will use node_tune instead of node_pep for every PEP node ... ]}.

    -

    3.3.16  mod_register

    +

    3.3.17  mod_register

    This module adds support for In-Band Registration (XEP-0077). This protocol enables end users to use a Jabber client to:

    -

    3.3.17  mod_roster

    +

    3.3.18  mod_roster

    This module implements roster management as defined in RFC 3921: XMPP IM.

    Options:

    iqdisc
    This specifies the processing discipline for Roster Management (jabber:iq:roster) IQ queries (see section 3.3.2).

    -

    3.3.18  mod_service_log

    +

    3.3.19  mod_service_log

    This module adds support for logging end user packets via a Jabber message auditing service such as Bandersnatch. All user @@ -2786,7 +2817,7 @@ To log all end user packets to the Bandersnatch service running on ... ]}.

    -

    3.3.19  mod_shared_roster

    +

    3.3.20  mod_shared_roster

    This module enables you to create shared roster groups. This means that you can create groups of people that can see members from (other) groups in their rosters. The big advantages of this feature are that end users do not need to @@ -2861,7 +2892,7 @@ roster groups as shown in the following table:

    -

    3.3.20  mod_stats

    +

    3.3.21  mod_stats

    This module adds support for Statistics Gathering (XEP-0039). This protocol allows you to retrieve next statistics from your ejabberd deployment:

    -

    3.3.21  mod_time

    +

    3.3.22  mod_time

    This module features support for Entity Time (XEP-0202). By using this XEP, you are able to discover the time at another entity’s location.

    Options:

    iqdisc
    This specifies the processing discipline for Entity Time (jabber:iq:time) IQ queries (see section 3.3.2).

    -

    3.3.22  mod_vcard

    +

    3.3.23  mod_vcard

    This module allows end users to store and retrieve their vCard, and to retrieve other users vCards, as defined in vcard-temp (XEP-0054). The module also implements an uncomplicated Jabber User Directory based on the vCards of @@ -2955,7 +2986,7 @@ and that all virtual hosts will be searched instead of only the current one: ... ]}.

    -

    3.3.23  mod_vcard_ldap

    +

    3.3.24  mod_vcard_ldap

    ejabberd can map LDAP attributes to vCard fields. This behaviour is implemented in the mod_vcard_ldap module. This module does not depend on the authentication method (see 3.2.5).

    Note that ejabberd treats LDAP as a read-only storage: @@ -3131,7 +3162,7 @@ searching his info in LDAP.

  • ldap_vcard_map

    • -

    3.3.24  mod_version

    +

    3.3.25  mod_version

    This module implements Software Version (XEP-0092). Consequently, it answers ejabberd’s version when queried.

    Options:

    @@ -3140,8 +3171,8 @@ The default value is true.
    iqdisc
    This specifies the processing discipline for Software Version (jabber:iq:version) IQ queries (see section 3.3.2).

    -

    Chapter 4  Managing an ejabberd Server

    -

    4.1  ejabberdctl

    With the ejabberdctl command line administration script +

    Chapter 4  Managing an ejabberd Server

    +

    4.1  ejabberdctl

    With the ejabberdctl command line administration script you can execute ejabberdctl commands (described in the next section, 4.1.1) and also many general ejabberd commands (described in section 4.2). This means you can start, stop and perform many other administrative tasks @@ -3153,7 +3184,7 @@ and other codes may be used for specific results. This can be used by other scripts to determine automatically if a command succeeded or failed, for example using: echo $?

    -

    4.1.1  ejabberdctl Commands

    When ejabberdctl is executed without any parameter, +

    4.1.1  ejabberdctl Commands

    When ejabberdctl is executed without any parameter, it displays the available options. If there isn’t an ejabberd server running, the available parameters are:

    @@ -3189,7 +3220,7 @@ robot1 testuser1 testuser2

    -

    4.1.2  Erlang Runtime System

    ejabberd is an Erlang/OTP application that runs inside an Erlang runtime system. +

    4.1.2  Erlang Runtime System

    ejabberd is an Erlang/OTP application that runs inside an Erlang runtime system. This system is configured using environment variables and command line parameters. The ejabberdctl administration script uses many of those possibilities. You can configure some of them with the file ejabberdctl.cfg, @@ -3262,7 +3293,7 @@ Starts the Erlang system detached from the system console.

    Note that some characters need to be escaped when used in shell scripts, for instance " and {}. You can find other options in the Erlang manual page (erl -man erl).

    -

    4.2  ejabberd Commands

    An ejabberd command is an abstract function identified by a name, +

    4.2  ejabberd Commands

    An ejabberd command is an abstract function identified by a name, with a defined number and type of calling arguments and type of result that is registered in the ejabberd_commands service. Those commands can be defined in any Erlang module and executed using any valid frontend.

    ejabberd includes a frontend to execute ejabberd commands: the script ejabberdctl. @@ -3270,7 +3301,7 @@ Other known frontends that can be installed to execute ejabberd commands in diff ejabberd_xmlrpc (XML-RPC service), mod_rest (HTTP POST service), mod_shcommands (ejabberd WebAdmin page).

    -

    4.2.1  List of ejabberd Commands

    ejabberd includes a few ejabberd Commands by default. +

    4.2.1  List of ejabberd Commands

    ejabberd includes a few ejabberd Commands by default. When more modules are installed, new commands may be available in the frontends.

    The easiest way to get a list of the available commands, and get help for them is to use the ejabberdctl script: 

    $ ejabberdctl help
@@ -3310,7 +3341,7 @@ exist tutorials to migrate
 in offline storage. This might be useful when the number of offline messages
 is very high.
 
      
    
-
    4.2.2  Restrict Execution with AccessCommands
      
    The frontends can be configured to restrict access to certain commands.
+
    4.2.2  Restrict Execution with AccessCommands
      
    The frontends can be configured to restrict access to certain commands.
 In that case, authentication information must be provided.
 In each frontend the AccessCommands option is defined
 in a different place. But in all cases the option syntax is the same:
@@ -3356,7 +3387,7 @@ and the provided arguments do not contradict Arguments.
    As an example to u
  {_bot_reg_test, [register, unregister], [{host, "test.org"}]}
 ]

    -

    4.3  Web Admin

    +

    4.3  Web Admin

    The ejabberd Web Admin allows to administer most of ejabberd using a web browser.

    This feature is enabled by default: a ejabberd_http listener with the option web_admin (see section 3.1.3) is included in the listening ports. Then you can open @@ -3428,13 +3459,13 @@ The file is searched by default in The directory of the documentation can be specified in the environment variable EJABBERD_DOC_PATH. See section 4.1.2.

    -

    4.4  Ad-hoc Commands

    If you enable mod_configure and mod_adhoc, +

    4.4  Ad-hoc Commands

    If you enable mod_configure and mod_adhoc, you can perform several administrative tasks in ejabberd with a Jabber client. The client must support Ad-Hoc Commands (XEP-0050), and you must login in the Jabber server with an account with proper privileges.

    -

    4.5  Change Computer Hostname

    ejabberd uses the distributed Mnesia database. +

    4.5  Change Computer Hostname

    ejabberd uses the distributed Mnesia database. Being distributed, Mnesia enforces consistency of its file, so it stores the name of the Erlang node in it (see section 5.4). The name of an Erlang node includes the hostname of the computer. @@ -3471,8 +3502,8 @@ mv /var/lib/ejabberd/*.* /var/lib/ejabberd/oldfiles/

  • Check that the information of the old database is available: accounts, rosters... After you finish, remember to delete the temporary backup files from public directories.

    • -

    Chapter 5  Securing ejabberd

    -

    5.1  Firewall Settings

    +

    Chapter 5  Securing ejabberd

    +

    5.1  Firewall Settings

    You need to take the following TCP ports in mind when configuring your firewall:

    @@ -3483,7 +3514,7 @@ After you finish, remember to delete the temporary backup files from public dire
    PortDescription
    port rangeUsed for connections between Erlang nodes. This range is configurable (see section 5.2).

    -

    5.2  epmd

    epmd (Erlang Port Mapper Daemon) +

    5.2  epmd

    epmd (Erlang Port Mapper Daemon) is a small name server included in Erlang/OTP and used by Erlang programs when establishing distributed Erlang communications. ejabberd needs epmd to use ejabberdctl and also when clustering ejabberd nodes. @@ -3508,7 +3539,7 @@ but can be configured in the file ejabberdctl.cfg. The Erlang command-line parameter used internally is, for example: 

    erl ... -kernel inet_dist_listen_min 4370 inet_dist_listen_max 4375

    -

    5.3  Erlang Cookie

    The Erlang cookie is a string with numbers and letters. +

    5.3  Erlang Cookie

    The Erlang cookie is a string with numbers and letters. An Erlang node reads the cookie at startup from the command-line parameter -setcookie. If not indicated, the cookie is read from the cookie file $HOME/.erlang.cookie. If this file does not exist, it is created immediately with a random cookie. @@ -3522,7 +3553,7 @@ to prevent unauthorized access or intrusion to an Erlang node. The communication between Erlang nodes are not encrypted, so the cookie could be read sniffing the traffic on the network. The recommended way to secure the Erlang node is to block the port 4369.

    -

    5.4  Erlang Node Name

    An Erlang node may have a node name. +

    5.4  Erlang Node Name

    An Erlang node may have a node name. The name can be short (if indicated with the command-line parameter -sname) or long (if indicated with the parameter -name). Starting an Erlang node with -sname limits the communication between Erlang nodes to the LAN.

    Using the option -sname instead of -name is a simple method @@ -3531,7 +3562,7 @@ However, it is not ultimately effective to prevent access to the Erlang node, because it may be possible to fake the fact that you are on another network using a modified version of Erlang epmd. The recommended way to secure the Erlang node is to block the port 4369.

    -

    5.5  Securing Sensible Files

    ejabberd stores sensible data in the file system either in plain text or binary files. +

    5.5  Securing Sensible Files

    ejabberd stores sensible data in the file system either in plain text or binary files. The file system permissions should be set to only allow the proper user to read, write and execute those files and directories.

    ejabberd configuration file: /etc/ejabberd/ejabberd.cfg
    @@ -3551,9 +3582,9 @@ so it is preferable to secure the whole /var/lib/ejabberd/ directory.
    Erlang cookie file: /var/lib/ejabberd/.erlang.cookie
    See section 5.3.

    -

    Chapter 6  Clustering

    +

    Chapter 6  Clustering

    -

    6.1  How it Works

    +

    6.1  How it Works

    A Jabber domain is served by one or more ejabberd nodes. These nodes can be run on different machines that are connected via a network. They all must have the ability to connect to port 4369 of all another nodes, and must @@ -3567,29 +3598,29 @@ router,

  • session manager,
  • s2s manager.

    • -

    6.1.1  Router

    +

    6.1.1  Router

    This module is the main router of Jabber packets on each node. It routes them based on their destination’s domains. It uses a global routing table. The domain of the packet’s destination is searched in the routing table, and if it is found, the packet is routed to the appropriate process. If not, it is sent to the s2s manager.

    -

    6.1.2  Local Router

    +

    6.1.2  Local Router

    This module routes packets which have a destination domain equal to one of this server’s host names. If the destination JID has a non-empty user part, it is routed to the session manager, otherwise it is processed depending on its content.

    -

    6.1.3  Session Manager

    +

    6.1.3  Session Manager

    This module routes packets to local users. It looks up to which user resource a packet must be sent via a presence table. Then the packet is either routed to the appropriate c2s process, or stored in offline storage, or bounced back.

    -

    6.1.4  s2s Manager

    +

    6.1.4  s2s Manager

    This module routes packets to other Jabber servers. First, it checks if an opened s2s connection from the domain of the packet’s source to the domain of the packet’s destination exists. If that is the case, the s2s manager routes the packet to the process serving this connection, otherwise a new connection is opened.

    -

    6.2  Clustering Setup

    +

    6.2  Clustering Setup

    Suppose you already configured ejabberd on one machine named (first), and you need to setup another one to make an ejabberd cluster. Then do following steps:

    1. @@ -3627,10 +3658,10 @@ and ‘access’ options because they will be taken from enabled only on one machine in the cluster.

    You can repeat these steps for other machines supposed to serve this domain.

    -

    6.3  Service Load-Balancing

    +

    6.3  Service Load-Balancing

    -

    6.3.1  Components Load-Balancing

    -

    6.3.2  Domain Load-Balancing Algorithm

    +

    6.3.1  Components Load-Balancing

    +

    6.3.2  Domain Load-Balancing Algorithm

    ejabberd includes an algorithm to load balance the components that are plugged on an ejabberd cluster. It means that you can plug one or several instances of the same component on each ejabberd cluster and that the traffic will be automatically distributed.

    The default distribution algorithm try to deliver to a local instance of a component. If several local instances are available, one instance is chosen randomly. If no instance is available locally, one instance is chosen randomly among the remote component instances.

    If you need a different behaviour, you can change the load balancing behaviour with the option domain_balancing. The syntax of the option is the following:

    {domain_balancing, "component.example.com", <balancing_criterium>}.

    Several balancing criteria are available: