diff --git a/.gitignore b/.gitignore index f69da9b93..d1418f9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,9 @@ /doc/*.toc /doc/contributed_modules.tex /doc/version.tex -/ebin/*.beam -/ebin/ejabberd.app +/ebin/ +/ejabberd.init +/ejabberdctl.example /include/XmppAddr.hrl /src/XmppAddr.asn1db /src/XmppAddr.erl diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..5b093b668 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,35 @@ +language: erlang + +otp_release: + - 17.0 + - R15B01 + +before_install: + - sudo apt-get -qq update + +install: + - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev + +before_script: + - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';" + - mysql -u root -e "CREATE DATABASE ejabberd_test;" + - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';" + - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';" + - psql -U postgres -c "CREATE DATABASE ejabberd_test;" + - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;" + +script: + - ./autogen.sh + - ./configure --enable-transient_supervisors --enable-all --disable-http --disable-odbc + - make + - make test + - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log + +after_script: + - find logs -name suite.log -exec cat '{}' ';' + +after_failure: + - find logs -name ejabberd.log -exec cat '{}' ';' + +notifications: + email: false diff --git a/COPYING b/COPYING index 8b325f530..e21e8c4ee 100644 --- a/COPYING +++ b/COPYING @@ -4,8 +4,8 @@ with the OpenSSL library and distribute the resulting binary. GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -306,9 +306,9 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. diff --git a/README b/README index d6b95bcda..6fa746b0f 100644 --- a/README +++ b/README @@ -1,13 +1,18 @@ ejabberd - High-Performance Enterprise Instant Messaging Server +--------------------------------------------------------------- Quickstart guide +================ 0. Requirements +--------------- To compile ejabberd you need: + - GNU Make - GCC + - pkg-config - Libexpat 1.95 or higher - Libyaml 1.4 or higher - Erlang/OTP R15B or higher. @@ -18,35 +23,41 @@ To compile ejabberd you need: - GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not needed on systems with GNU Libc. - ImageMagick's Convert program. Optional. For CAPTCHA challenges. - - exmpp 0.9.6 or higher. Optional. For import/export XEP-0227 files. 1. Compile and install on *nix systems +-------------------------------------- To compile ejabberd execute the commands: - ./configure - make + + ./configure + make To install ejabberd, run this command with system administrator rights (root user): - sudo make install + sudo make install These commands will: - - Install the configuration files in /etc/ejabberd/ - - Install ejabberd binary, header and runtime files in /lib/ejabberd/ - - Install the administration script: /sbin/ejabberdctl - - Install ejabberd documentation in /share/doc/ejabberd/ - - Create a spool directory: /var/lib/ejabberd/ - - Create a directory for log files: /var/log/ejabberd/ + + - Install the configuration files in `/etc/ejabberd/` + - Install ejabberd binary, header and runtime files in `/lib/ejabberd/` + - Install the administration script: `/sbin/ejabberdctl` + - Install ejabberd documentation in `/share/doc/ejabberd/` + - Create a spool directory: `/var/lib/ejabberd/` + - Create a directory for log files: `/var/log/ejabberd/` 2. Start ejabberd +----------------- -You can use the ejabberdctl command line administration script to +You can use the `ejabberdctl` command line administration script to start and stop ejabberd. For example: - ejabberdctl start + + ejabberdctl start -For detailed information please refer to the -ejabberd Installation and Operation Guide +For detailed information please refer to the [ejabberd Installation and +Operation Guide][1]. + +[1]: http://www.process-one.net/docs/ejabberd/guide_en.html diff --git a/README.md b/README.md new file mode 120000 index 000000000..100b93820 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +README \ No newline at end of file diff --git a/autogen.sh b/autogen.sh index 58209a34e..a347f68b6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,3 +1,3 @@ # generate a new autoconf aclocal -I m4 -autoconf \ No newline at end of file +autoconf -f diff --git a/configure b/configure index 4114b2e69..6f62dec79 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for ejabberd community. +# Generated by GNU Autoconf 2.67 for ejabberd community 13.12-119-g47a39ce. # # Report bugs to . # @@ -552,8 +552,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ejabberd' PACKAGE_TARNAME='ejabberd' -PACKAGE_VERSION='community' -PACKAGE_STRING='ejabberd community' +PACKAGE_VERSION='community 13.12-119-g47a39ce' +PACKAGE_STRING='ejabberd community 13.12-119-g47a39ce' PACKAGE_BUGREPORT='ejabberd@process-one.net' PACKAGE_URL='' @@ -1222,7 +1222,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ejabberd community to adapt to many kinds of systems. +\`configure' configures ejabberd community 13.12-119-g47a39ce to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1283,7 +1283,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ejabberd community:";; + short | recursive ) echo "Configuration of ejabberd community 13.12-119-g47a39ce:";; esac cat <<\_ACEOF @@ -1407,7 +1407,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ejabberd configure community +ejabberd configure community 13.12-119-g47a39ce generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1466,7 +1466,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ejabberd $as_me community, which was +It was created by ejabberd $as_me community 13.12-119-g47a39ce, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2480,7 +2480,7 @@ if test "${enable_erlang_version_check+set}" = set; then : enableval=$enable_erlang_version_check; fi - case "$enable_erlang_version_check" in +case "$enable_erlang_version_check" in yes|'') { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang/OTP version" >&5 $as_echo_n "checking Erlang/OTP version... " >&6; } @@ -2526,6 +2526,10 @@ parse(Version) -> less_or_equal([], []) -> true; +less_or_equal([], _Any) -> + true; +less_or_equal(_Any, []) -> + false; less_or_equal([Left| Rl], [Right| Rr]) -> case {Left < Right, Left == Right} of {true, _} -> @@ -2608,6 +2612,10 @@ parse(Version) -> less_or_equal([], []) -> true; +less_or_equal([], _Any) -> + true; +less_or_equal(_Any, []) -> + false; less_or_equal([Left| Rl], [Right| Rr]) -> case {Left < Right, Left == Right} of {true, _} -> @@ -4396,7 +4404,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ejabberd $as_me community, which was +This file was extended by ejabberd $as_me community 13.12-119-g47a39ce, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4449,7 +4457,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ejabberd config.status community +ejabberd config.status community 13.12-119-g47a39ce configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff --git a/doc/guide.html b/doc/guide.html index 9e956f18f..c37e00376 100644 --- a/doc/guide.html +++ b/doc/guide.html @@ -1,52 +1,45 @@ - - - - - - - - ejabberd - - Installation and Operation Guide - - - - - - - - - - - - - + + + + + + ejabberd community + + Installation and Operation Guide + + + + + + + + + + -

+

-

+

-

-
+

-

+

+
- - - -
ejabberd
 
Installation and Operation Guide

-
+ + + +
ejabberd community 13.12-119-g47a39ce
 
Installation and Operation Guide +

+
-
+
-

-

-

Contents

-

Chapter 1  Introduction

-

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

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.

-

1.1  Key Features

- -

ejabberd is: -

  • -Cross-platform: ejabberd runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.
  • Distributed: You can run ejabberd on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.
  • Fault-tolerant: You can deploy an ejabberd cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced ‘on the fly’.
  • Administrator Friendly: ejabberd is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include: -
    • +

+

+

Contents

+ +

Chapter 1  Introduction

+

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

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.

+ +

1.1  Key Features

+ +

ejabberd is: +

-

1.2  Additional Features

- -

Moreover, ejabberd comes with a wide range of other state-of-the-art features: -

+ +

1.2  Additional Features

+ +

Moreover, ejabberd comes with a wide range of other state-of-the-art features: +

+

+ +

Chapter 2  Installing ejabberd

+ +

2.1  Installing ejabberd with Binary Installer

Probably the easiest way to install an ejabberd instant messaging server is using the binary installer published by ProcessOne. -The binary installers of released ejabberd versions -are available in the ProcessOne ejabberd downloads page: -http://www.process-one.net/en/ejabberd/downloads

The installer will deploy and configure a full featured ejabberd -server and does not require any extra dependencies.

In *nix systems, remember to set executable the binary installer before starting it. For example: -

chmod +x ejabberd-2.0.0_1-linux-x86-installer.bin
+The binary installers of released ejabberd versions
+are available in the ProcessOne ejabberd downloads page:
+http://www.process-one.net/en/ejabberd/downloads
The installer will deploy and configure a full featured ejabberd
+server and does not require any extra dependencies.
In *nix systems, remember to set executable the binary installer before starting it. For example:
+
chmod +x ejabberd-2.0.0_1-linux-x86-installer.bin
 ./ejabberd-2.0.0_1-linux-x86-installer.bin
-
ejabberd can be started manually at any time,
-or automatically by the operating system at system boot time.
To start and stop ejabberd manually,
+

ejabberd can be started manually at any time, +or automatically by the operating system at system boot time.

To start and stop ejabberd manually, use the desktop shortcuts created by the installer. If the machine doesn’t have a graphical system, use the scripts ’start’ -and ’stop’ in the ’bin’ directory where ejabberd is installed.

The Windows installer also adds ejabberd as a system service, +and ’stop’ in the ’bin’ directory where ejabberd is installed.

The Windows installer also adds ejabberd as a system service, and a shortcut to a debug console for experienced administrators. If you want ejabberd to be started automatically at boot time, go to the Windows service settings and set ejabberd to be automatically started. Note that the Windows service is a feature still in development, -and for example it doesn’t read the file ejabberdctl.cfg.

On a *nix system, if you want ejabberd to be started as daemon at boot time, -copy ejabberd.init from the ’bin’ directory to something like /etc/init.d/ejabberd +and for example it doesn’t read the file ejabberdctl.cfg.

On a *nix system, if you want ejabberd to be started as daemon at boot time, +copy ejabberd.init from the ’bin’ directory to something like /etc/init.d/ejabberd (depending on your distribution). -Create a system user called ejabberd, -give it write access to the directories database/ and logs/, and set that as home; +Create a system user called ejabberd, +give it write access to the directories database/ and logs/, and set that as home; the script will start the server with that user. -Then you can call /etc/inid.d/ejabberd start as root to start the server.

When ejabberd is started, the processes that are started in the system -are beam or beam.smp, and also epmd. -In Microsoft Windows, the processes are erl.exe and epmd.exe. -For more information regarding epmd consult the section 5.2.

If ejabberd doesn’t start correctly in Windows, +Then you can call /etc/inid.d/ejabberd start as root to start the server.

When ejabberd is started, the processes that are started in the system +are beam or beam.smp, and also epmd. +In Microsoft Windows, the processes are erl.exe and epmd.exe. +For more information regarding epmd consult the section 5.2.

If ejabberd doesn’t start correctly in Windows, try to start it using the shortcut in desktop or start menu. If the window shows error 14001, the solution is to install: "Microsoft Visual C++ 2005 SP1 Redistributable Package". You can download it from -www.microsoft.com. -Then uninstall ejabberd and install it again.

If ejabberd doesn’t start correctly and a crash dump is generated, +www.microsoft.com. +Then uninstall ejabberd and install it again.

If ejabberd doesn’t start correctly and a crash dump is generated, there was a severe problem. -You can try starting ejabberd with -the script bin/live.bat in Windows, -or with the command bin/ejabberdctl live in other Operating Systems. +You can try starting ejabberd with +the script bin/live.bat in Windows, +or with the command bin/ejabberdctl live in other Operating Systems. This way you see the error message provided by Erlang -and can identify what is exactly the problem.

The ejabberdctl administration script is included in the bin directory. -Please refer to the section 4.1 for details about ejabberdctl, -and configurable options to fine tune the Erlang runtime system.

-

2.2  Installing ejabberd with Operating System Specific Packages

Some Operating Systems provide a specific ejabberd package adapted to +and can identify what is exactly the problem.

The ejabberdctl administration script is included in the bin directory. +Please refer to the section 4.1 for details about ejabberdctl, +and configurable options to fine tune the Erlang runtime system.

+ +

2.2  Installing ejabberd with Operating System Specific Packages

Some Operating Systems provide a specific ejabberd package adapted to the system architecture and libraries. It usually also checks dependencies and performs basic configuration tasks like creating the initial administrator account. Some examples are Debian and Gentoo. Consult the -resources provided by your Operating System for more information.

Usually those packages create a script like /etc/init.d/ejabberd -to start and stop ejabberd as a service at boot time.

-

2.3  Installing ejabberd with CEAN

CEAN +resources provided by your Operating System for more information.

Usually those packages create a script like /etc/init.d/ejabberd +to start and stop ejabberd as a service at boot time.

+ +

2.3  Installing ejabberd with CEAN

CEAN (Comprehensive Erlang Archive Network) is a repository that hosts binary -packages from many Erlang programs, including ejabberd and all its dependencies. +packages from many Erlang programs, including ejabberd and all its dependencies. The binaries are available for many different system architectures, so this is an -alternative to the binary installer and Operating System’s ejabberd packages.

You will have to create your own ejabberd start +alternative to the binary installer and Operating System’s ejabberd packages.

You will have to create your own ejabberd start script depending of how you handle your CEAN installation. -The default ejabberdctl script is located -into ejabberd’s priv directory and can be used as an example.

-

2.4  Installing ejabberd from Source Code

-

The canonical form for distribution of ejabberd stable releases is the source code package. -Compiling ejabberd from source code is quite easy in *nix systems, -as long as your system have all the dependencies.

-

2.4.1  Requirements

-

To compile ejabberd on a ‘Unix-like’ operating system, you need: -

+ +

2.4.2  Download Source Code

+

Released versions of ejabberd are available in the ProcessOne ejabberd downloads page: +http://www.process-one.net/en/ejabberd/downloads

Alternatively, the latest development source code can be retrieved from the Git repository using the commands: -

git clone git://github.com/processone/ejabberd.git ejabberd
+
git clone git://github.com/processone/ejabberd.git ejabberd
 cd ejabberd
 git checkout -b 2.1.x origin/2.1.x
-
  

-
2.4.3  Compile
  
-
To compile ejabberd execute the commands:
-
./configure
+
  

+
+
2.4.3  Compile
  
+
To compile ejabberd execute the commands:
+
./configure
 make
-
The build configuration script allows several options.
+

The build configuration script allows several options. To get the full list run the command: -

./configure --help
-

Some options that you may be interested in modifying: -

- --prefix=/
+

./configure --help
+

Some options that you may be interested in modifying: +

+ --prefix=/
Specify the path prefix where the files will be copied when running - the make install command.

--enable-user[=USER]
+ the make install command.

--enable-user[=USER]
Allow this normal system user to execute the ejabberdctl script - (see section 4.1), + (see section 4.1), read the configuration files, read and write in the spool directory, read and write in the log directory. The account user and group must exist in the machine - before running make install. + before running make install. This account doesn’t need an explicit HOME directory, because - /var/lib/ejabberd/ will be used by default.

--enable-pam
- Enable the PAM authentication method (see section 3.1.5).

--enable-mssql
+ /var/lib/ejabberd/ will be used by default.

--enable-pam
+ Enable the PAM authentication method (see section 3.1.5).

--enable-mssql
Required if you want to use an external database. - See section 3.2 for more information.
--enable-tools
-Enable the use of development tools.
--enable-mysql
-Enable MySQL support (see section 3.2.1).
--enable-pgsql
-Enable PostgreSQL support (see section 3.2.1).
--enable-zlib
-Enable Stream Compression (XEP-0138) using zlib.
--enable-stun
-Enable STUN support (see section 3.1.10).
--enable-iconv
-Enable iconv support. This is needed for mod_irc (see seciont 3.3.8).
--enable-debug
-Compile with +debug_info enabled.

--enable-full-xml
+ See section 3.2 for more information.
--enable-tools
+Enable the use of development tools.
--enable-mysql
+Enable MySQL support (see section 3.2.1).
--enable-pgsql
+Enable PostgreSQL support (see section 3.2.1).
--enable-zlib
+Enable Stream Compression (XEP-0138) using zlib.
--enable-stun
+Enable STUN support (see section 3.1.10).
--enable-iconv
+Enable iconv support. This is needed for mod_irc (see seciont 3.3.8).
--enable-debug
+Compile with +debug_info enabled.

--enable-full-xml
Enable the use of XML based optimisations. It will for example use CDATA to escape characters in the XMPP stream. - Use this option only if you are sure your XMPP clients include a fully compliant XML parser.

--disable-transient-supervisors
- Disable the use of Erlang/OTP supervision for transient processes.

--enable-nif
+ Use this option only if you are sure your XMPP clients include a fully compliant XML parser.

--disable-transient-supervisors
+ Disable the use of Erlang/OTP supervision for transient processes.

--enable-nif
Replaces some critical Erlang functions with equivalents written in C to improve performance. -

-

2.4.4  Install

-

To install ejabberd in the destination directories, run the command: -

make install
-

Note that you probably need administrative privileges in the system -to install ejabberd.

The files and directories created are, by default: -

- /etc/ejabberd/
Configuration directory: -
- ejabberd.yml
ejabberd configuration file -
ejabberdctl.cfg
Configuration file of the administration script -
inetrc
Network DNS configuration file -
-
/lib/ejabberd/
-
- ebin/
Erlang binary files (*.beam) -
include/
Erlang header files (*.hrl) -
priv/
Additional files required at runtime -
- bin/
Executable programs -
lib/
Binary system libraries (*.so) -
msgs/
Translation files (*.msgs) -
-
-
/sbin/ejabberdctl
Administration script (see section 4.1) -
/share/doc/ejabberd/
Documentation of ejabberd -
/var/lib/ejabberd/
Spool directory: -
- .erlang.cookie
Erlang cookie file (see section 5.3) -
acl.DCD, ...
Mnesia database spool files (*.DCD, *.DCL, *.DAT) -
-
/var/log/ejabberd/
Log directory (see section 7.1): -
- ejabberd.log
ejabberd service log -
erlang.log
Erlang/OTP system log -
-

-

2.4.5  Start

-

You can use the ejabberdctl command line administration script to start and stop ejabberd. -If you provided the configure option --enable-user=USER (see 2.4.3), -you can execute ejabberdctl with either that system account or root.

Usage example: -

ejabberdctl start
+

+ +

2.4.4  Install

+

To install ejabberd in the destination directories, run the command: +

make install
+

Note that you probably need administrative privileges in the system +to install ejabberd.

The files and directories created are, by default: +

+ /etc/ejabberd/
Configuration directory: +
+ ejabberd.yml
ejabberd configuration file +
ejabberdctl.cfg
Configuration file of the administration script +
inetrc
Network DNS configuration file +
+
/lib/ejabberd/
+
+ ebin/
Erlang binary files (*.beam) +
include/
Erlang header files (*.hrl) +
priv/
Additional files required at runtime +
+ bin/
Executable programs +
lib/
Binary system libraries (*.so) +
msgs/
Translation files (*.msgs) +
+
+
/sbin/ejabberdctl
Administration script (see section 4.1) +
/share/doc/ejabberd/
Documentation of ejabberd +
/var/lib/ejabberd/
Spool directory: +
+ .erlang.cookie
Erlang cookie file (see section 5.3) +
acl.DCD, ...
Mnesia database spool files (*.DCD, *.DCL, *.DAT) +
+
/var/log/ejabberd/
Log directory (see section 7.1): +
+ ejabberd.log
ejabberd service log +
erlang.log
Erlang/OTP system log +
+

+ +

2.4.5  Start

+

You can use the ejabberdctl command line administration script to start and stop ejabberd. +If you provided the configure option --enable-user=USER (see 2.4.3), +you can execute ejabberdctl with either that system account or root.

Usage example: +

ejabberdctl start
 
 ejabberdctl status
 The node ejabberd@localhost is started with status: started
 ejabberd is running in that node
 
 ejabberdctl stop
-

If ejabberd doesn’t start correctly and a crash dump is generated, +

If ejabberd doesn’t start correctly and a crash dump is generated, there was a severe problem. -You can try starting ejabberd with -the command ejabberdctl live +You can try starting ejabberd with +the command ejabberdctl live to see the error message provided by Erlang -and can identify what is exactly the problem.

Please refer to the section 4.1 for details about ejabberdctl, -and configurable options to fine tune the Erlang runtime system.

If you want ejabberd to be started as daemon at boot time, -copy ejabberd.init to something like /etc/init.d/ejabberd +and can identify what is exactly the problem.

Please refer to the section 4.1 for details about ejabberdctl, +and configurable options to fine tune the Erlang runtime system.

If you want ejabberd to be started as daemon at boot time, +copy ejabberd.init to something like /etc/init.d/ejabberd (depending on your distribution). -Create a system user called ejabberd; +Create a system user called ejabberd; it will be used by the script to start the server. -Then you can call /etc/inid.d/ejabberd start as root to start the server.

-

2.4.6  Specific Notes for BSD

-

The command to compile ejabberd in BSD systems is: -

gmake
-

-

2.4.7  Specific Notes for Sun Solaris

-

You need to have GNU install, +Then you can call /etc/inid.d/ejabberd start as root to start the server.

+ +

2.4.6  Specific Notes for BSD

+

The command to compile ejabberd in BSD systems is: +

gmake
+

+ +

2.4.7  Specific Notes for Sun Solaris

+

You need to have GNU install, but it isn’t included in Solaris. It can be easily installed if your Solaris system -is set up for blastwave.org +is set up for blastwave.org package repository. -Make sure /opt/csw/bin is in your PATH and run: -

pkg-get -i fileutils
-

If that program is called ginstall, -modify the ejabberd Makefile script to suit your system, +Make sure /opt/csw/bin is in your PATH and run: +

pkg-get -i fileutils
+

If that program is called ginstall, +modify the ejabberd Makefile script to suit your system, for example: -

cat Makefile | sed s/install/ginstall/ > Makefile.gi
-

And finally install ejabberd with: -

gmake -f Makefile.gi ginstall
-

-

2.4.8  Specific Notes for Microsoft Windows

-

-

Requirements

To compile ejabberd on a Microsoft Windows system, you need: -

+ +

Compilation

We assume that we will try to put as much library as possible into C:\sdk\ to make it easier to track what is install for ejabberd.

  1. +Install Erlang emulator (for example, into C:\sdk\erl5.5.5). +
  2. Install Expat library into C:\sdk\Expat-2.0.0 +directory.

    Copy file C:\sdk\Expat-2.0.0\Libs\libexpat.dll +to your Windows system directory (for example, C:\WINNT or +C:\WINNT\System32) +

  3. Build and install the Iconv library into the directory +C:\sdk\GnuWin32.

    Copy file C:\sdk\GnuWin32\bin\lib*.dll to your Windows system directory (more installation instructions can be found in the -file README.woe32 in the iconv distribution).

    Note: instead of copying libexpat.dll and iconv.dll to the Windows +file README.woe32 in the iconv distribution).

    Note: instead of copying libexpat.dll and iconv.dll to the Windows directory, you can add the directories -C:\sdk\Expat-2.0.0\Libs and -C:\sdk\GnuWin32\bin to the PATH environment +C:\sdk\Expat-2.0.0\Libs and +C:\sdk\GnuWin32\bin to the PATH environment variable. -

  4. Install OpenSSL in C:\sdk\OpenSSL and add C:\sdk\OpenSSL\lib\VC to your path or copy the binaries to your system directory. -
  5. Install ZLib in C:\sdk\gnuWin32. Copy -C:\sdk\GnuWin32\bin\zlib1.dll to your system directory. If you change your path it should already be set after libiconv install. -
  6. Make sure the you can access Erlang binaries from your path. For example: set PATH=%PATH%;"C:\sdk\erl5.6.5\bin" -
  7. Depending on how you end up actually installing the library you might need to check and tweak the paths in the file configure.erl. -
  8. While in the directory ejabberd\src run: -
    configure.bat
+
  9. Install OpenSSL in C:\sdk\OpenSSL and add C:\sdk\OpenSSL\lib\VC to your path or copy the binaries to your system directory. +
  10. Install ZLib in C:\sdk\gnuWin32. Copy +C:\sdk\GnuWin32\bin\zlib1.dll to your system directory. If you change your path it should already be set after libiconv install. +
  11. Make sure the you can access Erlang binaries from your path. For example: set PATH=%PATH%;"C:\sdk\erl5.6.5\bin" +
  12. Depending on how you end up actually installing the library you might need to check and tweak the paths in the file configure.erl. +
  13. While in the directory ejabberd\src run: +
    configure.bat
 nmake -f Makefile.win32
-
  14. Edit the file ejabberd\src\ejabberd.yml and run -
    werl -s ejabberd -name ejabberd
-

-

2.5  Create an XMPP Account for Administration

You need an XMPP account and grant him administrative privileges -to enter the ejabberd Web Admin: -

  1. -Register an XMPP account on your ejabberd server, for example admin1@example.org. +
  2. Edit the file ejabberd\src\ejabberd.yml and run +
    werl -s ejabberd -name ejabberd
+

+ +

2.5  Create an XMPP Account for Administration

You need an XMPP account and grant him administrative privileges +to enter the ejabberd Web Admin: +

  1. +Register an XMPP account on your ejabberd server, for example admin1@example.org. There are two ways to register an XMPP account: -
    1. -Using ejabberdctl (see section 4.1): -
      ejabberdctl register admin1 example.org FgT5bk3
-
    2. Using an XMPP client and In-Band Registration (see section 3.3.19). -
    -
  2. Edit the ejabberd configuration file to give administration rights to the XMPP account you created: -
    acl:
+
    1. 
+Using ejabberdctl (see section 4.1):
+
      ejabberdctl register admin1 example.org FgT5bk3
+
    2. Using an XMPP client and In-Band Registration (see section 3.3.19).
+
    
+
  3. Edit the ejabberd configuration file to give administration rights to the XMPP account you created: +
    acl:
   admin:
     user:
       - "admin1": "example.org"
 access:
   configure:
     admin: allow
-
    You can grant administrative privileges to many XMPP accounts, +You can grant administrative privileges to many XMPP accounts, and also to accounts in other XMPP servers. -
  4. Restart ejabberd to load the new configuration. -
  5. Open the Web Admin (http://server:port/admin/) in your -favourite browser. Make sure to enter the full JID as username (in this -example: admin1@example.org. The reason that you also need to enter the -suffix, is because ejabberd’s virtual hosting support. -

-

2.6  Upgrading ejabberd

To upgrade an ejabberd installation to a new version, +

  • Restart ejabberd to load the new configuration. +
  • Open the Web Admin (http://server:port/admin/) in your +favourite browser. Make sure to enter the full JID as username (in this +example: admin1@example.org. The reason that you also need to enter the +suffix, is because ejabberd’s virtual hosting support. +

    • + +

    2.6  Upgrading ejabberd

    To upgrade an ejabberd installation to a new version, simply uninstall the old version, and then install the new one. Of course, it is important that the configuration file -and Mnesia database spool directory are not removed.

    ejabberd automatically updates the Mnesia table definitions at startup when needed. +and Mnesia database spool directory are not removed.

    ejabberd automatically updates the Mnesia table definitions at startup when needed. If you also use an external database for storage of some modules, check if the release notes of the new ejabberd version -indicates you need to also update those tables.

    -

    Chapter 3  Configuring ejabberd

    -

    -

    3.1  Basic Configuration

    The configuration file will be loaded the first time you start ejabberd. +indicates you need to also update those tables.

    + +

    Chapter 3  Configuring ejabberd

    +

    + +

    3.1  Basic Configuration

    The configuration file will be loaded the first time you start ejabberd. The configuration file name MUST have “.yml” extension. This helps ejabberd -to differentiate between the new and legacy file formats (see section 3.1.1).

    Note that ejabberd never edits the configuration file.

    The configuration file is written in -YAML. +to differentiate between the new and legacy file formats (see section 3.1.1).

    Note that ejabberd never edits the configuration file.

    The configuration file is written in +YAML. However, different scalars are treated as different types: -

    + +

    3.1.1  Legacy Configuration File

    +In previous ejabberd version the configuration file should be written in Erlang terms. The format is still supported, but it is highly recommended -to convert it to the new YAML format using convert_to_yaml command -from ejabberdctl (see 4.1 for details).

    -

    3.1.2  Host Names

    -

    The option hosts defines a list containing one or more domains that -ejabberd will serve.

    The syntax is: -

    [HostName]

    Examples: -

    To define specific ejabberd modules in a virtual host, +you can define the global modules option with the common modules, and later add specific modules to certain virtual hosts. -To accomplish that, instead of defining each option in host_config -use append_host_config with the same syntax.

    In this example three virtual hosts have some similar modules, but there are also +To accomplish that, instead of defining each option in host_config +use append_host_config with the same syntax.

    In this example three virtual hosts have some similar modules, but there are also other different modules for some specific virtual hosts: -

    ## This ejabberd server has three vhosts:
+
    ## This ejabberd server has three vhosts:
 hosts:
   - "one.example.org"
   - "two.example.org"
@@ -679,19 +717,20 @@ append_host_config:
     modules:
       mod_echo:
         host: "mirror.two.example.org"
-
      
    
-
    3.1.4  Listening Ports
      
-
    The option listen defines for which ports, addresses and network protocols ejabberd
+

    + +

    3.1.4  Listening Ports

    +

    The option listen defines for which ports, addresses and network protocols ejabberd will listen and what services will be run on them. Each element of the list is an associative array with the following elements: -

    The option syntax is: +

    [Listener, ...]

    Example: -

    listen:
+
    listen:
   -
     port: 5222
     module: ejabberd_c2s
@@ -701,100 +740,120 @@ Example:
     port: 5269
     module: ejabberd_s2s_in
     transport: tcp
-
      
    
-
    Port Number, IP Address and Transport Protocol
      
    The port number defines which port to listen for incoming connections.
+

    + +

    Port Number, IP Address and Transport Protocol

    The port number defines which port to listen for incoming connections. It can be a Jabber/XMPP standard port -(see section 5.1) or any other valid port number.

    The IP address can be represented as a string. +(see section 5.1) or any other valid port number.

    The IP address can be represented as a string. The socket will listen only in that network interface. It is possible to specify a generic address, -so ejabberd will listen in all addresses. +so ejabberd will listen in all addresses. Depending in the type of the IP address, IPv4 or IPv6 will be used. -When not specified the IP address, it will listen on all IPv4 network addresses.

    Some example values for IP address: -

    The transport protocol can be tcp or udp. -Default is tcp.

    -

    Listening Module

    +When not specified the IP address, it will listen on all IPv4 network addresses.

    Some example values for IP address: +

    The transport protocol can be tcp or udp. +Default is tcp.

    + +

    Listening Module

    The available modules, their purpose and the options allowed by each one are: -

    -ejabberd_c2s
    -Handles c2s connections.
    - Options: access, certfile, max_fsm_queue, -max_stanza_size, shaper, -starttls, starttls_required, tls, -zlib, tls_compression -
    ejabberd_s2s_in
    -Handles incoming s2s connections.
    - Options: max_stanza_size, shaper, tls_compression -
    ejabberd_service
    -Interacts with an external component -(as defined in the Jabber Component Protocol (XEP-0114).
    - Options: access, hosts, max_fsm_queue, -service_check_from, shaper_rule -
    ejabberd_stun
    +

    +ejabberd_c2s
    +Handles c2s connections.
    + Options: access, certfile, ciphers, protocol_options +max_fsm_queue, +max_stanza_size, shaper, +starttls, starttls_required, tls, +zlib, tls_compression +
    ejabberd_s2s_in
    +Handles incoming s2s connections.
    + Options: max_stanza_size, shaper, tls_compression +
    ejabberd_service
    +Interacts with an external component +(as defined in the Jabber Component Protocol (XEP-0114).
    + Options: access, hosts, max_fsm_queue, +service_check_from, shaper_rule +
    ejabberd_sip
    +Handles SIP requests as defined in +RFC 3261.
    + Options: certfile, tls +
    ejabberd_stun
    Handles STUN Binding requests as defined in -RFC 5389.
    - Options: certfile -
    ejabberd_http
    -Handles incoming HTTP connections.
    - Options: captcha, certfile, default_host, http_bind, http_poll, -request_handlers, tls, tls_compression, trusted_proxies, web_admin
    -

    -

    Options

    This is a detailed description of each option allowed by the listening modules: -

    -access: AccessName
    This option defines -access to the port. The default value is all. -
    backlog: Value
    The backlog value +RFC 5389.
    + Options: certfile +
    ejabberd_http
    +Handles incoming HTTP connections.
    + Options: captcha, certfile, default_host, http_bind, http_poll, +request_handlers, tls, tls_compression, trusted_proxies, web_admin
    +
    ejabberd_xmlrpc
    +Handles XML-RPC requests to execute ejabberd commands (4.2).
    + Options: access_commands, maxsessions, timeout.
    + You can find option explanations, example configuration in old and new format, +and example calls in several languages in the old +ejabberd_xmlrpc README.txt +

    + +

    Options

    This is a detailed description of each option allowed by the listening modules: +

    +access: AccessName
    This option defines +access to the port. The default value is all. +
    backlog: Value
    The backlog value defines the maximum length that the queue of pending connections may grow to. This should be increased if the server is going to handle lots of new incoming connections as they may be dropped if there is no space in the queue (and ejabberd was not able to accept them immediately). Default value is 5. -
    captcha: true|false
    -Simple web page that allows a user to fill a CAPTCHA challenge (see section 3.1.9). -
    certfile: Path
    Full path to a file containing the default SSL certificate. -To define a certificate file specific for a given domain, use the global option domain_certfile. -
    default_host: undefined|HostName}
    -If the HTTP request received by ejabberd contains the HTTP header Host -with an ambiguous virtual host that doesn’t match any one defined in ejabberd (see 3.1.2), +
    captcha: true|false
    +Simple web page that allows a user to fill a CAPTCHA challenge (see section 3.1.9). +
    certfile: Path
    Full path to a file containing the default SSL certificate. +To define a certificate file specific for a given domain, use the global option domain_certfile. +
    ciphers: Ciphers
    OpenSSL ciphers list in the same format accepted by +‘openssl ciphers’ command. +
    protocol_options: ProtocolOpts
    +List of general options relating to SSL/TLS. These map to <a href="https://www.openssl.org/docs/ssl/SSL_CTX_set_options.html">OpenSSL's set_options()</a>. +For a full list of options available in ejabberd, <a href="https://github.com/processone/tls/blob/master/c_src/options.h">see the source</a>. +The default entry is: "no_sslv2" +
    default_host: undefined|HostName}
    +If the HTTP request received by ejabberd contains the HTTP header Host +with an ambiguous virtual host that doesn’t match any one defined in ejabberd (see 3.1.2), then this configured HostName is set as the request Host. -The default value of this option is: undefined. -
    hosts: {Hostname: [HostOption, ...]}
    -The external Jabber component that connects to this ejabberd_service +The default value of this option is: undefined. +
    hosts: {Hostname: [HostOption, ...]}
    +The external Jabber component that connects to this ejabberd_service can serve one or more hostnames. -As HostOption you can define options for the component; +As HostOption you can define options for the component; currently the only allowed option is the password required to the component -when attempt to connect to ejabberd: password: Secret. -Note that you cannot define in a single ejabberd_service components of -different services: add an ejabberd_service for each service, +when attempt to connect to ejabberd: password: Secret. +Note that you cannot define in a single ejabberd_service components of +different services: add an ejabberd_service for each service, as seen in an example below. -
    http_bind: true|false
    -This option enables HTTP Binding (XEP-0124 and XEP-0206) support. HTTP Bind -enables access via HTTP requests to ejabberd from behind firewalls which -do not allow outgoing sockets on port 5222.

    Remember that you must also install and enable the module mod_http_bind.

    If HTTP Bind is enabled, it will be available at -http://server:port/http-bind/. Be aware that support for HTTP Bind +

    http_bind: true|false
    +This option enables HTTP Binding (XEP-0124 and XEP-0206) support. HTTP Bind +enables access via HTTP requests to ejabberd from behind firewalls which +do not allow outgoing sockets on port 5222.

    Remember that you must also install and enable the module mod_http_bind.

    If HTTP Bind is enabled, it will be available at +http://server:port/http-bind/. Be aware that support for HTTP Bind is also needed in the XMPP client. Remark also that HTTP Bind can be interesting to host a web-based XMPP client such as -JWChat +JWChat (check the tutorials to install JWChat with ejabberd and an -embedded local web server -or Apache). -

    http_poll: true|false
    -This option enables HTTP Polling (XEP-0025) support. HTTP Polling -enables access via HTTP requests to ejabberd from behind firewalls which -do not allow outgoing sockets on port 5222.

    If HTTP Polling is enabled, it will be available at -http://server:port/http-poll/. Be aware that support for HTTP Polling +embedded local web server +or Apache). +

    http_poll: true|false
    +This option enables HTTP Polling (XEP-0025) support. HTTP Polling +enables access via HTTP requests to ejabberd from behind firewalls which +do not allow outgoing sockets on port 5222.

    If HTTP Polling is enabled, it will be available at +http://server:port/http-poll/. Be aware that support for HTTP Polling is also needed in the XMPP client. Remark also that HTTP Polling can be interesting to host a web-based XMPP client such as -JWChat.

    The maximum period of time to keep a client session active without +JWChat.

    The maximum period of time to keep a client session active without an incoming POST request can be configured with the global option -http_poll_timeout. The default value is five minutes. -The option can be defined in ejabberd.yml, expressing the time -in seconds: {http_poll_timeout, 300}. -

    max_fsm_queue: Size
    +http_poll_timeout. The default value is five minutes. +The option can be defined in ejabberd.yml, expressing the time +in seconds: {http_poll_timeout, 300}. +

    max_fsm_queue: Size
    This option specifies the maximum number of elements in the queue of the FSM (Finite State Machine). Roughly speaking, each message in such queues represents one XML @@ -804,112 +863,118 @@ the FSM and the corresponding connection (if any) will be terminated and error message will be logged. The reasonable value for this option depends on your hardware configuration. However, there is no much sense to set the size above 1000 elements. -This option can be specified for ejabberd_service and -ejabberd_c2s listeners, -or also globally for ejabberd_s2s_out. -If the option is not specified for ejabberd_service or -ejabberd_c2s listeners, +This option can be specified for ejabberd_service and +ejabberd_c2s listeners, +or also globally for ejabberd_s2s_out. +If the option is not specified for ejabberd_service or +ejabberd_c2s listeners, the globally configured value is used. The allowed values are integers and ’undefined’. Default value: ’undefined’. -
    max_stanza_size: Size
    +
    max_stanza_size: Size
    This option specifies an approximate maximum size in bytes of XML stanzas. Approximate, because it is calculated with the precision of one block of read -data. For example {max_stanza_size, 65536}. The default -value is infinity. Recommended values are 65536 for c2s +data. For example {max_stanza_size, 65536}. The default +value is infinity. Recommended values are 65536 for c2s connections and 131072 for s2s connections. s2s max stanza size must always much higher than c2s limit. Change this value with extreme care as it can cause unwanted disconnect if set too low. -
    request_handlers: {Path: Module}
    To define one or several handlers that will serve HTTP requests. +
    request_handlers: {Path: Module}
    To define one or several handlers that will serve HTTP requests. The Path is a string; so the URIs that start with that Path will be served by Module. -For example, if you want mod_foo to serve the URIs that start with /a/b/, -and you also want mod_http_bind to serve the URIs /http-bind/, +For example, if you want mod_foo to serve the URIs that start with /a/b/, +and you also want mod_http_bind to serve the URIs /http-bind/, use this option: -
    request_handlers:
+
    request_handlers:
   /"a"/"b": mod_foo
   /"http-bind": mod_http_bind
-
    service_check_from: true|false
    +
    service_check_from: true|false
    -This option can be used with ejabberd_service only. -XEP-0114 requires that the domain must match the hostname of the component. -If this option is set to false, ejabberd will allow the component +This option can be used with ejabberd_service only. +XEP-0114 requires that the domain must match the hostname of the component. +If this option is set to false, ejabberd will allow the component to send stanzas with any arbitrary domain in the ’from’ attribute. Only use this option if you are completely sure about it. -The default value is true, to be compliant with XEP-0114. -
    shaper: none|ShaperName
    This option defines a -shaper for the port (see section 3.1.7). The default value -is none. -
    shaper_rule: none|ShaperRule
    This option defines a -shaper rule for the ejabberd_service (see section 3.1.7). The recommended value -is fast. -
    starttls: true|false
    This option +The default value is true, to be compliant with XEP-0114. +
    shaper: none|ShaperName
    This option defines a +shaper for the port (see section 3.1.7). The default value +is none. +
    shaper_rule: none|ShaperRule
    This option defines a +shaper rule for the ejabberd_service (see section 3.1.7). The recommended value +is fast. +
    starttls: true|false
    This option specifies that STARTTLS encryption is available on connections to the port. -You should also set the certfile option. -You can define a certificate file for a specific domain using the global option domain_certfile. -
    starttls_required: true|false
    This option +You should also set the certfile option. +You can define a certificate file for a specific domain using the global option domain_certfile. +
    starttls_required: true|false
    This option specifies that STARTTLS encryption is required on connections to the port. No unencrypted connections will be allowed. -You should also set the certfile option. -You can define a certificate file for a specific domain using the global option domain_certfile. -
    timeout: Integer
    +You should also set the certfile option. +You can define a certificate file for a specific domain using the global option domain_certfile. +
    timeout: Integer
    Timeout of the connections, expressed in milliseconds. Default: 5000 -
    tls: true|false
    This option specifies that traffic on +
    tls: true|false
    This option specifies that traffic on the port will be encrypted using SSL immediately after connecting. This was the traditional encryption method in the early Jabber software, commonly on port 5223 for client-to-server communications. But this method is nowadays deprecated and not recommended. The preferable encryption method is STARTTLS on port 5222, as defined -RFC 3920: XMPP Core, -which can be enabled in ejabberd with the option starttls. -If this option is set, you should also set the certfile option. -The option tls can also be used in ejabberd_http to support HTTPS. -
    tls_compression: true|false
    -Whether to enable or disable TLS compression. The default value is true. -
    trusted_proxies: all | [IpString]
    -Specify what proxies are trusted when an HTTP request contains the header X-Forwarded-For -You can specify all to allow all proxies, or specify a list of IPs in string format. -The default value is: ["127.0.0.1"] -
    web_admin: true|false
    This option -enables the Web Admin for ejabberd administration which is available -at http://server:port/admin/. Login and password are the username and +RFC 3920: XMPP Core, +which can be enabled in ejabberd with the option starttls. +If this option is set, you should also set the certfile option. +The option tls can also be used in ejabberd_http to support HTTPS. +
    tls_compression: true|false
    +Whether to enable or disable TLS compression. The default value is true. +
    trusted_proxies: all | [IpString]
    +Specify what proxies are trusted when an HTTP request contains the header X-Forwarded-For +You can specify all to allow all proxies, or specify a list of IPs in string format. +The default value is: ["127.0.0.1"] +
    web_admin: true|false
    This option +enables the Web Admin for ejabberd administration which is available +at http://server:port/admin/. Login and password are the username and password of one of the registered users who are granted access by the ‘configure’ access rule. -
    zlib: true|false
    This -option specifies that Zlib stream compression (as defined in XEP-0138) +
    zlib: true|false
    This +option specifies that Zlib stream compression (as defined in XEP-0138) is available on connections to the port. -

    There are some additional global options that can be specified in the ejabberd configuration file (outside listen): -

    -s2s_use_starttls: false|optional|required|required_trusted
    +

    There are some additional global options that can be specified in the ejabberd configuration file (outside listen): +

    +s2s_use_starttls: false|optional|required|required_trusted
    This option defines if s2s connections don’t use STARTTLS encryption; if STARTTLS can be used optionally; if STARTTLS is required to establish the connection; or if STARTTLS is required and the remote certificate must be valid and trusted. -The default value is to not use STARTTLS: false. -
    s2s_certfile: Path
    Full path to a +The default value is to not use STARTTLS: false. +
    s2s_certfile: Path
    Full path to a file containing a SSL certificate. -
    domain_certfile: Path
    +
    domain_certfile: Path
    Full path to the file containing the SSL certificate for a specific domain. -
    outgoing_s2s_families: [Family, ...]
    +
    s2s_ciphers: Ciphers
    OpenSSL ciphers list +in the same format accepted by ‘openssl ciphers’ command. +
    s2s_protocol_options: ProtocolOpts
    +List of general options relating to SSL/TLS. These map to <a href="https://www.openssl.org/docs/ssl/SSL_CTX_set_options.html">OpenSSL's set_options()</a>. +For a full list of options available in ejabberd, <a href="https://github.com/processone/tls/blob/protocol_options/c_src/options.h">see the source</a>. +The default entry is: "no_sslv2" +
    outgoing_s2s_families: [Family, ...]
    Specify which address families to try, in what order. By default it first tries connecting with IPv4, if that fails it tries using IPv6. -
    outgoing_s2s_timeout: Timeout
    +
    outgoing_s2s_timeout: Timeout
    The timeout in milliseconds for outgoing S2S connection attempts. -
    s2s_dns_timeout: Timeout
    -The timeout in seconds for DNS resolving. The default value is 10. -
    s2s_dns_retries: Number
    -DNS resolving retries in seconds. The default value is 2. -
    s2s_policy: Access
    +
    s2s_dns_timeout: Timeout
    +The timeout in seconds for DNS resolving. The default value is 10. +
    s2s_dns_retries: Number
    +DNS resolving retries in seconds. The default value is 2. +
    s2s_policy: Access
    The policy for incoming and outgoing s2s connections to other XMPP servers. -The default value is all. -
    s2s_max_retry_delay: Seconds
    +The default value is all. +
    s2s_max_retry_delay: Seconds
    The maximum allowed delay for retry to connect after a failed connection attempt. Specified in seconds. The default value is 300 seconds (5 minutes). -
    s2s_tls_compression: true|false
    +
    s2s_tls_compression: true|false
    Whether to enable or disable TLS compression for s2s connections. -The default value is true. -
    max_fsm_queue: Size
    +The default value is true. +
    max_fsm_queue: Size
    This option specifies the maximum number of elements in the queue of the FSM (Finite State Machine). Roughly speaking, each message in such queues represents one XML @@ -919,33 +984,34 @@ the FSM and the corresponding connection (if any) will be terminated and error message will be logged. The reasonable value for this option depends on your hardware configuration. However, there is no much sense to set the size above 1000 elements. -This option can be specified for ejabberd_service and -ejabberd_c2s listeners, -or also globally for ejabberd_s2s_out. -If the option is not specified for ejabberd_service or -ejabberd_c2s listeners, +This option can be specified for ejabberd_service and +ejabberd_c2s listeners, +or also globally for ejabberd_s2s_out. +If the option is not specified for ejabberd_service or +ejabberd_c2s listeners, the globally configured value is used. The allowed values are integers and ’undefined’. Default value: ’undefined’. -
    route_subdomains: local|s2s
    +
    route_subdomains: local|s2s
    Defines if ejabberd must route stanzas directed to subdomains locally (compliant with -RFC 3920: XMPP Core), +RFC 3920: XMPP Core), or to foreign server using S2S (compliant with -RFC 3920 bis). -

    -

    Examples

    For example, the following simple configuration defines: -

    • -There are three domains. The default certificate file is server.pem. -However, the c2s and s2s connections to the domain example.com use the file example_com.pem. -
    • Port 5222 listens for c2s connections with STARTTLS, +RFC 3920 bis). +

    + +

    Examples

    For example, the following simple configuration defines: +

    hosts:
+
  • Port 5223 listens for c2s connections with the old SSL.
+
  • Port 5269 listens for s2s connections with STARTTLS. The socket is set for IPv6 instead of IPv4.
+
  • Port 3478 listens for STUN requests over UDP.
+
  • Port 5280 listens for HTTP requests, and serves the HTTP Poll service.
+
  • Port 5281 listens for HTTP requests, using HTTPS to serve HTTP-Bind (BOSH) and the Web Admin as explained in
+section 4.3. The socket only listens connections to the IP address 127.0.0.1.
+
    • hosts:
   - "example.com"
   - "example.org"
   - "example.net"
@@ -999,44 +1065,44 @@ outgoing_s2s_families:
   - ipv4
   - ipv6
 outgoing_s2s_timeout: 10000
-
    In this example, the following configuration defines that:
-

    In this example, the following configuration defines that: +

    acl: 
+
  • The
+AIM transport
+aim.example.org is connected to port 5233 on localhost IP addresses
+(127.0.0.1 and ::1) with password ‘aimsecret’.
+
  • The ICQ transport JIT (icq.example.org and
+sms.example.org) is connected to port 5234 with password
+‘jitsecret’.
+
  • The
+MSN transport
+msn.example.org is connected to port 5235 with password
+‘msnsecret’.
+
  • The
+Yahoo! transport
+yahoo.example.org is connected to port 5236 with password
+‘yahoosecret’.
+
  • The Gadu-Gadu transport gg.example.org is
+connected to port 5237 with password ‘ggsecret’.
+
  • The
+Jabber Mail Component
+jmc.example.org is connected to port 5238 with password
+‘jmcsecret’.
+
  • The service custom has enabled the special option to avoiding checking the from attribute in the packets send by this component. The component can send packets in behalf of any users from the server, or even on behalf of any server.
+
    • acl: 
   blocked: 
     user: "bad"
   trusted_servers: 
@@ -1147,9 +1213,9 @@ listen:
     hosts: 
       "custom.example.org": 
         password: "customsecret"
-
    Note, that for services based in jabberd14 or WPJabber
+

    Note, that for services based in jabberd14 or WPJabber you have to make the transports log and do XDB by themselves: -

      <!--
+
      <!--
      You have to add elogger and rlogger entries here when using ejabberd.
      In this case the transport will do the logging.
   -->
@@ -1177,393 +1243,406 @@ you have to make the transports log and do XDB by themselves:
       <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
     </xdb_file>
   </xdb>
-
      
    
-
    3.1.5  Authentication
      
-
    The option auth_method defines the authentication methods that are used
+

    + +

    3.1.5  Authentication

    +

    The option auth_method defines the authentication methods that are used for user authentication. The syntax is: -

    [Method, ...]

    The following authentication methods are supported by ejabberd: -

    Account creation is only supported by internal, external and odbc methods.

    The option resource_conflict defines the action when a client attempts to +

    [Method, ...]

    The following authentication methods are supported by ejabberd: +

    Account creation is only supported by internal, external and odbc methods.

    The option resource_conflict defines the action when a client attempts to login to an account with a resource that is already connected. The option syntax is: -

    resource_conflict: setresource|closenew|closeold

    +

    resource_conflict: setresource|closenew|closeold

    The possible values match exactly the three possibilities described in -XMPP Core: section 7.7.2.2. -The default value is closeold. -If the client uses old Jabber Non-SASL authentication (XEP-0078), -then this option is not respected, and the action performed is closeold.

    The option fqdn allows you to define the Fully Qualified Domain Name +XMPP Core: section 7.7.2.2. +The default value is closeold. +If the client uses old Jabber Non-SASL authentication (XEP-0078), +then this option is not respected, and the action performed is closeold.

    The option fqdn allows you to define the Fully Qualified Domain Name of the machine, in case it isn’t detected automatically. The FQDN is used to authenticate some clients that use the DIGEST-MD5 SASL mechanism. The option syntax is: -

    fqdn: undefined|FqdnString|[FqdnString]

    -

    Internal

    -

    ejabberd uses its internal Mnesia database as the default authentication method. -The value internal will enable the internal authentication method.

    The option auth_password_format: plain|scram +

    fqdn: undefined|FqdnString|[FqdnString]

    + +

    Internal

    +

    ejabberd uses its internal Mnesia database as the default authentication method. +The value internal will enable the internal authentication method.

    The option auth_password_format: plain|scram defines in what format the users passwords are stored: -

    -plain
    +

    +plain
    The password is stored as plain text in the database. This is risky because the passwords can be read if your database gets compromised. This is the default value. This format allows clients to authenticate using: -the old Jabber Non-SASL (XEP-0078), SASL PLAIN, -SASL DIGEST-MD5, and SASL SCRAM-SHA-1.
    scram
    +the old Jabber Non-SASL (XEP-0078), SASL PLAIN, +SASL DIGEST-MD5, and SASL SCRAM-SHA-1.
    scram
    The password is not stored, only some information that allows to verify the hash provided by the client. It is impossible to obtain the original plain password from the stored information; -for this reason, when this value is configured it cannot be changed to plain anymore. -This format allows clients to authenticate using: SASL PLAIN and SASL SCRAM-SHA-1. -

    Examples: -

    • -To use internal authentication on example.org and LDAP -authentication on example.net: -
      host_config:
+for this reason, when this value is configured it cannot be changed to plain anymore.
+This format allows clients to authenticate using: SASL PLAIN and SASL SCRAM-SHA-1.
+

    Examples: +

    -

    External Script

    -

    In this authentication method, when ejabberd starts, -it start a script, and calls it to perform authentication tasks.

    The server administrator can write the external authentication script +

    + +

    External Script

    +

    In this authentication method, when ejabberd starts, +it start a script, and calls it to perform authentication tasks.

    The server administrator can write the external authentication script in any language. The details on the interface between ejabberd and the script are described -in the ejabberd Developers Guide. -There are also several example authentication scripts.

    These are the specific options: -

    -extauth_program: PathToScript
    +in the ejabberd Developers Guide. +There are also several example authentication scripts.

    These are the specific options: +

    +extauth_program: PathToScript
    Indicate in this option the full path to the external authentication script. -The script must be executable by ejabberd.
    extauth_instances: Integer
    +The script must be executable by ejabberd.
    extauth_instances: Integer
    Indicate how many instances of the script to run simultaneously to serve authentication in the virtual host. -The default value is the minimum number: 1.
    extauth_cache: false|CacheTimeInteger
    -The value false disables the caching feature, this is the default. -The integer 0 (zero) enables caching for statistics, but doesn’t use that cached information to authenticate users. +The default value is the minimum number: 1.
    extauth_cache: false|CacheTimeInteger
    +The value false disables the caching feature, this is the default. +The integer 0 (zero) enables caching for statistics, but doesn’t use that cached information to authenticate users. If another integer value is set, caching is enabled both for statistics and for authentication: the CacheTimeInteger indicates the number of seconds that ejabberd can reuse the authentication information since the user last disconnected, to verify again the user authentication without querying again the extauth script. Note: caching should not be enabled in a host if internal auth is also enabled. -If caching is enabled, mod_last must be enabled also in that vhost. -

    This example sets external authentication, the extauth script, enables caching for 10 minutes, +If caching is enabled, mod_last must be enabled also in that vhost. +

    This example sets external authentication, the extauth script, enables caching for 10 minutes, and starts three instances of the script for each virtual host defined in ejabberd: -

    auth_method: [external]
+
    auth_method: [external]
 extauth_program: "/etc/ejabberd/JabberAuth.class.php"
 extauth_cache: 600
 extauth_instances: 3
-
      
    
-
    Anonymous Login and SASL Anonymous
      
-
    The anonymous authentication method enables two modes for anonymous authentication:
-
    
-Anonymous login:
     This is a standard login, that use the
+

    + +

    Anonymous Login and SASL Anonymous

    +

    The anonymous authentication method enables two modes for anonymous authentication: +

    +Anonymous login:
    This is a standard login, that use the classical login and password mechanisms, but where password is accepted or preconfigured for all anonymous users. This login is compliant with SASL authentication, password and digest non-SASL authentication, so this option will work with almost all XMPP -clients
    SASL Anonymous:
    This is a special SASL authentication +clients
    SASL Anonymous:
    This is a special SASL authentication mechanism that allows to login without providing username or -password (see XEP-0175). The main advantage of SASL Anonymous +password (see XEP-0175). The main advantage of SASL Anonymous is that the protocol was designed to give the user a login. This is useful to avoid in some case, where the server has many users already logged or registered and when it is hard to find a free username. The main disavantage is that you need a client that specifically supports the SASL Anonymous protocol. -

    The anonymous authentication method can be configured with the following -options. Remember that you can use the host_config option to set virtual -host specific options (see section 3.1.3).

    -allow_multiple_connections: false|true
    This option is only used +

    The anonymous authentication method can be configured with the following +options. Remember that you can use the host_config option to set virtual +host specific options (see section 3.1.3).

    +allow_multiple_connections: false|true
    This option is only used when the anonymous mode is -enabled. Setting it to true means that the same username can be taken +enabled. Setting it to true means that the same username can be taken multiple times in anonymous login mode if different resource are used to connect. This option is only useful in very special occasions. The default -value is false. -
    anonymous_protocol: login_anon | sasl_anon | both
    -login_anon means that the anonymous login method will be used. -sasl_anon means that the SASL Anonymous method will be used. -both means that SASL Anonymous and login anonymous are both enabled. -

    Those options are defined for each virtual host with the host_config -parameter (see section 3.1.3).

    Examples: -

    There are more configuration examples and XMPP client example stanzas in +Anonymous users support.

    + +

    PAM Authentication

    +

    ejabberd supports authentication via Pluggable Authentication Modules (PAM). PAM is currently supported in AIX, FreeBSD, HP-UX, Linux, Mac OS X, NetBSD and Solaris. PAM authentication is disabled by default, so you have to configure and compile -ejabberd with PAM support enabled: -

    ./configure --enable-pam && make install
-

    Options: -

    -pam_service: Name
    This option defines the PAM service name. -Default is "ejabberd". Refer to the PAM documentation of your operation system +ejabberd with PAM support enabled: +

    ./configure --enable-pam && make install
+

    Options: +

    +pam_service: Name
    This option defines the PAM service name. +Default is "ejabberd". Refer to the PAM documentation of your operation system for more information. -
    pam_userinfotype: username|jid
    +
    pam_userinfotype: username|jid
    This option defines what type of information about the user ejabberd provides to the PAM service: only the username, or the user JID. -Default is username. -

    Example: -

    auth_method: [pam]
+Default is username.
+

    Example: +

    auth_method: [pam]
 pam_service: "ejabberd"
-

    Though it is quite easy to set up PAM support in ejabberd, PAM itself introduces some -security issues:

    + +

    3.1.6  Access Rules

    +

    + +

    ACL Definition

    +

    Access control in ejabberd is performed via Access Control Lists (ACLs). The declarations of ACLs in the configuration file have the following syntax: -

    acl: { ACLName: { ACLType: ACLValue } }

    ACLType: ACLValue can be one of the following: -

    -all
    Matches all JIDs. Example: -
    acl:
+
    acl: { ACLName: { ACLType: ACLValue } }
    ACLType: ACLValue can be one of the following:
+
    
+all
     Matches all JIDs. Example:
+
    acl:
   world: all
-
    user: Username
     Matches the user with the name
-Username at the first virtual host. Example:
-
    acl:
+
    user: Username
     Matches the user with the name
+Username at the first virtual host. Example:
+
    acl:
   admin:
     user: "yozhik"
-
    user: {Username: Server}
     Matches the user with the JID
-Username@Server and any resource. Example:
-
    acl:
+
    user: {Username: Server}
     Matches the user with the JID
+Username@Server and any resource. Example:
+
    acl:
   admin:
     user:
       "yozhik": "example.org"
-
    server: Server
     Matches any JID from server
-Server. Example:
-
    acl:
+
    server: Server
     Matches any JID from server
+Server. Example:
+
    acl:
   exampleorg:
     server: "example.org"
-
    resource: Resource
     Matches any JID with a resource
-Resource. Example:
-
    acl:
+
    resource: Resource
     Matches any JID with a resource
+Resource. Example:
+
    acl:
   mucklres:
    resource: "muckl"
-
    shared_group: Groupname
     Matches any member of a Shared Roster Group with name Groupname in the virtual host. Example:
-
    acl:
+
    shared_group: Groupname
     Matches any member of a Shared Roster Group with name Groupname in the virtual host. Example:
+
    acl:
   techgroupmembers:
     shared_group: "techteam"
-
    shared_group: {Groupname: Server}
     Matches any member of a Shared Roster Group with name Groupname in the virtual host Server. Example:
-
    acl:
+
    shared_group: {Groupname: Server}
     Matches any member of a Shared Roster Group with name Groupname in the virtual host Server. Example:
+
    acl:
   techgroupmembers:
     shared_group:
       "techteam": "example.org"
-
    ip: Network
     Matches any IP address from the Network. Example:
-
    acl:
+
    ip: Network
     Matches any IP address from the Network. Example:
+
    acl:
   loopback:
     ip:
       - "127.0.0.0/8"
       - "::"
-
    user_regexp: Regexp
     Matches any local user with a name that
-matches Regexp on local virtual hosts. Example:
-
    acl:
+
    user_regexp: Regexp
     Matches any local user with a name that
+matches Regexp on local virtual hosts. Example:
+
    acl:
   tests:
     user_regexp: "^test[0-9]*$"
-
    user_regexp: {Regexp: Server}
     Matches any user with a name
-that matches Regexp at server Server. Example:
-
    acl:
+
    user_regexp: {Regexp: Server}
     Matches any user with a name
+that matches Regexp at server Server. Example:
+
    acl:
   tests:
     user_regexp:
       "^test": "example.org"
-
    server_regexp: Regexp
     Matches any JID from the server that
-matches Regexp. Example:
-
    acl:
+
    server_regexp: Regexp
     Matches any JID from the server that
+matches Regexp. Example:
+
    acl:
   icq:
     server_regexp: "^icq\\."
-
    resource_regexp: Regexp
     Matches any JID with a resource that
-matches Regexp. Example:
-
    acl:
+
    resource_regexp: Regexp
     Matches any JID with a resource that
+matches Regexp. Example:
+
    acl:
   icq:
     resource_regexp: "^laptop\\."
-
    node_regexp: {UserRegexp: ServerRegexp}
     Matches any user
-with a name that matches UserRegexp at any server that matches
-ServerRegexp. Example:
-
    acl:
+
    node_regexp: {UserRegexp: ServerRegexp}
     Matches any user
+with a name that matches UserRegexp at any server that matches
+ServerRegexp. Example:
+
    acl:
   yozhik:
     node_regexp:
       "^yozhik$": "^example.(com|org)$"
-
    user_glob: Glob}
    
-
    user_glob: {Glob: Server}
    
-
    server_glob: Glob
    
-
    resource_glob: Glob
    
-
    node_glob: {UserGlob: ServerGlob}
     This is the same as
+
    user_glob: Glob}
    +
    user_glob: {Glob: Server}
    +
    server_glob: Glob
    +
    resource_glob: Glob
    +
    node_glob: {UserGlob: ServerGlob}
    This is the same as above. However, it uses shell glob patterns instead of regexp. These patterns can have the following special characters: -
    -*
    matches any string including the null string. -
    ?
    matches any single character. -
    [...]
    matches any of the enclosed characters. Character -ranges are specified by a pair of characters separated by a ‘-’. -If the first character after ‘[’ is a ‘!’, any +
    +*
    matches any string including the null string. +
    ?
    matches any single character. +
    [...]
    matches any of the enclosed characters. Character +ranges are specified by a pair of characters separated by a ‘-’. +If the first character after ‘[’ is a ‘!’, any character not enclosed is matched. -
    -

    The following ACLName are pre-defined: -

    -all
    Matches any JID. -
    none
    Matches no JID. -

    -

    Access Rights

    -

    An entry allowing or denying access to different services. +

    +

    The following ACLName are pre-defined: +

    +all
    Matches any JID. +
    none
    Matches no JID. +

    + +

    Access Rights

    +

    An entry allowing or denying access to different services. The syntax is: -

    access: { AccessName: { ACLName: allow|deny } }

    When a JID is checked to have access to Accessname, the server +

    access: { AccessName: { ACLName: allow|deny } }

    When a JID is checked to have access to Accessname, the server sequentially checks if that JID matches any of the ACLs that are named in the -second elements of the tuples in the list. If it matches, the first element of -the first matched tuple is returned, otherwise the value ‘deny’ is -returned.

    If you define specific Access rights in a virtual host, +first elements of the tuples in the list. If it matches, the second element of +the first matched tuple is returned, otherwise the value ‘deny’ is +returned.

    If you define specific Access rights in a virtual host, remember that the globally defined Access rights have precedence over those. This means that, in case of conflict, the Access granted or denied in the global server is used -and the Access of a virtual host doesn’t have effect.

    Example: -

    access:
+and the Access of a virtual host doesn’t have effect.
    Example:
+
    access:
   configure:
     admin: allow
   something
     badmans: deny
     all: allow
-
    The following AccessName are pre-defined:
-
    
-all
     Always returns the value ‘allow’.
-
    none
     Always returns the value ‘deny’.
-
      
    
-
    Limiting Opened Sessions with ACL
      
-
    The special access max_user_sessions specifies the maximum
+

    The following AccessName are pre-defined: +

    +all
    Always returns the value ‘allow’. +
    none
    Always returns the value ‘deny’. +

    + +

    Limiting Opened Sessions with ACL

    +

    The special access max_user_sessions specifies the maximum number of sessions (authenticated connections) per user. If a user tries to open more sessions by using different resources, the first -opened session will be disconnected. The error session replaced +opened session will be disconnected. The error session replaced will be sent to the disconnected session. The value for this option -can be either a number, or infinity. The default value is -infinity.

    The syntax is: -

    { max_user_sessions: { ACLName: MaxNumber } }

    This example limits the number of sessions per user to 5 for all users, and to 10 for admins: -

    access:
+can be either a number, or infinity. The default value is
+infinity.
    The syntax is:
+
    { max_user_sessions: { ACLName: MaxNumber } }
    This example limits the number of sessions per user to 5 for all users, and to 10 for admins:
+
    access:
   max_user_sessions:
     admin: 10
     all: 5
-
      
    
-
    Several connections to a remote XMPP server with ACL
      
-
    The special access max_s2s_connections specifies how many
+

    + +

    Several connections to a remote XMPP server with ACL

    +

    The special access max_s2s_connections specifies how many simultaneous S2S connections can be established to a specific remote XMPP server. -The default value is 1. -There’s also available the access max_s2s_connections_per_node.

    The syntax is: -

    { max_s2s_connections: { ACLName: MaxNumber } }

    Examples: -

    + +

    3.1.7  Shapers

    +

    Shapers enable you to limit connection traffic. The syntax is: -

    shaper: { ShaperName: Rate }

    -where Rate stands for the maximum allowed incoming rate in bytes per +

    shaper: { ShaperName: Rate }

    +where Rate stands for the maximum allowed incoming rate in bytes per second. -When a connection exceeds this limit, ejabberd stops reading from the socket -until the average rate is again below the allowed maximum.

    Examples: -

    + +

    3.1.8  Default Language

    +

    The option language defines the default language of server strings that can be seen by XMPP clients. If a XMPP client does not support -xml:lang, the specified language is used.

    The option syntax is: -

    language: Language

    The default value is en. +xml:lang, the specified language is used.

    The option syntax is: +

    language: Language

    The default value is en. In order to take effect there must be a translation file -Language.msg in ejabberd’s msgs directory.

    For example, to set Russian as default language: -

    language: "ru"
-

    Appendix A provides more details about internationalization and localization.

    -

    3.1.9  CAPTCHA

    -

    Some ejabberd modules can be configured to require a CAPTCHA challenge on certain actions. -If the client does not support CAPTCHA Forms (XEP-0158), -a web link is provided so the user can fill the challenge in a web browser.

    An example script is provided that generates the image -using ImageMagick’s Convert program.

    The configurable options are: -

    -captcha_cmd: Path
    +Language.msg in ejabberd’s msgs directory.

    For example, to set Russian as default language: +

    language: "ru"
+

    Appendix A provides more details about internationalization and localization.

    + +

    3.1.9  CAPTCHA

    +

    Some ejabberd modules can be configured to require a CAPTCHA challenge on certain actions. +If the client does not support CAPTCHA Forms (XEP-0158), +a web link is provided so the user can fill the challenge in a web browser.

    An example script is provided that generates the image +using ImageMagick’s Convert program.

    The configurable options are: +

    +captcha_cmd: Path
    Full path to a script that generates the image. -The default value disables the feature: undefined -
    captcha_host: ProtocolHostPort
    +The default value disables the feature: undefined +
    captcha_host: ProtocolHostPort
    ProtocolHostPort is a string with the host, and optionally the Protocol and Port number. It must identify where ejabberd listens for CAPTCHA requests. -The URL sent to the user is formed by: Protocol://Host:Port/captcha/ -The default value is: protocol http, the first hostname configured, and port 80. +The URL sent to the user is formed by: Protocol://Host:Port/captcha/ +The default value is: protocol http, the first hostname configured, and port 80. If you specify a port number that does not match exactly an ejabberd listener (because you are using a reverse proxy or other port-forwarding tool), then you must specify the transfer protocol, as seen in the example below. -

    Additionally, an ejabberd_http listener must be enabled with the captcha option. -See section 3.1.4.

    Example configuration: -

    hosts: ["example.org"]
+

    Additionally, an ejabberd_http listener must be enabled with the captcha option. +See section 3.1.4.

    Example configuration: +

    hosts: ["example.org"]
 
 captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
 captcha_host: "example.org:5280"
@@ -1577,18 +1656,19 @@ listen:
     module: ejabberd_http
     captcha: true
   ...
-

    -

    3.1.10  STUN

    -

    ejabberd is able to act as a stand-alone STUN server -(RFC 5389). Currently only Binding usage -is supported. In that role ejabberd helps clients with Jingle ICE (XEP-0176) support to discover their external addresses and ports.

    You should configure ejabberd_stun listening module as described in 3.1.4 section. -If certfile option is defined, ejabberd multiplexes TCP and -TLS over TCP connections on the same port. Obviously, certfile option -is defined for tcp only. Note however that TCP or TLS over TCP +

    + +

    3.1.10  STUN

    +

    ejabberd is able to act as a stand-alone STUN server +(RFC 5389). Currently only Binding usage +is supported. In that role ejabberd helps clients with ICE (RFC 5245) or Jingle ICE (XEP-0176) support to discover their external addresses and ports.

    You should configure ejabberd_stun listening module as described in 3.1.4 section. +If certfile option is defined, ejabberd multiplexes TCP and +TLS over TCP connections on the same port. Obviously, certfile option +is defined for tcp only. Note however that TCP or TLS over TCP support is not required for Binding usage and is reserved for -TURN -functionality. Feel free to configure udp transport only.

    Example configuration: -

    listen:
+TURN
+functionality. Feel free to configure udp transport only.
    Example configuration:
+
    listen:
   ...
   - 
     port: 3478
@@ -1602,40 +1682,79 @@ functionality. Feel free to configure udp transport only.
    Example
     module: ejabberd_stun
     certfile: "/etc/ejabberd/server.pem"
   ...
-
    You also need to configure DNS SRV records properly so clients can easily discover a
+

    You also need to configure DNS SRV records properly so clients can easily discover a STUN server serving your XMPP domain. Refer to section -DNS Discovery of a Server -of RFC 5389 for details.

    Example DNS SRV configuration: -

    _stun._udp   IN SRV  0 0 3478 stun.example.com.
+DNS Discovery of a Server
+of RFC 5389 for details.
    Example DNS SRV configuration:
+
    _stun._udp   IN SRV  0 0 3478 stun.example.com.
 _stun._tcp   IN SRV  0 0 3478 stun.example.com.
 _stuns._tcp  IN SRV  0 0 5349 stun.example.com.
-
      
    
-
    3.1.11  Include Additional Configuration Files
      
-
    The option include_config_file in a configuration file instructs ejabberd to include other configuration files immediately.
    The basic syntax is:
-
    include_config_file: [Filename]
    
+

    + +

    3.1.11  SIP

    +

    ejabberd has built-in SIP support. In order to activate it you need to add +listeners for it, configure DNS properly and enable mod_sip for +the desired virtual host.

    To add a listener you should configure ejabberd_sip listening module as +described in 3.1.4 section. If option tls is specified, option +certfile must be specified as well, otherwise incoming TLS connections would fail.

    Example configuration with standard ports +(as per RFC 3261): +

    listen:
+  ...
+  - 
+    port: 5060
+    transport: udp
+    module: ejabberd_sip
+  - 
+    port: 5060
+    module: ejabberd_sip
+  -
+    port: 5061
+    module: ejabberd_sip
+    tls: true
+    certfile: "/etc/ejabberd/server.pem"
+  ...
+

    Note that there is no StartTLS support in SIP and SNI support is somewhat tricky, so for TLS you have to configure +different virtual hosts on different ports if you have different certificate files for them.

    Next you need to configure DNS SIP records for your virtual domains. +Refer to RFC 3263 for the detailed explanation. +Simply put, you should add NAPTR and SRV records for your domains. +Skip NAPTR configuration if your DNS provider doesn’t support this type of records. +It’s not fatal, however, highly recommended.

    Example configuration of NAPTR records: +

    example.com IN NAPTR 10  0 "s" "SIPS+D2T" "" _sips._tcp.example.com.
+example.com IN NAPTR 20  0 "s" "SIP+D2T" "" _sip._tcp.example.com.
+example.com IN NAPTR 30  0 "s" "SIP+D2U" "" _sip._udp.example.com.
+

    Example configuration of SRV records with standard ports +(as per RFC 3261): +

    _sip._udp   IN SRV  0 0 5060 sip.example.com.
+_sip._tcp   IN SRV  0 0 5060 sip.example.com.
+_sips._tcp  IN SRV  0 0 5061 sip.example.com.
+

    + +

    3.1.12  Include Additional Configuration Files

    +

    The option include_config_file in a configuration file instructs ejabberd to include other configuration files immediately.

    The basic syntax is: +

    include_config_file: [Filename]

    It is possible to specify suboptions using the full syntax: -

    include_config_file: { Filename: [Suboption, ...] }

    The filename can be indicated either as an absolute path, -or relative to the main ejabberd configuration file. +

    include_config_file: { Filename: [Suboption, ...] }

    The filename can be indicated either as an absolute path, +or relative to the main ejabberd configuration file. It isn’t possible to use wildcards. -The file must exist and be readable.

    The allowed suboptions are: -

    -disallow: [Optionname, ...]
    Disallows the usage of those options in the included configuration file. +The file must exist and be readable.

    The allowed suboptions are: +

    +disallow: [Optionname, ...]
    Disallows the usage of those options in the included configuration file. The options that match this criteria are not accepted. -The default value is an empty list: [] -
    allow_only: [Optionname, ...]
    Allows only the usage of those options in the included configuration file. +The default value is an empty list: [] +
    allow_only: [Optionname, ...]
    Allows only the usage of those options in the included configuration file. The options that do not match this criteria are not accepted. -The default value is: all -

    This is a basic example: -

    include_config_file: "/etc/ejabberd/additional.yml"
-

    In this example, the included file is not allowed to contain a listen option. +The default value is: all +

    This is a basic example: +

    include_config_file: "/etc/ejabberd/additional.yml"
+

    In this example, the included file is not allowed to contain a listen option. If such an option is present, the option will not be accepted. The file is in a subdirectory from where the main configuration file is. -

    include_config_file:
+
    include_config_file:
   "./example.org/additional_not_listen.yml":
     disallow: [listen]
-
    In this example, ejabberd.yml defines some ACL and Access rules,
+

    In this example, ejabberd.yml defines some ACL and Access rules, and later includes another file with additional rules: -

    acl:
+
    acl:
   admin:
     user:
       - "admin": "localhost"
@@ -1647,43 +1766,44 @@ include_config_file:
     allow_only:
       - acl
       - access
-
    and content of the file acl_and_access.yml can be, for example:
-
    acl:
+
    and content of the file acl_and_access.yml can be, for example:
+
    acl:
   admin:
     user:
       - "bob": "localhost"
       - "jan": "localhost"
-
      
    
-
    3.1.12  Option Macros in Configuration File
      
-
    In the ejabberd configuration file,
+

    + +

    3.1.13  Option Macros in Configuration File

    +

    In the ejabberd configuration file, it is possible to define a macro for a value -and later use this macro when defining an option.

    A macro is defined with this syntax: -

    define_macro: { ’MACRO’: Value }

    -The MACRO must be surrounded by single quotation marks, +and later use this macro when defining an option.

    A macro is defined with this syntax: +

    define_macro: { ’MACRO’: Value }

    +The MACRO must be surrounded by single quotation marks, and all letters in uppercase; check the examples bellow. -The value can be any valid arbitrary Erlang term.

    The first definition of a macro is preserved, -and additional definitions of the same macro are forgotten.

    Macros are processed after +The value can be any valid arbitrary Erlang term.

    The first definition of a macro is preserved, +and additional definitions of the same macro are forgotten.

    Macros are processed after additional configuration files have been included, so it is possible to use macros that -are defined in configuration files included before the usage.

    It isn’t possible to use a macro in the definition -of another macro.

    This example shows the basic usage of a macro: -

    define_macro:
+are defined in configuration files included before the usage.
    It isn’t possible to use a macro in the definition
+of another macro.
    This example shows the basic usage of a macro:
+
    define_macro:
   'LOG_LEVEL_NUMBER': 5
 loglevel: 'LOG_LEVEL_NUMBER'
-
    The resulting option interpreted by ejabberd is: loglevel: 5.
    This example shows that values can be any arbitrary Erlang term:
-
    define_macro:
+
    The resulting option interpreted by ejabberd is: loglevel: 5.
    This example shows that values can be any arbitrary Erlang term:
+
    define_macro:
   'USERBOB':
     user:
       - "bob": "localhost"
 acl:
   admin: 'USERBOB'
-
    The resulting option interpreted by ejabberd is:
-
    acl:
+
    The resulting option interpreted by ejabberd is:
+
    acl:
   admin:
     user:
       - "bob": "localhost"
-
    This complex example:
-
    define_macro:
+
    This complex example:
+
    define_macro:
   'NUMBER_PORT_C2S': 5222
   'NUMBER_PORT_HTTP': 5280
 listen:
@@ -1693,44 +1813,45 @@ listen:
   - 
     port: 'NUMBER_PORT_HTTP'
     module: ejabberd_http
-
    produces this result after being interpreted:
-
    listen:
+
    produces this result after being interpreted:
+
    listen:
   - 
     port: 5222
     module: ejabberd_c2s
   - 
     port: 5280
     module: ejabberd_http
-
      
    
-
    3.2  Database and LDAP Configuration
      
+

    + +

    3.2  Database and LDAP Configuration

    -

    ejabberd uses its internal Mnesia database by default. However, it is +

    ejabberd uses its internal Mnesia database by default. However, it is possible to use a relational database or an LDAP server to store persistent, -long-living data. ejabberd is very flexible: you can configure different +long-living data. ejabberd is very flexible: you can configure different authentication methods for different virtual hosts, you can configure different authentication mechanisms for the same virtual host (fallback), you can set -different storage systems for modules, and so forth.

    The following databases are supported by ejabberd: -

    The following LDAP servers are tested with ejabberd: -

    Important note about virtual hosting: +if you define several domains in ejabberd.yml (see section 3.1.2), you probably want that each virtual host uses a different configuration of database, authentication and storage, so that usernames do not conflict and mix between different virtual hosts. For that purpose, the options described in the next sections -must be set inside a host_config for each vhost (see section 3.1.3). +must be set inside a host_config for each vhost (see section 3.1.3). For example: -

    host_config:
+
    host_config:
   "public.example.org":
     odbc_type: pgsql
     odbc_server: "localhost"
@@ -1738,165 +1859,172 @@ For example:
     odbc_username: "ejabberd"
     odbc_password: "password"
     auth_method: [odbc]
-
      
    
-
    3.2.1  ODBC
      
    The actual database access is defined in the options with odbc_ prefix. The
+

    + +

    3.2.1  ODBC

    The actual database access is defined in the options with odbc_ prefix. The values are used to define if we want to use ODBC, or one of the two native -interface available, PostgreSQL or MySQL.

    The following paramaters are available: -

    -odbc_type: mysql | pgsql | odbc
    The type of an ODBC connection. -The default is odbc. -
    odbc_server: String
    A hostname of the ODBC server. The default is -‘‘localhost’’. -
    odbc_port: Port
    The port where the ODBC server is accepting connections. -The option is only valid for mysql and pgsql. The default is -3306 and 5432 respectively. -
    odbc_database: String
    The database name. The default is ‘‘ejabberd’’. -The option is only valid for mysql and pgsql. -
    odbc_username: String
    The username. The default is ‘‘ejabberd’’. -The option is only valid for mysql and pgsql. -
    odbc_password: String
    The password. The default is empty string. -The option is only valid for mysql and pgsql. -
    odbc_pool_size: N
    By default ejabberd opens 10 connections to +interface available, PostgreSQL or MySQL.

    The following paramaters are available: +

    +odbc_type: mysql | pgsql | odbc
    The type of an ODBC connection. +The default is odbc. +
    odbc_server: String
    A hostname of the ODBC server. The default is +‘‘localhost’’. +
    odbc_port: Port
    The port where the ODBC server is accepting connections. +The option is only valid for mysql and pgsql. The default is +3306 and 5432 respectively. +
    odbc_database: String
    The database name. The default is ‘‘ejabberd’’. +The option is only valid for mysql and pgsql. +
    odbc_username: String
    The username. The default is ‘‘ejabberd’’. +The option is only valid for mysql and pgsql. +
    odbc_password: String
    The password. The default is empty string. +The option is only valid for mysql and pgsql. +
    odbc_pool_size: N
    By default ejabberd opens 10 connections to the database for each virtual host. You can change this number by using this option. -
    odbc_keepalive_interval: N
    You can configure an interval to +
    odbc_keepalive_interval: N
    You can configure an interval to make a dummy SQL request to keep alive the connections to the database. The default value is ’undefined’, so no keepalive requests are made. Specify in seconds: for example 28800 means 8 hours. -
    odbc_start_interval: N
    If the connection to the database fails, -ejabberd waits 30 seconds before retrying. +
    odbc_start_interval: N
    If the connection to the database fails, +ejabberd waits 30 seconds before retrying. You can modify this interval with this option. -

    Example of plain ODBC connection: -

    odbc_server: "DSN=database;UID=ejabberd;PWD=password"
-

    Example of MySQL connection: -

    odbc_type: mysql
+

    Example of plain ODBC connection: +

    odbc_server: "DSN=database;UID=ejabberd;PWD=password"
+

    Example of MySQL connection: +

    odbc_type: mysql
 odbc_server: "server.company.com"
 odbc_port: 3306 # the default
 odbc_database: "mydb"
 odbc_username: "user1"
 odbc_password: "**********"
 odbc_pool_size: 5
-

    -

    Storage

    -

    An ODBC compatible database also can be used to store information into from -several ejabberd -modules. See section 3.3.1 to see which modules can be used with +

    + +

    Storage

    +

    An ODBC compatible database also can be used to store information into from +several ejabberd +modules. See section 3.3.1 to see which modules can be used with relational databases like MySQL. To enable storage to your database, just make sure that your database is running well (see previous sections), and add the -module option db_type: odbc.

    -

    3.2.2  LDAP

    -

    ejabberd has built-in LDAP support. You can authenticate users against LDAP -server and use LDAP directory as vCard storage.

    Usually ejabberd treats LDAP as a read-only storage: +module option db_type: odbc.

    + +

    3.2.2  LDAP

    +

    ejabberd has built-in LDAP support. You can authenticate users against LDAP +server and use LDAP directory as vCard storage.

    Usually ejabberd treats LDAP as a read-only storage: it is possible to consult data, but not possible to create accounts or edit vCard that is stored in LDAP. -However, it is possible to change passwords if mod_register module is enabled +However, it is possible to change passwords if mod_register module is enabled and LDAP server supports -RFC 3062.

    -

    Connection

    Two connections are established to the LDAP server per vhost, -one for authentication and other for regular calls.

    Parameters: -

    -ldap_servers: [Servers, ...]
    List of IP addresses or DNS names of your +RFC 3062.

    + +

    Connection

    Two connections are established to the LDAP server per vhost, +one for authentication and other for regular calls.

    Parameters: +

    +ldap_servers: [Servers, ...]
    List of IP addresses or DNS names of your LDAP servers. This option is required. -
    ldap_encrypt: none|tls
    Type of connection encryption to the LDAP server. -Allowed values are: none, tls. -The value tls enables encryption by using LDAP over SSL. +
    ldap_encrypt: none|tls
    Type of connection encryption to the LDAP server. +Allowed values are: none, tls. +The value tls enables encryption by using LDAP over SSL. Note that STARTTLS encryption is not supported. -The default value is: none. -
    ldap_tls_verify: false|soft|hard
    +The default value is: none. +
    ldap_tls_verify: false|soft|hard
    This option specifies whether to verify LDAP server certificate or not when TLS is enabled. -When hard is enabled ejabberd doesn’t proceed if a certificate is invalid. -When soft is enabled ejabberd proceeds even if check fails. -The default is false which means no checks are performed. -
    ldap_tls_cacertfile: Path
    +When hard is enabled ejabberd doesn’t proceed if a certificate is invalid. +When soft is enabled ejabberd proceeds even if check fails. +The default is false which means no checks are performed. +
    ldap_tls_cacertfile: Path
    Path to file containing PEM encoded CA certificates. This option is needed (and required) when TLS verification is enabled. -
    ldap_tls_depth: Number
    +
    ldap_tls_depth: Number
    Specifies the maximum verification depth when TLS verification is enabled, i.e. how far in a chain of certificates the verification process can proceed before the verification is considered to fail. Peer certificate = 0, CA certificate = 1, higher level CA certificate = 2, etc. The value 2 thus means that a chain can at most contain peer cert, CA cert, next CA cert, and an additional CA cert. The default value is 1. -
    ldap_port: Number
    Port to connect to your LDAP server. +
    ldap_port: Number
    Port to connect to your LDAP server. The default port is 389 if encryption is disabled; and 636 if encryption is enabled. -If you configure a value, it is stored in ejabberd’s database. +If you configure a value, it is stored in ejabberd’s database. Then, if you remove that value from the configuration file, the value previously stored in the database will be used instead of the default port. -
    ldap_rootdn: RootDN
    Bind DN. The default value -is "" which means ‘anonymous connection’. -
    ldap_password: Password
    Bind password. The default -value is "". -
    ldap_deref_aliases: never|always|finding|searching
    Whether or not to dereference aliases. The default is never. -

    Example: -

    auth_method: [ldap]
+
    ldap_rootdn: RootDN
    Bind DN. The default value +is "" which means ‘anonymous connection’. +
    ldap_password: Password
    Bind password. The default +value is "". +
    ldap_deref_aliases: never|always|finding|searching
    Whether or not to dereference aliases. The default is never. +

    Example: +

    auth_method: [ldap]
 ldap_servers:
   - "ldap1.example.org"
 ldap_port: 389
 ldap_rootdn: "cn=Manager,dc=domain,dc=org"
 ldap_password: "**********"
-

    -

    Authentication

    You can authenticate users against an LDAP directory. -Note that current LDAP implementation does not support SASL authentication.

    Available options are:

    -ldap_base: Base
    LDAP base directory which stores +

    + +

    Authentication

    You can authenticate users against an LDAP directory. +Note that current LDAP implementation does not support SASL authentication.

    Available options are:

    +ldap_base: Base
    LDAP base directory which stores users accounts. This option is required. -
    ldap_uids: [ ldap_uidattr | {ldap_uidattr: ldap_uidattr_format} ]
    +
    ldap_uids: [ ldap_uidattr | {ldap_uidattr: ldap_uidattr_format} ]
    LDAP attribute which holds a list of attributes to use as alternatives for getting the JID. -The default attributes are [{"uid", "%u"}]. +The default attributes are [{"uid", "%u"}]. The attributes are of the form: -[{ldap_uidattr}] or [{ldap_uidattr, ldap_uidattr_format}]. +[{ldap_uidattr}] or [{ldap_uidattr, ldap_uidattr_format}]. You can use as many comma separated attributes as needed. -The values for ldap_uidattr and -ldap_uidattr_format are described as follow: -
    -ldap_uidattr
    LDAP attribute which holds -the user’s part of a JID. The default value is "uid". -
    ldap_uidattr_format
    Format of -the ldap_uidattr variable. The format must contain one and -only one pattern variable "%u" which will be replaced by the -user’s part of a JID. For example, "%u@example.org". The default -value is "%u". -
    -
    ldap_filter: Filter
    -RFC 4515 LDAP filter. The -default Filter value is: undefined. Example: -"(&(objectClass=shadowAccount)(memberOf=Jabber Users))". Please, do +The values for ldap_uidattr and +ldap_uidattr_format are described as follow: +
    +ldap_uidattr
    LDAP attribute which holds +the user’s part of a JID. The default value is "uid". +
    ldap_uidattr_format
    Format of +the ldap_uidattr variable. The format must contain one and +only one pattern variable "%u" which will be replaced by the +user’s part of a JID. For example, "%u@example.org". The default +value is "%u". +
    +
    ldap_filter: Filter
    +RFC 4515 LDAP filter. The +default Filter value is: undefined. Example: +"(&(objectClass=shadowAccount)(memberOf=Jabber Users))". Please, do not forget to close brackets and do not use superfluous whitespaces. Also you -must not use ldap_uidattr attribute in filter because this +must not use ldap_uidattr attribute in filter because this attribute will be substituted in LDAP filter automatically. -
    ldap_dn_filter: { Filter: FilterAttrs }
    +
    ldap_dn_filter: { Filter: FilterAttrs }
    This filter is applied on the results returned by the main filter. This filter performs additional LDAP lookup to make the complete result. This is useful -when you are unable to define all filter rules in ldap_filter. You -can define "%u", "%d", "%s" and "%D" pattern -variables in Filter: "%u" is replaced by a user’s part of a JID, -"%d" is replaced by the corresponding domain (virtual host), -all "%s" variables are consecutively replaced by values of FilterAttrs -attributes and "%D" is replaced by Distinguished Name. By default -ldap_dn_filter is undefined. +when you are unable to define all filter rules in ldap_filter. You +can define "%u", "%d", "%s" and "%D" pattern +variables in Filter: "%u" is replaced by a user’s part of a JID, +"%d" is replaced by the corresponding domain (virtual host), +all "%s" variables are consecutively replaced by values of FilterAttrs +attributes and "%D" is replaced by Distinguished Name. By default +ldap_dn_filter is undefined. Example: -
    ldap_dn_filter:
+
    ldap_dn_filter:
   "(&(name=%s)(owner=%D)(user=%u@%d))": ["sn"]
-
    Since this filter makes additional LDAP lookups, use it only in the
-last resort: try to define all filter rules in ldap_filter if possible.
-
    {ldap_local_filter, Filter}
    -If you can’t use ldap_filter due to performance reasons +Since this filter makes additional LDAP lookups, use it only in the +last resort: try to define all filter rules in ldap_filter if possible. +
    {ldap_local_filter, Filter}
    +If you can’t use ldap_filter due to performance reasons (the LDAP server has many users registered), you can use this local filter. The local filter checks an attribute in ejabberd, not in LDAP, so this limits the load on the LDAP directory. -The default filter is: undefined. +The default filter is: undefined. Example values: -
    {ldap_local_filter, {notequal, {"accountStatus",["disabled"]}}}.
+
    {ldap_local_filter, {notequal, {"accountStatus",["disabled"]}}}.
 {ldap_local_filter, {equal, {"accountStatus",["enabled"]}}}.
 {ldap_local_filter, undefined}.
-

    -

    Examples

    -
    Common example

    Let’s say ldap.example.org is the name of our LDAP server. We have -users with their passwords in "ou=Users,dc=example,dc=org" directory. +

    + +

    Examples

    + +
    Common example

    Let’s say ldap.example.org is the name of our LDAP server. We have +users with their passwords in "ou=Users,dc=example,dc=org" directory. Also we have addressbook, which contains users emails and their additional -infos in "ou=AddressBook,dc=example,dc=org" directory. +infos in "ou=AddressBook,dc=example,dc=org" directory. The connection to the LDAP server is encrypted using TLS, and using the custom port 6123. -Corresponding authentication section should looks like this:

    ## Authentication method
+Corresponding authentication section should looks like this:
    ## Authentication method
 auth_method: [ldap]
 ## DNS name of our LDAP server
 ldap_servers: ["ldap.example.org"]
@@ -1909,10 +2037,10 @@ ldap_port: 6123
 ldap_base: "ou=Users,dc=example,dc=org"
 ## We want to authorize users from 'shadowAccount' object class only
 ldap_filter: "(objectClass=shadowAccount)"
-
    Now we want to use users LDAP-info as their vCards. We have four attributes
-defined in our LDAP schema: "mail" — email address, "givenName"
-— first name, "sn" — second name, "birthDay" — birthday.
-Also we want users to search each other. Let’s see how we can set it up:
    modules:
+
    Now we want to use users LDAP-info as their vCards. We have four attributes
+defined in our LDAP schema: "mail" — email address, "givenName"
+— first name, "sn" — second name, "birthDay" — birthday.
+Also we want users to search each other. Let’s see how we can set it up:
    modules:
   ...
   mod_vcard_ldap:
     ## We use the same server and port, but want to bind anonymously because
@@ -1951,11 +2079,12 @@ Also we want users to search each other. Let’s see how we can set it up:<
       "Nickname": "NICKNAME"
       "Birthday": "BDAY"
   ...
-
    Note that mod_vcard_ldap module checks for the existence of the user before
-searching in his information in LDAP.
      
    
-
    Active Directory
      
-
    Active Directory is just an LDAP-server with predefined attributes. A sample
-configuration is shown below:
    auth_method: [ldap]
+
    Note that mod_vcard_ldap module checks for the existence of the user before
+searching in his information in LDAP.
      
    
+
+
    Active Directory
      
+
    Active Directory is just an LDAP-server with predefined attributes. A sample
+configuration is shown below:
    auth_method: [ldap]
 ldap_servers: ["office.org"]  # List of LDAP servers
 ldap_base: "DC=office,DC=org" # Search base of LDAP directory
 ldap_rootdn: "CN=Administrator,CN=Users,DC=office,DC=org" # LDAP manager
@@ -1999,170 +2128,177 @@ modules:
       "Nickname": "NICKNAME"
       "Email": "EMAIL"
   ...
-
      
    
-
    3.3  Modules Configuration
      
-
    The option modules defines the list of modules that will be loaded after
-ejabberd’s startup. Each entry in the list is a tuple in which the first
+

    + +

    3.3  Modules Configuration

    +

    The option modules defines the list of modules that will be loaded after +ejabberd’s startup. Each entry in the list is a tuple in which the first element is the name of a module and the second is a list of options for that -module.

    The syntax is: -

    modules: { ModuleName: ModuleOptions }

    Examples: -

    You can find more +contributed modules on the +ejabberd website. Please remember that these contributions might not work or that they can contain severe bugs and security leaks. Therefore, use them at -your own risk!

    -

    3.3.2  Common Options

    The following options are used by many modules. Therefore, they are described in -this separate section.

    -

    iqdisc

    -

    Many modules define handlers for processing IQ queries of different namespaces -to this server or to a user (e. g. to example.org or to -user@example.org). This option defines processing discipline for -these queries.

    The syntax is: -

    iqdisc: Value

    Possible Value are: -

    -no_queue
    All queries of a namespace with this processing discipline are +your own risk!

    + +

    3.3.2  Common Options

    The following options are used by many modules. Therefore, they are described in +this separate section.

    + +

    iqdisc

    +

    Many modules define handlers for processing IQ queries of different namespaces +to this server or to a user (e. g. to example.org or to +user@example.org). This option defines processing discipline for +these queries.

    The syntax is: +

    iqdisc: Value

    Possible Value are: +

    +no_queue
    All queries of a namespace with this processing discipline are processed directly. This means that the XMPP connection that sends this IQ query gets blocked: no other packets can be processed until this one has been completely processed. Hence this discipline is not recommended if the processing of a query can take a relatively long time. -
    one_queue
    In this case a separate queue is created for the processing +
    one_queue
    In this case a separate queue is created for the processing of IQ queries of a namespace with this discipline. In addition, the processing of this queue is done in parallel with that of other packets. This discipline is most recommended. -
    N
    N separate queues are created to process the +
    N
    N separate queues are created to process the queries. The queries are thus processed in parallel, but in a controlled way. -
    parallel
    For every packet with this discipline a separate Erlang process +
    parallel
    For every packet with this discipline a separate Erlang process is spawned. Consequently, all these packets are processed in parallel. Although spawning of Erlang process has a relatively low cost, this can break the server’s normal work, because the Erlang emulator has a limit on the number of processes (32000 by default). -

    Example: -

    modules:
+

    Example: +

    modules:
   ...
   mod_time:
     iqdisc: no_queue
   ...
-

    -

    host

    -

    This option defines the Jabber ID of a service provided by an ejabberd module.

    The syntax is: -

    host: HostName

    If you include the keyword "@HOST@" in the HostName, -it is replaced at start time with the real virtual host string.

    This example configures +

    + +

    host

    +

    This option defines the Jabber ID of a service provided by an ejabberd module.

    The syntax is: +

    host: HostName

    If you include the keyword "@HOST@" in the HostName, +it is replaced at start time with the real virtual host string.

    This example configures the echo module to provide its echoing service -in the Jabber ID mirror.example.org: -

    modules:
+in the Jabber ID mirror.example.org:
+
    modules:
   ...
   mod_echo:
     host: "mirror.example.org"
   ...
-
    However, if there are several virtual hosts and this module is enabled in all of them,
+

    However, if there are several virtual hosts and this module is enabled in all of them, the "@HOST@" keyword must be used: -

    modules:
+
    modules:
   ...
   mod_echo:
     host: "mirror.@HOST@"
   ...
-
      
    
-
    3.3.3  mod_announce
      
-
    This module enables configured users to broadcast announcements and to set
+

    + +

    3.3.3  mod_announce

    +

    This module enables configured users to broadcast announcements and to set the message of the day (MOTD). Configured users can perform these actions with a XMPP client either using Ad-hoc commands -or sending messages to specific JIDs.

    The Ad-hoc commands are listed in the Server Discovery. -For this feature to work, mod_adhoc must be enabled.

    The specific JIDs where messages can be sent are listed bellow. +or sending messages to specific JIDs.

    The Ad-hoc commands are listed in the Server Discovery. +For this feature to work, mod_adhoc must be enabled.

    The specific JIDs where messages can be sent are listed bellow. The first JID in each entry will apply only to the specified virtual host -example.org, while the JID between brackets will apply to all virtual +example.org, while the JID between brackets will apply to all virtual hosts in ejabberd. -

    -example.org/announce/all (example.org/announce/all-hosts/all)
    The +

    +example.org/announce/all (example.org/announce/all-hosts/all)
    The message is sent to all registered users. If the user is online and connected to several resources, only the resource with the highest priority will receive the message. If the registered user is not connected, the message will be stored offline in assumption that offline storage -(see section 3.3.12) is enabled. -
    example.org/announce/online (example.org/announce/all-hosts/online)
    The +(see section 3.3.12) is enabled. +
    example.org/announce/online (example.org/announce/all-hosts/online)
    The message is sent to all connected users. If the user is online and connected to several resources, all resources will receive the message. -
    example.org/announce/motd (example.org/announce/all-hosts/motd)
    The +
    example.org/announce/motd (example.org/announce/all-hosts/motd)
    The message is set as the message of the day (MOTD) and is sent to users when they login. In addition the message is sent to all connected users (similar to -announce/online). -
    example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)
    +announce/online). +
    example.org/announce/motd/update (example.org/announce/all-hosts/motd/update)
    The message is set as message of the day (MOTD) and is sent to users when they -login. The message is not sent to any currently connected user. -
    example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)
    +login. The message is not sent to any currently connected user. +
    example.org/announce/motd/delete (example.org/announce/all-hosts/motd/delete)
    Any message sent to this JID removes the existing message of the day (MOTD). -

    Options: -

    -db_type: internal|odbc
    +

    Options: +

    +db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -
    access: AccessName
    This option specifies who is allowed to +If odbc value is defined, make sure you have defined the database, see 3.2. +
    access: AccessName
    This option specifies who is allowed to send announcements and to set the message of the day (by default, nobody is able to send such messages). -

    Examples: -

    • +

    Examples: +

    Note that mod_announce can be resource intensive on large +

    Note that mod_announce can be resource intensive on large deployments as it can broadcast lot of messages. This module should be -disabled for instances of ejabberd with hundreds of thousands users.

    -

    3.3.4  mod_disco

    +disabled for instances of ejabberd with hundreds of thousands users.

    + +

    3.3.4  mod_disco

    -

    This module adds support for Service Discovery (XEP-0030). With +

    This module adds support for Service Discovery (XEP-0030). With this module enabled, services on your server can be discovered by -XMPP clients. Note that ejabberd has no modules with support -for the superseded Jabber Browsing (XEP-0011) and Agent Information -(XEP-0094). Accordingly, XMPP clients need to have support for +XMPP clients. Note that ejabberd has no modules with support +for the superseded Jabber Browsing (XEP-0011) and Agent Information +(XEP-0094). Accordingly, XMPP clients need to have support for the newer Service Discovery protocol if you want them be able to discover -the services you offer.

    Options: -

    -iqdisc: Discipline
    This specifies -the processing discipline for Service Discovery (http://jabber.org/protocol/disco#items and -http://jabber.org/protocol/disco#info) IQ queries (see section 3.3.2). -
    extra_domains: [Domain, ...]
    With this option, +the services you offer.

    Options: +

    +iqdisc: Discipline
    This specifies +the processing discipline for Service Discovery (http://jabber.org/protocol/disco#items and +http://jabber.org/protocol/disco#info) IQ queries (see section 3.3.2). +
    extra_domains: [Domain, ...]
    With this option, you can specify a list of extra domains that are added to the Service Discovery item list. -
    server_info: [ { modules: Modules, name: Name, urls: [URL, ...] } ]
    +
    server_info: [ { modules: Modules, name: Name, urls: [URL, ...] } ]
    Specify additional information about the server, -as described in Contact Addresses for XMPP Services (XEP-0157). -Modules can be the keyword ‘all’, +as described in Contact Addresses for XMPP Services (XEP-0157). +Modules can be the keyword ‘all’, in which case the information is reported in all the services; -or a list of ejabberd modules, +or a list of ejabberd modules, in which case the information is only specified for the services provided by those modules. -Any arbitrary Name and URL can be specified, not only contact addresses. -

    Examples: -

    • -To serve a link to the Jabber User Directory on jabber.org: -
      modules:
+Any arbitrary Name and URL can be specified, not only contact addresses.
+

    Examples: +

    -

    3.3.5  mod_echo

    -

    This module simply echoes any XMPP +

    + +

    3.3.5  mod_echo

    +

    This module simply echoes any XMPP packet back to the sender. This mirror can be of interest for -ejabberd and XMPP client debugging.

    Options: -

    +ejabberd and XMPP client debugging.

    Options: +

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘echo.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘echo.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -

    Example: Mirror, mirror, on the wall, who is the most beautiful +

    Example: Mirror, mirror, on the wall, who is the most beautiful of them all? -

    modules:
+
    modules:
   ...
   mod_echo:
     host: "mirror.example.org"
   ...
-
      
    
-
    3.3.6  mod_http_bind
      
-
    This module implements XMPP over Bosh (formerly known as HTTP Binding)
-as defined in XEP-0124 and XEP-0206.
+

    + +

    3.3.6  mod_http_bind

    +

    This module implements XMPP over Bosh (formerly known as HTTP Binding) +as defined in XEP-0124 and XEP-0206. It extends ejabberd’s built in HTTP service with a configurable -resource at which this service will be hosted.

    To use HTTP-Binding, enable the module: -

    modules:
+resource at which this service will be hosted.
    To use HTTP-Binding, enable the module:
+
    modules:
   ...
   mod_http_bind: {}
   ...
-
    and add http_bind in the HTTP service. For example:
-
    listen:
+
    and add http_bind in the HTTP service. For example:
+
    listen:
   ...
   - 
     port: 5280
@@ -2315,13 +2454,13 @@ resource at which this service will be hosted.
    To use HTTP-Binding, enable
     http_poll: true
     web_admin: true
   ...
-
    With this configuration, the module will serve the requests sent to 
-http://example.org:5280/http-bind/
+

    With this configuration, the module will serve the requests sent to +http://example.org:5280/http-bind/ Remember that this page is not designed to be used by web browsers, -it is used by XMPP clients that support XMPP over Bosh.

    If you want to set the service in a different URI path or use a different module, -you can configure it manually using the option request_handlers. +it is used by XMPP clients that support XMPP over Bosh.

    If you want to set the service in a different URI path or use a different module, +you can configure it manually using the option request_handlers. For example: -

    listen:
+
    listen:
   ...
   - 
     port: 5280
@@ -2331,49 +2470,50 @@ For example:
     http_poll: true
     web_admin: true
   ...
-
    Options:
-
    
-{max_inactivity, Seconds}
     
+

    Options: +

    +{max_inactivity, Seconds}
    Define the maximum inactivity period in seconds. Default value is 30 seconds. For example, to set 50 seconds: -
    modules:
+
    modules:
   ...
   mod_http_bind:
     max_inactivity: 50
   ...
-

    -

    3.3.7  mod_http_fileserver

    -

    This simple module serves files from the local disk over HTTP.

    Options: -

    -docroot: Path
    +

    + +

    3.3.7  mod_http_fileserver

    +

    This simple module serves files from the local disk over HTTP.

    Options: +

    +docroot: Path
    Directory to serve the files. -
    accesslog: Path
    +
    accesslog: Path
    File to log accesses using an Apache-like format. No log will be recorded if this option is not specified. -
    directory_indices: [Index, ...]
    +
    directory_indices: [Index, ...]
    Indicate one or more directory index files, similarly to Apache’s DirectoryIndex variable. When a web request hits a directory instead of a regular file, those directory indices are looked in order, and the first one found is returned. -
    custom_headers: {Name: Value}
    +
    custom_headers: {Name: Value}
    Indicate custom HTTP headers to be included in all responses. -Default value is: [] -
    content_types: {Name: Type}
    +Default value is: [] +
    content_types: {Name: Type}
    Specify mappings of extension to content type. There are several content types already defined, with this option you can add new definitions, modify or delete existing ones. To delete an existing definition, simply define it with a value: ‘undefined’. -
    default_content_type: Type
    +
    default_content_type: Type
    Specify the content type to use for unknown extensions. Default value is ‘application/octet-stream’. -

    This example configuration will serve the files from -the local directory /var/www -in the address http://example.org:5280/pub/archive/. -In this example a new content type ogg is defined, -png is redefined, and jpg definition is deleted. +

    This example configuration will serve the files from +the local directory /var/www +in the address http://example.org:5280/pub/archive/. +In this example a new content type ogg is defined, +png is redefined, and jpg definition is deleted. To use this module you must enable it: -

    modules:
+
    modules:
   ...
   mod_http_fileserver:
     docroot: "/var/www"
@@ -2390,8 +2530,8 @@ To use this module you must enable it:
       ".jpg": undefined
     default_content_type: "text/html"
   ...
-
    And define it as a handler in the HTTP service:
-
    listen:
+
    And define it as a handler in the HTTP service:
+
    listen:
   ...
   - 
     port: 5280
@@ -2401,59 +2541,60 @@ To use this module you must enable it:
       "/pub/archive": mod_http_fileserver
       ...
   ...
-
      
    
-
    3.3.8  mod_irc
      
-
    This module is an IRC transport that can be used to join channels on IRC
-servers.
    End user information:
+

    + +

    3.3.8  mod_irc

    +

    This module is an IRC transport that can be used to join channels on IRC +servers.

    End user information: -

    Options: +

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘irc.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘irc.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -
    db_type: internal|odbc
    +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -
    access: AccessName
    This option can be used to specify who -may use the IRC transport (default value: all). -
    default_encoding: Encoding
    Set the default IRC encoding. -Default value: "iso8859-1" -

    Examples: -

    + +

    3.3.9  mod_last

    +

    This module adds support for Last Activity (XEP-0012). It can be used to discover when a disconnected user last accessed the server, to know when a connected user was last active on the server, or to query the uptime of the -ejabberd server.

    Options: -

    -iqdisc: Discipline
    This specifies -the processing discipline for Last activity (jabber:iq:last) IQ queries (see section 3.3.2). -
    db_type: internal|odbc
    +ejabberd server.

    Options: +

    +iqdisc: Discipline
    This specifies +the processing discipline for Last activity (jabber:iq:last) IQ queries (see section 3.3.2). +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -

    -

    3.3.10  mod_muc

    -

    This module provides a Multi-User Chat (XEP-0045) service. +If odbc value is defined, make sure you have defined the database, see 3.2. +

    + +

    3.3.10  mod_muc

    +

    This module provides a Multi-User Chat (XEP-0045) service. Users can discover existing rooms, join or create them. -Occupants of a room can chat in public or have private chats.

    Some of the features of Multi-User Chat: -

    The MUC service allows any Jabber ID to register a nickname, so nobody else can use that nickname in any room in the MUC service. To register a nickname, open the Service Discovery in your -XMPP client and register in the MUC service.

    This module supports clustering and load +XMPP client and register in the MUC service.

    This module supports clustering and load balancing. One module can be started per cluster node. Rooms are distributed at creation time on all available MUC module instances. The multi-user chat module is clustered but the rooms themselves are not clustered nor fault-tolerant: if the node managing a set of rooms goes down, the rooms disappear and they will be recreated -on an available node on first connection attempt.

    Module options: -

    +on an available node on first connection attempt.

    Module options: +

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘conference.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘conference.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -
    db_type: internal|odbc
    +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -
    access: AccessName
    You can specify who is allowed to use +If odbc value is defined, make sure you have defined the database, see 3.2. +
    access: AccessName
    You can specify who is allowed to use the Multi-User Chat service. By default everyone is allowed to use it. -
    access_create: AccessName
    To configure who is +
    access_create: AccessName
    To configure who is allowed to create new rooms at the Multi-User Chat service, this option can be used. By default any account in the local ejabberd server is allowed to create rooms. -
    access_persistent: AccessName
    To configure who is +
    access_persistent: AccessName
    To configure who is allowed to modify the ’persistent’ room option. By default any account in the local ejabberd server is allowed to modify that option. -
    access_admin: AccessName
    This option specifies +
    access_admin: AccessName
    This option specifies who is allowed to administrate the Multi-User Chat service. The default -value is none, which means that only the room creator can +value is none, which means that only the room creator can administer his room. The administrators can send a normal message to the service JID, and it will be shown in all active rooms as a service message. The administrators can send a groupchat message to the JID of an active room, and the message will be shown in the room as a service message. -
    history_size: Size
    A small history of +
    history_size: Size
    A small history of the current discussion is sent to users when they enter the room. With this option you can define the number of history messages to keep and send to users joining the room. The value is an -integer. Setting the value to 0 disables the history feature +integer. Setting the value to 0 disables the history feature and, as a result, nothing is kept in memory. The default value is -20. This value is global and thus affects all rooms on the +20. This value is global and thus affects all rooms on the service. -
    max_users: Number
    This option defines at +
    max_users: Number
    This option defines at the service level, the maximum number of users allowed per room. It can be lowered in each room configuration but cannot be increased in individual room configuration. The default value is 200. -
    max_users_admin_threshold: Number
    +
    max_users_admin_threshold: Number
    This option defines the number of service admins or room owners allowed to enter the room when the maximum number of allowed occupants was reached. The default limit is 5. -
    max_user_conferences: Number
    +
    max_user_conferences: Number
    This option defines the maximum number of rooms that any given user can join. The default value is 10. This option is used to prevent possible abuses. Note that this is a soft limit: some users can sometimes join more conferences in cluster configurations. -
    max_room_id: Number
    +
    max_room_id: Number
    This option defines the maximum number of characters that Room ID can have when creating a new room. The default value is to not limit: infinite. -
    max_room_name: Number
    +
    max_room_name: Number
    This option defines the maximum number of characters that Room Name can have when configuring the room. The default value is to not limit: infinite. -
    max_room_desc: Number
    +
    max_room_desc: Number
    This option defines the maximum number of characters that Room Description can have when configuring the room. The default value is to not limit: infinite. -
    min_message_interval: Number
    +
    min_message_interval: Number
    This option defines the minimum interval between two messages send by an occupant in seconds. This option is global and valid for all rooms. A decimal value can be used. When this option is not defined, @@ -2578,7 +2721,7 @@ be broadcasted by the service. A good value for this minimum message interval is 0.4 second. If an occupant tries to send messages faster, an error is send back explaining that the message has been discarded and describing the reason why the message is not acceptable. -
    min_presence_interval: Number
    +
    min_presence_interval: Number
    This option defines the minimum of time between presence changes coming from a given occupant in seconds. This option is global and valid for all rooms. A @@ -2586,61 +2729,61 @@ decimal value can be used. When this option is not defined, no restriction is applied. This option can be used to protect a MUC service for occupants abuses. If an occupant tries to change its presence more often than the specified interval, the -presence is cached by ejabberd and only the last presence is +presence is cached by ejabberd and only the last presence is broadcasted to all occupants in the room after expiration of the interval delay. Intermediate presence packets are silently discarded. A good value for this option is 4 seconds. -
    default_room_options: {OptionName: OptionValue}
    +
    default_room_options: {OptionName: OptionValue}
    This module option allows to define the desired default room options. Note that the creator of a room can modify the options of his room at any time using an XMPP client with MUC capability. The available room options and the default values are: -
    -allow_change_subj: true|false
    Allow occupants to change the subject. -
    allow_private_messages: true|false
    Occupants can send private messages to other occupants. -
    allow_private_messages_from_visitors: anyone|moderators|nobody
    Visitors can send private messages to other occupants. -
    allow_query_users: true|false
    Occupants can send IQ queries to other occupants. -
    allow_user_invites: false|true
    Allow occupants to send invitations. -
    allow_visitor_nickchange: true|false
    Allow visitors to +
    +allow_change_subj: true|false
    Allow occupants to change the subject. +
    allow_private_messages: true|false
    Occupants can send private messages to other occupants. +
    allow_private_messages_from_visitors: anyone|moderators|nobody
    Visitors can send private messages to other occupants. +
    allow_query_users: true|false
    Occupants can send IQ queries to other occupants. +
    allow_user_invites: false|true
    Allow occupants to send invitations. +
    allow_visitor_nickchange: true|false
    Allow visitors to change nickname. -
    allow_visitor_status: true|false
    Allow visitors to send -status text in presence updates. If disallowed, the status +
    allow_visitor_status: true|false
    Allow visitors to send +status text in presence updates. If disallowed, the status text is stripped before broadcasting the presence update to all the room occupants. -
    anonymous: true|false
    The room is anonymous: +
    anonymous: true|false
    The room is anonymous: occupants don’t see the real JIDs of other occupants. Note that the room moderators can always see the real JIDs of the occupants. -
    captcha_protected: false
    +
    captcha_protected: false
    When a user tries to join a room where he has no affiliation (not owner, admin or member), -the room requires him to fill a CAPTCHA challenge (see section 3.1.9) +the room requires him to fill a CAPTCHA challenge (see section 3.1.9) in order to accept her join in the room. -
    logging: false|true
    The public messages are logged using mod_muc_log. -
    max_users: 200
    Maximum number of occupants in the room. -
    members_by_default: true|false
    The occupants that enter the room are participants by default, so they have ’voice’. -
    members_only: false|true
    Only members of the room can enter. -
    moderated: true|false
    Only occupants with ’voice’ can send public messages. -
    password: "roompass123"
    Password of the room. You may want to enable the next option too. -
    password_protected: false|true
    The password is required to enter the room. -
    persistent: false|true
    The room persists even if the last participant leaves. -
    public: true|false
    The room is public in the list of the MUC service, so it can be discovered. -
    public_list: true|false
    The list of participants is public, without requiring to enter the room. -
    title: "Room Title"
    A human-readable title of the room. -
    -All of those room options can be set to true or false, -except password and title which are strings, -and max_users that is integer. -

    Examples: -

    • +
    logging: false|true
    The public messages are logged using mod_muc_log. +
    max_users: 200
    Maximum number of occupants in the room. +
    members_by_default: true|false
    The occupants that enter the room are participants by default, so they have ’voice’. +
    members_only: false|true
    Only members of the room can enter. +
    moderated: true|false
    Only occupants with ’voice’ can send public messages. +
    password: "roompass123"
    Password of the room. You may want to enable the next option too. +
    password_protected: false|true
    The password is required to enter the room. +
    persistent: false|true
    The room persists even if the last participant leaves. +
    public: true|false
    The room is public in the list of the MUC service, so it can be discovered. +
    public_list: true|false
    The list of participants is public, without requiring to enter the room. +
    title: "Room Title"
    A human-readable title of the room. +
    +All of those room options can be set to true or false, +except password and title which are strings, +and max_users that is integer. +

    Examples: +

    -

    3.3.11  mod_muc_log

    -

    This module enables optional logging of Multi-User Chat (MUC) public conversations to +

    + +

    3.3.11  mod_muc_log

    +

    This module enables optional logging of Multi-User Chat (MUC) public conversations to HTML. Once you enable this module, users can join a room using a MUC capable XMPP client, and if they have enough privileges, they can request the -configuration form in which they can set the option to enable room logging.

    Features: -

    Options: +

    +access_log: AccessName
    This option restricts which occupants are allowed to enable or disable room -logging. The default value is muc_admin. Note for this default setting -you need to have an access rule for muc_admin in order to take effect. -
    cssfile: false|URL
    +logging. The default value is muc_admin. Note for this default setting +you need to have an access rule for muc_admin in order to take effect. +
    cssfile: false|URL
    With this option you can set whether the HTML files should have a custom CSS file or if they need to use the embedded CSS file. Allowed values are -false and an URL to a CSS file. With the first value, HTML files will +false and an URL to a CSS file. With the first value, HTML files will include the embedded CSS code. With the latter, you can specify the URL of the -custom CSS file (for example: "http://example.com/my.css"). The default value -is false. -
    dirname: room_jid|room_name
    +custom CSS file (for example: "http://example.com/my.css"). The default value +is false. +
    dirname: room_jid|room_name
    Allows to configure the name of the room directory. -Allowed values are room_jid and room_name. +Allowed values are room_jid and room_name. With the first value, the room directory name will be the full room JID. With the latter, the room directory name will be only the room name, not including the MUC service name. -The default value is room_jid. -
    dirtype: subdirs|plain
    +The default value is room_jid. +
    dirtype: subdirs|plain
    The type of the created directories can be specified with this option. Allowed -values are subdirs and plain. With the first value, +values are subdirs and plain. With the first value, subdirectories are created for each year and month. With the latter, the names of the log files contain the full date, and there are no subdirectories. -The default value is subdirs. -
    file_format: html|plaintext
    +The default value is subdirs. +
    file_format: html|plaintext
    Define the format of the log files: -html stores in HTML format, -plaintext stores in plain text. -The default value is html. -
    file_permissions: {mode: Mode, group: Group}
    +html stores in HTML format, +plaintext stores in plain text. +The default value is html. +
    file_permissions: {mode: Mode, group: Group}
    Define the permissions that must be used when creating the log files: the number of the mode, and the numeric id of the group that will own the files. -The default value is {644, 33}. -
    outdir: Path
    +The default value is {644, 33}. +
    outdir: Path
    This option sets the full path to the directory in which the HTML files should -be stored. Make sure the ejabberd daemon user has write access on that -directory. The default value is "www/muc". -
    spam_prevention: true|false
    -To prevent spam, the spam_prevention option adds a special attribute +be stored. Make sure the ejabberd daemon user has write access on that +directory. The default value is "www/muc". +
    spam_prevention: true|false
    +To prevent spam, the spam_prevention option adds a special attribute to links that prevent their indexation by search engines. The default value -is true, which mean that nofollow attributes will be added to user +is true, which mean that nofollow attributes will be added to user submitted links. -
    timezone: local|universal
    +
    timezone: local|universal
    The time zone for the logs is configurable with this option. Allowed values -are local and universal. With the first value, the local time, +are local and universal. With the first value, the local time, as reported to Erlang by the operating system, will be used. With the latter, -GMT/UTC time will be used. The default value is local. -
    top_link: {URL: Text}
    +GMT/UTC time will be used. The default value is local. +
    top_link: {URL: Text}
    With this option you can customize the link on the top right corner of each -log file. The default value is {"/", "Home"}. -

    Examples: -

    + +

    3.3.12  mod_offline

    +

    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 -(see section 4.1).

    -db_type: internal|odbc
    +ejabberdctl has a command to delete expired messages +(see section 4.1).

    +db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -
    access_max_user_messages: AccessName
    +If odbc value is defined, make sure you have defined the database, see 3.2. +
    access_max_user_messages: AccessName
    This option defines which access rule will be enforced to limit the maximum number of offline messages that a user can have (quota). When a user has too many offline messages, any new messages that he receive are discarded, and a resource-constraint error is returned to the sender. -The default value is max_user_offline_messages. +The default value is max_user_offline_messages. Then you can define an access rule with a syntax similar to -max_user_sessions (see 3.1.6). -

    This example allows power users to have as much as 5000 offline messages, +max_user_sessions (see 3.1.6). +

    This example allows power users to have as much as 5000 offline messages, administrators up to 2000, and all the other users up to 100. -

    acl: 
+
    acl: 
   admin: 
     user: 
       - "admin1": "localhost"
@@ -2894,42 +3039,44 @@ modules:
   mod_offline: 
     access_max_user_messages: max_user_offline_messages
   ...
-
      
    
-
    3.3.13  mod_ping
      
-
    This module implements support for XMPP Ping (XEP-0199) and periodic keepalives.
+

    + +

    3.3.13  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. +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
    +
    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
    +
    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 +

    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:
+
    modules:
   ...
   mod_ping:
     send_pings: true
     ping_interval: 240
     timeout_action: kill
   ...
-
      
    
-
    3.3.14  mod_pres_counter
      
-
    This module detects flood/spam in presence subscription stanza traffic.
+

    + +

    3.3.14  mod_pres_counter

    +

    This module detects flood/spam in presence subscription stanza traffic. If a user sends or receives more of those stanzas in a time interval, -the exceeding stanzas are silently dropped, and warning is logged.

    Configuration options: -

    -count: StanzaNumber
    +the exceeding stanzas are silently dropped, and warning is logged.

    Configuration options: +

    +count: StanzaNumber
    The number of subscription presence stanzas (subscribe, unsubscribe, subscribed, unsubscribed) allowed for any direction (input or output) @@ -2937,109 +3084,112 @@ per time interval. Please note that two users subscribing to each other usually generate 4 stanzas, so the recommended value is 4 or more. The default value is: 5. -
    interval: Seconds
    +
    interval: Seconds
    The time interval defined in seconds. The default value is 60. -

    This example enables the module, and allows up to 5 presence subscription stanzas +

    This example enables the module, and allows up to 5 presence subscription stanzas to be sent or received by the users in 60 seconds: -

    modules:
+
    modules:
   ...
   mod_pres_counter:
     count: 5
     interval: 60
   ...
-
      
    
-
    3.3.15  mod_privacy
      
-
    This module implements Blocking Communication (also known as Privacy Rules)
+

    + +

    3.3.15  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 XMPP client, they will be able to: -

    - +(from http://xmpp.org/rfcs/rfc3921.html#privacy) +

    Options: +

    +iqdisc: Discipline
    This specifies +the processing discipline for Blocking Communication (jabber:iq:privacy) IQ queries (see section 3.3.2). +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -

    -

    3.3.16  mod_private

    -

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

    +If odbc value is defined, make sure you have defined the database, see 3.2. +

    + +

    3.3.16  mod_private

    +

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

    Using this method, XMPP entities can store private data on the server and retrieve it whenever necessary. The data stored might be anything, as long as it is valid XML. One typical usage for this namespace is the server-side storage -of client-specific preferences; another is Bookmark Storage (XEP-0048). -

    Options: -

    -iqdisc: Discipline
    This specifies -the processing discipline for Private XML Storage (jabber:iq:private) IQ queries (see section 3.3.2). -
    db_type: internal|odbc
    +of client-specific preferences; another is Bookmark Storage (XEP-0048). +

    Options: +

    +iqdisc: Discipline
    This specifies +the processing discipline for Private XML Storage (jabber:iq:private) IQ queries (see section 3.3.2). +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -

    -

    3.3.17  mod_proxy65

    -

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

    Options: -

    +If odbc value is defined, make sure you have defined the database, see 3.2. +

    + +

    3.3.17  mod_proxy65

    +

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

    Options: +

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘proxy.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘proxy.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -
    name: Text
    Defines Service Discovery name of the service. -Default is "SOCKS5 Bytestreams". -
    ip: IP
    This option specifies which network interface +
    name: Text
    Defines Service Discovery name of the service. +Default is "SOCKS5 Bytestreams". +
    ip: IP
    This option specifies which network interface to listen for. Default is an IP address of the service’s DNS name, or, -if fails, "127.0.0.1". -
    port: Number
    This option defines port to listen for +if fails, "127.0.0.1". +
    port: Number
    This option defines port to listen for incoming connections. Default is 7777. -
    hostname: HostName
    Defines a hostname advertised +
    hostname: HostName
    Defines a hostname advertised by the service when establishing a session with clients. This is useful when -you run the service behind a NAT. The default is the value of ip option. -Examples: "proxy.mydomain.org", "200.150.100.50". Note that +you run the service behind a NAT. The default is the value of ip option. +Examples: "proxy.mydomain.org", "200.150.100.50". Note that not all clients understand domain names in stream negotiation, so you should think twice before setting domain name in this option. -
    auth_type: anonymous|plain
    SOCKS5 authentication type. -Possible values are anonymous and plain. Default is -anonymous. -
    access: AccessName
    Defines ACL for file transfer initiators. -Default is all. -
    max_connections: Number
    Maximum number of +
    auth_type: anonymous|plain
    SOCKS5 authentication type. +Possible values are anonymous and plain. Default is +anonymous. +
    access: AccessName
    Defines ACL for file transfer initiators. +Default is all. +
    max_connections: Number
    Maximum number of active connections per file transfer initiator. No limit by default. -
    shaper: none|ShaperName
    This option defines shaper for +
    shaper: none|ShaperName
    This option defines shaper for the file transfer peers. Shaper with the maximum bandwidth will be selected. -Default is none. -

    Examples: -

    + +

    3.3.18  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) is enabled in the default ejabberd configuration file, -and it requires mod_caps.

    Options: -

    +and it requires mod_caps.

    Options: +

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘pubsub.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘pubsub.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -If you use mod_pubsub_odbc, please ensure the prefix contains only one dot, -for example ‘pubsub.’, or ‘publish.’,. -
    access_createnode: AccessName
    +If you use mod_pubsub_odbc, please ensure the prefix contains only one dot, +for example ‘pubsub.’, or ‘publish.’,. +
    access_createnode: AccessName
    This option restricts which users are allowed to create pubsub nodes using ACL and ACCESS. By default any account in the local ejabberd server is allowed to create pubsub nodes. -
    max_items_node: MaxItems
    +
    max_items_node: MaxItems
    Define the maximum number of items that can be stored in a node. Default value is 10. -
    plugins: [ Plugin, ...]
    +
    plugins: [ Plugin, ...]
    To specify which pubsub node plugins to use. The first one in the list is used by default. -If this option is not defined, the default plugins list is: ["flat"]. +If this option is not defined, the default plugins list is: ["flat"]. PubSub clients can define which plugin to use when creating a node: -add type=’plugin-name’ attribute to the create stanza element. -
    nodetree: Nodetree
    +add type=’plugin-name’ attribute to the create stanza element. +
    nodetree: Nodetree
    To specify which nodetree to use. If not defined, the default pubsub nodetree is used: "tree". -Only one nodetree can be used per host, and is shared by all node plugins.

    The "virtual" nodetree does not store nodes on database. +Only one nodetree can be used per host, and is shared by all node plugins.

    The "virtual" nodetree does not store nodes on database. This saves resources on systems with tons of nodes. If using the "virtual" nodetree, you can only enable those node plugins: @@ -3110,29 +3261,29 @@ any other plugins configuration will not work. Also, all nodes will have the defaut configuration, and this can not be changed. Using "virtual" nodetree requires to start from a clean database, -it will not work if you used the default "tree" nodetree before.

    The "dag" nodetree provides experimental support for PubSub Collection Nodes (XEP-0248). +it will not work if you used the default "tree" nodetree before.

    The "dag" nodetree provides experimental support for PubSub Collection Nodes (XEP-0248). In that case you should also add "dag" node plugin as default, for example: -plugins: ["dag","flat","hometree","pep"] -

    ignore_pep_from_offline: false|true
    +plugins: ["dag","flat","hometree","pep"] +

    ignore_pep_from_offline: false|true
    To specify whether or not we should get last published PEP items from users in our roster which are offline when we connect. Value is true or false. If not defined, pubsub assumes true so we only get last items of online contacts. -
    last_item_cache: false|true
    +
    last_item_cache: false|true
    To specify whether or not pubsub should cache last items. Value is true or false. If not defined, pubsub do not cache last items. On systems with not so many nodes, caching last items speeds up pubsub and allows to raise user connection rate. The cost is memory usage, as every item is stored in memory. -
    pep_mapping: {Key, Value}
    +
    pep_mapping: {Key, Value}
    This allow to define a Key-Value list to choose defined node plugins on given PEP namespace. The following example will use node_tune instead of node_pep for every PEP node with tune namespace: -
    modules:
+
    modules:
   ...
   mod_pubsub:
     pep_mapping:
       "http://jabber.org/protocol/tune": "tune"
   ...
-

    Example of configuration that uses flat nodes as default, and allows use of flat, nodetree and pep nodes: -

    modules:
+

    Example of configuration that uses flat nodes as default, and allows use of flat, nodetree and pep nodes: +

    modules:
   ...
   mod_pubsub:
     access_createnode: pubsub_createnode
@@ -3141,9 +3292,9 @@ The following example will use node_tune instead of node_pep for every PEP node
       - "hometree"
       - "pep"
   ...
-

    Using ODBC database requires using mod_pubsub_odbc without option changes. Only flat, hometree and pep plugins supports ODBC. +

    Using ODBC database requires using mod_pubsub_odbc without option changes. Only flat, hometree and pep plugins supports ODBC. The following example shows previous configuration with ODBC usage: -

    modules:
+
    modules:
   ...
   mod_pubsub_odbc:
     access_createnode: pubsub_createnode
@@ -3152,58 +3303,59 @@ The following example shows previous configuration with ODBC usage:
       - "hometree"
       - "pep"
   ...
-
      
    
-
    3.3.19  mod_register
      
-
    This module adds support for In-Band Registration (XEP-0077). This protocol
+

    + +

    3.3.19  mod_register

    +

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

    Options: +

    +access: AccessName
    Specify rules to restrict what usernames can be registered and unregistered. If a rule returns ‘deny’ on the requested username, registration and unregistration of that user name is denied. There are no restrictions by default. -
    access_from: AccessName
    By default, ejabberd +
    access_from: AccessName
    By default, ejabberd doesn’t allow to register new accounts from s2s or existing c2s sessions. You can change it by defining access rule in this option. Use with care: allowing registration from s2s leads to uncontrolled massive accounts creation by rogue users. -
    captcha_protected: false|true
    -Protect registrations with CAPTCHA (see section 3.1.9). The default is false. -
    ip_access: AccessName
    +
    captcha_protected: false|true
    +Protect registrations with CAPTCHA (see section 3.1.9). The default is false. +
    ip_access: AccessName
    Define rules to allow or deny account registration depending -on the IP address of the XMPP client. The AccessName should be -of type ip. The default value is all. -
    password_strength: Entropy
    -This option sets the minimum informational entropy for passwords. The value Entropy +on the IP address of the XMPP client. The AccessName should be +of type ip. The default value is all. +
    password_strength: Entropy
    +This option sets the minimum informational entropy for passwords. The value Entropy is a number of bits of entropy. The recommended minimum is 32 bits. The default is 0, i.e. no checks are performed. -
    welcome_message: {subject: Subject, body: Body}
    +
    welcome_message: {subject: Subject, body: Body}
    Set a welcome message that is sent to each newly registered account. The first string is the subject, and the second string is the message body. -
    registration_watchers: [ JID, ...]
    This option defines a +
    registration_watchers: [ JID, ...]
    This option defines a list of JIDs which will be notified each time a new account is registered. -
    iqdisc: Discipline
    This specifies -the processing discipline for In-Band Registration (jabber:iq:register) IQ queries (see section 3.3.2). -

    This module reads also another option defined globally for the server: -registration_timeout: Timeout. +

    iqdisc: Discipline
    This specifies +the processing discipline for In-Band Registration (jabber:iq:register) IQ queries (see section 3.3.2). +

    This module reads also another option defined globally for the server: +registration_timeout: Timeout. This option limits the frequency of registration from a given IP or username. So, a user that tries to register a new account from the same IP address or JID during this number of seconds after his previous registration -will receive an error resource-constraint with the explanation: +will receive an error resource-constraint with the explanation: “Users are not allowed to register accounts so quickly”. The timeout is expressed in seconds, and it must be an integer. To disable this limitation, -instead of an integer put a word like: infinity. -Default value: 600 seconds.

    Examples: -

    This module supports CAPTCHA image to register a new account. +To enable this feature, configure the options captcha_cmd and captcha_host.

    Options: +

    +registration_watchers: [ JID, ...]
    This option defines a list of JIDs which will be notified each time a new account is registered. -

    This example configuration shows how to enable the module and the web handler: -

    hosts: 
+
    This example configuration shows how to enable the module and the web handler:
+
    hosts: 
   - "localhost"
   - "example.org"
   - "example.com"
@@ -3295,324 +3448,381 @@ modules:
   ...
   mod_register_web: {}
   ...
-
    For example, the users of the host example.org can visit the page:
-https://example.org:5281/register/
+

    For example, the users of the host example.org can visit the page: +https://example.org:5281/register/ It is important to include the last / character in the URL, -otherwise the subpages URL will be incorrect.

    -

    3.3.21  mod_roster

    -

    This module implements roster management as defined in -RFC 3921: XMPP IM. -It also supports Roster Versioning (XEP-0237).

    Options: -

    -iqdisc: Discipline
    This specifies -the processing discipline for Roster Management (jabber:iq:roster) IQ queries (see section 3.3.2). -
    db_type: internal|odbc
    +otherwise the subpages URL will be incorrect.

    + +

    3.3.21  mod_roster

    +

    This module implements roster management as defined in +RFC 3921: XMPP IM. +It also supports Roster Versioning (XEP-0237).

    Options: +

    +iqdisc: Discipline
    This specifies +the processing discipline for Roster Management (jabber:iq:roster) IQ queries (see section 3.3.2). +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -
    versioning: false|true
    Enables +If odbc value is defined, make sure you have defined the database, see 3.2. +
    versioning: false|true
    Enables Roster Versioning. This option is disabled by default. -
    store_current_id: false|true
    +
    store_current_id: false|true
    If this option is enabled, the current version number is stored on the database. If disabled, the version number is calculated on the fly each time. Enabling this option reduces the load for both ejabberd and the database. This option does not affect the client in any way. This option is only useful if Roster Versioning is enabled. This option is disabled by default. -Important: if you use mod_shared_roster or mod_shared_roster_ldap, +Important: if you use mod_shared_roster or mod_shared_roster_ldap, you must disable this option. -

    This example configuration enables Roster Versioning with storage of current id: -

    modules:
+
    access
    +This option can be configured to specify rules to restrict roster management. +If a rule returns ‘deny’ on the requested user name, +that user cannot modify his personal roster: +not add/remove/modify contacts, +or subscribe/unsubscribe presence. +By default there aren’t restrictions. +
    managers
    +List of remote entities that can manage users rosters using Remote Roster Management +(XEP-0321). +The protocol sections implemented are: +4.2. The remote entity requests current user’s roster. +4.3. The user updates roster. +4.4. The remote entity updates the user’s roster. +A remote entity cab only get or modify roster items that have the same domain as the entity. +Default value is: []. +

    This example configuration enables Roster Versioning with storage of current id. +The ICQ and MSN transports can get ICQ and MSN contacts, add them, or remove them for any local account: +

    modules:
   ...
   mod_roster:
     versioning: true
     store_current_id: true
+    managers:
+     - "icq.example.org"
+     - "msn.example.org"
   ...
-

    -

    3.3.22  mod_service_log

    -

    This module adds support for logging end user packets via a XMPP message +

    With this example configuration, only admins can manage their rosters; +everybody else cannot modify the roster: +

    acl:
+  admin:
+    user:
+      - "sarah": "example.org"
+access:
+  roster:
+    admin: allow
+
+modules:
+  ...
+  mod_roster:
+    access: roster
+  ...
+

    + +

    3.3.22  mod_service_log

    +

    This module adds support for logging end user packets via a XMPP message auditing service such as -Bandersnatch. All user -packets are encapsulated in a <route/> element and sent to the specified -service(s).

    Options: -

    -loggers: [Names, ...]
    With this option a (list of) service(s) +Bandersnatch. All user +packets are encapsulated in a <route/> element and sent to the specified +service(s).

    Options: +

    +loggers: [Names, ...]
    With this option a (list of) service(s) that will receive the packets can be specified. -

    Examples: -

    • +

    Examples: +

    -

    3.3.23  mod_shared_roster

    -

    This module enables you to create shared roster groups. This means that you can +

    + +

    3.3.23  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 manually add all users to their rosters, and that they cannot permanently delete users from the shared roster groups. A shared roster group can have members from any XMPP server, but the presence will only be available from and to members -of the same virtual host where the group is created.

    Options: -

    -db_type: internal|odbc
    +of the same virtual host where the group is created.

    Options: +

    +db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -

    Shared roster groups can be edited only via the Web Admin. Each group +If odbc value is defined, make sure you have defined the database, see 3.2. +

    Shared roster groups can be edited only via the Web Admin. Each group has a unique identification and the following parameters: -

    -Name
    The name of the group, which will be displayed in the roster. -
    Description
    The description of the group. This parameter does not affect +

    +Name
    The name of the group, which will be displayed in the roster. +
    Description
    The description of the group. This parameter does not affect anything. -
    Members
    A list of JIDs of group members, entered one per line in +
    Members
    A list of JIDs of group members, entered one per line in the Web Admin. -The special member directive @all@ +The special member directive @all@ represents all the registered users in the virtual host; which is only recommended for a small server with just a few hundred users. -The special member directive @online@ +The special member directive @online@ represents the online users in the virtual host. -
    Displayed groups
    +
    Displayed groups
    A list of groups that will be in the rosters of this group’s members. -A group of other vhost can be identified with groupid@vhost -

    Examples: -

    • +A group of other vhost can be identified with groupid@vhost +

    Examples: +

    -

    3.3.24  mod_shared_roster_ldap

    -

    This module lets the server administrator +

    + + + + + +
    Identification Group ‘management’ Group ‘marketing’ Group ‘sales’
    NameManagementMarketingSales
    Description 
    Members + + + +
    manager1@example.org
    manager2@example.org
    manager3@example.org
    manager4@example.org +
    +    		 + + + +
    marketeer1@example.org
    marketeer2@example.org
    marketeer3@example.org
    marketeer4@example.org +
    +    		 + + + +
    saleswoman1@example.org
    salesman1@example.org
    saleswoman2@example.org
    salesman2@example.org +
    +
    Displayed groups + + +
    management
    marketing
    sales +
    +    		 + +
    management
    marketing +
    +    		 + +
    management
    sales +
    +
    +
    +

    + +

    3.3.24  mod_shared_roster_ldap

    +

    This module lets the server administrator automatically populate users’ rosters (contact lists) with entries based on -users and groups defined in an LDAP-based directory.

    -

    Configuration parameters

    The module accepts the following configuration parameters. Some of them, if +users and groups defined in an LDAP-based directory.

    + +

    Configuration parameters

    The module accepts the following configuration parameters. Some of them, if unspecified, default to the values specified for the top level of configuration. This lets you avoid specifying, for example, the bind password, -in multiple places.

    -
    Filters

    These parameters specify LDAP filters used to query for shared roster information. -All of them are run against the ldap_base.

    ldap_rfilter
    +in multiple places.

    + +
    Filters

    These parameters specify LDAP filters used to query for shared roster information. +All of them are run against the ldap_base.

    ldap_rfilter
    So called “Roster Filter”. Used to find names of all “shared roster” groups. -See also the ldap_groupattr parameter. +See also the ldap_groupattr parameter. If unspecified, defaults to the top-level parameter of the same name. -You must specify it in some place in the configuration, there is no default.
    ldap_ufilter
    +You must specify it in some place in the configuration, there is no default.
    ldap_ufilter
    “User Filter” – used for retrieving the human-readable name of roster entries (usually full names of people in the roster). -See also the parameters ldap_userdesc and ldap_useruid. +See also the parameters ldap_userdesc and ldap_useruid. If unspecified, defaults to the top-level parameter of the same name. If that one also is unspecified, then the filter is assembled from values of -other parameters as follows ([ldap_SOMETHING] is used to mean “the -value of the configuration parameter ldap_SOMETHING”):
    (&(&([ldap_memberattr]=[ldap_memberattr_format])([ldap_groupattr]=%g))[ldap_filter])
-

    Subsequently %u and %g are replaced with a *. This means +other parameters as follows ([ldap_SOMETHING] is used to mean “the +value of the configuration parameter ldap_SOMETHING”):

    (&(&([ldap_memberattr]=[ldap_memberattr_format])([ldap_groupattr]=%g))[ldap_filter])
+

    Subsequently %u and %g are replaced with a *. This means that given the defaults, the filter sent to the LDAP server is would be -(&(memberUid=*)(cn=*)). If however the ldap_memberattr_format -is something like uid=%u,ou=People,o=org, then the filter will be -(&(memberUid=uid=*,ou=People,o=org)(cn=*)).

    ldap_gfilter
    +(&(memberUid=*)(cn=*)). If however the ldap_memberattr_format +is something like uid=%u,ou=People,o=org, then the filter will be +(&(memberUid=uid=*,ou=People,o=org)(cn=*)).

    ldap_gfilter
    “Group Filter” – used when retrieving human-readable name (a.k.a. “Display Name”) and the members of a group. -See also the parameters ldap_groupattr, ldap_groupdesc and ldap_memberattr. +See also the parameters ldap_groupattr, ldap_groupdesc and ldap_memberattr. If unspecified, defaults to the top-level parameter of the same name. If that one also is unspecified, then the filter is constructed exactly in the -same way as User Filter.
    ldap_filter
    -Additional filter which is AND-ed together with User Filter and Group Filter. +same way as User Filter.
    ldap_filter
    +Additional filter which is AND-ed together with User Filter and Group Filter. If unspecified, defaults to the top-level parameter of the same name. If that one is also unspecified, then no additional filter is merged with the other filters. -

    Note that you will probably need to manually define the User and Group Filters (since the auto-assembled ones will not work) if: -

    • -your ldap_memberattr_format is anything other than a simple %u, -
    • and the attribute specified with ldap_memberattr does not support substring matches. -

    -An example where it is the case is OpenLDAP and (unique)MemberName attribute from the groupOf(Unique)Names objectClass. -A symptom of this problem is that you will see messages such as the following in your slapd.log: -

    get_filter: unknown filter type=130
+

    Note that you will probably need to manually define the User and Group Filters (since the auto-assembled ones will not work) if: +

    +An example where it is the case is OpenLDAP and (unique)MemberName attribute from the groupOf(Unique)Names objectClass. +A symptom of this problem is that you will see messages such as the following in your slapd.log: +

    get_filter: unknown filter type=130
 filter="(&(?=undefined)(?=undefined)(something=else))"
-

    -

    Attributes

    These parameters specify the names of the attributes which hold interesting data +

    + +

    Attributes

    These parameters specify the names of the attributes which hold interesting data in the entries returned by running filters specified in -section 3.3.24.

    -ldap_groupattr
    +section 3.3.24.

    +ldap_groupattr
    The name of the attribute that holds the group name, and that is used to differentiate between them. Retrieved from results of the “Roster Filter” and “Group Filter”. -Defaults to cn.
    ldap_groupdesc
    +Defaults to cn.
    ldap_groupdesc
    The name of the attribute which holds the human-readable group name in the objects you use to represent groups. Retrieved from results of the “Group Filter”. -Defaults to whatever ldap_groupattr is set.
    ldap_memberattr
    +Defaults to whatever ldap_groupattr is set.
    ldap_memberattr
    The name of the attribute which holds the IDs of the members of a group. Retrieved from results of the “Group Filter”. -Defaults to memberUid.

    The name of the attribute differs depending on the objectClass you use +Defaults to memberUid.

    The name of the attribute differs depending on the objectClass you use for your group objects, for example: -

    -
    posixGroup → memberUid -
    groupOfNames → member -
    groupOfUniqueNames → uniqueMember -
    ldap_userdesc
    +

    +
    posixGroup → memberUid +
    groupOfNames → member +
    groupOfUniqueNames → uniqueMember +
    ldap_userdesc
    The name of the attribute which holds the human-readable user name. Retrieved from results of the “User Filter”. -Defaults to cn.
    ldap_useruid
    +Defaults to cn.
    ldap_useruid
    The name of the attribute which holds the ID of a roster item. Value of this attribute in the roster item objects needs to match the ID retrieved from the -ldap_memberattr attribute of a group object. +ldap_memberattr attribute of a group object. Retrieved from results of the “User Filter”. -Defaults to cn. -

    -

    Control parameters

    These paramters control the behaviour of the module.

    ldap_memberattr_format
    +Defaults to cn. +

    + +

    Control parameters

    These paramters control the behaviour of the module.

    ldap_memberattr_format
    A globbing format for extracting user ID from the value of the attribute named by -ldap_memberattr. -Defaults to %u, which means that the whole value is the member ID. If +ldap_memberattr. +Defaults to %u, which means that the whole value is the member ID. If you change it to something different, you may also need to specify the User -and Group Filters manually — see section 3.3.24.
    ldap_memberattr_format_re
    +and Group Filters manually — see section 3.3.24.
    ldap_memberattr_format_re
    A regex for extracting user ID from the value of the attribute named by -ldap_memberattr.

    An example value "CN=(\\w*),(OU=.*,)*DC=company,DC=com" works for user IDs such as the following: -

    • -CN=Romeo,OU=Montague,DC=company,DC=com -
    • CN=Abram,OU=Servants,OU=Montague,DC=company,DC=com -
    • CN=Juliet,OU=Capulet,DC=company,DC=com -
    • CN=Peter,OU=Servants,OU=Capulet,DC=company,DC=com -

    In case: -

    • +ldap_memberattr.

      An example value "CN=(\\w*),(OU=.*,)*DC=company,DC=com" works for user IDs such as the following: +

      • +CN=Romeo,OU=Montague,DC=company,DC=com +
      • CN=Abram,OU=Servants,OU=Montague,DC=company,DC=com +
      • CN=Juliet,OU=Capulet,DC=company,DC=com +
      • CN=Peter,OU=Servants,OU=Capulet,DC=company,DC=com +

      In case: +

      • the option is unset, -
      • or the re module in unavailable in the current Erlang environment, -
      • or the regular expression does not compile, -

      -then instead of a regular expression, a simple format specified by ldap_memberattr_format is used. Also, in the last two cases an error -message is logged during the module initialization.

      Also, note that in all cases ldap_memberattr_format (and not the +

    • or the re module in unavailable in the current Erlang environment, +
    • or the regular expression does not compile, +

    +then instead of a regular expression, a simple format specified by ldap_memberattr_format is used. Also, in the last two cases an error +message is logged during the module initialization.

    Also, note that in all cases ldap_memberattr_format (and not the regex version) is used for constructing the default “User/Group Filter” — -see section 3.3.24.

    ldap_auth_check
    +see section 3.3.24.

    ldap_auth_check
    Whether the module should check (via the ejabberd authentication subsystem) for existence of each user in the shared LDAP roster. See -section 3.3.24 form more information. Set to off if you +section 3.3.24 form more information. Set to off if you want to disable the check. -Defaults to on.
    ldap_user_cache_validity
    +Defaults to on.
    ldap_user_cache_validity
    Number of seconds for which the cache for roster item full names is considered -fresh after retrieval. 300 by default. See section 3.3.24 on -how it is used during roster retrieval.
    ldap_group_cache_validity
    +fresh after retrieval. 300 by default. See section 3.3.24 on +how it is used during roster retrieval.
    ldap_group_cache_validity
    Number of seconds for which the cache for group membership is considered -fresh after retrieval. 300 by default. See section 3.3.24 on +fresh after retrieval. 300 by default. See section 3.3.24 on how it is used during roster retrieval. -

    -

    Connection parameters

    The module also accepts the connection parameters, all of which default to the -top-level parameter of the same name, if unspecified. See 3.2.2 -for more information about them.

    -

    Retrieving the roster

    When the module is called to retrieve the shared roster for a user, the -following algorithm is used:

    1. - A list of names of groups to display is created: the Roster Filter +

    + +

    Connection parameters

    The module also accepts the connection parameters, all of which default to the +top-level parameter of the same name, if unspecified. See 3.2.2 +for more information about them.

    + +

    Retrieving the roster

    When the module is called to retrieve the shared roster for a user, the +following algorithm is used:

    1. + A list of names of groups to display is created: the Roster Filter is run against the base DN, retrieving the values of the attribute named by -ldap_groupattr.
    2. Unless the group cache is fresh (see the ldap_group_cache_validity option), it is refreshed:
      1. -Information for all groups is retrieved using a single query: the Group Filter is run against the Base DN, retrieving the values of attributes -named by ldap_groupattr (group ID), ldap_groupdesc (group -“Display Name”) and ldap_memberattr (IDs of group members).
      2. group “Display Name”, read from the attribute named by ldap_groupdesc, is stored in the cache for the given group
      3. the following processing takes place for each retrieved value of -attribute named by ldap_memberattr: -
        1. -the user ID part of it is extracted using ldap_memberattr_format(_re),
        2. then (unless ldap_auth_check is set to off) for each -found user ID, the module checks (using the ejabberd authentication +ldap_groupattr.
        3. Unless the group cache is fresh (see the ldap_group_cache_validity option), it is refreshed:
          1. +Information for all groups is retrieved using a single query: the Group Filter is run against the Base DN, retrieving the values of attributes +named by ldap_groupattr (group ID), ldap_groupdesc (group +“Display Name”) and ldap_memberattr (IDs of group members).
          2. group “Display Name”, read from the attribute named by ldap_groupdesc, is stored in the cache for the given group
          3. the following processing takes place for each retrieved value of +attribute named by ldap_memberattr: +
            1. +the user ID part of it is extracted using ldap_memberattr_format(_re),
            2. then (unless ldap_auth_check is set to off) for each +found user ID, the module checks (using the ejabberd authentication subsystem) whether such user exists in the given virtual host. It is -skipped if the check is enabled and fails.

              This step is here for historical reasons. If you have a tidy DIT and +skipped if the check is enabled and fails.

              This step is here for historical reasons. If you have a tidy DIT and properly defined “Roster Filter” and “Group Filter”, it is safe to -disable it by setting ldap_auth_check to off — it will -speed up the roster retrieval.

            3. the user ID is stored in the list of members in the cache for the +disable it by setting ldap_auth_check to off — it will +speed up the roster retrieval.

            4. the user ID is stored in the list of members in the cache for the given group -
            -
        4. For each item (group name) in the list of groups retrieved in step 1:
          1. +
          +
      4. For each item (group name) in the list of groups retrieved in step 1:
        1. the display name of a shared roster group is retrieved from the group -cache
        2. for each IDs of users which belong to the group, retrieved from the -group cache:
          1. +cache
          2. for each IDs of users which belong to the group, retrieved from the +group cache:
            1. the ID is skipped if it’s the same as the one for which we are retrieving the roster. This is so that the user does not have himself in -the roster.
            2. the display name of a shared roster user is retrieved: -
              1. -first, unless the user name cache is fresh (see the ldap_user_cache_validity option), it is refreshed by running the -User Filter, against the Base DN, retrieving the values of -attributes named by ldap_useruid and ldap_userdesc. -
              2. then, the display name for the given user ID is retrieved from the +the roster.
              3. the display name of a shared roster user is retrieved: +
                1. +first, unless the user name cache is fresh (see the ldap_user_cache_validity option), it is refreshed by running the +User Filter, against the Base DN, retrieving the values of +attributes named by ldap_useruid and ldap_userdesc. +
                2. then, the display name for the given user ID is retrieved from the user name cache. -
                -

          -

          Configuration examples

          Since there are many possible -DIT +

        +

    + +

    Configuration examples

    Since there are many possible +DIT layouts, it will probably be easiest to understand how to configure the module -by looking at an example for a given DIT (or one resembling it).

    -
    Flat DIT

    This seems to be the kind of DIT for which this module was initially designed. +by looking at an example for a given DIT (or one resembling it).

    + +
    Flat DIT

    This seems to be the kind of DIT for which this module was initially designed. Basically there are just user objects, and group membership is stored in an attribute individually for each user. For example in a layout shown in -figure 3.1, the group of each user is stored in its ou attribute.

    +figure 3.1, the group of each user is stored in its ou attribute.

    -msrl-dit-flat.png +msrl-dit-flat.png -
    -
    Figure 3.1: Flat DIT graph
    - -

    Such layout has a few downsides, including: -

    • +
      +
      Figure 3.1: Flat DIT graph
      + +

    Such layout has a few downsides, including: +

    This however seems to be a common DIT layout, so the module keeps supporting it. -You can use the following configuration…

    modules:
+
  • inefficiency – the list of unique group names has to be computed by iterating over all users
+
    • This however seems to be a common DIT layout, so the module keeps supporting it.
+You can use the following configuration…
    modules:
   ...
   mod_shared_roster_ldap:
     ldap_base: "ou=flat,dc=nodomain"
@@ -3622,26 +3832,27 @@ You can use the following configuration…
    modules
     ldap_filter: "(objectClass=inetOrgPerson)"
     ldap_userdesc: "displayName"
   ...
-
    …to be provided with a roster as shown in figure 3.2 upon connecting as user czesio.
    
+
    …to be provided with a roster as shown in figure 3.2 upon connecting as user czesio.
    
 
-msrl-roster-flat.png
+msrl-roster-flat.png
 
 
-
    
-
    Figure 3.2: Roster from flat DIT
    
-
-
      
    
-
    Deep DIT
      
    This type of DIT contains distinctly typed objects for users and groups – see figure 3.3.
-They are shown separated into different subtrees, but it’s not a requirement.
    
+
    
+
    Figure 3.2: Roster from flat DIT
    
+
+
      
    
+
+
    Deep DIT
      
    This type of DIT contains distinctly typed objects for users and groups – see figure 3.3.
+They are shown separated into different subtrees, but it’s not a requirement.
    
 
-msrl-dit-deep.png
+msrl-dit-deep.png
 
 
-
    
-
    Figure 3.3: Example “deep” DIT graph
    
-
-
    If you use the following example module configuration with it:
-
    modules: 
+
    
+
    Figure 3.3: Example “deep” DIT graph
    
+
+
    If you use the following example module configuration with it:
+
    modules: 
   ...
   mod_shared_roster_ldap: 
     ldap_base: "ou=deep,dc=nodomain"
@@ -3654,102 +3865,142 @@ They are shown separated into different subtrees, but it’s not a requirem
     ldap_ufilter: "(&(objectClass=inetOrgPerson)(cn=%u))"
     ldap_userdesc: "displayName"
   ...
-
    …and connect as user czesio, then ejabberd will provide you with
-the roster shown in figure 3.4.
    
+
    …and connect as user czesio, then ejabberd will provide you with
+the roster shown in figure 3.4.
    
 
-msrl-roster-deep.png
+msrl-roster-deep.png
 
 
-
    
-
    Figure 3.4: Example roster from “deep” DIT
    
-
-
      
    
-
    3.3.25  mod_sic
      
-
    This module adds support for Server IP Check (XEP-0279). This protocol
-enables a client to discover its external IP address.
    Options:
-
    
-iqdisc: Discipline
     This specifies
-the processing discipline for urn:xmpp:sic:0 IQ queries (see section 3.3.2).
-
      
    
-
    3.3.26  mod_stats
      
-
    This module adds support for Statistics Gathering (XEP-0039). This protocol
-allows you to retrieve next statistics from your ejabberd deployment:
-
    Options:
+
    
+iqdisc: Discipline
     This specifies
+the processing discipline for Statistics Gathering (http://jabber.org/protocol/stats) IQ queries (see section 3.3.2).
+
    As there are only a small amount of clients (for example
+Tkabber) and software libraries with
 support for this XEP, a few examples are given of the XML you need to send
 in order to get the statistics. Here they are:
-
  • You can request the total number of registered users on all virtual hosts by sending: -
    <iq to='example.org' type='get'>
+
    <iq to='example.org' type='get'>
   <query xmlns='http://jabber.org/protocol/stats'>
     <stat name='users/all-hosts/total'/>
   </query>
 </iq>
-

    • -

    3.3.27  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: Discipline
    This specifies -the processing discipline for Entity Time (jabber:iq:time) IQ queries (see section 3.3.2). -

    -

    3.3.28  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 +

    + +

    3.3.28  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: Discipline
    This specifies +the processing discipline for Entity Time (jabber:iq:time) IQ queries (see section 3.3.2). +

    + +

    3.3.29  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 -these users. Moreover, it enables the server to send its vCard when queried.

    Options: -

    +these users. Moreover, it enables the server to send its vCard when queried.

    Options: +

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘vjud.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘vjud.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -
    iqdisc: Discipline
    This specifies -the processing discipline for vcard-temp IQ queries (see section 3.3.2). -
    db_type: internal|odbc
    +
    iqdisc: Discipline
    This specifies +the processing discipline for vcard-temp IQ queries (see section 3.3.2). +
    db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -
    search: true|false
    This option specifies whether the search +If odbc value is defined, make sure you have defined the database, see 3.2. +
    search: true|false
    This option specifies whether the search functionality is enabled or not -If disabled, the option host will be ignored and the +If disabled, the option host will be ignored and the Jabber User Directory service will not appear in the Service Discovery item -list. The default value is true. -
    matches: infinity|Number
    With this option, the number of reported -search results can be limited. If the option’s value is set to infinity, -all search results are reported. The default value is 30. -
    allow_return_all: false|true
    This option enables +list. The default value is true. +
    matches: infinity|Number
    With this option, the number of reported +search results can be limited. If the option’s value is set to infinity, +all search results are reported. The default value is 30. +
    allow_return_all: false|true
    This option enables you to specify if search operations with empty input fields should return all users who added some information to their vCard. The default value is -false. -
    search_all_hosts, true|false
    If this option is set -to true, search operations will apply to all virtual hosts. Otherwise -only the current host will be searched. The default value is true. -This option is available in mod_vcardwhen using Mnesia, but not when using ODBC storage. -

    Examples: -

    + +

    3.3.30  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.2).

    Usually ejabberd treats LDAP as a read-only storage: it is possible to consult data, but not possible to create accounts or edit vCard that is stored in LDAP. -However, it is possible to change passwords if mod_register module is enabled +However, it is possible to change passwords if mod_register module is enabled and LDAP server supports -RFC 3062.

    The mod_vcard_ldap module has +RFC 3062.

    The mod_vcard_ldap module has its own optional parameters. The first group of parameters has the same meaning as the top-level LDAP parameters to set the authentication method: -ldap_servers, ldap_port, ldap_rootdn, -ldap_password, ldap_base, ldap_uids, -ldap_deref_aliases and ldap_filter. -See section 3.2.2 for detailed information -about these options. If one of these options is not set, ejabberd will look -for the top-level option with the same name.

    The second group of parameters -consists of the following mod_vcard_ldap-specific options:

    +ldap_servers, ldap_port, ldap_rootdn, +ldap_password, ldap_base, ldap_uids, +ldap_deref_aliases and ldap_filter. +See section 3.2.2 for detailed information +about these options. If one of these options is not set, ejabberd will look +for the top-level option with the same name.

    The second group of parameters +consists of the following mod_vcard_ldap-specific options:

    -host: HostName
    This option defines the Jabber ID of the -service. If the host option is not specified, the Jabber ID will be the -hostname of the virtual host with the prefix ‘vjud.’. The keyword "@HOST@" +host: HostName
    This option defines the Jabber ID of the +service. If the host option is not specified, the Jabber ID will be the +hostname of the virtual host with the prefix ‘vjud.’. The keyword "@HOST@" is replaced at start time with the real virtual host name. -
    iqdisc: Discipline
    This specifies -the processing discipline for vcard-temp IQ queries (see section 3.3.2). -
    {search, true|false}
    This option specifies whether the search -functionality is enabled (value: true) or disabled (value: -false). If disabled, the option host will be ignored and the +
    iqdisc: Discipline
    This specifies +the processing discipline for vcard-temp IQ queries (see section 3.3.2). +
    {search, true|false}
    This option specifies whether the search +functionality is enabled (value: true) or disabled (value: +false). If disabled, the option host will be ignored and the Jabber User Directory service will not appear in the Service Discovery item -list. The default value is true. -
    {matches, infinity|Number}
    With this option, the number of reported -search results can be limited. If the option’s value is set to infinity, -all search results are reported. The default value is 30. -
    {ldap_vcard_map, [ {Name, Pattern, LDAPattributes}, ...]}
    +list. The default value is true. +
    {matches, infinity|Number}
    With this option, the number of reported +search results can be limited. If the option’s value is set to infinity, +all search results are reported. The default value is 30. +
    {ldap_vcard_map, [ {Name, Pattern, LDAPattributes}, ...]}
    With this option you can set the table that maps LDAP attributes to vCard fields. -Name is the type name of the vCard as defined in -RFC 2426. -Pattern is a string which contains pattern variables -"%u", "%d" or "%s". -LDAPattributes is the list containing LDAP attributes. +Name is the type name of the vCard as defined in +RFC 2426. +Pattern is a string which contains pattern variables +"%u", "%d" or "%s". +LDAPattributes is the list containing LDAP attributes. The pattern variables -"%s" will be sequentially replaced -with the values of LDAP attributes from List_of_LDAP_attributes, -"%u" will be replaced with the user part of a JID, -and "%d" will be replaced with the domain part of a JID. +"%s" will be sequentially replaced +with the values of LDAP attributes from List_of_LDAP_attributes, +"%u" will be replaced with the user part of a JID, +and "%d" will be replaced with the domain part of a JID. The default is: -
    [{"NICKNAME", "%u", []},
+
    [{"NICKNAME", "%u", []},
  {"FN", "%s", ["displayName"]},
  {"LAST", "%s", ["sn"]},
  {"FIRST", "%s", ["givenName"]},
@@ -3835,13 +4087,13 @@ The default is:
  {"BDAY", "%s", ["birthDay"]},
  {"ROLE", "%s", ["employeeType"]},
  {"PHOTO", "%s", ["jpegPhoto"]}]
-
    {ldap_search_fields, [ {Name, Attribute}, ...]}
    This option +
    {ldap_search_fields, [ {Name, Attribute}, ...]}
    This option defines the search form and the LDAP attributes to search within. -Name is the name of a search form +Name is the name of a search form field which will be automatically translated by using the translation -files (see msgs/*.msg for available words). Attribute is the -LDAP attribute or the pattern "%u". The default is: -
    [{"User", "%u"},
+files (see msgs/*.msg for available words). Attribute is the
+LDAP attribute or the pattern "%u". The default is:
+
    [{"User", "%u"},
  {"Full Name", "displayName"},
  {"Given Name", "givenName"},
  {"Middle Name", "initials"},
@@ -3853,14 +4105,14 @@ LDAP attribute or the pattern "%u". The default is:
  {"Email", "mail"},
  {"Organization Name", "o"},
  {"Organization Unit", "ou"}]
-
    {ldap_search_reported, [ {SearchField, VcardField}, ...]}
    This option +
    {ldap_search_reported, [ {SearchField, VcardField}, ...]}
    This option defines which search fields should be reported. -SearchField is the name of a search form +SearchField is the name of a search form field which will be automatically translated by using the translation -files (see msgs/*.msg for available words). VcardField is the -vCard field name defined in the ldap_vcard_map option. The default +files (see msgs/*.msg for available words). VcardField is the +vCard field name defined in the ldap_vcard_map option. The default is: -
    [{"Full Name", "FN"},
+
    [{"Full Name", "FN"},
  {"Given Name", "FIRST"},
  {"Middle Name", "MIDDLE"},
  {"Family Name", "LAST"},
@@ -3871,22 +4123,22 @@ is:
  {"Email", "EMAIL"},
  {"Organization Name", "ORGNAME"},
  {"Organization Unit", "ORGUNIT"}]
-

    Examples: -

    + +

    3.3.31  mod_vcard_xupdate

    +

    The user’s client can store an avatar in the user vCard. +The vCard-Based Avatars protocol (XEP-0153) provides a method for clients to inform the contacts what is the avatar hash value. -However, simple or small clients may not implement that protocol.

    If this module is enabled, all the outgoing client presence stanzas get automatically +However, simple or small clients may not implement that protocol.

    If this module is enabled, all the outgoing client presence stanzas get automatically the avatar hash on behalf of the client. So, the contacts receive the presence stanzas with the Update Data described -in XEP-0153 as if the client would had inserted it itself. +in XEP-0153 as if the client would had inserted it itself. If the client had already included such element in the presence stanza, -it is replaced with the element generated by ejabberd.

    By enabling this module, each vCard modification produces a hash recalculation, +it is replaced with the element generated by ejabberd.

    By enabling this module, each vCard modification produces a hash recalculation, and each presence sent by a client produces hash retrieval and a presence stanza rewrite. For this reason, enabling this module will introduce a computational overhead -in servers with clients that change frequently their presence.

    Options: -

    -db_type: internal|odbc
    +in servers with clients that change frequently their presence.

    Options: +

    +db_type: internal|odbc
    Define the type of storage where the module will create the tables and store user information. The default is to store in the internal Mnesia database. -If odbc value is defined, make sure you have defined the database, see 3.2. -

    -

    3.3.31  mod_version

    -

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

    Options: -

    -show_os: true|false
    Should the operating system be revealed or not. -The default value is true. -
    iqdisc: Discipline
    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 -you can execute ejabberdctl commands (described in the next section, 4.1.1) -and also many general ejabberd commands (described in section 4.2). +If odbc value is defined, make sure you have defined the database, see 3.2. +

    + +

    3.3.32  mod_version

    +

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

    Options: +

    +show_os: true|false
    Should the operating system be revealed or not. +The default value is true. +
    iqdisc: Discipline
    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 +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 -in a local or remote ejabberd server (by providing the argument --node NODENAME).

    The ejabberdctl script can be configured in the file ejabberdctl.cfg. -This file includes detailed information about each configurable option. See section 4.1.2.

    The ejabberdctl script returns a numerical status code. -Success is represented by 0, -error is represented by 1, +in a local or remote ejabberd server (by providing the argument --node NODENAME).

    The ejabberdctl script can be configured in the file ejabberdctl.cfg. +This file includes detailed information about each configurable option. See section 4.1.2.

    The ejabberdctl script returns a numerical status code. +Success is represented by 0, +error is represented by 1, 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, -it displays the available options. If there isn’t an ejabberd server running, +for example using: echo $?

    If you use Bash, you can get Bash completion by copying the file tools/ejabberdctl.bc +to the directory /etc/bash_completion.d/ (in Debian, Ubuntu, Fedora and maybe others).

    + +

    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: -

    -start
    Start ejabberd in background mode. This is the default method. -
    debug
    Attach an Erlang shell to an already existing ejabberd server. This allows to execute commands interactively in the ejabberd server. -
    live
    Start ejabberd in live mode: the shell keeps attached to the started server, showing log messages and allowing to execute interactive commands. -

    If there is an ejabberd server running in the system, -ejabberdctl shows the ejabberdctl commands described bellow -and all the ejabberd commands available in that server (see 4.2.1).

    The ejabberdctl commands are: -

    -help
    Get help about ejabberdctl or any available command. Try ejabberdctl help help. -
    status
    Check the status of the ejabberd server. -
    stop
    Stop the ejabberd server. -
    restart
    Restart the ejabberd server. -
    mnesia
    Get information about the Mnesia database. -

    The ejabberdctl script can be restricted to require authentication -and execute some ejabberd commands; see 4.2.2. -Add the option to the file ejabberd.yml. +

    +start
    Start ejabberd in background mode. This is the default method. +
    debug
    Attach an Erlang shell to an already existing ejabberd server. This allows to execute commands interactively in the ejabberd server. +
    live
    Start ejabberd in live mode: the shell keeps attached to the started server, showing log messages and allowing to execute interactive commands. +

    If there is an ejabberd server running in the system, +ejabberdctl shows the ejabberdctl commands described bellow +and all the ejabberd commands available in that server (see 4.2.1).

    The ejabberdctl commands are: +

    +help
    Get help about ejabberdctl or any available command. Try ejabberdctl help help. +
    status
    Check the status of the ejabberd server. +
    stop
    Stop the ejabberd server. +
    restart
    Restart the ejabberd server. +
    mnesia
    Get information about the Mnesia database. +

    The ejabberdctl script can be restricted to require authentication +and execute some ejabberd commands; see 4.2.2. +Add the option to the file ejabberd.yml. In this example there is no restriction: -

    ejabberdctl_access_commands: []
-

    If account robot1@example.org is registered in ejabberd with password abcdef +

    ejabberdctl_access_commands: []
+

    If account robot1@example.org is registered in ejabberd with password abcdef (which MD5 is E8B501798950FC58AAD83C8C14978E), -and ejabberd.yml contains this setting: -

    {hosts, ["example.org"]}.
+and ejabberd.yml contains this setting:
+
    {hosts, ["example.org"]}.
 {acl, bots, {user, "robot1", "example.org"}}.
 {access, ctlaccess, [{allow, bots}]}.
 {ejabberdctl_access_commands, [ {ctlaccess, [registered_users, register], []} ]}.
-
    then you can do this in the shell:
-
    $ ejabberdctl registered_users example.org
+
    then you can do this in the shell:
+
    $ ejabberdctl registered_users example.org
 Error: no_auth_provided
 $ ejabberdctl --auth robot1 example.org abcdef registered_users example.org
 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, +The ejabberdctl administration script uses many of those possibilities. +You can configure some of them with the file ejabberdctl.cfg, which includes detailed description about them. This section describes for reference purposes -all the environment variables and command line parameters.

    The environment variables: -

    -EJABBERD_CONFIG_PATH
    +all the environment variables and command line parameters.

    The environment variables: +

    +EJABBERD_CONFIG_PATH
    Path to the ejabberd configuration file. -
    EJABBERD_MSGS_PATH
    +
    EJABBERD_MSGS_PATH
    Path to the directory with translated strings. -
    EJABBERD_LOG_PATH
    +
    EJABBERD_LOG_PATH
    Path to the ejabberd service log file. -
    EJABBERD_SO_PATH
    +
    EJABBERD_SO_PATH
    Path to the directory with binary system libraries. -
    EJABBERD_DOC_PATH
    +
    EJABBERD_DOC_PATH
    Path to the directory with ejabberd documentation. -
    EJABBERD_PID_PATH
    +
    EJABBERD_PID_PATH
    Path to the PID file that ejabberd can create when started. -
    HOME
    - Path to the directory that is considered ejabberd’s home. - This path is used to read the file .erlang.cookie. -
    ERL_CRASH_DUMP
    +
    HOME
    + Path to the directory that is considered ejabberd’s home. + This path is used to read the file .erlang.cookie. +
    ERL_CRASH_DUMP
    Path to the file where crash reports will be dumped. -
    ERL_EPMD_ADDRESS
    - IP address where epmd listens for connections (see section 5.2). -
    ERL_INETRC
    +
    ERL_EPMD_ADDRESS
    + IP address where epmd listens for connections (see section 5.2). +
    ERL_INETRC
    Indicates which IP name resolution to use. - If using -sname, specify either this option or -kernel inetrc filepath. -
    ERL_MAX_PORTS
    + If using -sname, specify either this option or -kernel inetrc filepath. +
    ERL_MAX_PORTS
    Maximum number of simultaneously open Erlang ports. -
    ERL_MAX_ETS_TABLES
    +
    ERL_MAX_ETS_TABLES
    Maximum number of ETS and Mnesia tables. -

    The command line parameters: -

    --sname ejabberd
    +

    The command line parameters: +

    +-sname ejabberd
    The Erlang node will be identified using only the first part of the host name, i. e. other Erlang nodes outside this domain cannot contact this node. This is the preferable option in most cases. -
    -name ejabberd
    +
    -name ejabberd
    The Erlang node will be fully identified. -This is only useful if you plan to setup an ejabberd cluster with nodes in different networks. -
    -kernel inetrc ’"/etc/ejabberd/inetrc"’
    +This is only useful if you plan to setup an ejabberd cluster with nodes in different networks. +
    -kernel inetrc ’"/etc/ejabberd/inetrc"’
    Indicates which IP name resolution to use. - If using -sname, specify either this option or ERL_INETRC. -
    -kernel inet_dist_listen_min 4200 inet_dist_listen_min 4210
    - Define the first and last ports that epmd (section 5.2) can listen to. -
    -kernel inet_dist_use_interface "{ 127,0,0,1 }"
    + If using -sname, specify either this option or ERL_INETRC. +
    -kernel inet_dist_listen_min 4200 inet_dist_listen_min 4210
    + Define the first and last ports that epmd (section 5.2) can listen to. +
    -kernel inet_dist_use_interface "{ 127,0,0,1 }"
    Define the IP address where this Erlang node listens for other nodes -connections (see section 5.2). -
    -detached
    +connections (see section 5.2). +
    -detached
    Starts the Erlang system detached from the system console. Useful for running daemons and background processes. -
    -noinput
    +
    -noinput
    Ensures that the Erlang system never tries to read any input. Useful for running daemons and background processes. -
    -pa /var/lib/ejabberd/ebin
    +
    -pa /var/lib/ejabberd/ebin
    Specify the directory where Erlang binary files (*.beam) are located. -
    -s ejabberd
    - Tell Erlang runtime system to start the ejabberd application. -
    -mnesia dir ’"/var/lib/ejabberd/"’
    +
    -s ejabberd
    + Tell Erlang runtime system to start the ejabberd application. +
    -mnesia dir ’"/var/lib/ejabberd/"’
    Specify the Mnesia database directory. -
    -sasl sasl_error_logger {file, "/var/log/ejabberd/erlang.log"}
    +
    -sasl sasl_error_logger {file, "/var/log/ejabberd/erlang.log"}
    Path to the Erlang/OTP system log file. SASL here means “System Architecture Support Libraries” not “Simple Authentication and Security Layer”. -
    +K [true|false]
    +
    +K [true|false]
    Kernel polling. -
    -smp [auto|enable|disable]
    +
    -smp [auto|enable|disable]
    SMP support. -
    +P 250000
    +
    +P 250000
    Maximum number of Erlang processes. -
    -remsh ejabberd@localhost
    +
    -remsh ejabberd@localhost
    Open an Erlang shell in a remote Erlang node. -
    -hidden
    +
    -hidden
    The connections to other nodes are hidden (not published). The result is that this node is not considered part of the cluster. - This is important when starting a temporary ctl or debug node. -

    -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, + This is important when starting a temporary ctl or debug node. +

    +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, 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. +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 two frontends to execute ejabberd commands: the script ejabberdctl (4.1) +and the ejabberd_xmlrpc listener (3.1.4). Other known frontends that can be installed to execute ejabberd commands in different ways are: -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. -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 +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. +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
+
    $ ejabberdctl help
 Usage: ejabberdctl [--node nodename] [--auth user host password] command [options]
 
 Available commands in this ejabberd node:
@@ -4129,78 +4390,81 @@ Available commands in this ejabberd node:
   connected_users              List all established sessions
   connected_users_number       Get the number of established sessions
   ...
-
    The most interesting ones are:
-
    
-reopen_log
     Reopen the log files after they were renamed.
+

    The most interesting ones are: +

    +reopen_log
    Reopen the log files after they were renamed. If the old files were not renamed before calling this command, -they are automatically renamed to "*-old.log". See section 7.1. -
    backup ejabberd.backup
    +they are automatically renamed to "*-old.log". See section 7.1. +
    convert_to_yaml /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberd-converted.yml
    +Convert an old ejabberd.cfg file to the YAML syntax in a new file. +
    backup ejabberd.backup
    Store internal Mnesia database to a binary backup file. -
    restore ejabberd.backup
    +
    restore ejabberd.backup
    Restore immediately from a binary backup file the internal Mnesia database. This will consume a lot of memory if you have a large database, -so better use install_fallback. -
    install_fallback ejabberd.backup
    +so better use install_fallback. +
    install_fallback ejabberd.backup
    The binary backup file is installed as fallback: it will be used to restore the database at the next ejabberd start. This means that, after running this command, you have to restart ejabberd. -This command requires less memory than restore. -
    dump ejabberd.dump
    +This command requires less memory than restore. +
    dump ejabberd.dump
    Dump internal Mnesia database to a text file dump. -
    load ejabberd.dump
    +
    load ejabberd.dump
    Restore immediately from a text file dump. This is not recommended for big databases, as it will consume much time, -memory and processor. In that case it’s preferable to use backup and install_fallback. -
    import_piefxis, export_piefxis, export_piefxis_host
    +memory and processor. In that case it’s preferable to use backup and install_fallback. +
    import_piefxis, export_piefxis, export_piefxis_host
    These options can be used to migrate accounts -using XEP-0227 formatted XML files +using XEP-0227 formatted XML files from/to other Jabber/XMPP servers or move users of a vhost to another ejabberd installation. -See also ejabberd migration kit. -
    import_file, import_dir
    +See also ejabberd migration kit. +
    import_file, import_dir
    These options can be used to migrate accounts using jabberd1.4 formatted XML files. from other Jabber/XMPP servers There exist tutorials to -migrate from other software to ejabberd. -
    export2odbc virtualhost directory
    +migrate from other software to ejabberd. +
    export2odbc virtualhost directory
    Export virtual host information from Mnesia tables to SQL files. -
    delete_expired_messages
    This option can be used to delete old messages +
    delete_expired_messages
    This option can be used to delete old messages in offline storage. This might be useful when the number of offline messages is very high. -
    delete_old_messages days
    Delete offline messages older than the given days. -
    register user host password
    Register an account in that domain with the given password. -
    unregister user host
    Unregister the given account. -

    -

    4.2.2  Restrict Execution with AccessCommands

    The frontends can be configured to restrict access to certain commands. +

    delete_old_messages days
    Delete offline messages older than the given days. +
    register user host password
    Register an account in that domain with the given password. +
    unregister user host
    Unregister the given account. +

    + +

    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 each frontend the AccessCommands option is defined in a different place. But in all cases the option syntax is the same: -

    AccessCommands = [ {Access, CommandNames, Arguments}, ...]
+
    AccessCommands = [ {Access, CommandNames, Arguments}, ...]
 Access = atom()
 CommandNames = all | [CommandName]
 CommandName = atom()
 Arguments = [ {ArgumentName, ArgumentValue}, ...]
 ArgumentName = atom()
 ArgumentValue = any()
-
    The default value is to not define any restriction: [].
+

    The default value is to not define any restriction: []. The authentication information is provided when executing a command, and is Username, Hostname and Password of a local XMPP account that has permission to execute the corresponding command. This means that the account must be registered in the local ejabberd, -because the information will be verified.

    When one or several access restrictions are defined and the +because the information will be verified.

    When one or several access restrictions are defined and the authentication information is provided, each restriction is verified until one matches completely: the account matches the Access rule, the command name is listed in CommandNames, -and the provided arguments do not contradict Arguments.

    As an example to understand the syntax, let’s suppose those options: -

    {hosts, ["example.org"]}.
+and the provided arguments do not contradict Arguments.
    As an example to understand the syntax, let’s suppose those options:
+
    {hosts, ["example.org"]}.
 {acl, bots, {user, "robot1", "example.org"}}.
 {access, commaccess, [{allow, bots}]}.
-
    This list of access restrictions allows only robot1@example.org to execute all commands:
-
    [{commaccess, all, []}]
-
    See another list of restrictions (the corresponding ACL and ACCESS are not shown):
-
    [
+
    This list of access restrictions allows only robot1@example.org to execute all commands:
+
    [{commaccess, all, []}]
+
    See another list of restrictions (the corresponding ACL and ACCESS are not shown):
+
    [
  %% This bot can execute all commands:
  {bot, all, []},
  %% This bot can only execute the command 'dump'. No argument restriction:
@@ -4215,42 +4479,43 @@ and the provided arguments do not contradict Arguments.
    As an example to u
  %% if argument host is provided, it must be "test.org":
  {_bot_reg_test, [register, unregister], [{host, "test.org"}]}
 ]
-
      
    
-
    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.4) is included in the listening ports. Then you can open
-http://server:port/admin/ in your favourite web browser. You
-will be asked to enter the username (the full Jabber ID) and password
-of an ejabberd user with administrator rights. After authentication
-you will see a page similar to figure 4.1.
    
+

    + +

    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.4) is included in the listening ports. Then you can open +http://server:port/admin/ in your favourite web browser. You +will be asked to enter the username (the full Jabber ID) and password +of an ejabberd user with administrator rights. After authentication +you will see a page similar to figure 4.1.

    -webadmmain.png +webadmmain.png -
    -
    Figure 4.1: Top page from the Web Admin
    - -

    +

    +
    Figure 4.1: Top page from the Web Admin
    + +

    Here you can edit access restrictions, manage users, create backups, manage the database, enable/disable ports listened for, view server -statistics,…

    The access rule configure determines what accounts can access the Web Admin and modify it. -The access rule webadmin_view is to grant only view access: those accounts can browse the Web Admin with read-only access.

    Example configurations: -

    Certain pages in the ejabberd Web Admin contain a link to a related section in the ejabberd Installation and Operation Guide. In order to view such links, a copy in HTML format of the Guide must be installed in the system. The file is searched by default in -"/share/doc/ejabberd/guide.html". +"/share/doc/ejabberd/guide.html". 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, -you can perform several administrative tasks in ejabberd +the environment variable EJABBERD_DOC_PATH. +See section 4.1.2.

    + +

    4.4  Ad-hoc Commands

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

    -

    4.5  Change Computer Hostname

    ejabberd uses the distributed Mnesia database. +an account with proper privileges.

    + +

    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). +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. So, the name of the Erlang node changes -if you change the name of the machine in which ejabberd runs, -or when you move ejabberd to a different machine.

    You have two ways to use the old Mnesia database in an ejabberd with new node name: -put the old node name in ejabberdctl.cfg, -or convert the database to the new node name.

    Those example steps will backup, convert and load the Mnesia database. +if you change the name of the machine in which ejabberd runs, +or when you move ejabberd to a different machine.

    You have two ways to use the old Mnesia database in an ejabberd with new node name: +put the old node name in ejabberdctl.cfg, +or convert the database to the new node name.

    Those example steps will backup, convert and load the Mnesia database. You need to have either the old Mnesia spool dir or a backup of Mnesia. If you already have a backup file of the old database, you can go directly to step 5. You also need to know the old node name and the new node name. -If you don’t know them, look for them by executing ejabberdctl -or in the ejabberd log files.

    Before starting, setup some variables: -

    OLDNODE=ejabberd@oldmachine
+If you don’t know them, look for them by executing ejabberdctl
+or in the ejabberd log files.
    Before starting, setup some variables:
+
    OLDNODE=ejabberd@oldmachine
 NEWNODE=ejabberd@newmachine
 OLDFILE=/tmp/old.backup
 NEWFILE=/tmp/new.backup
-
    1. 
+
    1. Start ejabberd enforcing the old node name: -
      ejabberdctl --node $OLDNODE start
-
    2. Generate a backup file: -
      ejabberdctl --node $OLDNODE backup $OLDFILE
-
    3. Stop the old node: -
      ejabberdctl --node $OLDNODE stop
-
    4. Make sure there aren’t files in the Mnesia spool dir. For example: -
      mkdir /var/lib/ejabberd/oldfiles
+
      ejabberdctl --node $OLDNODE start
+
    5. Generate a backup file: +
      ejabberdctl --node $OLDNODE backup $OLDFILE
+
    6. Stop the old node: +
      ejabberdctl --node $OLDNODE stop
+
    7. Make sure there aren’t files in the Mnesia spool dir. For example: +
      mkdir /var/lib/ejabberd/oldfiles
 mv /var/lib/ejabberd/*.* /var/lib/ejabberd/oldfiles/
-
    8. Start ejabberd. There isn’t any need to specify the node name anymore: -
      ejabberdctl start
-
    9. Convert the backup to new node name: -
      ejabberdctl mnesia_change_nodename $OLDNODE $NEWNODE $OLDFILE $NEWFILE
-
    10. Install the backup file as a fallback: -
      ejabberdctl install_fallback $NEWFILE
-
    11. Stop ejabberd: -
      ejabberdctl stop
-
      You may see an error message in the log files, it’s normal, so don’t worry: -
      Mnesia(ejabberd@newmachine):
+
    12. Start ejabberd. There isn’t any need to specify the node name anymore: +
      ejabberdctl start
+
    13. Convert the backup to new node name: +
      ejabberdctl mnesia_change_nodename $OLDNODE $NEWNODE $OLDFILE $NEWFILE
+
    14. Install the backup file as a fallback: +
      ejabberdctl install_fallback $NEWFILE
+
    15. Stop ejabberd: +
      ejabberdctl stop
+
      You may see an error message in the log files, it’s normal, so don’t worry: +
      Mnesia(ejabberd@newmachine):
 ** ERROR ** (ignoring core)
 ** FATAL ** A fallback is installed and Mnesia must be restarted.
   Forcing shutdown after mnesia_down from ejabberd@newmachine...
-
    16. Now you can finally start ejabberd: -
      ejabberdctl start
-
    17. Check that the information of the old database is available: accounts, rosters... +
    18. Now you can finally start ejabberd: +
      ejabberdctl start
+
    19. 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

    -

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

    - - - - - - -
    PortDescription
    5222Standard port for Jabber/XMPP client connections, plain or STARTTLS.
    5223Standard port for Jabber client connections using the old SSL method.
    5269Standard port for Jabber/XMPP server connections.
    4369EPMD (section 5.2) listens for Erlang node name requests.
    port rangeUsed for connections between Erlang nodes. This range is configurable (see section 5.2).
    -

    -

    5.2  epmd

    epmd (Erlang Port Mapper Daemon) +

    + +

    Chapter 5  Securing ejabberd

    + +

    5.1  Firewall Settings

    +

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

    + + + + + + +
    PortDescription
    5222Standard port for Jabber/XMPP client connections, plain or STARTTLS.
    5223Standard port for Jabber client connections using the old SSL method.
    5269Standard port for Jabber/XMPP server connections.
    4369EPMD (section 5.2) listens for Erlang node name requests.
    port rangeUsed for connections between Erlang nodes. This range is configurable (see section 5.2).
    +

    + +

    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. +ejabberd needs epmd to use ejabberdctl and also when clustering ejabberd nodes. This small program is automatically started by Erlang, and is never stopped. -If ejabberd is stopped, and there aren’t any other Erlang programs -running in the system, you can safely stop epmd if you want.

    ejabberd runs inside an Erlang node. -To communicate with ejabberd, the script ejabberdctl starts a new Erlang node -and connects to the Erlang node that holds ejabberd. +If ejabberd is stopped, and there aren’t any other Erlang programs +running in the system, you can safely stop epmd if you want.

    ejabberd runs inside an Erlang node. +To communicate with ejabberd, the script ejabberdctl starts a new Erlang node +and connects to the Erlang node that holds ejabberd. In order for this communication to work, -epmd must be running and listening for name requests in the port 4369. +epmd must be running and listening for name requests in the port 4369. You should block the port 4369 in the firewall in such a way that only the programs in your machine can access it. -or configure the option ERL_EPMD_ADDRESS in the file ejabberdctl.cfg.

    If you build a cluster of several ejabberd instances, -each ejabberd instance is called an ejabberd node. -Those ejabberd nodes use a special Erlang communication method to +or configure the option ERL_EPMD_ADDRESS in the file ejabberdctl.cfg.

    If you build a cluster of several ejabberd instances, +each ejabberd instance is called an ejabberd node. +Those ejabberd nodes use a special Erlang communication method to build the cluster, and EPMD is again needed listening in the port 4369. -So, if you plan to build a cluster of ejabberd nodes +So, if you plan to build a cluster of ejabberd nodes you must open the port 4369 for the machines involved in the cluster. -Remember to block the port so Internet doesn’t have access to it.

    Once an Erlang node solved the node name of another Erlang node using EPMD and port 4369, +Remember to block the port so Internet doesn’t have access to it.

    Once an Erlang node solved the node name of another Erlang node using EPMD and port 4369, the nodes communicate directly. The ports used in this case by default are random, -but can be configured in the file ejabberdctl.cfg. +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
-

    It is also possible to configure in ejabberdctl.cfg +

    erl ... -kernel inet_dist_listen_min 4370 inet_dist_listen_max 4375
+

    It is also possible to configure in ejabberdctl.cfg the network interface where the Erlang node will listen and accept connections. The Erlang command-line parameter used internally is, for example: -

    erl ... -kernel inet_dist_use_interface "{127,0,0,1}"
-

    -

    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. +

    erl ... -kernel inet_dist_use_interface "{127,0,0,1}"
+

    + +

    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. Two Erlang nodes communicate only if they have the same cookie. Setting a cookie on the Erlang node allows you to structure your Erlang network -and define which nodes are allowed to connect to which.

    Thanks to Erlang cookies, you can prevent access to the Erlang node by mistake, -for example when there are several Erlang nodes running different programs in the same machine.

    Setting a secret cookie is a simple method +and define which nodes are allowed to connect to which.

    Thanks to Erlang cookies, you can prevent access to the Erlang node by mistake, +for example when there are several Erlang nodes running different programs in the same machine.

    Setting a secret cookie is a simple method to difficult unauthorized access to your Erlang node. However, the cookie system is not ultimately effective 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. -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 +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. +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 to difficult unauthorized access to your Erlang node. 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 Sensitive Files

    ejabberd stores sensitive data in the file system either in plain text or binary files. +using a modified version of Erlang epmd. +The recommended way to secure the Erlang node is to block the port 4369.

    + +

    5.5  Securing Sensitive Files

    ejabberd stores sensitive 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.yml
    +write and execute those files and directories.

    +ejabberd configuration file: /etc/ejabberd/ejabberd.yml
    Contains the JID of administrators and passwords of external components. The backup files probably contain also this information, -so it is preferable to secure the whole /etc/ejabberd/ directory. -
    ejabberd service log: /var/log/ejabberd/ejabberd.log
    +so it is preferable to secure the whole /etc/ejabberd/ directory. +
    ejabberd service log: /var/log/ejabberd/ejabberd.log
    Contains IP addresses of clients. If the loglevel is set to 5, it contains whole conversations and passwords. If a logrotate system is used, there may be several log files with similar information, -so it is preferable to secure the whole /var/log/ejabberd/ directory. -
    Mnesia database spool files in /var/lib/ejabberd/
    +so it is preferable to secure the whole /var/log/ejabberd/ directory. +
    Mnesia database spool files in /var/lib/ejabberd/
    The files store binary data, but some parts are still readable. The files are generated by Mnesia and their permissions cannot be set directly, -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

    -

    -

    6.1  How it Works

    -

    A XMPP domain is served by one or more ejabberd nodes. These nodes can +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

    +

    + +

    6.1  How it Works

    +

    A XMPP 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 have the same magic cookie (see Erlang/OTP documentation, in other words the -file ~ejabberd/.erlang.cookie must be the same on all nodes). This is +file ~ejabberd/.erlang.cookie must be the same on all nodes). This is needed because all nodes exchange information about connected users, s2s -connections, registered services, etc…

    Each ejabberd node has the following modules: -

    + +

    6.1.1  Router

    +

    This module is the main router of XMPP 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

    -

    This module routes packets which have a destination domain equal to +appropriate process. If not, it is sent to the s2s manager.

    + +

    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

    -

    This module routes packets to local users. It looks up to which user +on its content.

    + +

    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

    -

    This module routes packets to other XMPP servers. First, it +storage, or bounced back.

    + +

    6.1.4  s2s Manager

    +

    This module routes packets to other XMPP 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

    -

    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. -Copy ~ejabberd/.erlang.cookie file from first to -second.

      (alt) You can also add ‘-setcookie content_of_.erlang.cookie’ -option to all ‘erl’ commands below.

    2. On second run the following command as the ejabberd daemon user, -in the working directory of ejabberd:
      erl -sname ejabberd \
+serving this connection, otherwise a new connection is opened.
        
      
+
+
      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. 
+Copy ~ejabberd/.erlang.cookie file from first to
+second.
        (alt) You can also add ‘-setcookie content_of_.erlang.cookie’
+option to all ‘erl’ commands below.
      2. On second run the following command as the ejabberd daemon user,
+in the working directory of ejabberd:
        erl -sname ejabberd \
     -mnesia dir '"/var/lib/ejabberd/"' \
     -mnesia extra_db_nodes "['ejabberd@first']" \
     -s mnesia
-
        This will start Mnesia serving the same database as ejabberd@first.
-You can check this by running the command ‘mnesia:info().’. You
-should see a lot of remote tables and a line like the following:
        Note: the Mnesia directory may be different in your system.
+

      This will start Mnesia serving the same database as ejabberd@first. +You can check this by running the command ‘mnesia:info().’. You +should see a lot of remote tables and a line like the following:

      Note: the Mnesia directory may be different in your system. To know where does ejabberd expect Mnesia to be installed by default, -call 4.1 without options and it will show some help, -including the Mnesia database spool dir.

      running db nodes   = [ejabberd@first, ejabberd@second]
-
    3. Now run the following in the same ‘erl’ session:
      mnesia:change_table_copy_type(schema, node(), disc_copies).
-

      This will create local disc storage for the database.

      (alt) Change storage type of the scheme table to ‘RAM and disc -copy’ on the second node via the Web Admin.

    4. Now you can add replicas of various tables to this node with -‘mnesia:add_table_copy’ or -‘mnesia:change_table_copy_type’ as above (just replace -‘schema’ with another table name and ‘disc_copies’ -can be replaced with ‘ram_copies’ or -‘disc_only_copies’).

      Which tables to replicate is very dependant on your needs, you can get -some hints from the command ‘mnesia:info().’, by looking at the -size of tables and the default storage type for each table on ’first’.

      Replicating a table makes lookups in this table faster on this node. +call 4.1 without options and it will show some help, +including the Mnesia database spool dir.

      running db nodes   = [ejabberd@first, ejabberd@second]
+
    5. Now run the following in the same ‘erl’ session:
      mnesia:change_table_copy_type(schema, node(), disc_copies).
+

      This will create local disc storage for the database.

      (alt) Change storage type of the scheme table to ‘RAM and disc +copy’ on the second node via the Web Admin.

    6. Now you can add replicas of various tables to this node with +‘mnesia:add_table_copy’ or +‘mnesia:change_table_copy_type’ as above (just replace +‘schema’ with another table name and ‘disc_copies’ +can be replaced with ‘ram_copies’ or +‘disc_only_copies’).

      Which tables to replicate is very dependant on your needs, you can get +some hints from the command ‘mnesia:info().’, by looking at the +size of tables and the default storage type for each table on ’first’.

      Replicating a table makes lookups in this table faster on this node. Writing, on the other hand, will be slower. And of course if machine with one -of the replicas is down, other replicas will be used.

      Also section 5.3 (Table Fragmentation) of Mnesia User’s Guide can be helpful. -

      (alt) Same as in previous item, but for other tables.

    7. Run ‘init:stop().’ or just ‘q().’ to exit from +of the replicas is down, other replicas will be used.

      Also section 5.3 (Table Fragmentation) of Mnesia User’s Guide can be helpful. +

      (alt) Same as in previous item, but for other tables.

    8. Run ‘init:stop().’ or just ‘q().’ to exit from the Erlang shell. This probably can take some time if Mnesia has not yet -transfered and processed all data it needed from first.
    9. Now run ejabberd on second with a configuration similar as -on first: you probably do not need to duplicate ‘acl’ -and ‘access’ options because they will be taken from -first; and mod_irc should be +transfered and processed all data it needed from first.
    10. Now run ejabberd on second with a configuration similar as +on first: you probably do not need to duplicate ‘acl’ +and ‘access’ options because they will be taken from +first; and mod_irc should be 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.1  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: BalancingCriteria

    Several balancing criteria are available: -

    If the value corresponding to the criteria is the same, the same component instance in the cluster will be used.

    -

    6.3.2  Load-Balancing Buckets

    -

    When there is a risk of failure for a given component, domain balancing can cause service trouble. If one component is failing the service will not work correctly unless the sessions are rebalanced.

    In this case, it is best to limit the problem to the sessions handled by the failing component. This is what the domain_balancing_component_number option does, making the load balancing algorithm not dynamic, but sticky on a fix number of component instances.

    The syntax is: -

    domain_balancing_component_number: Number

    -

    Chapter 7  Debugging

    -

    -

    7.1  Log Files

    An ejabberd node writes two log files: -

    - ejabberd.log
    is the ejabberd service log, with the messages reported by ejabberd code -
    erlang.log
    is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries) -

    The option loglevel modifies the verbosity of the file ejabberd.log. The syntax: -

    -loglevel: Level
    The standard form to set a global log level. -

    The possible Level are: -

    - 0
    No ejabberd log at all (not recommended) -
    1
    Critical -
    2
    Error -
    3
    Warning -
    4
    Info -
    5
    Debug -

    +

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

    + +

    6.3  Service Load-Balancing

    +

    + +

    6.3.1  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: BalancingCriteria

    Several balancing criteria are available: +

    If the value corresponding to the criteria is the same, the same component instance in the cluster will be used.

    + +

    6.3.2  Load-Balancing Buckets

    +

    When there is a risk of failure for a given component, domain balancing can cause service trouble. If one component is failing the service will not work correctly unless the sessions are rebalanced.

    In this case, it is best to limit the problem to the sessions handled by the failing component. This is what the domain_balancing_component_number option does, making the load balancing algorithm not dynamic, but sticky on a fix number of component instances.

    The syntax is: +

    domain_balancing_component_number: Number

    + +

    Chapter 7  Debugging

    +

    + +

    7.1  Log Files

    An ejabberd node writes two log files: +

    + ejabberd.log
    is the ejabberd service log, with the messages reported by ejabberd code +
    erlang.log
    is the Erlang/OTP system log, with the messages reported by Erlang/OTP using SASL (System Architecture Support Libraries) +

    The option loglevel modifies the verbosity of the file ejabberd.log. The syntax: +

    +loglevel: Level
    The standard form to set a global log level. +

    The possible Level are: +

    + 0
    No ejabberd log at all (not recommended) +
    1
    Critical +
    2
    Error +
    3
    Warning +
    4
    Info +
    5
    Debug +

    For example, the default configuration is: -

    loglevel: 4
-

    The log files grow continually, so it is recommended to rotate them periodically. +

    loglevel: 4
+

    The log files grow continually, so it is recommended to rotate them periodically. To rotate the log files, rename the files and then reopen them. -The ejabberdctl command reopen-log -(please refer to section 4.1.1) +The ejabberdctl command reopen-log +(please refer to section 4.1.1) reopens the log files, -and also renames the old ones if you didn’t rename them.

    -

    7.2  Debug Console

    The Debug Console is an Erlang shell attached to an already running ejabberd server. -With this Erlang shell, an experienced administrator can perform complex tasks.

    This shell gives complete control over the ejabberd server, +and also renames the old ones if you didn’t rename them.

    + +

    7.2  Debug Console

    The Debug Console is an Erlang shell attached to an already running ejabberd server. +With this Erlang shell, an experienced administrator can perform complex tasks.

    This shell gives complete control over the ejabberd server, so it is important to use it with extremely care. There are some simple and safe examples in the article -Interconnecting Erlang Nodes

    To exit the shell, close the window or press the keys: control+c control+c.

    -

    7.3  Watchdog Alerts

    -

    ejabberd includes a watchdog mechanism that may be useful to developers +Interconnecting Erlang Nodes

    To exit the shell, close the window or press the keys: control+c control+c.

    + +

    7.3  Watchdog Alerts

    +

    ejabberd includes a watchdog mechanism that may be useful to developers when troubleshooting a problem related to memory usage. -If a process in the ejabberd server consumes more memory than the configured threshold, +If a process in the ejabberd server consumes more memory than the configured threshold, a message is sent to the XMPP accounts defined with the option -watchdog_admins - in the ejabberd configuration file.

    The syntax is: -

    watchdog_admins: [JID, ...]

    The memory consumed is measured in words: +watchdog_admins + in the ejabberd configuration file.

    The syntax is: +

    watchdog_admins: [JID, ...]

    The memory consumed is measured in words: a word on 32-bit architecture is 4 bytes, and a word on 64-bit architecture is 8 bytes. The threshold by default is 1000000 words. -This value can be configured with the option watchdog_large_heap, -or in a conversation with the watchdog alert bot.

    The syntax is: -

    watchdog_large_heap: Number

    Example configuration: -

    watchdog_admins:
+This value can be configured with the option watchdog_large_heap,
+or in a conversation with the watchdog alert bot.
    The syntax is:
+
    watchdog_large_heap: Number
    Example configuration:
+
    watchdog_admins:
   - "admin2@localhost"
   - "admin2@example.org"
 watchdog_large_heap: 30000000
-
    To remove watchdog admins, remove them in the option.
+

    To remove watchdog admins, remove them in the option. To remove all watchdog admins, set the option with an empty list: -

    watchdog_admins: []
-

    -

    Appendix A  Internationalization and Localization

    -

    The source code of ejabberd supports localization. +

    watchdog_admins: []
+

    + +

    Appendix A  Internationalization and Localization

    +

    The source code of ejabberd supports localization. The translators can edit the -gettext .po files -using any capable program (KBabel, Lokalize, Poedit...) or a simple text editor.

    Then gettext -is used to extract, update and export those .po files to the .msg format read by ejabberd. -To perform those management tasks, in the src/ directory execute make translations. -The translatable strings are extracted from source code to generate the file ejabberd.pot. +gettext .po files +using any capable program (KBabel, Lokalize, Poedit...) or a simple text editor.

    Then gettext +is used to extract, update and export those .po files to the .msg format read by ejabberd. +To perform those management tasks, in the src/ directory execute make translations. +The translatable strings are extracted from source code to generate the file ejabberd.pot. This file is merged with each .po file to produce updated .po files. -Finally those .po files are exported to .msg files, that have a format easily readable by ejabberd.

    All built-in modules support the xml:lang attribute inside IQ queries. -Figure A.1, for example, shows the reply to the following query: -

    <iq id='5'
+Finally those .po files are exported to .msg files, that have a format easily readable by ejabberd.
    All built-in modules support the xml:lang attribute inside IQ queries.
+Figure A.1, for example, shows the reply to the following query:
+
    <iq id='5'
     to='example.org'
     type='get'
     xml:lang='ru'>
   <query xmlns='http://jabber.org/protocol/disco#items'/>
 </iq>
-
    
+
    -discorus.png +discorus.png -
    -
    Figure A.1: Service Discovery when xml:lang=’ru’
    - -

    The Web Admin also supports the Accept-Language HTTP header.

    +
    +
    Figure A.1: Service Discovery when xml:lang=’ru’
    + +

    The Web Admin also supports the Accept-Language HTTP header.

    -webadmmainru.png +webadmmainru.png -
    -
    Figure A.2: Web Admin showing a virtual host when the web browser provides the -HTTP header ‘Accept-Language: ru’
    - -

    -

    Appendix B  Release Notes

    -

    Release notes are available from ejabberd Home Page

    -

    Appendix C  Acknowledgements

    Thanks to all people who contributed to this guide: -

    -

    Appendix D  Copyright Information

    Ejabberd Installation and Operation Guide.
    -Copyright © 2003 — 2013 ProcessOne

    This document is free software; you can redistribute it and/or +

    +
    Figure A.2: Web Admin showing a virtual host when the web browser provides the +HTTP header ‘Accept-Language: ru’
    + +

    + +

    Appendix B  Release Notes

    +

    Release notes are available from ejabberd Home Page

    + +

    Appendix C  Acknowledgements

    Thanks to all people who contributed to this guide: +

    + +

    Appendix D  Copyright Information

    Ejabberd Installation and Operation Guide.
    +Copyright © 2003 — 2014 ProcessOne

    This document is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version.

    This document is distributed in the hope that it will be useful, +of the License, or (at your option) any later version.

    This document is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details.

    You should have received a copy of the GNU General Public License along with +GNU General Public License for more details.

    You should have received a copy of the GNU General Public License along with this document; if not, write to the Free Software Foundation, Inc., 51 Franklin -Street, Fifth Floor, Boston, MA 02110-1301, USA.

    +Street, Fifth Floor, Boston, MA 02110-1301, USA.

    -
    This document was translated from LATEX by -HEVEA.
    - +
    This document was translated from LATEX by +HEVEA.
    + diff --git a/doc/guide.tex b/doc/guide.tex index 714a62a57..92beb1f04 100644 --- a/doc/guide.tex +++ b/doc/guide.tex @@ -68,6 +68,7 @@ \newcommand{\modannounce}{\module{mod\_announce}} \newcommand{\modblocking}{\module{mod\_blocking}} \newcommand{\modcaps}{\module{mod\_caps}} +\newcommand{\modcarboncopy}{\module{mod\_carboncopy}} \newcommand{\modconfigure}{\module{mod\_configure}} \newcommand{\moddisco}{\module{mod\_disco}} \newcommand{\modecho}{\module{mod\_echo}} @@ -92,6 +93,7 @@ \newcommand{\modsharedroster}{\module{mod\_shared\_roster}} \newcommand{\modsharedrosterldap}{\module{mod\_shared\_roster\_ldap}} \newcommand{\modsic}{\module{mod\_sic}} +\newcommand{\modsip}{\module{mod\_sip}} \newcommand{\modstats}{\module{mod\_stats}} \newcommand{\modtime}{\module{mod\_time}} \newcommand{\modvcard}{\module{mod\_vcard}} @@ -318,6 +320,7 @@ To compile \ejabberd{} on a `Unix-like' operating system, you need: \begin{itemize} \item GNU Make \item GCC +\item pkg-config \item Libexpat 1.95 or higher \item Erlang/OTP R15B or higher. \item Libyaml 1.4 or higher @@ -869,7 +872,7 @@ The available modules, their purpose and the options allowed by each one are: \begin{description} \titem{\texttt{ejabberd\_c2s}} Handles c2s connections.\\ - Options: \texttt{access}, \texttt{certfile}, \texttt{ciphers}, + Options: \texttt{access}, \texttt{certfile}, \texttt{ciphers}, \texttt{protocol\_options} \texttt{max\_ack\_queue}, \texttt{max\_fsm\_queue}, \texttt{max\_stanza\_size}, \texttt{resend\_on\_timeout}, \texttt{resume\_timeout}, \texttt{shaper}, @@ -884,6 +887,10 @@ The available modules, their purpose and the options allowed by each one are: (as defined in the Jabber Component Protocol (\xepref{0114}).\\ Options: \texttt{access}, \texttt{hosts}, \texttt{max\_fsm\_queue}, \texttt{service\_check\_from}, \texttt{shaper\_rule} + \titem{\texttt{ejabberd\_sip}} + Handles SIP requests as defined in + \footahref{http://tools.ietf.org/html/rfc3261}{RFC 3261}.\\ + Options: \texttt{certfile}, \texttt{tls} \titem{\texttt{ejabberd\_stun}} Handles STUN Binding requests as defined in \footahref{http://tools.ietf.org/html/rfc5389}{RFC 5389}.\\ @@ -919,6 +926,10 @@ This is a detailed description of each option allowed by the listening modules: To define a certificate file specific for a given domain, use the global option \term{domain\_certfile}. \titem{ciphers: Ciphers} OpenSSL ciphers list in the same format accepted by `\verb|openssl ciphers|' command. + \titem{protocol\_options: ProtocolOpts} \ind{options!protocol\_options} + List of general options relating to SSL/TLS. These map to \verb|OpenSSL's set_options()|. + For a full list of options available in ejabberd, \verb|see the source|. + The default entry is: \verb|"no_sslv2"| \titem{default\_host: undefined|HostName\}} If the HTTP request received by ejabberd contains the HTTP header \term{Host} with an ambiguous virtual host that doesn't match any one defined in ejabberd (see \ref{hostnames}), @@ -1095,6 +1106,10 @@ There are some additional global options that can be specified in the ejabberd c Full path to the file containing the SSL certificate for a specific domain. \titem{s2s\_ciphers: Ciphers} \ind{options!s2s\_ciphers} OpenSSL ciphers list in the same format accepted by `\verb|openssl ciphers|' command. + \titem{s2s\_protocol\_options: ProtocolOpts} \ind{options!s2s\_protocol\_options} + List of general options relating to SSL/TLS. These map to \verb|OpenSSL's set_options()|. + For a full list of options available in ejabberd, \verb|see the source|. + The default entry is: \verb|"no_sslv2"| \titem{outgoing\_s2s\_families: [Family, ...]} \ind{options!outgoing\_s2s\_families} Specify which address families to try, in what order. By default it first tries connecting with IPv4, if that fails it tries using IPv6. @@ -1814,7 +1829,7 @@ The syntax is: When a JID is checked to have access to \term{Accessname}, the server sequentially checks if that JID matches any of the ACLs that are named in the -second elements of the tuples in the list. If it matches, the first element of +first elements of the tuples in the list. If it matches, the second element of the first matched tuple is returned, otherwise the value `\term{deny}' is returned. @@ -1982,7 +1997,7 @@ listen: \ejabberd{} is able to act as a stand-alone STUN server (\footahref{http://tools.ietf.org/html/rfc5389}{RFC 5389}). Currently only Binding usage -is supported. In that role \ejabberd{} helps clients with Jingle ICE (\xepref{0176}) support to discover their external addresses and ports. +is supported. In that role \ejabberd{} helps clients with ICE (\footahref{http://tools.ietf.org/html/rfc5245}{RFC 5245}) or Jingle ICE (\xepref{0176}) support to discover their external addresses and ports. You should configure \term{ejabberd\_stun} listening module as described in \ref{listened} section. If \option{certfile} option is defined, \ejabberd{} multiplexes TCP and @@ -2022,6 +2037,61 @@ _stun._tcp IN SRV 0 0 3478 stun.example.com. _stuns._tcp IN SRV 0 0 5349 stun.example.com. \end{verbatim} +\makesubsection{sip}{SIP} +\ind{options!sip}\ind{sip} + +\ejabberd{} has built-in SIP support. In order to activate it you need to add +listeners for it, configure DNS properly and enable \modsip{} for +the desired virtual host. + +To add a listener you should configure \term{ejabberd\_sip} listening module as +described in \ref{listened} section. If option \option{tls} is specified, option +\option{certfile} must be specified as well, otherwise incoming TLS connections would fail. + +Example configuration with standard ports +(as per \footahref{http://tools.ietf.org/html/rfc3261}{RFC 3261}): +\begin{verbatim} +listen: + ... + - + port: 5060 + transport: udp + module: ejabberd_sip + - + port: 5060 + module: ejabberd_sip + - + port: 5061 + module: ejabberd_sip + tls: true + certfile: "/etc/ejabberd/server.pem" + ... +\end{verbatim} + +Note that there is no StartTLS support in SIP and \footahref{http://en.wikipedia.org/wiki/Server\_Name\_Indication}{SNI} support is somewhat tricky, so for TLS you have to configure +different virtual hosts on different ports if you have different certificate files for them. + +Next you need to configure DNS SIP records for your virtual domains. +Refer to \footahref{http://tools.ietf.org/html/rfc3263}{RFC 3263} for the detailed explanation. +Simply put, you should add NAPTR and SRV records for your domains. +Skip NAPTR configuration if your DNS provider doesn't support this type of records. +It's not fatal, however, highly recommended. + +Example configuration of NAPTR records: +\begin{verbatim} +example.com IN NAPTR 10 0 "s" "SIPS+D2T" "" _sips._tcp.example.com. +example.com IN NAPTR 20 0 "s" "SIP+D2T" "" _sip._tcp.example.com. +example.com IN NAPTR 30 0 "s" "SIP+D2U" "" _sip._udp.example.com. +\end{verbatim} + +Example configuration of SRV records with standard ports +(as per \footahref{http://tools.ietf.org/html/rfc3261}{RFC 3261}): +\begin{verbatim} +_sip._udp IN SRV 0 0 5060 sip.example.com. +_sip._tcp IN SRV 0 0 5060 sip.example.com. +_sips._tcp IN SRV 0 0 5061 sip.example.com. +\end{verbatim} + \makesubsection{includeconfigfile}{Include Additional Configuration Files} \ind{options!includeconfigfile}\ind{includeconfigfile} @@ -2551,8 +2621,7 @@ modules: mod_echo: {} \end{verbatim} \item In the second example the modules \modecho{}, \modtime{}, and - \modversion{} are loaded without options. Remark that, besides the last entry, - all entries end with a comma: + \modversion{} are loaded without options. \begin{verbatim} modules: mod_echo: {} @@ -2575,6 +2644,7 @@ The following table lists all modules included in \ejabberd{}. \hline \ahrefloc{modannounce}{\modannounce{}} & Manage announcements & recommends \modadhoc{} \\ \hline \modblocking{} & Simple Communications Blocking (\xepref{0191}) & \modprivacy{} \\ \hline \modcaps{} & Entity Capabilities (\xepref{0115}) & \\ + \hline \modcarboncopy{} & Message Carbons (\xepref{0280}) & \\ \hline \modconfigure{} & Server configuration using Ad-Hoc & \modadhoc{} \\ \hline \ahrefloc{moddisco}{\moddisco{}} & Service Discovery (\xepref{0030}) & \\ \hline \ahrefloc{modecho}{\modecho{}} & Echoes XMPP stanzas & \\ @@ -2599,6 +2669,7 @@ The following table lists all modules included in \ejabberd{}. \hline \ahrefloc{modsharedroster}{\modsharedroster{}} & Shared roster management & \modroster{} \\ \hline \ahrefloc{modsharedrosterldap}{\modsharedrosterldap{}} & LDAP Shared roster management & \modroster{} \\ \hline \ahrefloc{modsic}{\modsic{}} & Server IP Check (\xepref{0279}) & \\ + \hline \ahrefloc{modsip}{\modsip{}} & SIP Registrar/Proxy (\footahref{http://tools.ietf.org/html/rfc3261}{RFC 3261}) & \term{ejabberd\_sip} \\ \hline \ahrefloc{modstats}{\modstats{}} & Statistics Gathering (\xepref{0039}) & \\ \hline \ahrefloc{modtime}{\modtime{}} & Entity Time (\xepref{0202}) & \\ \hline \ahrefloc{modvcard}{\modvcard{}} & vcard-temp (\xepref{0054}) & \\ @@ -4639,6 +4710,49 @@ Options: \iqdiscitem{\ns{urn:xmpp:sic:0}} \end{description} +\makesubsection{modsip}{\modsip{}} +\ind{modules!\modsip{}} +This module adds SIP proxy/registrar support for the corresponding virtual host. +Note that it is not enough to just load this module only. You should also configure +listeners and DNS records properly. See section \ref{sip} for the full explanation. + +Example configuration: +\begin{verbatim} +modules: + ... + mod_sip: {} + ... +\end{verbatim} + +Options: +\begin{description} +\titem{via: [\{type: Type, host: Host, port: Port\}]}\ind{options!via}With +this option for every \term{Type} you can specify \term{Host} and \term{Port} +to set in \term{Via} header of outgoing SIP messages, where \term{Type} can be +\term{udp}, \term{tcp} or \term{tls}. \term{Host} is a string and \term{Port} is +a non negative integer. This is useful if you're running your server in a non-standard +network topology. Example configuration: +\begin{verbatim} +modules: + ... + mod_sip: + via: + - + type: tls + host: "sip-tls.example.com" + port: 5061 + - + type: tcp + host: "sip-tcp.example.com" + port: 5060 + - + type: udp + host: "sip-udp.example.com" + port: 5060 + ... +\end{verbatim} +\end{description} + \makesubsection{modstats}{\modstats{}} \ind{modules!\modstats{}}\ind{protocols!XEP-0039: Statistics Gathering}\ind{statistics} @@ -5031,6 +5145,9 @@ This can be used by other scripts to determine automatically if a command succeeded or failed, for example using: \term{echo \$?} +If you use Bash, you can get Bash completion by copying the file \term{tools/ejabberdctl.bc} +to the directory \term{/etc/bash\_completion.d/} (in Debian, Ubuntu, Fedora and maybe others). + \makesubsection{ectl-commands}{ejabberdctl Commands} When \term{ejabberdctl} is executed without any parameter, @@ -5992,7 +6109,7 @@ Thanks to all people who contributed to this guide: \makechapter{copyright}{Copyright Information} Ejabberd Installation and Operation Guide.\\ -Copyright \copyright{} 2003 --- 2013 ProcessOne +Copyright \copyright{} 2003 --- 2014 ProcessOne This document is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc/introduction.tex b/doc/introduction.tex index 163312b38..fee27048c 100644 --- a/doc/introduction.tex +++ b/doc/introduction.tex @@ -128,6 +128,7 @@ Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features \item \txepref{0060}{Publish-Subscribe} component with support for \txepref{0163}{Personal Eventing via Pubsub}. \item Support for web clients: \txepref{0025}{HTTP Polling} and \txepref{0206}{HTTP Binding (BOSH)} services. \item IRC transport. +\item SIP support. \item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports. \end{itemize} \end{itemize} diff --git a/ejabberd.yml.example b/ejabberd.yml.example index 28f61fdbe..1f55fe990 100644 --- a/ejabberd.yml.example +++ b/ejabberd.yml.example @@ -86,6 +86,12 @@ listen: ## ## certfile: "/path/to/ssl.pem" ## starttls: true + ## + ## Custom OpenSSL options + ## + ## protocol_options: + ## - "no_sslv3" + ## - "no_tlsv1" max_stanza_size: 65536 shaper: c2s_shaper access: c2s @@ -144,6 +150,12 @@ listen: ## ## s2s_certfile: "/path/to/ssl.pem" +## Custom OpenSSL options +## +## s2s_protocol_options: +## - "no_sslv3" +## - "no_tlsv1" + ## ## domain_certfile: Specify a different certificate for each served hostname. ## @@ -514,6 +526,7 @@ modules: access: announce mod_blocking: {} # requires mod_privacy mod_caps: {} + mod_carboncopy: {} mod_configure: {} # requires mod_adhoc mod_disco: {} ## mod_echo: {} diff --git a/include/adhoc.hrl b/include/adhoc.hrl index 0910dc621..f16b188ae 100644 --- a/include/adhoc.hrl +++ b/include/adhoc.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ejabberd.hrl b/include/ejabberd.hrl index 736a2aa42..67ac763a2 100644 --- a/include/ejabberd.hrl +++ b/include/ejabberd.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ejabberd_commands.hrl b/include/ejabberd_commands.hrl index 116bb7357..5f35ba9ec 100644 --- a/include/ejabberd_commands.hrl +++ b/include/ejabberd_commands.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ejabberd_config.hrl b/include/ejabberd_config.hrl index bf3952846..cbc8a5e69 100644 --- a/include/ejabberd_config.hrl +++ b/include/ejabberd_config.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ejabberd_ctl.hrl b/include/ejabberd_ctl.hrl index 09a5287ee..e87dd03c2 100644 --- a/include/ejabberd_ctl.hrl +++ b/include/ejabberd_ctl.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ejabberd_http.hrl b/include/ejabberd_http.hrl index 542dc0cdb..73f5aa960 100644 --- a/include/ejabberd_http.hrl +++ b/include/ejabberd_http.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ejabberd_web_admin.hrl b/include/ejabberd_web_admin.hrl index 6c939f9e9..cd3c3c0ec 100644 --- a/include/ejabberd_web_admin.hrl +++ b/include/ejabberd_web_admin.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/eldap.hrl b/include/eldap.hrl index 30ec0e954..2b1676d15 100644 --- a/include/eldap.hrl +++ b/include/eldap.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/http_bind.hrl b/include/http_bind.hrl index 2eac91e9d..a318561cf 100644 --- a/include/http_bind.hrl +++ b/include/http_bind.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/jlib.hrl b/include/jlib.hrl index 13fb8fcf4..8b749955a 100644 --- a/include/jlib.hrl +++ b/include/jlib.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/logger.hrl b/include/logger.hrl index 17fad8d38..439567d97 100644 --- a/include/logger.hrl +++ b/include/logger.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- -define(PRINT(Format, Args), io:format(Format, Args)). diff --git a/include/mod_muc_room.hrl b/include/mod_muc_room.hrl index 3bbc9318e..c32c47a17 100644 --- a/include/mod_muc_room.hrl +++ b/include/mod_muc_room.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -59,6 +58,7 @@ voice_request_min_interval = 1800 :: non_neg_integer(), max_users = ?MAX_USERS_DEFAULT :: non_neg_integer() | none, logging = false :: boolean(), + vcard = <<"">> :: boolean(), captcha_whitelist = (?SETS):empty() :: gb_set() }). diff --git a/include/mod_privacy.hrl b/include/mod_privacy.hrl index f70982b0f..848de8640 100644 --- a/include/mod_privacy.hrl +++ b/include/mod_privacy.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/mod_proxy65.hrl b/include/mod_proxy65.hrl index d0779af14..72fd70db2 100644 --- a/include/mod_proxy65.hrl +++ b/include/mod_proxy65.hrl @@ -2,7 +2,7 @@ %%% RFC 1928 constants. %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -14,10 +14,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/mod_roster.hrl b/include/mod_roster.hrl index 4751eec38..c14aa0cf8 100644 --- a/include/mod_roster.hrl +++ b/include/mod_roster.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/ns.hrl b/include/ns.hrl index 2cf218c7c..aa6150cfd 100644 --- a/include/ns.hrl +++ b/include/ns.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -12,10 +12,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/include/pubsub.hrl b/include/pubsub.hrl index 4f2cc9f38..08f8ea0fe 100644 --- a/include/pubsub.hrl +++ b/include/pubsub.hrl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% copyright 2006-2013 ProcessOne +%%% copyright 2006-2014 ProcessOne %%% %%% This file contains pubsub types definition. %%% ==================================================================== diff --git a/priv/msgs/he.po b/priv/msgs/he.po index 581f554bf..f013b93b8 100644 --- a/priv/msgs/he.po +++ b/priv/msgs/he.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: Isratine Citizen \n" -"Language-Team: Rahut \n" +"Language-Team: Rahut \n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13,7 +13,7 @@ msgstr "" "X-Poedit-Language: Hebrew (עברית)\n" "X-Generator: Poedit 1.5.4\n" -#: ejabberd_c2s.erl:424 ejabberd_c2s.erl:729 +#: ejabberd_c2s.erl:424 ejabberd_c2s.erl:727 msgid "Use of STARTTLS required" msgstr "נדרש שימוש של STARTTLS" @@ -21,15 +21,16 @@ msgstr "נדרש שימוש של STARTTLS" msgid "No resource provided" msgstr "לא סופק משאב" -#: ejabberd_c2s.erl:1200 +#: ejabberd_c2s.erl:1197 msgid "Replaced by new connection" msgstr "הוחלף בחיבור חדש" -#: ejabberd_c2s.erl:1888 +#: ejabberd_c2s.erl:1885 msgid "Your active privacy list has denied the routing of this stanza." msgstr "רשימת הפרטיות הפעילה שלך אסרה את הניתוב של סטנזה זו." # תמליל +# כפי שעינייך רואות #: ejabberd_captcha.erl:96 ejabberd_captcha.erl:152 ejabberd_captcha.erl:178 msgid "Enter the text you see" msgstr "הזן את הטקסט אותו הינך רואה" @@ -37,7 +38,7 @@ msgstr "הזן את הטקסט אותו הינך רואה" # כדי שלא לחסומן #: ejabberd_captcha.erl:101 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s" -msgstr "הודעותייך אל ~s הינן חסומות. כדי למנוע את חסימתן, נא לבקר אצל ~s" +msgstr "ההודעות שלך לערוץ ~s הינן חסומות. כדי למנוע את חסימתן, בקר בכתובת ~s" # בקר את עמוד #: ejabberd_captcha.erl:134 @@ -64,65 +65,68 @@ msgstr "פינג" msgid "Pong" msgstr "פונג" -#: mod_announce.erl:516 +#: mod_announce.erl:507 mod_announce_odbc.erl:499 msgid "Really delete message of the day?" msgstr "באמת למחוק את הודעת היום?" -#: mod_announce.erl:524 mod_configure.erl:1083 mod_configure.erl:1128 +#: mod_announce.erl:515 mod_announce_odbc.erl:507 mod_configure.erl:1083 +#: mod_configure.erl:1128 msgid "Subject" msgstr "נושא" -#: mod_announce.erl:529 mod_configure.erl:1088 mod_configure.erl:1133 +#: mod_announce.erl:520 mod_announce_odbc.erl:512 mod_configure.erl:1088 +#: mod_configure.erl:1133 msgid "Message body" msgstr "גוף הודעה" -#: mod_announce.erl:609 +#: mod_announce.erl:600 mod_announce_odbc.erl:592 #, fuzzy msgid "No body provided for announce message" msgstr "לא סופק גוף עבור announce message" -#: mod_announce.erl:644 +#: mod_announce.erl:635 mod_announce_odbc.erl:627 msgid "Announcements" msgstr "מודעות" -#: mod_announce.erl:646 +#: mod_announce.erl:637 mod_announce_odbc.erl:629 msgid "Send announcement to all users" msgstr "שלח מודעות אל כל המשתמשים" # אצל כל -#: mod_announce.erl:648 +#: mod_announce.erl:639 mod_announce_odbc.erl:631 msgid "Send announcement to all users on all hosts" msgstr "שלח מודעות אל כל המשתמשים בכל המארחים" -#: mod_announce.erl:650 +#: mod_announce.erl:641 mod_announce_odbc.erl:633 msgid "Send announcement to all online users" msgstr "שלח מודעות אל כל המשתמשים המקוונים" -#: mod_announce.erl:652 mod_configure.erl:1078 mod_configure.erl:1123 +#: mod_announce.erl:643 mod_announce_odbc.erl:635 mod_configure.erl:1078 +#: mod_configure.erl:1123 msgid "Send announcement to all online users on all hosts" msgstr "שלח מודעות אל כל המשתמשים המקוונים בכל המארחים" -#: mod_announce.erl:654 +#: mod_announce.erl:645 mod_announce_odbc.erl:637 msgid "Set message of the day and send to online users" msgstr "קבע הודעת היום ושלח אל משתמשים מקוונים" -#: mod_announce.erl:656 +#: mod_announce.erl:647 mod_announce_odbc.erl:639 msgid "Set message of the day on all hosts and send to online users" msgstr "קבע הודעת היום בכל המארחים ושלח אל משתמשים מקוונים" -#: mod_announce.erl:658 +#: mod_announce.erl:649 mod_announce_odbc.erl:641 msgid "Update message of the day (don't send)" msgstr "עדכן הודעת היום (אל תשלח)" -#: mod_announce.erl:660 +#: mod_announce.erl:651 mod_announce_odbc.erl:643 msgid "Update message of the day on all hosts (don't send)" msgstr "עדכן הודעת היום בכל המארחים (אל תשלח)" -#: mod_announce.erl:662 +#: mod_announce.erl:653 mod_announce_odbc.erl:645 msgid "Delete message of the day" msgstr "מחק הודעת היום" -#: mod_announce.erl:664 +#: mod_announce.erl:655 mod_announce_odbc.erl:647 msgid "Delete message of the day on all hosts" msgstr "מחק הודעת היום בכל המארחים" @@ -131,7 +135,7 @@ msgstr "מחק הודעת היום בכל המארחים" msgid "Configuration" msgstr "תצורה" -#: mod_configure.erl:125 mod_configure.erl:576 web/ejabberd_web_admin.erl:1929 +#: mod_configure.erl:125 mod_configure.erl:576 web/ejabberd_web_admin.erl:1936 msgid "Database" msgstr "מסד נתונים" @@ -144,7 +148,7 @@ msgid "Stop Modules" msgstr "הפסק מודולים" # גיבוי -#: mod_configure.erl:131 mod_configure.erl:604 web/ejabberd_web_admin.erl:1930 +#: mod_configure.erl:131 mod_configure.erl:604 web/ejabberd_web_admin.erl:1937 msgid "Backup" msgstr "גבה" @@ -197,9 +201,10 @@ msgstr "השג סיסמת משתמש" msgid "Change User Password" msgstr "שנה סיסמת משתמש" +# התחברות #: mod_configure.erl:155 mod_configure.erl:523 mod_configure.erl:1272 msgid "Get User Last Login Time" -msgstr "השג זמן התחברות אחרון של משתמש" +msgstr "השג זמן כניסה אחרון של משתמש" #: mod_configure.erl:157 mod_configure.erl:524 mod_configure.erl:1284 msgid "Get User Statistics" @@ -243,15 +248,15 @@ msgstr "כל המשתמשים" msgid "Outgoing s2s Connections" msgstr "חיבורי s2s יוצאים" -#: mod_configure.erl:503 web/ejabberd_web_admin.erl:1900 +#: mod_configure.erl:503 web/ejabberd_web_admin.erl:1907 msgid "Running Nodes" msgstr "ממסרים שמורצים כעת" -#: mod_configure.erl:504 web/ejabberd_web_admin.erl:1902 +#: mod_configure.erl:504 web/ejabberd_web_admin.erl:1909 msgid "Stopped Nodes" msgstr "ממסרים שנפסקו" -#: mod_configure.erl:577 mod_configure.erl:587 web/ejabberd_web_admin.erl:1946 +#: mod_configure.erl:577 mod_configure.erl:587 web/ejabberd_web_admin.erl:1953 msgid "Modules" msgstr "מודולים" @@ -262,7 +267,7 @@ msgstr "ניהול גיבוי" # help is needed with spool #: mod_configure.erl:579 msgid "Import Users From jabberd14 Spool Files" -msgstr "ייבוא משתמשים מן קבצי סליל (Spool Files) של jabberd14" +msgstr "ייבוא משתמשים מתוך קבצי סליל (Spool Files) של jabberd14" #: mod_configure.erl:699 msgid "To ~s" @@ -336,7 +341,7 @@ msgstr "נתיב אל קובץ" #: mod_configure.erl:997 msgid "Restore Backup from File at " -msgstr "שחזר גיבוי מן קובץ אצל " +msgstr "שחזר גיבוי מתוך קובץ אצל " #: mod_configure.erl:1011 msgid "Dump Backup to Text File at " @@ -348,7 +353,7 @@ msgstr "הזן נתיב אל קובץ טקסט" #: mod_configure.erl:1025 msgid "Import User from File at " -msgstr "ייבוא משתמש מן קובץ אצל " +msgstr "ייבוא משתמש מתוך קובץ אצל " #: mod_configure.erl:1029 msgid "Enter path to jabberd14 spool file" @@ -356,7 +361,7 @@ msgstr "הזן נתיב אל קובץ סליל (spool file) של jabberd14" #: mod_configure.erl:1039 msgid "Import Users from Dir at " -msgstr "ייבוא משתמשים מן מדור אצל " +msgstr "ייבוא משתמשים מתוך מדור אצל " #: mod_configure.erl:1043 msgid "Enter path to jabberd14 spool dir" @@ -388,17 +393,16 @@ msgstr "תצורת גישה" msgid "Access rules" msgstr "כללי גישה" -# מזהה Jabber #: mod_configure.erl:1200 mod_configure.erl:1222 mod_configure.erl:1234 #: mod_configure.erl:1246 mod_configure.erl:1258 mod_configure.erl:1275 #: mod_configure.erl:1287 mod_configure.erl:1650 mod_configure.erl:1700 -#: mod_configure.erl:1721 mod_roster.erl:1345 mod_vcard.erl:543 -#: mod_vcard_ldap.erl:554 +#: mod_configure.erl:1721 mod_roster.erl:943 mod_roster_odbc.erl:1060 +#: mod_vcard.erl:472 mod_vcard_ldap.erl:554 mod_vcard_odbc.erl:448 msgid "Jabber ID" -msgstr "‫JID" +msgstr "מזהה Jabber" #: mod_configure.erl:1205 mod_configure.erl:1263 mod_configure.erl:1651 -#: mod_configure.erl:1861 mod_muc/mod_muc_room.erl:3218 mod_register.erl:235 +#: mod_configure.erl:1863 mod_muc/mod_muc_room.erl:3224 mod_register.erl:235 #: web/ejabberd_web_admin.erl:1520 msgid "Password" msgstr "סיסמה" @@ -415,19 +419,19 @@ msgstr "מספר של משתמשים רשומים" msgid "Number of online users" msgstr "מספר של משתמשים מקוונים" -#: mod_configure.erl:1682 web/ejabberd_web_admin.erl:1587 -#: web/ejabberd_web_admin.erl:1736 +#: mod_configure.erl:1682 web/ejabberd_web_admin.erl:1588 +#: web/ejabberd_web_admin.erl:1743 msgid "Never" msgstr "אף פעם" -#: mod_configure.erl:1696 web/ejabberd_web_admin.erl:1600 -#: web/ejabberd_web_admin.erl:1749 +#: mod_configure.erl:1696 web/ejabberd_web_admin.erl:1601 +#: web/ejabberd_web_admin.erl:1756 msgid "Online" msgstr "מקוון" #: mod_configure.erl:1701 msgid "Last login" -msgstr "התחברות אחרונה" +msgstr "כניסה אחרונה" #: mod_configure.erl:1722 msgid "Roster size" @@ -441,56 +445,56 @@ msgstr "כתובות IP" msgid "Resources" msgstr "משאבים" -#: mod_configure.erl:1848 +#: mod_configure.erl:1850 msgid "Administration of " msgstr "ניהול של " -#: mod_configure.erl:1851 +#: mod_configure.erl:1853 msgid "Action on user" msgstr "פעולה על משתמש" -#: mod_configure.erl:1855 +#: mod_configure.erl:1857 msgid "Edit Properties" msgstr "ערוך מאפיינים" -#: mod_configure.erl:1858 web/ejabberd_web_admin.erl:1762 +#: mod_configure.erl:1860 web/ejabberd_web_admin.erl:1769 msgid "Remove User" msgstr "הסר משתמש" -#: mod_irc/mod_irc.erl:207 mod_muc/mod_muc.erl:406 +#: mod_irc/mod_irc.erl:201 mod_irc/mod_irc_odbc.erl:196 +#: mod_muc/mod_muc.erl:336 mod_muc/mod_muc_odbc.erl:342 msgid "Access denied by service policy" msgstr "גישה נדחתה על ידי פוליסת שירות" -#: mod_irc/mod_irc.erl:409 +#: mod_irc/mod_irc.erl:401 mod_irc/mod_irc_odbc.erl:398 msgid "IRC Transport" msgstr "מוביל IRC" -#: mod_irc/mod_irc.erl:436 +#: mod_irc/mod_irc.erl:428 mod_irc/mod_irc_odbc.erl:425 msgid "ejabberd IRC module" msgstr "מודול IRC של ejabberd" -#: mod_irc/mod_irc.erl:600 +#: mod_irc/mod_irc.erl:559 mod_irc/mod_irc_odbc.erl:568 msgid "You need an x:data capable client to configure mod_irc settings" -msgstr "" -"עליך לעשות שימוש בלקוח שביכולתו להבין x:data בכדי להגדיר הגדרות של mod_irc" +msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי להגדיר הגדרות של mod_irc" -#: mod_irc/mod_irc.erl:607 +#: mod_irc/mod_irc.erl:566 mod_irc/mod_irc_odbc.erl:575 msgid "Registration in mod_irc for " msgstr "רישום בתוך mod_irc עבור " -#: mod_irc/mod_irc.erl:612 +#: mod_irc/mod_irc.erl:571 mod_irc/mod_irc_odbc.erl:580 msgid "" "Enter username, encodings, ports and passwords you wish to use for " "connecting to IRC servers" msgstr "" -"הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש עבור התחברות אל " +"הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש לשם התחברות אל " "שרתים של IRC" -#: mod_irc/mod_irc.erl:617 +#: mod_irc/mod_irc.erl:576 mod_irc/mod_irc_odbc.erl:585 msgid "IRC Username" msgstr "שם משתמש IRC" -#: mod_irc/mod_irc.erl:627 +#: mod_irc/mod_irc.erl:586 mod_irc/mod_irc_odbc.erl:595 msgid "" "If you want to specify different ports, passwords, encodings for IRC " "servers, fill this list with values in format '{\"irc server\", \"encoding" @@ -501,7 +505,7 @@ msgstr "" "רשימה זו עם ערכים בפורמט '{\"irc server\", \"encoding\", port, \"password" "\"}'. באופן משתמט שירות זה משתמש בקידוד \"~s\", פורט ~p, סיסמה ריקה." -#: mod_irc/mod_irc.erl:639 +#: mod_irc/mod_irc.erl:598 mod_irc/mod_irc_odbc.erl:607 msgid "" "Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef." "net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." @@ -510,112 +514,115 @@ msgstr "" "net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]." # פרמטרי חיבור -#: mod_irc/mod_irc.erl:644 +#: mod_irc/mod_irc.erl:603 mod_irc/mod_irc_odbc.erl:612 msgid "Connections parameters" msgstr "פרמטרים של חיבור" -#: mod_irc/mod_irc.erl:787 +#: mod_irc/mod_irc.erl:728 mod_irc/mod_irc_odbc.erl:757 msgid "Join IRC channel" msgstr "הצטרף אל ערוץ IRC" # לא לשים סימן # ראשון # לא לשים את סימן # הראשון -#: mod_irc/mod_irc.erl:791 +#: mod_irc/mod_irc.erl:732 mod_irc/mod_irc_odbc.erl:761 msgid "IRC channel (don't put the first #)" msgstr "ערוץ IRC (אל תשים סימן # ראשון)" -#: mod_irc/mod_irc.erl:796 +#: mod_irc/mod_irc.erl:737 mod_irc/mod_irc_odbc.erl:766 msgid "IRC server" msgstr "שרת IRC" -#: mod_irc/mod_irc.erl:829 mod_irc/mod_irc.erl:833 +#: mod_irc/mod_irc.erl:770 mod_irc/mod_irc.erl:774 +#: mod_irc/mod_irc_odbc.erl:799 mod_irc/mod_irc_odbc.erl:803 msgid "Join the IRC channel here." msgstr "הצטרף אל ערוץ IRC כאן." -#: mod_irc/mod_irc.erl:837 +#: mod_irc/mod_irc.erl:778 mod_irc/mod_irc_odbc.erl:807 msgid "Join the IRC channel in this Jabber ID: ~s" -msgstr "הצטרף אל ערוץ IRC בכתובת JID זו: ~s" +msgstr "הצטרף אל ערוץ IRC במזהה Jabber זה: ~s" -#: mod_irc/mod_irc.erl:915 +#: mod_irc/mod_irc.erl:863 mod_irc/mod_irc_odbc.erl:904 msgid "IRC settings" msgstr "הגדרות IRC" # השלם -#: mod_irc/mod_irc.erl:920 +#: mod_irc/mod_irc.erl:868 mod_irc/mod_irc_odbc.erl:909 msgid "" "Enter username and encodings you wish to use for connecting to IRC servers. " "Press 'Next' to get more fields to fill in. Press 'Complete' to save " "settings." msgstr "" -"הזן שם משתמש וקידודים בהם ברצונך להשתמש עבור התחברות אל שרתים של IRC. לחץ " +"הזן שם משתמש וקידודים בהם ברצונך להשתמש לשם התחברות אל שרתים של IRC. לחץ " "'הבא' כדי להשיג עוד שדות למילוי. לחץ 'סיים' כדי לשמור הגדרות." -#: mod_irc/mod_irc.erl:926 +#: mod_irc/mod_irc.erl:874 mod_irc/mod_irc_odbc.erl:915 msgid "IRC username" msgstr "שם משתמש IRC" -#: mod_irc/mod_irc.erl:975 +#: mod_irc/mod_irc.erl:923 mod_irc/mod_irc_odbc.erl:964 msgid "Password ~b" msgstr "סיסמה ~b" -#: mod_irc/mod_irc.erl:980 +#: mod_irc/mod_irc.erl:928 mod_irc/mod_irc_odbc.erl:969 msgid "Port ~b" msgstr "פורט ~b" -#: mod_irc/mod_irc.erl:985 +#: mod_irc/mod_irc.erl:933 mod_irc/mod_irc_odbc.erl:974 msgid "Encoding for server ~b" msgstr "קידוד עבור שרת ~b" -#: mod_irc/mod_irc.erl:994 +#: mod_irc/mod_irc.erl:942 mod_irc/mod_irc_odbc.erl:983 msgid "Server ~b" msgstr "שרת ~b" -#: mod_muc/mod_muc.erl:520 +#: mod_muc/mod_muc.erl:449 mod_muc/mod_muc_odbc.erl:456 msgid "Only service administrators are allowed to send service messages" msgstr "רק מנהלי שירות רשאים לשלוח הודעות שירות" -#: mod_muc/mod_muc.erl:564 +#: mod_muc/mod_muc.erl:493 mod_muc/mod_muc_odbc.erl:500 msgid "Room creation is denied by service policy" msgstr "יצירת חדר נדחתה על ידי פוליסת שירות" -#: mod_muc/mod_muc.erl:571 +#: mod_muc/mod_muc.erl:500 mod_muc/mod_muc_odbc.erl:507 msgid "Conference room does not exist" msgstr "חדר ועידה לא קיים" -#: mod_muc/mod_muc.erl:673 +#: mod_muc/mod_muc.erl:582 mod_muc/mod_muc_odbc.erl:595 msgid "Chatrooms" msgstr "חדרי שיחה" # to register nickname -#: mod_muc/mod_muc.erl:829 +#: mod_muc/mod_muc.erl:712 mod_muc/mod_muc_odbc.erl:729 msgid "You need a client that supports x:data to register the nickname" -msgstr "עליך לעשות שימוש בלקוח שתומך x:data בכדי לרשום את שם הכינוי" +msgstr "עליך להשתמש בלקוח אשר תומך x:data בכדי לרשום את שם הכינוי" -#: mod_muc/mod_muc.erl:835 +#: mod_muc/mod_muc.erl:718 mod_muc/mod_muc_odbc.erl:735 msgid "Nickname Registration at " msgstr "רישום שם כינוי אצל " # אותו ברצונך לרשום -#: mod_muc/mod_muc.erl:839 +#: mod_muc/mod_muc.erl:722 mod_muc/mod_muc_odbc.erl:739 msgid "Enter nickname you want to register" -msgstr "הזן שם כינוי שברצונך לרושמו" +msgstr "הזן שם כינוי אשר ברצונך לרושמו" -#: mod_muc/mod_muc.erl:840 mod_muc/mod_muc_room.erl:3804 mod_roster.erl:1346 -#: mod_vcard.erl:435 mod_vcard.erl:548 +#: mod_muc/mod_muc.erl:723 mod_muc/mod_muc_odbc.erl:740 +#: mod_muc/mod_muc_room.erl:3810 mod_roster.erl:944 mod_roster_odbc.erl:1061 +#: mod_vcard.erl:364 mod_vcard.erl:477 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:453 msgid "Nickname" msgstr "שם כינוי" # note: another person > someone else -#: mod_muc/mod_muc.erl:924 mod_muc/mod_muc_room.erl:1059 -#: mod_muc/mod_muc_room.erl:1783 +#: mod_muc/mod_muc.erl:762 mod_muc/mod_muc_odbc.erl:784 +#: mod_muc/mod_muc_room.erl:1064 mod_muc/mod_muc_room.erl:1787 msgid "That nickname is registered by another person" msgstr "שם כינוי זה הינו רשום על ידי מישהו אחר" -#: mod_muc/mod_muc.erl:951 +#: mod_muc/mod_muc.erl:788 mod_muc/mod_muc_odbc.erl:811 msgid "You must fill in field \"Nickname\" in the form" msgstr "עליך למלא את השדה \"שם כינוי\" בתוך התבנית" -#: mod_muc/mod_muc.erl:971 +#: mod_muc/mod_muc.erl:808 mod_muc/mod_muc_odbc.erl:831 msgid "ejabberd MUC module" msgstr "מודול MUC של ejabberd" @@ -656,7 +663,7 @@ msgid "is now known as" msgstr "ידועה כעת בכינוי" #: mod_muc/mod_muc_log.erl:417 mod_muc/mod_muc_log.erl:688 -#: mod_muc/mod_muc_room.erl:2389 +#: mod_muc/mod_muc_room.erl:2393 msgid " has set the subject to: " msgstr " הגדיר/ה את הנושא אל: " @@ -761,365 +768,368 @@ msgid "Room Occupants" msgstr "נוכחי חדר" # נעברה -#: mod_muc/mod_muc_room.erl:170 +#: mod_muc/mod_muc_room.erl:174 msgid "Traffic rate limit is exceeded" msgstr "מגבלת שיעור תעבורה נחצתה" -#: mod_muc/mod_muc_room.erl:242 +#: mod_muc/mod_muc_room.erl:246 msgid "" "This participant is kicked from the room because he sent an error message" -msgstr "משתתף זה נבעט מן החדר משום שהוא שלח הודעת שגיאה" +msgstr "משתתף זה נבעט מתוך החדר מכיוון שהוא שלח הודעת שגיאה" -#: mod_muc/mod_muc_room.erl:251 +#: mod_muc/mod_muc_room.erl:255 msgid "It is not allowed to send private messages to the conference" msgstr "אין זה מותר לשלוח הודעות פרטיות אל הועידה" -#: mod_muc/mod_muc_room.erl:328 +#: mod_muc/mod_muc_room.erl:332 msgid "Please, wait for a while before sending new voice request" msgstr "אנא, המתן לזמן מה לפני שליחת בקשת ביטוי חדשה" -#: mod_muc/mod_muc_room.erl:343 +#: mod_muc/mod_muc_room.erl:347 msgid "Voice requests are disabled in this conference" msgstr "בקשות ביטוי מנוטרלות בועידה זו" -# לחלץ -#: mod_muc/mod_muc_room.erl:360 +#: mod_muc/mod_muc_room.erl:364 msgid "Failed to extract JID from your voice request approval" -msgstr "נכשל לחלץ JID מן אישור בקשת הביטוי שלך" +msgstr "נכשל לחלץ JID מתוך אישור בקשת הביטוי שלך" -#: mod_muc/mod_muc_room.erl:389 +#: mod_muc/mod_muc_room.erl:393 msgid "Only moderators can approve voice requests" msgstr "רק אחראים יכולים לאשר בקשות ביטוי" # הולם -#: mod_muc/mod_muc_room.erl:404 +#: mod_muc/mod_muc_room.erl:408 msgid "Improper message type" msgstr "טיפוס הודעה לא מתאים" -#: mod_muc/mod_muc_room.erl:514 +#: mod_muc/mod_muc_room.erl:518 msgid "" "This participant is kicked from the room because he sent an error message to " "another participant" -msgstr "משתתף זה נבעט מן החדר משום שהוא שלח הודעת שגיאה אל משתתף אחר" +msgstr "משתתף זה נבעט מתוך החדר משום שהוא שלח הודעת שגיאה אל משתתף אחר" -#: mod_muc/mod_muc_room.erl:527 +#: mod_muc/mod_muc_room.erl:531 msgid "It is not allowed to send private messages of type \"groupchat\"" msgstr "אין זה מותר לשלוח הודעות פרטיות מן טיפוס \"groupchat\"" -#: mod_muc/mod_muc_room.erl:539 mod_muc/mod_muc_room.erl:607 +#: mod_muc/mod_muc_room.erl:543 mod_muc/mod_muc_room.erl:611 msgid "Recipient is not in the conference room" msgstr "מקבל אינו מצוי בחדר הועידה" # אסור -#: mod_muc/mod_muc_room.erl:560 mod_muc/mod_muc_room.erl:581 +#: mod_muc/mod_muc_room.erl:564 mod_muc/mod_muc_room.erl:585 msgid "It is not allowed to send private messages" msgstr "אין זה מותר לשלוח הודעות פרטיות" -#: mod_muc/mod_muc_room.erl:572 mod_muc/mod_muc_room.erl:951 -#: mod_muc/mod_muc_room.erl:4034 +#: mod_muc/mod_muc_room.erl:576 mod_muc/mod_muc_room.erl:956 +#: mod_muc/mod_muc_room.erl:4040 msgid "Only occupants are allowed to send messages to the conference" msgstr "רק נוכחים רשאים לשלוח הודעות אל הועידה" -#: mod_muc/mod_muc_room.erl:630 +#: mod_muc/mod_muc_room.erl:634 msgid "Only occupants are allowed to send queries to the conference" msgstr "רק נוכחים רשאים לשלוח שאילתות אל הועידה" -#: mod_muc/mod_muc_room.erl:642 +#: mod_muc/mod_muc_room.erl:646 msgid "Queries to the conference members are not allowed in this room" msgstr "שאילתות אל חברי הועידה אינן מותרות בחדר זה" -#: mod_muc/mod_muc_room.erl:927 +#: mod_muc/mod_muc_room.erl:932 msgid "" "Only moderators and participants are allowed to change the subject in this " "room" msgstr "רק אחראים ומשתתפים רשאים לשנות את הנושא בחדר זה" -#: mod_muc/mod_muc_room.erl:932 +#: mod_muc/mod_muc_room.erl:937 msgid "Only moderators are allowed to change the subject in this room" msgstr "רק אחראים רשאים לשנות את הנושא בחדר זה" # רשאים -#: mod_muc/mod_muc_room.erl:942 +#: mod_muc/mod_muc_room.erl:947 msgid "Visitors are not allowed to send messages to all occupants" msgstr "מבקרים אינם מורשים לשלוח הודעות אל כל הנוכחים" # שגיאת נוכחות -#: mod_muc/mod_muc_room.erl:1016 +# נוכחות שגויה +#: mod_muc/mod_muc_room.erl:1021 msgid "" "This participant is kicked from the room because he sent an error presence" -msgstr "משתתף זה נבעט מן החדר משום שהוא שלח נוכחות שגויה" +msgstr "משתתף זה נבעט מתוך החדר משום שהוא שלח נוכחות שגיאה" -#: mod_muc/mod_muc_room.erl:1035 +#: mod_muc/mod_muc_room.erl:1040 msgid "Visitors are not allowed to change their nicknames in this room" -msgstr "מבקרים אינם מורשים לשנות את שמות כינוים בחדר זה" +msgstr "מבקרים אינם מורשים לשנות את שמות הכינויים שלהם בחדר זה" -#: mod_muc/mod_muc_room.erl:1048 mod_muc/mod_muc_room.erl:1775 +#: mod_muc/mod_muc_room.erl:1053 mod_muc/mod_muc_room.erl:1779 msgid "That nickname is already in use by another occupant" msgstr "שם כינוי זה כבר מצוי בשימוש על ידי נוכח אחר" -#: mod_muc/mod_muc_room.erl:1764 +#: mod_muc/mod_muc_room.erl:1768 msgid "You have been banned from this room" msgstr "נאסרת מן חדר זה" -#: mod_muc/mod_muc_room.erl:1767 +#: mod_muc/mod_muc_room.erl:1771 msgid "Membership is required to enter this room" msgstr "נדרשת חברות כדי להיכנס אל חדר זה" -#: mod_muc/mod_muc_room.erl:1803 +#: mod_muc/mod_muc_room.erl:1807 msgid "This room is not anonymous" msgstr "חדר זה אינו אנונימי" # מילת־מעבר -#: mod_muc/mod_muc_room.erl:1829 +#: mod_muc/mod_muc_room.erl:1833 msgid "A password is required to enter this room" msgstr "נדרשת סיסמה כדי להיכנס אל חדר זה" -#: mod_muc/mod_muc_room.erl:1851 mod_register.erl:246 +#: mod_muc/mod_muc_room.erl:1855 mod_register.erl:246 msgid "Too many CAPTCHA requests" msgstr "יותר מדי בקשות CAPTCHA" -# לחולל -#: mod_muc/mod_muc_room.erl:1860 mod_register.erl:251 +#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251 msgid "Unable to generate a CAPTCHA" -msgstr "לא ניתן להלחין CAPTCHA" +msgstr "אין אפשרות לחולל CAPTCHA" -#: mod_muc/mod_muc_room.erl:1870 +#: mod_muc/mod_muc_room.erl:1874 msgid "Incorrect password" msgstr "מילת מעבר שגויה" -#: mod_muc/mod_muc_room.erl:2444 +#: mod_muc/mod_muc_room.erl:2448 msgid "Administrator privileges required" msgstr "נדרשות הרשאות מנהל" -#: mod_muc/mod_muc_room.erl:2459 +#: mod_muc/mod_muc_room.erl:2463 msgid "Moderator privileges required" msgstr "נדרשות הרשאות אחראי" -#: mod_muc/mod_muc_room.erl:2615 +#: mod_muc/mod_muc_room.erl:2619 msgid "Jabber ID ~s is invalid" -msgstr "כתובת JID ‫~s הינה שגויה" +msgstr "מזהה Jabber ‏~s הינו שגוי" -#: mod_muc/mod_muc_room.erl:2629 +#: mod_muc/mod_muc_room.erl:2633 msgid "Nickname ~s does not exist in the room" msgstr "שם כינוי ~s לא קיים בחדר" -#: mod_muc/mod_muc_room.erl:2655 mod_muc/mod_muc_room.erl:3045 +#: mod_muc/mod_muc_room.erl:2659 mod_muc/mod_muc_room.erl:3049 msgid "Invalid affiliation: ~s" msgstr "סינוף שגוי: ~s" -#: mod_muc/mod_muc_room.erl:2709 +#: mod_muc/mod_muc_room.erl:2713 msgid "Invalid role: ~s" msgstr "תפקיד שגוי: ~s" -#: mod_muc/mod_muc_room.erl:3022 mod_muc/mod_muc_room.erl:3058 +#: mod_muc/mod_muc_room.erl:3026 mod_muc/mod_muc_room.erl:3062 msgid "Owner privileges required" msgstr "נדרשות הרשאות בעלים" # תצורה של חדר -#: mod_muc/mod_muc_room.erl:3189 +#: mod_muc/mod_muc_room.erl:3195 msgid "Configuration of room ~s" msgstr "תצורת חדר ~s" -#: mod_muc/mod_muc_room.erl:3194 +#: mod_muc/mod_muc_room.erl:3200 msgid "Room title" msgstr "כותרת חדר" -#: mod_muc/mod_muc_room.erl:3197 mod_muc/mod_muc_room.erl:3686 +#: mod_muc/mod_muc_room.erl:3203 mod_muc/mod_muc_room.erl:3692 msgid "Room description" msgstr "תיאור חדר" -#: mod_muc/mod_muc_room.erl:3204 +#: mod_muc/mod_muc_room.erl:3210 msgid "Make room persistent" msgstr "הפוך חדר אל קבוע" -#: mod_muc/mod_muc_room.erl:3209 +#: mod_muc/mod_muc_room.erl:3215 msgid "Make room public searchable" -msgstr "הפוך חדר אל בר־חיפוש פומבי" +msgstr "הפוך חדר אל בר חיפוש פומבי" -#: mod_muc/mod_muc_room.erl:3212 +#: mod_muc/mod_muc_room.erl:3218 msgid "Make participants list public" msgstr "הפוך רשימת משתתפים אל פומבית" -#: mod_muc/mod_muc_room.erl:3215 +#: mod_muc/mod_muc_room.erl:3221 msgid "Make room password protected" msgstr "הפוך חדר אל מוגן במילת מעבר" -#: mod_muc/mod_muc_room.erl:3226 +#: mod_muc/mod_muc_room.erl:3232 msgid "Maximum Number of Occupants" msgstr "מספר מרבי של נוכחים" -#: mod_muc/mod_muc_room.erl:3233 +#: mod_muc/mod_muc_room.erl:3239 msgid "No limit" msgstr "ללא הגבלה" # הצג כתובות JID ממשיות ל -#: mod_muc/mod_muc_room.erl:3244 +#: mod_muc/mod_muc_room.erl:3250 msgid "Present real Jabber IDs to" msgstr "הצג כתובות JID ממשיות" -#: mod_muc/mod_muc_room.erl:3252 mod_muc/mod_muc_room.erl:3286 +#: mod_muc/mod_muc_room.erl:3258 mod_muc/mod_muc_room.erl:3292 msgid "moderators only" msgstr "לאחראים בלבד" -#: mod_muc/mod_muc_room.erl:3254 mod_muc/mod_muc_room.erl:3288 +#: mod_muc/mod_muc_room.erl:3260 mod_muc/mod_muc_room.erl:3294 msgid "anyone" msgstr "לכל אחד" -#: mod_muc/mod_muc_room.erl:3256 +#: mod_muc/mod_muc_room.erl:3262 msgid "Make room members-only" msgstr "הפוך חדר אל חברים-בלבד" # חדר מבוקר חדר תחת ביקורת -#: mod_muc/mod_muc_room.erl:3259 +#: mod_muc/mod_muc_room.erl:3265 msgid "Make room moderated" msgstr "הפוך חדר אל מבוקר" -#: mod_muc/mod_muc_room.erl:3262 +#: mod_muc/mod_muc_room.erl:3268 msgid "Default users as participants" msgstr "משתמשים משתמטים כמשתתפים" # התרה -#: mod_muc/mod_muc_room.erl:3265 +#: mod_muc/mod_muc_room.erl:3271 msgid "Allow users to change the subject" msgstr "התר למשתמשים לשנות את הנושא" -#: mod_muc/mod_muc_room.erl:3268 +#: mod_muc/mod_muc_room.erl:3274 msgid "Allow users to send private messages" msgstr "התר למשתמשים לשלוח הודעות פרטיות" -#: mod_muc/mod_muc_room.erl:3273 +#: mod_muc/mod_muc_room.erl:3279 msgid "Allow visitors to send private messages to" msgstr "התר למבקרים לשלוח הודעות פרטיות אל" -#: mod_muc/mod_muc_room.erl:3284 +#: mod_muc/mod_muc_room.erl:3290 msgid "nobody" msgstr "אף אחד" -#: mod_muc/mod_muc_room.erl:3290 +#: mod_muc/mod_muc_room.erl:3296 msgid "Allow users to query other users" msgstr "התר למשתמשים לתשאל משתמשים אחרים" -#: mod_muc/mod_muc_room.erl:3293 +#: mod_muc/mod_muc_room.erl:3299 msgid "Allow users to send invites" msgstr "התר למשתמשים לשלוח הזמנות" -#: mod_muc/mod_muc_room.erl:3296 +#: mod_muc/mod_muc_room.erl:3302 msgid "Allow visitors to send status text in presence updates" msgstr "התר למבקרים לשלוח טקסט מצב בעדכוני נוכחות" -#: mod_muc/mod_muc_room.erl:3299 +#: mod_muc/mod_muc_room.erl:3305 msgid "Allow visitors to change nickname" msgstr "התר למבקרים לשנות שם כינוי" -#: mod_muc/mod_muc_room.erl:3302 +#: mod_muc/mod_muc_room.erl:3308 msgid "Allow visitors to send voice requests" msgstr "התר למבקרים לשלוח בקשות ביטוי" -#: mod_muc/mod_muc_room.erl:3305 +#: mod_muc/mod_muc_room.erl:3311 msgid "Minimum interval between voice requests (in seconds)" msgstr "תדירות מינימלית בין בקשות ביטוי (בשניות)" -#: mod_muc/mod_muc_room.erl:3311 +#: mod_muc/mod_muc_room.erl:3317 msgid "Make room CAPTCHA protected" msgstr "הפוך חדר אל מוגן CAPTCHA" # זהויות -#: mod_muc/mod_muc_room.erl:3316 +#: mod_muc/mod_muc_room.erl:3322 msgid "Exclude Jabber IDs from CAPTCHA challenge" -msgstr "הוצא כתובות של Jabber מן אתגר CAPTCHA" +msgstr "הוצא כתובות של Jabber מתוך אתגר CAPTCHA" -#: mod_muc/mod_muc_room.erl:3323 +#: mod_muc/mod_muc_room.erl:3329 msgid "Enable logging" msgstr "אפשור רישום פעילות" -#: mod_muc/mod_muc_room.erl:3331 +#: mod_muc/mod_muc_room.erl:3337 msgid "You need an x:data capable client to configure room" -msgstr "עליך לעשות שימוש בלקוח שביכולתו להבין x:data בכדי להגדיר חדר" +msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי להגדיר חדר" -#: mod_muc/mod_muc_room.erl:3688 +#: mod_muc/mod_muc_room.erl:3694 msgid "Number of occupants" msgstr "מספר של נוכחים" # private what? (fe/male) -#: mod_muc/mod_muc_room.erl:3744 +#: mod_muc/mod_muc_room.erl:3750 #, fuzzy msgid "private, " msgstr "פרטי, " -#: mod_muc/mod_muc_room.erl:3793 +#: mod_muc/mod_muc_room.erl:3799 msgid "Voice request" msgstr "בקשת ביטוי" -#: mod_muc/mod_muc_room.erl:3797 +# אשר או דחה +#: mod_muc/mod_muc_room.erl:3803 msgid "Either approve or decline the voice request." msgstr "או שתאשר או שתדחה את בקשת הביטוי." -#: mod_muc/mod_muc_room.erl:3803 +#: mod_muc/mod_muc_room.erl:3809 msgid "User JID" msgstr "‏JID משתמש" -#: mod_muc/mod_muc_room.erl:3805 +#: mod_muc/mod_muc_room.erl:3811 msgid "Grant voice to this person?" msgstr "להעניק ביטוי לאישיות זו?" -#: mod_muc/mod_muc_room.erl:3954 +#: mod_muc/mod_muc_room.erl:3960 msgid "~s invites you to the room ~s" msgstr "‫~s מזמינך אל החדר ~s" -#: mod_muc/mod_muc_room.erl:3963 +#: mod_muc/mod_muc_room.erl:3969 msgid "the password is" msgstr "הסיסמה היא" # תור הודעות לא מקוונות של הקשר שלך הינו -#: mod_offline.erl:623 +#: mod_offline.erl:510 mod_offline_odbc.erl:352 msgid "" "Your contact offline message queue is full. The message has been discarded." msgstr "תור הודעות קשר לא מקוונות הינו מלא. ההודעה סולקה." -#: mod_offline.erl:713 +#: mod_offline.erl:560 mod_offline_odbc.erl:408 msgid "~s's Offline Messages Queue" msgstr "תור הודעות לא מקוונות של ~s" -#: mod_offline.erl:716 mod_roster.erl:1389 mod_shared_roster.erl:1060 -#: mod_shared_roster.erl:1169 web/ejabberd_web_admin.erl:833 +#: mod_offline.erl:563 mod_offline_odbc.erl:411 mod_roster.erl:987 +#: mod_roster_odbc.erl:1104 mod_shared_roster.erl:901 +#: mod_shared_roster.erl:1010 mod_shared_roster_odbc.erl:930 +#: mod_shared_roster_odbc.erl:1039 web/ejabberd_web_admin.erl:833 #: web/ejabberd_web_admin.erl:874 web/ejabberd_web_admin.erl:942 #: web/ejabberd_web_admin.erl:978 web/ejabberd_web_admin.erl:1019 -#: web/ejabberd_web_admin.erl:1508 web/ejabberd_web_admin.erl:1753 -#: web/ejabberd_web_admin.erl:1924 web/ejabberd_web_admin.erl:1956 -#: web/ejabberd_web_admin.erl:2024 web/ejabberd_web_admin.erl:2128 -#: web/ejabberd_web_admin.erl:2153 web/ejabberd_web_admin.erl:2241 +#: web/ejabberd_web_admin.erl:1508 web/ejabberd_web_admin.erl:1760 +#: web/ejabberd_web_admin.erl:1931 web/ejabberd_web_admin.erl:1963 +#: web/ejabberd_web_admin.erl:2031 web/ejabberd_web_admin.erl:2135 +#: web/ejabberd_web_admin.erl:2160 web/ejabberd_web_admin.erl:2248 msgid "Submitted" msgstr "" -#: mod_offline.erl:724 +#: mod_offline.erl:571 msgid "Time" msgstr "זמן" # מאת -#: mod_offline.erl:725 +#: mod_offline.erl:572 msgid "From" msgstr "מן" -#: mod_offline.erl:726 +#: mod_offline.erl:573 msgid "To" msgstr "אל" -#: mod_offline.erl:727 +#: mod_offline.erl:574 mod_offline_odbc.erl:419 #, fuzzy msgid "Packet" msgstr "חבילת מידע" # נבחרים -#: mod_offline.erl:740 mod_shared_roster.erl:1067 -#: web/ejabberd_web_admin.erl:882 web/ejabberd_web_admin.erl:986 +#: mod_offline.erl:587 mod_offline_odbc.erl:432 mod_shared_roster.erl:908 +#: mod_shared_roster_odbc.erl:937 web/ejabberd_web_admin.erl:882 +#: web/ejabberd_web_admin.erl:986 msgid "Delete Selected" msgstr "מחק נבחרות" -#: mod_offline.erl:864 +#: mod_offline.erl:645 mod_offline_odbc.erl:519 msgid "Offline Messages:" msgstr "הודעות לא מקוונות:" -#: mod_offline.erl:864 +#: mod_offline.erl:645 mod_offline_odbc.erl:519 msgid "Remove All Offline Messages" msgstr "הסר את כל ההודעות הלא מקוונות" @@ -1175,7 +1185,7 @@ msgstr "הודע מנויים כאשר הממסר נמחק" #: mod_pubsub/mod_pubsub.erl:3478 mod_pubsub/mod_pubsub_odbc.erl:3291 msgid "Notify subscribers when items are removed from the node" -msgstr "הודע מנויים כאשר פריטים מוסרים מן הממסר" +msgstr "הודע מנויים כאשר פריטים מוסרים מתוך הממסר" # Typo: store #: mod_pubsub/mod_pubsub.erl:3479 mod_pubsub/mod_pubsub_odbc.erl:3292 @@ -1243,14 +1253,14 @@ msgstr "אימות CAPTCHA נכשל" #: mod_register.erl:220 msgid "You need a client that supports x:data and CAPTCHA to register" -msgstr "עליך לעשות שימוש בלקוח שתומך x:data וגם CAPTCHA בכדי להירשם" +msgstr "עליך להשתמש בלקוח אשר תומך x:data וגם CAPTCHA בכדי להירשם" #: mod_register.erl:226 mod_register.erl:265 msgid "Choose a username and password to register with this server" msgstr "בחר שם משתמש וסיסמה להירשם עם שרת זה" -#: mod_register.erl:230 mod_vcard.erl:435 web/ejabberd_web_admin.erl:1515 -#: web/ejabberd_web_admin.erl:1571 +#: mod_register.erl:230 mod_vcard.erl:364 mod_vcard_odbc.erl:342 +#: web/ejabberd_web_admin.erl:1515 web/ejabberd_web_admin.erl:1572 msgid "User" msgstr "משתמש" @@ -1263,122 +1273,131 @@ msgstr "הסיסמה חלשה מדי" msgid "Users are not allowed to register accounts so quickly" msgstr "משתמשים אינם מורשים לרשום חשבונות כל כך במהירות" -#: mod_roster.erl:1340 web/ejabberd_web_admin.erl:1695 -#: web/ejabberd_web_admin.erl:1879 web/ejabberd_web_admin.erl:1890 -#: web/ejabberd_web_admin.erl:2212 +#: mod_roster.erl:938 mod_roster_odbc.erl:1055 web/ejabberd_web_admin.erl:1701 +#: web/ejabberd_web_admin.erl:1886 web/ejabberd_web_admin.erl:1897 +#: web/ejabberd_web_admin.erl:2219 #, fuzzy msgid "None" msgstr "ללא" -#: mod_roster.erl:1347 +#: mod_roster.erl:945 mod_roster_odbc.erl:1062 msgid "Subscription" msgstr "מִנּוּי" # ממתינות -#: mod_roster.erl:1348 +#: mod_roster.erl:946 mod_roster_odbc.erl:1063 #, fuzzy msgid "Pending" msgstr "ממתינים" -#: mod_roster.erl:1349 +#: mod_roster.erl:947 mod_roster_odbc.erl:1064 msgid "Groups" msgstr "קבוצות" -#: mod_roster.erl:1376 +#: mod_roster.erl:974 mod_roster_odbc.erl:1091 msgid "Validate" msgstr "הענק תוקף" -#: mod_roster.erl:1384 +#: mod_roster.erl:982 mod_roster_odbc.erl:1099 msgid "Remove" msgstr "הסר" -#: mod_roster.erl:1387 +#: mod_roster.erl:985 mod_roster_odbc.erl:1102 msgid "Roster of " msgstr "רשימה של " # פגום -#: mod_roster.erl:1390 mod_shared_roster.erl:1061 mod_shared_roster.erl:1170 -#: web/ejabberd_web_admin.erl:834 web/ejabberd_web_admin.erl:875 -#: web/ejabberd_web_admin.erl:943 web/ejabberd_web_admin.erl:979 -#: web/ejabberd_web_admin.erl:1020 web/ejabberd_web_admin.erl:1509 -#: web/ejabberd_web_admin.erl:1754 web/ejabberd_web_admin.erl:1925 -#: web/ejabberd_web_admin.erl:2129 web/ejabberd_web_admin.erl:2154 +#: mod_roster.erl:988 mod_roster_odbc.erl:1105 mod_shared_roster.erl:902 +#: mod_shared_roster.erl:1011 mod_shared_roster_odbc.erl:931 +#: mod_shared_roster_odbc.erl:1040 web/ejabberd_web_admin.erl:834 +#: web/ejabberd_web_admin.erl:875 web/ejabberd_web_admin.erl:943 +#: web/ejabberd_web_admin.erl:979 web/ejabberd_web_admin.erl:1020 +#: web/ejabberd_web_admin.erl:1509 web/ejabberd_web_admin.erl:1761 +#: web/ejabberd_web_admin.erl:1932 web/ejabberd_web_admin.erl:2136 +#: web/ejabberd_web_admin.erl:2161 msgid "Bad format" msgstr "פורמט רע" -#: mod_roster.erl:1397 +#: mod_roster.erl:995 mod_roster_odbc.erl:1112 msgid "Add Jabber ID" msgstr "הוסף JID" -#: mod_roster.erl:1496 +#: mod_roster.erl:1094 mod_roster_odbc.erl:1211 msgid "Roster" msgstr "רשימה" -#: mod_shared_roster.erl:1016 mod_shared_roster.erl:1058 -#: mod_shared_roster.erl:1166 +#: mod_shared_roster.erl:857 mod_shared_roster.erl:899 +#: mod_shared_roster.erl:1007 mod_shared_roster_odbc.erl:886 +#: mod_shared_roster_odbc.erl:928 mod_shared_roster_odbc.erl:1036 msgid "Shared Roster Groups" msgstr "קבוצות רשימה משותפות" -#: mod_shared_roster.erl:1054 web/ejabberd_web_admin.erl:1365 -#: web/ejabberd_web_admin.erl:2454 +#: mod_shared_roster.erl:895 mod_shared_roster_odbc.erl:924 +#: web/ejabberd_web_admin.erl:1365 web/ejabberd_web_admin.erl:2461 msgid "Add New" msgstr "הוסף חדש" -#: mod_shared_roster.erl:1137 +#: mod_shared_roster.erl:978 mod_shared_roster_odbc.erl:1007 msgid "Name:" msgstr "שם:" -#: mod_shared_roster.erl:1142 +#: mod_shared_roster.erl:983 mod_shared_roster_odbc.erl:1012 msgid "Description:" msgstr "תיאור:" -#: mod_shared_roster.erl:1150 +#: mod_shared_roster.erl:991 mod_shared_roster_odbc.erl:1020 msgid "Members:" msgstr "חברים:" -#: mod_shared_roster.erl:1158 +#: mod_shared_roster.erl:999 mod_shared_roster_odbc.erl:1028 msgid "Displayed Groups:" msgstr "קבוצות מוצגות:" -#: mod_shared_roster.erl:1167 +#: mod_shared_roster.erl:1008 mod_shared_roster_odbc.erl:1037 msgid "Group " msgstr "קבוצה " -#: mod_shared_roster.erl:1176 web/ejabberd_web_admin.erl:840 -#: web/ejabberd_web_admin.erl:884 web/ejabberd_web_admin.erl:949 -#: web/ejabberd_web_admin.erl:1026 web/ejabberd_web_admin.erl:2010 +#: mod_shared_roster.erl:1017 mod_shared_roster_odbc.erl:1046 +#: web/ejabberd_web_admin.erl:840 web/ejabberd_web_admin.erl:884 +#: web/ejabberd_web_admin.erl:949 web/ejabberd_web_admin.erl:1026 +#: web/ejabberd_web_admin.erl:2017 msgid "Submit" msgstr "שליחה" -#: mod_vcard.erl:172 mod_vcard_ldap.erl:238 +#: mod_vcard.erl:165 mod_vcard_ldap.erl:238 mod_vcard_odbc.erl:129 #, fuzzy msgid "Erlang Jabber Server" msgstr "שרת ג׳אבּר Erlang" -#: mod_vcard.erl:435 mod_vcard.erl:549 +#: mod_vcard.erl:364 mod_vcard.erl:478 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:454 msgid "Birthday" msgstr "יום הולדת" -#: mod_vcard.erl:435 mod_vcard.erl:551 +#: mod_vcard.erl:364 mod_vcard.erl:480 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:456 msgid "City" msgstr "עיר" -#: mod_vcard.erl:435 mod_vcard.erl:550 +#: mod_vcard.erl:364 mod_vcard.erl:479 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:455 msgid "Country" msgstr "ארץ" -#: mod_vcard.erl:435 mod_vcard.erl:552 +#: mod_vcard.erl:364 mod_vcard.erl:481 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:457 msgid "Email" msgstr "דוא״ל" -#: mod_vcard.erl:435 mod_vcard.erl:547 +#: mod_vcard.erl:364 mod_vcard.erl:476 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:452 msgid "Family Name" msgstr "שם משפחה" # נא למלא # שקול לתאום # note: matching > wanted -#: mod_vcard.erl:435 +#: mod_vcard.erl:364 mod_vcard_odbc.erl:342 msgid "" "Fill in the form to search for any matching Jabber User (Add * to the end of " "field to match substring)" @@ -1386,44 +1405,49 @@ msgstr "" "מלא את התבניות כדי לחפש עבור כל משתמש Jabber מבוקש (באפשרותך להוסיף * בסוף " "שדה כדי להתאים אל מחרוזת-משנה)" -#: mod_vcard.erl:435 mod_vcard.erl:544 +#: mod_vcard.erl:364 mod_vcard.erl:473 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:449 msgid "Full Name" msgstr "שם מלא" -#: mod_vcard.erl:435 mod_vcard.erl:546 +#: mod_vcard.erl:364 mod_vcard.erl:475 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:451 msgid "Middle Name" msgstr "שם אמצעי" -#: mod_vcard.erl:435 mod_vcard.erl:545 web/ejabberd_web_admin.erl:1999 +#: mod_vcard.erl:364 mod_vcard.erl:474 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:450 web/ejabberd_web_admin.erl:2006 msgid "Name" msgstr "שם" -#: mod_vcard.erl:435 mod_vcard.erl:553 +#: mod_vcard.erl:364 mod_vcard.erl:482 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:458 msgid "Organization Name" msgstr "שם ארגון" -#: mod_vcard.erl:435 mod_vcard.erl:554 +#: mod_vcard.erl:364 mod_vcard.erl:483 mod_vcard_odbc.erl:342 +#: mod_vcard_odbc.erl:459 msgid "Organization Unit" msgstr "יחידת איגוד" # בקרב -#: mod_vcard.erl:435 mod_vcard_ldap.erl:462 +#: mod_vcard.erl:364 mod_vcard_ldap.erl:462 mod_vcard_odbc.erl:342 msgid "Search users in " msgstr "חיפוש משתמשים אצל " -#: mod_vcard.erl:435 mod_vcard_ldap.erl:462 +#: mod_vcard.erl:364 mod_vcard_ldap.erl:462 mod_vcard_odbc.erl:342 msgid "You need an x:data capable client to search" -msgstr "עליך לעשות שימוש בלקוח שביכולתו להבין x:data בכדי לחפש" +msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי לחפש" -#: mod_vcard.erl:460 mod_vcard_ldap.erl:487 +#: mod_vcard.erl:389 mod_vcard_ldap.erl:487 mod_vcard_odbc.erl:367 msgid "vCard User Search" msgstr "חיפוש משתמש vCard" -#: mod_vcard.erl:516 mod_vcard_ldap.erl:541 +#: mod_vcard.erl:445 mod_vcard_ldap.erl:541 mod_vcard_odbc.erl:421 msgid "ejabberd vCard module" msgstr "מודול vCard של ejabberd" -#: mod_vcard.erl:540 mod_vcard_ldap.erl:551 +#: mod_vcard.erl:469 mod_vcard_ldap.erl:551 mod_vcard_odbc.erl:445 msgid "Search Results for " msgstr "תוצאות חיפוש עבור " @@ -1490,7 +1514,7 @@ msgstr "הצג טבלה רגילה" msgid "Show Integral Table" msgstr "הצג טבלה אינטגרלית" -#: web/ejabberd_web_admin.erl:1105 web/ejabberd_web_admin.erl:1932 +#: web/ejabberd_web_admin.erl:1105 web/ejabberd_web_admin.erl:1939 msgid "Statistics" msgstr "סטטיסטיקה" @@ -1510,262 +1534,264 @@ msgstr "מארח" msgid "Registered Users" msgstr "משתמשים רשומים" -#: web/ejabberd_web_admin.erl:1572 +#: web/ejabberd_web_admin.erl:1573 msgid "Offline Messages" msgstr "הודעות לא מקוונות" -#: web/ejabberd_web_admin.erl:1573 web/ejabberd_web_admin.erl:1760 +#: web/ejabberd_web_admin.erl:1574 web/ejabberd_web_admin.erl:1767 msgid "Last Activity" msgstr "פעילות אחרונה" -#: web/ejabberd_web_admin.erl:1653 web/ejabberd_web_admin.erl:1669 +#: web/ejabberd_web_admin.erl:1659 web/ejabberd_web_admin.erl:1675 msgid "Registered Users:" msgstr "משתמשים רשומים:" -#: web/ejabberd_web_admin.erl:1655 web/ejabberd_web_admin.erl:1671 -#: web/ejabberd_web_admin.erl:2185 +#: web/ejabberd_web_admin.erl:1661 web/ejabberd_web_admin.erl:1677 +#: web/ejabberd_web_admin.erl:2192 msgid "Online Users:" msgstr "משתמשים מקוונים:" -#: web/ejabberd_web_admin.erl:1657 +#: web/ejabberd_web_admin.erl:1663 msgid "Outgoing s2s Connections:" msgstr "חיבורי s2s יוצאים:" -#: web/ejabberd_web_admin.erl:1659 +#: web/ejabberd_web_admin.erl:1665 msgid "Outgoing s2s Servers:" msgstr "שרתי s2s יוצאים:" -#: web/ejabberd_web_admin.erl:1728 web/mod_register_web.erl:175 +#: web/ejabberd_web_admin.erl:1734 web/mod_register_web.erl:175 #: web/mod_register_web.erl:372 web/mod_register_web.erl:381 #: web/mod_register_web.erl:411 msgid "Change Password" msgstr "שנה סיסמה" -#: web/ejabberd_web_admin.erl:1751 -msgid "User " -msgstr "משתמש" - #: web/ejabberd_web_admin.erl:1758 +msgid "User " +msgstr "משתמש " + +#: web/ejabberd_web_admin.erl:1765 msgid "Connected Resources:" msgstr "משאבים מחוברים:" -#: web/ejabberd_web_admin.erl:1759 web/mod_register_web.erl:227 +#: web/ejabberd_web_admin.erl:1766 web/mod_register_web.erl:227 #: web/mod_register_web.erl:519 msgid "Password:" msgstr "סיסמה:" -#: web/ejabberd_web_admin.erl:1821 +#: web/ejabberd_web_admin.erl:1828 msgid "No Data" msgstr "אין מידע" -#: web/ejabberd_web_admin.erl:1899 +#: web/ejabberd_web_admin.erl:1906 msgid "Nodes" msgstr "ממסרים" -#: web/ejabberd_web_admin.erl:1922 web/ejabberd_web_admin.erl:1944 +#: web/ejabberd_web_admin.erl:1929 web/ejabberd_web_admin.erl:1951 msgid "Node " msgstr "ממסר" -#: web/ejabberd_web_admin.erl:1931 +#: web/ejabberd_web_admin.erl:1938 #, fuzzy msgid "Listened Ports" msgstr "פורטים מואזנים" -#: web/ejabberd_web_admin.erl:1933 web/ejabberd_web_admin.erl:2253 -#: web/ejabberd_web_admin.erl:2441 +#: web/ejabberd_web_admin.erl:1940 web/ejabberd_web_admin.erl:2260 +#: web/ejabberd_web_admin.erl:2448 msgid "Update" msgstr "עדכן" -#: web/ejabberd_web_admin.erl:1936 web/ejabberd_web_admin.erl:2562 +#: web/ejabberd_web_admin.erl:1943 web/ejabberd_web_admin.erl:2569 msgid "Restart" msgstr "אתחל" -#: web/ejabberd_web_admin.erl:1938 web/ejabberd_web_admin.erl:2564 +#: web/ejabberd_web_admin.erl:1945 web/ejabberd_web_admin.erl:2571 msgid "Stop" msgstr "הפסק" -#: web/ejabberd_web_admin.erl:1952 +#: web/ejabberd_web_admin.erl:1959 msgid "RPC Call Error" msgstr "שגיאת קריאת RPC" -#: web/ejabberd_web_admin.erl:1993 +#: web/ejabberd_web_admin.erl:2000 msgid "Database Tables at " msgstr "טבלאות מסד נתונים אצל " -#: web/ejabberd_web_admin.erl:2000 +#: web/ejabberd_web_admin.erl:2007 msgid "Storage Type" msgstr "טיפוס אחסון" -#: web/ejabberd_web_admin.erl:2001 +#: web/ejabberd_web_admin.erl:2008 msgid "Elements" msgstr "אלמנטים" -#: web/ejabberd_web_admin.erl:2002 +#: web/ejabberd_web_admin.erl:2009 msgid "Memory" msgstr "זיכרון" -#: web/ejabberd_web_admin.erl:2025 web/ejabberd_web_admin.erl:2130 +#: web/ejabberd_web_admin.erl:2032 web/ejabberd_web_admin.erl:2137 msgid "Error" msgstr "שגיאה" -#: web/ejabberd_web_admin.erl:2027 +#: web/ejabberd_web_admin.erl:2034 msgid "Backup of " msgstr "גיבוי של " -# האינטגרלי בנפרד -#: web/ejabberd_web_admin.erl:2029 +# האינטגרלי לחוד +#: web/ejabberd_web_admin.erl:2036 msgid "" "Please note that these options will only backup the builtin Mnesia database. " "If you are using the ODBC module, you also need to backup your SQL database " "separately." msgstr "" -"נא לשים לב שלאפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך " -"עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL שברשותך לחוד." +"נא לשים לב כי אפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך " +"עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL אשר מצוי ברשותך " +"בנפרד." -#: web/ejabberd_web_admin.erl:2034 +#: web/ejabberd_web_admin.erl:2041 msgid "Store binary backup:" msgstr "אחסן גיבוי בינארי:" -#: web/ejabberd_web_admin.erl:2038 web/ejabberd_web_admin.erl:2045 -#: web/ejabberd_web_admin.erl:2053 web/ejabberd_web_admin.erl:2060 -#: web/ejabberd_web_admin.erl:2067 web/ejabberd_web_admin.erl:2074 -#: web/ejabberd_web_admin.erl:2081 web/ejabberd_web_admin.erl:2089 -#: web/ejabberd_web_admin.erl:2096 web/ejabberd_web_admin.erl:2103 +#: web/ejabberd_web_admin.erl:2045 web/ejabberd_web_admin.erl:2052 +#: web/ejabberd_web_admin.erl:2060 web/ejabberd_web_admin.erl:2067 +#: web/ejabberd_web_admin.erl:2074 web/ejabberd_web_admin.erl:2081 +#: web/ejabberd_web_admin.erl:2088 web/ejabberd_web_admin.erl:2096 +#: web/ejabberd_web_admin.erl:2103 web/ejabberd_web_admin.erl:2110 msgid "OK" msgstr "אישור" # ללא דיחוי -#: web/ejabberd_web_admin.erl:2041 +#: web/ejabberd_web_admin.erl:2048 msgid "Restore binary backup immediately:" msgstr "שחזר גיבוי בינארי לאלתר:" # לאחר אתחול בא של -#: web/ejabberd_web_admin.erl:2049 +#: web/ejabberd_web_admin.erl:2056 msgid "" "Restore binary backup after next ejabberd restart (requires less memory):" msgstr "שחזר גיבוי בינארי לאחר האתחול הבא של ejabberd (מצריך פחות זיכרון):" # תמליל ברור -#: web/ejabberd_web_admin.erl:2056 +#: web/ejabberd_web_admin.erl:2063 msgid "Store plain text backup:" msgstr "אחסן גיבוי טקסט גלוי (plain text):" -#: web/ejabberd_web_admin.erl:2063 +#: web/ejabberd_web_admin.erl:2070 msgid "Restore plain text backup immediately:" msgstr "שחזר גיבוי טקסט גלוי (plain text) לאלתר:" -#: web/ejabberd_web_admin.erl:2070 -msgid "Import users data from a PIEFXIS file (XEP-0227):" -msgstr "ייבוא מידע משתמשים מן קובץ PIEFXIS (‫XEP-0227):" - #: web/ejabberd_web_admin.erl:2077 -msgid "Export data of all users in the server to PIEFXIS files (XEP-0227):" -msgstr "ייצוא מידע של כל המשתמשים שבשרת אל קבצי PIEFXIS (‫XEP-0227):" +msgid "Import users data from a PIEFXIS file (XEP-0227):" +msgstr "ייבוא מידע משתמשים מתוך קובץ PIEFXIS ‏(XEP-0227):" #: web/ejabberd_web_admin.erl:2084 -msgid "Export data of users in a host to PIEFXIS files (XEP-0227):" -msgstr "ייצוא מידע של כל המשתמשים אצל מארח אל קבצי PIEFXIS (‫XEP-0227):" +msgid "Export data of all users in the server to PIEFXIS files (XEP-0227):" +msgstr "" +"ייצוא מידע של כל המשתמשים אשר מצויים בשרת זה אל קבצי PIEFXIS (‫XEP-0227):" -#: web/ejabberd_web_admin.erl:2092 -msgid "Import user data from jabberd14 spool file:" -msgstr "ייבוא נתוני משתמש מן קובץ סליל (spool file) של jabberd14:" +#: web/ejabberd_web_admin.erl:2091 +msgid "Export data of users in a host to PIEFXIS files (XEP-0227):" +msgstr "ייצוא מידע של כל המשתמשים בתוך מארח אל קבצי PIEFXIS (‫XEP-0227):" #: web/ejabberd_web_admin.erl:2099 -msgid "Import users data from jabberd14 spool directory:" -msgstr "ייבוא נתוני משתמשים מן מדור סליל (spool directory) של jabberd14:" +msgid "Import user data from jabberd14 spool file:" +msgstr "ייבוא נתוני משתמש מתוך קובץ סליל (spool file) של jabberd14:" -#: web/ejabberd_web_admin.erl:2125 +#: web/ejabberd_web_admin.erl:2106 +msgid "Import users data from jabberd14 spool directory:" +msgstr "ייבוא נתוני משתמשים מתוך מדור סליל (spool directory) של jabberd14:" + +#: web/ejabberd_web_admin.erl:2132 #, fuzzy msgid "Listened Ports at " msgstr "פורטים מואזנים אצל " -#: web/ejabberd_web_admin.erl:2150 +#: web/ejabberd_web_admin.erl:2157 msgid "Modules at " msgstr "מודולים אצל " -#: web/ejabberd_web_admin.erl:2176 +#: web/ejabberd_web_admin.erl:2183 msgid "Statistics of ~p" msgstr "סטטיסטיקות עבור ~p" -#: web/ejabberd_web_admin.erl:2179 +#: web/ejabberd_web_admin.erl:2186 msgid "Uptime:" msgstr "זמן פעילות:" -#: web/ejabberd_web_admin.erl:2182 +#: web/ejabberd_web_admin.erl:2189 msgid "CPU Time:" msgstr "זמן מחשב (CPU):" # זיכרון דברים (דיני חוזים) -#: web/ejabberd_web_admin.erl:2188 +#: web/ejabberd_web_admin.erl:2195 msgid "Transactions Committed:" msgstr "טרנזקציות בוצעו:" -#: web/ejabberd_web_admin.erl:2191 +#: web/ejabberd_web_admin.erl:2198 msgid "Transactions Aborted:" msgstr "טרנזקציות בוטלו:" -#: web/ejabberd_web_admin.erl:2194 +#: web/ejabberd_web_admin.erl:2201 msgid "Transactions Restarted:" msgstr "טרנזקציות הותחלו מחדש:" -#: web/ejabberd_web_admin.erl:2197 +#: web/ejabberd_web_admin.erl:2204 msgid "Transactions Logged:" msgstr "טרנזקציות נרשמו:" -#: web/ejabberd_web_admin.erl:2239 +#: web/ejabberd_web_admin.erl:2246 msgid "Update " msgstr "" -#: web/ejabberd_web_admin.erl:2247 +#: web/ejabberd_web_admin.erl:2254 msgid "Update plan" msgstr "" # adjusted -#: web/ejabberd_web_admin.erl:2248 +#: web/ejabberd_web_admin.erl:2255 msgid "Modified modules" msgstr "מודולים שהותאמו" # תסריט עדכון -#: web/ejabberd_web_admin.erl:2249 +#: web/ejabberd_web_admin.erl:2256 #, fuzzy msgid "Update script" msgstr "עדכן תסריט" -#: web/ejabberd_web_admin.erl:2250 +#: web/ejabberd_web_admin.erl:2257 #, fuzzy msgid "Low level update script" msgstr "תסריט עדכון Low level" -#: web/ejabberd_web_admin.erl:2251 +#: web/ejabberd_web_admin.erl:2258 #, fuzzy msgid "Script check" msgstr "תסריט בדיקה" -#: web/ejabberd_web_admin.erl:2419 +#: web/ejabberd_web_admin.erl:2426 msgid "Port" msgstr "פורט" -#: web/ejabberd_web_admin.erl:2420 +#: web/ejabberd_web_admin.erl:2427 msgid "IP" msgstr "‫IP" -#: web/ejabberd_web_admin.erl:2421 +#: web/ejabberd_web_admin.erl:2428 msgid "Protocol" msgstr "פרוטוקול" -#: web/ejabberd_web_admin.erl:2422 web/ejabberd_web_admin.erl:2549 +#: web/ejabberd_web_admin.erl:2429 web/ejabberd_web_admin.erl:2556 msgid "Module" msgstr "מודול" -#: web/ejabberd_web_admin.erl:2423 web/ejabberd_web_admin.erl:2550 +#: web/ejabberd_web_admin.erl:2430 web/ejabberd_web_admin.erl:2557 msgid "Options" msgstr "אפשרויות" -#: web/ejabberd_web_admin.erl:2443 +#: web/ejabberd_web_admin.erl:2450 msgid "Delete" msgstr "מחק" -#: web/ejabberd_web_admin.erl:2572 +#: web/ejabberd_web_admin.erl:2579 msgid "Start" msgstr "התחל" @@ -1775,7 +1801,7 @@ msgstr "חשבון Jabber נוצר בהצלחה." #: web/mod_register_web.erl:107 msgid "There was an error creating the account: " -msgstr "ארעה שגיאה ביצירת החשבון: " +msgstr "אירעה שגיאה ביצירת החשבון: " #: web/mod_register_web.erl:115 msgid "Your Jabber account was successfully deleted." @@ -1783,7 +1809,7 @@ msgstr "חשבון Jabber נמחק בהצלחה." #: web/mod_register_web.erl:118 msgid "There was an error deleting the account: " -msgstr "ארעה שגיאה במחיקת החשבון: " +msgstr "אירעה שגיאה במחיקת החשבון: " #: web/mod_register_web.erl:128 msgid "The password of your Jabber account was successfully changed." @@ -1791,7 +1817,7 @@ msgstr "סיסמת חשבון Jabber שונתה בהצלחה." #: web/mod_register_web.erl:131 msgid "There was an error changing the password: " -msgstr "ארעה שגיאה בשנוי הסיסמה: " +msgstr "אירעה שגיאה בשינוי הסיסמה: " #: web/mod_register_web.erl:163 web/mod_register_web.erl:172 msgid "Jabber Account Registration" @@ -1815,7 +1841,7 @@ msgid "" "carefully the instructions to fill correctly the fields." msgstr "" "עמוד זה מתיר ליצור חשבון Jabber בשרת Jabber זה. כתובת JID ‏(Jabber " -"IDentifier) תגובש באופן של: username@server. נא לקרוא את בזהירות את ההוראות " +"IDentifier) תגובש באופן של: username@server. נא לקרוא בזהירות את ההוראות " "למילוי השדות באופן נכון." #: web/mod_register_web.erl:212 web/mod_register_web.erl:386 @@ -1838,16 +1864,16 @@ msgstr "תווים לא מורשים:" msgid "Server:" msgstr "שרת:" -# אל נא לומר את סיסמתך +# אל נא לומר #: web/mod_register_web.erl:232 msgid "" "Don't tell your password to anybody, not even the administrators of the " "Jabber server." -msgstr "אל תאמר את סיסמתך לאף אחד, אפילו לא למנהלים של שרת Jabber" +msgstr "אל תגלה את הסיסמה שלך לאף אחד, אפילו לא למנהלים של שרת Jabber" #: web/mod_register_web.erl:234 msgid "You can later change your password using a Jabber client." -msgstr "ביכולתך לשנות את סיסמתך מאוחר יותר באמצעות לקוח Jabber." +msgstr "ביכולתך לשנות את הסיסמה שלך מאוחר יותר באמצעות לקוח Jabber." # בוטח # trust that your @@ -1856,8 +1882,8 @@ msgid "" "Some Jabber clients can store your password in your computer. Use that " "feature only if you trust your computer is safe." msgstr "" -"לקוחות Jabber מסוימים יכולים לאחסן את סיסמתך במחשבך. השתמש בתכונה זו רק אם " -"אתה סמוך שמחשבך הינו מוגן." +"לקוחות Jabber מסוימים יכולים לאחסן את הסיסמה שלך על המחשב שלך. השתמש בתכונה " +"זו רק אם אתה סמוך כי המחשב שלך הינו מוגן." # תישכח #: web/mod_register_web.erl:237 @@ -1866,8 +1892,8 @@ msgid "" "Jabber there isn't an automated way to recover your password if you forget " "it." msgstr "" -"שנן את סיסמתך, או רשום אותה בנייר שמור במקום בטוח. אצל Jabber אין דרך " -"אוטומטית לשחזר את סיסמתך במידה וזו תישמט מן זכרונך." +"שנן את הסיסמה שלך, או רשום אותה בנייר שמור במקום בטוח. אצל Jabber אין דרך " +"אוטומטית לשחזר את הסיסמה שלך במידה וזו תישמט מתוך זיכרונך." #: web/mod_register_web.erl:242 web/mod_register_web.erl:406 msgid "Password Verification:" diff --git a/rebar.config.script b/rebar.config.script index 7a5e332c4..f6772e0e8 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -43,6 +43,7 @@ HiPE = case lists:keysearch(hipe, 1, Cfg) of end, Includes = [{i, "include"}, + {i, filename:join(["deps", "esip", "include"])}, {i, filename:join(["deps", "p1_xml", "include"])}], SrcDirs = lists:foldl( @@ -56,6 +57,7 @@ Deps = [{p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, {p1_tls, ".*", {git, "git://github.com/processone/tls"}}, {p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, {p1_xml, ".*", {git, "git://github.com/processone/xml"}}, + {esip, ".*", {git, "git://github.com/processone/p1_sip"}}, {p1_yaml, ".*", {git, "git://github.com/processone/p1_yaml"}}, {xmlrpc, ".*", {git, "git://github.com/rds13/xmlrpc"}}], @@ -77,6 +79,7 @@ XMLFlags = lists:foldl( PostHooks = [ConfigureCmd("p1_tls", ""), ConfigureCmd("p1_stringprep", ""), ConfigureCmd("p1_yaml", ""), + ConfigureCmd("esip", ""), ConfigureCmd("p1_xml", XMLFlags)], CfgDeps = lists:flatmap( diff --git a/sql/mssql2000.sql b/sql/mssql2000.sql index d5381bafa..d052c6209 100644 --- a/sql/mssql2000.sql +++ b/sql/mssql2000.sql @@ -1,5 +1,5 @@ /* - * ejabberd, Copyright (C) 2002-2013 ProcessOne + * ejabberd, Copyright (C) 2002-2014 ProcessOne * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -11,10 +11,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ diff --git a/sql/mssql2005.sql b/sql/mssql2005.sql index 2cfb078e2..b2f03b258 100644 --- a/sql/mssql2005.sql +++ b/sql/mssql2005.sql @@ -1,5 +1,5 @@ /* - * ejabberd, Copyright (C) 2002-2013 ProcessOne + * ejabberd, Copyright (C) 2002-2014 ProcessOne * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -11,10 +11,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ diff --git a/sql/mssql2012.sql b/sql/mssql2012.sql index 9e94e7a49..928f92a7b 100644 --- a/sql/mssql2012.sql +++ b/sql/mssql2012.sql @@ -1,5 +1,5 @@ /* - * ejabberd, Copyright (C) 2002-2013 ProcessOne + * ejabberd, Copyright (C) 2002-2014 ProcessOne * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -11,10 +11,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ diff --git a/sql/mysql.sql b/sql/mysql.sql index c908022d5..7871d4534 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2013 ProcessOne +-- ejabberd, Copyright (C) 2002-2014 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -11,10 +11,9 @@ -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA --- 02111-1307 USA +-- You should have received a copy of the GNU General Public License along +-- with this program; if not, write to the Free Software Foundation, Inc., +-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- CREATE TABLE users ( diff --git a/sql/pg.sql b/sql/pg.sql index 0b641d575..aa87678ac 100644 --- a/sql/pg.sql +++ b/sql/pg.sql @@ -1,5 +1,5 @@ -- --- ejabberd, Copyright (C) 2002-2013 ProcessOne +-- ejabberd, Copyright (C) 2002-2014 ProcessOne -- -- This program is free software; you can redistribute it and/or -- modify it under the terms of the GNU General Public License as @@ -11,10 +11,9 @@ -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- General Public License for more details. -- --- You should have received a copy of the GNU General Public License --- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA --- 02111-1307 USA +-- You should have received a copy of the GNU General Public License along +-- with this program; if not, write to the Free Software Foundation, Inc., +-- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- CREATE TABLE users ( diff --git a/src/acl.erl b/src/acl.erl index 3cd789463..53256fcbd 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -5,7 +5,7 @@ %%% Created : 18 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -237,6 +236,8 @@ normalize_spec(Spec) -> {server_regexp, SR} -> {server_regexp, b(SR)}; {server_glob, S} -> {server_glob, b(S)}; {resource_glob, R} -> {resource_glob, b(R)}; + {ip, {Net, Mask}} -> + {ip, {Net, Mask}}; {ip, S} -> case parse_ip_netmask(b(S)) of {ok, Net, Mask} -> @@ -263,9 +264,6 @@ match_rule(Host, Access, JID) -> end, case GAccess ++ LAccess of [] -> - ?WARNING_MSG("Attempt to match against unspecified " - "access rule '~s' (scope: ~s)", - [Access, Host]), deny; AccessList -> Rules = lists:flatmap( diff --git a/src/adhoc.erl b/src/adhoc.erl index 50ef7e5bf..800a0a302 100644 --- a/src/adhoc.erl +++ b/src/adhoc.erl @@ -5,7 +5,7 @@ %%% Created : 31 Oct 2005 by Magnus Henoch %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl index 6c847bb52..f404a7afb 100644 --- a/src/cyrsasl.erl +++ b/src/cyrsasl.erl @@ -5,7 +5,7 @@ %%% Created : 8 Mar 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl index 1daa1c103..67e12b8c6 100644 --- a/src/cyrsasl_anonymous.erl +++ b/src/cyrsasl_anonymous.erl @@ -6,7 +6,7 @@ %%% Created : 23 Aug 2005 by Magnus Henoch %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl index b837a2e25..d6a2afdf1 100644 --- a/src/cyrsasl_digest.erl +++ b/src/cyrsasl_digest.erl @@ -5,7 +5,7 @@ %%% Created : 11 Mar 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/cyrsasl_plain.erl b/src/cyrsasl_plain.erl index c5c5f2e02..4f530e8f5 100644 --- a/src/cyrsasl_plain.erl +++ b/src/cyrsasl_plain.erl @@ -5,7 +5,7 @@ %%% Created : 8 Mar 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl index 7338ea7bb..1175af1e9 100644 --- a/src/cyrsasl_scram.erl +++ b/src/cyrsasl_scram.erl @@ -5,7 +5,7 @@ %%% Created : 7 Aug 2011 by Stephen Röttger %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd.erl b/src/ejabberd.erl index 78ef10089..ebe2b170c 100644 --- a/src/ejabberd.erl +++ b/src/ejabberd.erl @@ -5,7 +5,7 @@ %%% Created : 16 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index a21331536..3174b8523 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -5,7 +5,7 @@ %%% Created : 7 May 2006 by Mickael Remond %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index dba61b7d9..6d315c6d3 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -5,7 +5,7 @@ %%% Created : 31 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index 704c82cd4..bf399af28 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -5,7 +5,7 @@ %%% Created : 23 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl index 180e9d0df..c8c9cb153 100644 --- a/src/ejabberd_auth_anonymous.erl +++ b/src/ejabberd_auth_anonymous.erl @@ -5,7 +5,7 @@ %%% Created : 17 Feb 2006 by Mickael Remond %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl index 514b551d7..17944b650 100644 --- a/src/ejabberd_auth_external.erl +++ b/src/ejabberd_auth_external.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -173,7 +172,9 @@ remove_user(User, Server, Password) -> get_cache_option(Host) -> case ejabberd_config:get_option( {extauth_cache, Host}, - fun(I) when is_integer(I), I > 0 -> I end) of + fun(false) -> undefined; + (I) when is_integer(I), I >= 0 -> I + end) of undefined -> false; CacheTime -> {true, CacheTime} end. diff --git a/src/ejabberd_auth_internal.erl b/src/ejabberd_auth_internal.erl index 8d7d0a0dd..48bd6bd96 100644 --- a/src/ejabberd_auth_internal.erl +++ b/src/ejabberd_auth_internal.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl index 1c1a4f313..77937d010 100644 --- a/src/ejabberd_auth_ldap.erl +++ b/src/ejabberd_auth_ldap.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl index a1841f3d1..27e89aa2b 100644 --- a/src/ejabberd_auth_odbc.erl +++ b/src/ejabberd_auth_odbc.erl @@ -5,7 +5,7 @@ %%% Created : 12 Dec 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -213,6 +212,7 @@ is_user_exists(User, Server) -> true; %% Account exists {selected, [<<"password">>], []} -> false; %% Account does not exist + {error, unknownhost} -> false; {error, Error} -> {error, Error} catch _:B -> {error, B} diff --git a/src/ejabberd_auth_pam.erl b/src/ejabberd_auth_pam.erl index 8e744e2c4..9c73d97f8 100644 --- a/src/ejabberd_auth_pam.erl +++ b/src/ejabberd_auth_pam.erl @@ -5,7 +5,7 @@ %%% Created : 5 Jul 2007 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- -module(ejabberd_auth_pam). diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 7117e46ab..8874c48ad 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -5,7 +5,7 @@ %%% Created : 16 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -118,7 +117,7 @@ mgmt_resend, mgmt_stanzas_in = 0, mgmt_stanzas_out = 0, - lang}). + lang = <<"">>}). %-define(DBGFSM, true). @@ -288,11 +287,20 @@ init([{SockMod, Socket}, Opts]) -> (_) -> false end, Opts), - TLSOpts2 = case proplists:get_bool(tls_compression, Opts) of - false -> [compression_none | TLSOpts1]; - true -> TLSOpts1 + TLSOpts2 = case lists:keysearch(protocol_options, 1, Opts) of + {value, {_, O}} -> + [_|ProtocolOptions] = lists:foldl( + fun(X, Acc) -> X ++ Acc end, [], + [["|" | binary_to_list(Opt)] || Opt <- O, is_binary(Opt)] + ), + [{protocol_options, iolist_to_binary(ProtocolOptions)} | TLSOpts1]; + _ -> TLSOpts1 end, - TLSOpts = [verify_none | TLSOpts2], + TLSOpts3 = case proplists:get_bool(tls_compression, Opts) of + false -> [compression_none | TLSOpts2]; + true -> TLSOpts2 + end, + TLSOpts = [verify_none | TLSOpts3], StreamMgmtEnabled = proplists:get_value(stream_management, Opts, true), StreamMgmtState = if StreamMgmtEnabled -> inactive; true -> disabled @@ -617,8 +625,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> ?INFO_MSG("(~w) Accepted legacy authentication for ~s by ~p", [StateData#state.socket, jlib:jid_to_string(JID), AuthModule]), - Conn = (StateData#state.sockmod):get_conn_type( - StateData#state.socket), + Conn = get_conn_type(StateData), Info = [{ip, StateData#state.ip}, {conn, Conn}, {auth_module, AuthModule}], Res = jlib:make_result_iq_reply( @@ -1353,14 +1360,19 @@ handle_info({send_text, Text}, StateName, StateData) -> send_text(StateData, Text), ejabberd_hooks:run(c2s_loop_debug, [Text]), fsm_next_state(StateName, StateData); -handle_info(replaced, _StateName, StateData) -> +handle_info(replaced, StateName, StateData) -> Lang = StateData#state.lang, - send_element(StateData, - ?SERRT_CONFLICT(Lang, - <<"Replaced by new connection">>)), + Xmlelement = ?SERRT_CONFLICT(Lang, <<"Replaced by new connection">>), + handle_info({kick, replaced, Xmlelement}, StateName, StateData); +handle_info(disconnect, StateName, StateData) -> + Lang = StateData#state.lang, + Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>), + handle_info({kick, kicked_by_admin, Xmlelement}, StateName, StateData); +handle_info({kick, Reason, Xmlelement}, _StateName, StateData) -> + send_element(StateData, Xmlelement), send_trailer(StateData), {stop, normal, - StateData#state{authenticated = replaced}}; + StateData#state{authenticated = Reason}}; handle_info({route, _From, _To, {broadcast, Data}}, StateName, StateData) -> ?DEBUG("broadcast~n~p~n", [Data]), diff --git a/src/ejabberd_c2s_config.erl b/src/ejabberd_c2s_config.erl index 2229e5ef1..3c65d562b 100644 --- a/src/ejabberd_c2s_config.erl +++ b/src/ejabberd_c2s_config.erl @@ -6,7 +6,7 @@ %%% Created : 2 Nov 2007 by Mickael Remond %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl index e9a3ea3a9..ab91ccb04 100644 --- a/src/ejabberd_captcha.erl +++ b/src/ejabberd_captcha.erl @@ -5,7 +5,7 @@ %%% Created : 26 Apr 2008 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- diff --git a/src/ejabberd_commands.erl b/src/ejabberd_commands.erl index 5287876ce..8d9ec0cb0 100644 --- a/src/ejabberd_commands.erl +++ b/src/ejabberd_commands.erl @@ -5,7 +5,7 @@ %%% Created : 20 May 2008 by Badlop %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 0551b49a5..06db8b569 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -5,7 +5,7 @@ %%% Created : 14 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index 46a365019..eda1c4970 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -5,7 +5,7 @@ %%% Created : 11 Jan 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -419,6 +418,7 @@ is_supported_args(Args) -> fun({_Name, Format}) -> (Format == integer) or (Format == string) + or (Format == binary) end, Args). @@ -565,7 +565,7 @@ format_command_lines(CALD, MaxCmdLen, MaxC, ShCode, dual) -> lists:map( fun({Cmd, Args, CmdArgsL, Desc}) -> DescFmt = prepare_description(MaxCmdLen+4, MaxC, Desc), - [" ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], + [" ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], string:chars($\s, MaxCmdLen - CmdArgsL + 1), DescFmt, "\n"] end, CALD); @@ -574,7 +574,7 @@ format_command_lines(CALD, _MaxCmdLen, MaxC, ShCode, long) -> lists:map( fun({Cmd, Args, _CmdArgsL, Desc}) -> DescFmt = prepare_description(8, MaxC, Desc), - ["\n ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], "\n", " ", + ["\n ", ?B(Cmd), " ", [[?U(Arg), " "] || Arg <- Args], "\n", " ", DescFmt, "\n"] end, CALD). diff --git a/src/ejabberd_frontend_socket.erl b/src/ejabberd_frontend_socket.erl index 583396ec9..d6ef3617d 100644 --- a/src/ejabberd_frontend_socket.erl +++ b/src/ejabberd_frontend_socket.erl @@ -5,7 +5,7 @@ %%% Created : 23 Aug 2006 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_hooks.erl b/src/ejabberd_hooks.erl index 3891fd9ff..e1f99eb88 100644 --- a/src/ejabberd_hooks.erl +++ b/src/ejabberd_hooks.erl @@ -5,7 +5,7 @@ %%% Created : 8 Aug 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl index 4919242a2..c5b5758ae 100644 --- a/src/ejabberd_http.erl +++ b/src/ejabberd_http.erl @@ -5,7 +5,7 @@ %%% Created : 27 Feb 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -51,7 +50,7 @@ request_auth, request_keepalive, request_content_length, - request_lang = "en", + request_lang = <<"en">>, %% XXX bard: request handlers are configured in %% ejabberd.cfg under the HTTP service. For example, %% to have the module test_web handle requests with diff --git a/src/ejabberd_http_poll.erl b/src/ejabberd_http_poll.erl index a00e690e2..9e65045cc 100644 --- a/src/ejabberd_http_poll.erl +++ b/src/ejabberd_http_poll.erl @@ -5,7 +5,7 @@ %%% Created : 4 Mar 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 5dc26c68e..844080a04 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -5,7 +5,7 @@ %%% Created : 16 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -152,7 +151,20 @@ init_udp(PortIP, Module, Opts, SockOpts, Port, IPS) -> {ok, Socket} -> %% Inform my parent that this port was opened succesfully proc_lib:init_ack({ok, self()}), - udp_recv(Socket, Module, Opts); + case erlang:function_exported(Module, udp_init, 2) of + false -> + udp_recv(Socket, Module, Opts); + true -> + case catch Module:udp_init(Socket, Opts) of + {'EXIT', _} = Err -> + ?ERROR_MSG("failed to process callback function " + "~p:~s(~p, ~p): ~p", + [Module, udp_init, Socket, Opts, Err]), + udp_recv(Socket, Module, Opts); + NewOpts -> + udp_recv(Socket, Module, NewOpts) + end + end; {error, Reason} -> socket_error(Reason, PortIP, Module, SockOpts, Port, IPS) end. @@ -161,8 +173,20 @@ init_tcp(PortIP, Module, Opts, SockOpts, Port, IPS) -> ListenSocket = listen_tcp(PortIP, Module, SockOpts, Port, IPS), %% Inform my parent that this port was opened succesfully proc_lib:init_ack({ok, self()}), - %% And now start accepting connection attempts - accept(ListenSocket, Module, Opts). + case erlang:function_exported(Module, tcp_init, 2) of + false -> + accept(ListenSocket, Module, Opts); + true -> + case catch Module:tcp_init(ListenSocket, Opts) of + {'EXIT', _} = Err -> + ?ERROR_MSG("failed to process callback function " + "~p:~s(~p, ~p): ~p", + [Module, tcp_init, ListenSocket, Opts, Err]), + accept(ListenSocket, Module, Opts); + NewOpts -> + accept(ListenSocket, Module, NewOpts) + end + end. listen_tcp(PortIP, Module, SockOpts, Port, IPS) -> case ets:lookup(listen_sockets, PortIP) of @@ -285,9 +309,10 @@ accept(ListenSocket, Module, Opts) -> case gen_tcp:accept(ListenSocket) of {ok, Socket} -> case {inet:sockname(Socket), inet:peername(Socket)} of - {{ok, Addr}, {ok, PAddr}} -> - ?INFO_MSG("(~w) Accepted connection ~w -> ~w", - [Socket, PAddr, Addr]); + {{ok, {Addr, Port}}, {ok, {PAddr, PPort}}} -> + ?INFO_MSG("(~w) Accepted connection ~s:~p -> ~s:~p", + [Socket, inet_parse:ntoa(PAddr), PPort, + inet_parse:ntoa(Addr), Port]); _ -> ok end, @@ -311,11 +336,11 @@ udp_recv(Socket, Module, Opts) -> ?ERROR_MSG("failed to process UDP packet:~n" "** Source: {~p, ~p}~n" "** Reason: ~p~n** Packet: ~p", - [Addr, Port, Reason, Packet]); - _ -> - ok - end, - udp_recv(Socket, Module, Opts); + [Addr, Port, Reason, Packet]), + udp_recv(Socket, Module, Opts); + NewOpts -> + udp_recv(Socket, Module, NewOpts) + end; {error, Reason} -> ?ERROR_MSG("unexpected UDP error: ~s", [format_error(Reason)]), throw({error, Reason}) @@ -342,6 +367,7 @@ start_listener2(Port, Module, Opts) -> %% But it doesn't hurt to attempt to start it for any listener. %% So, it's normal (and harmless) that in most cases this call returns: {error, {already_started, pid()}} maybe_start_stun(Module), + maybe_start_sip(Module), start_module_sup(Port, Module), start_listener_sup(Port, Module, Opts). @@ -463,6 +489,11 @@ maybe_start_stun(ejabberd_stun) -> maybe_start_stun(_) -> ok. +maybe_start_sip(esip_socket) -> + ejabberd:start_app(esip); +maybe_start_sip(_) -> + ok. + %%% %%% Check options %%% @@ -642,7 +673,11 @@ prepare_ip(IP) when is_binary(IP) -> prepare_mod(ejabberd_stun) -> prepare_mod(stun); +prepare_mod(ejabberd_sip) -> + prepare_mod(sip); prepare_mod(stun) -> stun; +prepare_mod(sip) -> + esip_socket; prepare_mod(Mod) when is_atom(Mod) -> Mod. diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl index f288bed9a..fd9ef1ca9 100644 --- a/src/ejabberd_local.erl +++ b/src/ejabberd_local.erl @@ -5,7 +5,7 @@ %%% Created : 30 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl index 92eefcff3..e1883f1db 100644 --- a/src/ejabberd_logger.erl +++ b/src/ejabberd_logger.erl @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%%------------------------------------------------------------------- -module(ejabberd_logger). diff --git a/src/ejabberd_node_groups.erl b/src/ejabberd_node_groups.erl index eb39b7265..ae1db531f 100644 --- a/src/ejabberd_node_groups.erl +++ b/src/ejabberd_node_groups.erl @@ -5,7 +5,7 @@ %%% Created : 1 Nov 2006 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_odbc.erl b/src/ejabberd_odbc.erl index 554322c23..df9a4c398 100644 --- a/src/ejabberd_odbc.erl +++ b/src/ejabberd_odbc.erl @@ -5,7 +5,7 @@ %%% Created : 8 Dec 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -141,9 +140,12 @@ sql_bloc(Host, F) -> sql_call(Host, {sql_bloc, F}). sql_call(Host, Msg) -> case get(?STATE_KEY) of undefined -> - (?GEN_FSM):sync_send_event(ejabberd_odbc_sup:get_random_pid(Host), - {sql_cmd, Msg, now()}, - ?TRANSACTION_TIMEOUT); + case ejabberd_odbc_sup:get_random_pid(Host) of + none -> {error, unknownhost}; + Pid -> + (?GEN_FSM):sync_send_event(Pid,{sql_cmd, Msg, now()}, + ?TRANSACTION_TIMEOUT) + end; _State -> nested_op(Msg) end. diff --git a/src/ejabberd_odbc_sup.erl b/src/ejabberd_odbc_sup.erl index 86b737948..d05fd139e 100644 --- a/src/ejabberd_odbc_sup.erl +++ b/src/ejabberd_odbc_sup.erl @@ -5,7 +5,7 @@ %%% Created : 22 Dec 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -83,8 +82,10 @@ get_pids(Host) -> [R#sql_pool.pid || R <- Rs]. get_random_pid(Host) -> - Pids = get_pids(Host), - lists:nth(erlang:phash(now(), length(Pids)), Pids). + case get_pids(Host) of + [] -> none; + Pids -> lists:nth(erlang:phash(now(), length(Pids)), Pids) + end. add_pid(Host, Pid) -> F = fun () -> diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl index 6c13e7426..d4a06de9c 100644 --- a/src/ejabberd_piefxis.erl +++ b/src/ejabberd_piefxis.erl @@ -9,7 +9,7 @@ %%% @doc %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -21,10 +21,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_rdbms.erl b/src/ejabberd_rdbms.erl index b5525de10..7c2b5e9ce 100644 --- a/src/ejabberd_rdbms.erl +++ b/src/ejabberd_rdbms.erl @@ -5,7 +5,7 @@ %%% Created : 31 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_receiver.erl b/src/ejabberd_receiver.erl index f666ea837..86cd3e8f9 100644 --- a/src/ejabberd_receiver.erl +++ b/src/ejabberd_receiver.erl @@ -5,7 +5,7 @@ %%% Created : 10 Nov 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_regexp.erl b/src/ejabberd_regexp.erl index 6603ec626..dff8bee1b 100644 --- a/src/ejabberd_regexp.erl +++ b/src/ejabberd_regexp.erl @@ -5,7 +5,7 @@ %%% Created : 8 Dec 2011 by Badlop %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl index 24f52d329..70a01ee4e 100644 --- a/src/ejabberd_router.erl +++ b/src/ejabberd_router.erl @@ -5,7 +5,7 @@ %%% Created : 27 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -397,6 +396,7 @@ update_tables() -> [domain, node, pid] -> mnesia:delete_table(route); [domain, pid] -> mnesia:delete_table(route); [domain, pid, local_hint] -> ok; + [domain, pid, local_hint|_] -> mnesia:delete_table(route); {'EXIT', _} -> ok end, case lists:member(local_route, diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index b13fdd58e..eb9894350 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -5,7 +5,7 @@ %%% Created : 7 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -38,7 +37,8 @@ incoming_s2s_number/0, outgoing_s2s_number/0, clean_temporarily_blocked_table/0, list_temporarily_blocked_hosts/0, - external_host_overloaded/1, is_temporarly_blocked/1]). + external_host_overloaded/1, is_temporarly_blocked/1, + check_peer_certificate/3]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, @@ -54,6 +54,14 @@ -include("ejabberd_commands.hrl"). +-include_lib("public_key/include/public_key.hrl"). + +-define(PKIXEXPLICIT, 'OTP-PUB-KEY'). + +-define(PKIXIMPLICIT, 'OTP-PUB-KEY'). + +-include("XmppAddr.hrl"). + -define(DEFAULT_MAX_S2S_CONNECTIONS_NUMBER, 1). -define(DEFAULT_MAX_S2S_CONNECTIONS_NUMBER_PER_NODE, 1). @@ -208,6 +216,31 @@ try_register(FromTo) -> dirty_get_connections() -> mnesia:dirty_all_keys(s2s). +check_peer_certificate(SockMod, Sock, Peer) -> + case SockMod:get_peer_certificate(Sock) of + {ok, Cert} -> + case SockMod:get_verify_result(Sock) of + 0 -> + case idna:domain_utf8_to_ascii(Peer) of + false -> + {error, <<"Cannot decode remote server name">>}; + AsciiPeer -> + case + lists:any(fun(D) -> match_domain(AsciiPeer, D) end, + get_cert_domains(Cert)) of + true -> + {ok, <<"Verification successful">>}; + false -> + {error, <<"Certificate host name mismatch">>} + end + end; + VerifyRes -> + {error, p1_tls:get_cert_verify_string(VerifyRes, Cert)} + end; + error -> + {error, <<"Cannot get peer certificate">>} + end. + %%==================================================================== %% gen_server callbacks %%==================================================================== @@ -620,3 +653,121 @@ get_s2s_state(S2sPid) -> {badrpc, _} -> [{status, error}] end, [{s2s_pid, S2sPid} | Infos]. + +get_cert_domains(Cert) -> + {rdnSequence, Subject} = + (Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.subject, + Extensions = + (Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.extensions, + lists:flatmap(fun (#'AttributeTypeAndValue'{type = + ?'id-at-commonName', + value = Val}) -> + case 'OTP-PUB-KEY':decode('X520CommonName', Val) of + {ok, {_, D1}} -> + D = if is_binary(D1) -> D1; + is_list(D1) -> list_to_binary(D1); + true -> error + end, + if D /= error -> + case jlib:string_to_jid(D) of + #jid{luser = <<"">>, lserver = LD, + lresource = <<"">>} -> + [LD]; + _ -> [] + end; + true -> [] + end; + _ -> [] + end; + (_) -> [] + end, + lists:flatten(Subject)) + ++ + lists:flatmap(fun (#'Extension'{extnID = + ?'id-ce-subjectAltName', + extnValue = Val}) -> + BVal = if is_list(Val) -> list_to_binary(Val); + true -> Val + end, + case 'OTP-PUB-KEY':decode('SubjectAltName', BVal) + of + {ok, SANs} -> + lists:flatmap(fun ({otherName, + #'AnotherName'{'type-id' = + ?'id-on-xmppAddr', + value = + XmppAddr}}) -> + case + 'XmppAddr':decode('XmppAddr', + XmppAddr) + of + {ok, D} + when + is_binary(D) -> + case + jlib:string_to_jid((D)) + of + #jid{luser = + <<"">>, + lserver = + LD, + lresource = + <<"">>} -> + case + idna:domain_utf8_to_ascii(LD) + of + false -> + []; + PCLD -> + [PCLD] + end; + _ -> [] + end; + _ -> [] + end; + ({dNSName, D}) + when is_list(D) -> + case + jlib:string_to_jid(list_to_binary(D)) + of + #jid{luser = <<"">>, + lserver = LD, + lresource = + <<"">>} -> + [LD]; + _ -> [] + end; + (_) -> [] + end, + SANs); + _ -> [] + end; + (_) -> [] + end, + Extensions). + +match_domain(Domain, Domain) -> true; +match_domain(Domain, Pattern) -> + DLabels = str:tokens(Domain, <<".">>), + PLabels = str:tokens(Pattern, <<".">>), + match_labels(DLabels, PLabels). + +match_labels([], []) -> true; +match_labels([], [_ | _]) -> false; +match_labels([_ | _], []) -> false; +match_labels([DL | DLabels], [PL | PLabels]) -> + case lists:all(fun (C) -> + $a =< C andalso C =< $z orelse + $0 =< C andalso C =< $9 orelse + C == $- orelse C == $* + end, + binary_to_list(PL)) + of + true -> + Regexp = ejabberd_regexp:sh_to_awk(PL), + case ejabberd_regexp:run(DL, Regexp) of + match -> match_labels(DLabels, PLabels); + nomatch -> false + end; + false -> false + end. diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 4789f8652..4fde814fe 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -5,7 +5,7 @@ %%% Created : 6 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -31,8 +30,7 @@ -behaviour(p1_fsm). %% External exports --export([start/2, start_link/2, match_domain/2, - socket_type/0]). +-export([start/2, start_link/2, socket_type/0]). %% gen_fsm callbacks -export([init/1, wait_for_stream/2, @@ -45,14 +43,6 @@ -include("jlib.hrl"). --include_lib("public_key/include/public_key.hrl"). - --define(PKIXEXPLICIT, 'OTP-PUB-KEY'). - --define(PKIXIMPLICIT, 'OTP-PUB-KEY'). - --include("XmppAddr.hrl"). - -define(DICT, dict). -record(state, @@ -182,9 +172,21 @@ init([{SockMod, Socket}, Opts]) -> undefined -> TLSOpts1; Ciphers -> [{ciphers, Ciphers} | TLSOpts1] end, + TLSOpts3 = case ejabberd_config:get_option( + s2s_protocol_options, + fun (Options) -> + [_|O] = lists:foldl( + fun(X, Acc) -> X ++ Acc end, [], + [["|" | binary_to_list(Opt)] || Opt <- Options, is_binary(Opt)] + ), + iolist_to_binary(O) + end) of + undefined -> TLSOpts2; + ProtocolOpts -> [{protocol_options, ProtocolOpts} | TLSOpts2] + end, TLSOpts = case proplists:get_bool(tls_compression, Opts) of - false -> [compression_none | TLSOpts2]; - true -> TLSOpts2 + false -> [compression_none | TLSOpts3]; + true -> TLSOpts3 end, Timer = erlang:start_timer(?S2STIMEOUT, self(), []), {ok, wait_for_stream, @@ -213,34 +215,21 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, not StateData#state.authenticated -> send_text(StateData, ?STREAM_HEADER(<<" version='1.0'">>)), - SASL = if StateData#state.tls_enabled -> - case - (StateData#state.sockmod):get_peer_certificate(StateData#state.socket) - of - {ok, Cert} -> - case - (StateData#state.sockmod):get_verify_result(StateData#state.socket) - of - 0 -> - [#xmlel{name = <<"mechanisms">>, - attrs = [{<<"xmlns">>, ?NS_SASL}], - children = - [#xmlel{name = <<"mechanism">>, - attrs = [], - children = - [{xmlcdata, - <<"EXTERNAL">>}]}]}]; - CertVerifyRes -> - case StateData#state.tls_certverify of - true -> - {error_cert_verif, CertVerifyRes, - Cert}; - false -> [] - end - end; - error -> [] + Auth = if StateData#state.tls_enabled -> + case jlib:nameprep(xml:get_attr_s(<<"from">>, Attrs)) of + From when From /= <<"">>, From /= error -> + {Result, Message} = + ejabberd_s2s:check_peer_certificate(StateData#state.sockmod, + StateData#state.socket, + From), + {Result, From, Message}; + _ -> + {error, <<"(unknown)">>, + <<"Got no valid 'from' attribute">>} end; - true -> [] + true -> + {no_verify, <<"(unknown)">>, + <<"TLS not (yet) enabled">>} end, StartTLS = if StateData#state.tls_enabled -> []; not StateData#state.tls_enabled and @@ -256,26 +245,36 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, [#xmlel{name = <<"required">>, attrs = [], children = []}]}] end, - case SASL of - {error_cert_verif, CertVerifyResult, Certificate} -> - CertError = p1_tls:get_cert_verify_string(CertVerifyResult, - Certificate), - RemoteServer = xml:get_attr_s(<<"from">>, Attrs), + case Auth of + {error, RemoteServer, CertError} + when StateData#state.tls_certverify -> ?INFO_MSG("Closing s2s connection: ~s <--> ~s (~s)", [StateData#state.server, RemoteServer, CertError]), send_text(StateData, - xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, - CertError))), - {atomic, Pid} = - ejabberd_s2s:find_connection(jlib:make_jid(<<"">>, - Server, <<"">>), - jlib:make_jid(<<"">>, - RemoteServer, - <<"">>)), - ejabberd_s2s_out:stop_connection(Pid), + <<(xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, + CertError)))/binary, + (?STREAM_TRAILER)/binary>>), {stop, normal, StateData}; - _ -> - send_element(StateData, + {VerifyResult, RemoteServer, Msg} -> + {SASL, NewStateData} = case VerifyResult of + ok -> + {[#xmlel{name = <<"mechanisms">>, + attrs = [{<<"xmlns">>, ?NS_SASL}], + children = + [#xmlel{name = <<"mechanism">>, + attrs = [], + children = + [{xmlcdata, + <<"EXTERNAL">>}]}]}], + StateData#state{auth_domain = RemoteServer}}; + error -> + ?DEBUG("Won't accept certificate of ~s: ~s", + [RemoteServer, Msg]), + {[], StateData}; + no_verify -> + {[], StateData} + end, + send_element(NewStateData, #xmlel{name = <<"stream:features">>, attrs = [], children = SASL ++ @@ -284,7 +283,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, Server, [], [Server])}), {next_state, wait_for_feature_request, - StateData#state{server = Server}} + NewStateData#state{server = Server}} end; {<<"jabber:server">>, _, Server, true} when StateData#state.authenticated -> @@ -319,7 +318,7 @@ wait_for_stream(closed, StateData) -> wait_for_feature_request({xmlstreamelement, El}, StateData) -> - #xmlel{name = Name, attrs = Attrs, children = Els} = El, + #xmlel{name = Name, attrs = Attrs} = El, TLS = StateData#state.tls, TLSEnabled = StateData#state.tls_enabled, SockMod = @@ -365,39 +364,11 @@ wait_for_feature_request({xmlstreamelement, El}, {?NS_SASL, <<"auth">>} when TLSEnabled -> Mech = xml:get_attr_s(<<"mechanism">>, Attrs), case Mech of - <<"EXTERNAL">> -> - Auth = jlib:decode_base64(xml:get_cdata(Els)), - AuthDomain = jlib:nameprep(Auth), - AuthRes = case - (StateData#state.sockmod):get_peer_certificate(StateData#state.socket) - of - {ok, Cert} -> - case - (StateData#state.sockmod):get_verify_result(StateData#state.socket) - of - 0 -> - case AuthDomain of - error -> false; - _ -> - case - idna:domain_utf8_to_ascii(AuthDomain) - of - false -> false; - PCAuthDomain -> - lists:any(fun (D) -> - match_domain(PCAuthDomain, - D) - end, - get_cert_domains(Cert)) - end - end; - _ -> false - end; - error -> false - end, + <<"EXTERNAL">> when StateData#state.auth_domain /= <<"">> -> + AuthDomain = StateData#state.auth_domain, AllowRemoteHost = ejabberd_s2s:allow_host(<<"">>, AuthDomain), - if AuthRes andalso AllowRemoteHost -> + if AllowRemoteHost -> (StateData#state.sockmod):reset_stream(StateData#state.socket), send_element(StateData, #xmlel{name = <<"success">>, @@ -409,8 +380,7 @@ wait_for_feature_request({xmlstreamelement, El}, jlib:make_jid(<<"">>, AuthDomain, <<"">>)), {next_state, wait_for_stream, StateData#state{streamid = new_id(), - authenticated = true, - auth_domain = AuthDomain}}; + authenticated = true}}; true -> send_element(StateData, #xmlel{name = <<"failure">>, @@ -727,125 +697,6 @@ is_key_packet(#xmlel{name = Name, attrs = Attrs, xml:get_attr_s(<<"id">>, Attrs), xml:get_cdata(Els)}; is_key_packet(_) -> false. -get_cert_domains(Cert) -> - {rdnSequence, Subject} = - (Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.subject, - Extensions = - (Cert#'Certificate'.tbsCertificate)#'TBSCertificate'.extensions, - lists:flatmap(fun (#'AttributeTypeAndValue'{type = - ?'id-at-commonName', - value = Val}) -> - case 'OTP-PUB-KEY':decode('X520CommonName', Val) of - {ok, {_, D1}} -> - D = if is_binary(D1) -> D1; - is_binary(D1) -> (D1); - true -> error - end, - if D /= error -> - case jlib:string_to_jid(D) of - #jid{luser = <<"">>, lserver = LD, - lresource = <<"">>} -> - [LD]; - _ -> [] - end; - true -> [] - end; - _ -> [] - end; - (_) -> [] - end, - lists:flatten(Subject)) - ++ - lists:flatmap(fun (#'Extension'{extnID = - ?'id-ce-subjectAltName', - extnValue = Val}) -> - BVal = if is_binary(Val) -> iolist_to_binary(Val); - is_binary(Val) -> Val; - true -> Val - end, - case 'OTP-PUB-KEY':decode('SubjectAltName', BVal) - of - {ok, SANs} -> - lists:flatmap(fun ({otherName, - #'AnotherName'{'type-id' = - ?'id-on-xmppAddr', - value = - XmppAddr}}) -> - case - 'XmppAddr':decode('XmppAddr', - XmppAddr) - of - {ok, D} - when - is_binary(D) -> - case - jlib:string_to_jid((D)) - of - #jid{luser = - <<"">>, - lserver = - LD, - lresource = - <<"">>} -> - case - idna:domain_utf8_to_ascii(LD) - of - false -> - []; - PCLD -> - [PCLD] - end; - _ -> [] - end; - _ -> [] - end; - ({dNSName, D}) - when is_binary(D) -> - case - jlib:string_to_jid(D) - of - #jid{luser = <<"">>, - lserver = LD, - lresource = - <<"">>} -> - [LD]; - _ -> [] - end; - (_) -> [] - end, - SANs); - _ -> [] - end; - (_) -> [] - end, - Extensions). - -match_domain(Domain, Domain) -> true; -match_domain(Domain, Pattern) -> - DLabels = str:tokens(Domain, <<".">>), - PLabels = str:tokens(Pattern, <<".">>), - match_labels(DLabels, PLabels). - -match_labels([], []) -> true; -match_labels([], [_ | _]) -> false; -match_labels([_ | _], []) -> false; -match_labels([DL | DLabels], [PL | PLabels]) -> - case lists:all(fun (C) -> - $a =< C andalso C =< $z orelse - $0 =< C andalso C =< $9 orelse - C == $- orelse C == $* - end, - binary_to_list(PL)) - of - true -> - Regexp = ejabberd_regexp:sh_to_awk(PL), - case ejabberd_regexp:run(DL, Regexp) of - match -> match_labels(DLabels, PLabels); - nomatch -> false - end; - false -> false - end. - fsm_limit_opts(Opts) -> case lists:keysearch(max_fsm_queue, 1, Opts) of {value, {_, N}} when is_integer(N) -> [{max_queue, N}]; diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index a5acdad95..052729314 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -5,7 +5,7 @@ %%% Created : 6 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -70,6 +69,7 @@ use_v10 = true :: boolean(), tls = false :: boolean(), tls_required = false :: boolean(), + tls_certverify = false :: boolean(), tls_enabled = false :: boolean(), tls_options = [connect] :: list(), authenticated = false :: boolean(), @@ -161,28 +161,27 @@ stop_connection(Pid) -> p1_fsm:send_event(Pid, closed). init([From, Server, Type]) -> process_flag(trap_exit, true), ?DEBUG("started: ~p", [{From, Server, Type}]), - {TLS, TLSRequired} = case - ejabberd_config:get_option( - s2s_use_starttls, - fun(true) -> true; - (false) -> false; - (optional) -> optional; - (required) -> required; - (required_trusted) -> required_trusted - end) - of - UseTls - when (UseTls == undefined) or - (UseTls == false) -> - {false, false}; - UseTls - when (UseTls == true) or (UseTls == optional) -> - {true, false}; - UseTls - when (UseTls == required) or - (UseTls == required_trusted) -> - {true, true} - end, + {TLS, TLSRequired, TLSCertverify} = + case ejabberd_config:get_option( + s2s_use_starttls, + fun(true) -> true; + (false) -> false; + (optional) -> optional; + (required) -> required; + (required_trusted) -> required_trusted + end) + of + UseTls + when (UseTls == undefined) or (UseTls == false) -> + {false, false, false}; + UseTls + when (UseTls == true) or (UseTls == optional) -> + {true, false, false}; + required -> + {true, true, false}; + required_trusted -> + {true, true, true} + end, UseV10 = TLS, TLSOpts1 = case ejabberd_config:get_option( @@ -196,13 +195,25 @@ init([From, Server, Type]) -> undefined -> TLSOpts1; Ciphers -> [{ciphers, Ciphers} | TLSOpts1] end, + TLSOpts3 = case ejabberd_config:get_option( + s2s_protocol_options, + fun (Options) -> + [_|O] = lists:foldl( + fun(X, Acc) -> X ++ Acc end, [], + [["|" | binary_to_list(Opt)] || Opt <- Options, is_binary(Opt)] + ), + iolist_to_binary(O) + end) of + undefined -> TLSOpts2; + ProtocolOpts -> [{protocol_options, ProtocolOpts} | TLSOpts2] + end, TLSOpts = case ejabberd_config:get_option( {s2s_tls_compression, From}, fun(true) -> true; (false) -> false end, true) of - false -> [compression_none | TLSOpts2]; - true -> TLSOpts2 + false -> [compression_none | TLSOpts3]; + true -> TLSOpts3 end, {New, Verify} = case Type of {new, Key} -> {Key, false}; @@ -212,9 +223,9 @@ init([From, Server, Type]) -> Timer = erlang:start_timer(?S2STIMEOUT, self(), []), {ok, open_socket, #state{use_v10 = UseV10, tls = TLS, - tls_required = TLSRequired, tls_options = TLSOpts, - queue = queue:new(), myname = From, server = Server, - new = New, verify = Verify, timer = Timer}}. + tls_required = TLSRequired, tls_certverify = TLSCertverify, + tls_options = TLSOpts, queue = queue:new(), myname = From, + server = Server, new = New, verify = Verify, timer = Timer}}. %%---------------------------------------------------------------------- %% Func: StateName/2 @@ -334,35 +345,57 @@ open_socket2(Type, Addr, Port) -> wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) -> + {CertCheckRes, CertCheckMsg, NewStateData} = + if StateData#state.tls_certverify, StateData#state.tls_enabled -> + {Res, Msg} = + ejabberd_s2s:check_peer_certificate(ejabberd_socket, + StateData#state.socket, + StateData#state.server), + ?DEBUG("Certificate verification result for ~s: ~s", + [StateData#state.server, Msg]), + {Res, Msg, StateData#state{tls_certverify = false}}; + true -> + {no_verify, <<"Not verified">>, StateData} + end, case {xml:get_attr_s(<<"xmlns">>, Attrs), xml:get_attr_s(<<"xmlns:db">>, Attrs), xml:get_attr_s(<<"version">>, Attrs) == <<"1.0">>} of + _ when CertCheckRes == error -> + send_text(NewStateData, + <<(xml:element_to_binary(?SERRT_POLICY_VIOLATION(<<"en">>, + CertCheckMsg)))/binary, + (?STREAM_TRAILER)/binary>>), + ?INFO_MSG("Closing s2s connection: ~s -> ~s (~s)", + [NewStateData#state.myname, + NewStateData#state.server, + CertCheckMsg]), + {stop, normal, NewStateData}; {<<"jabber:server">>, <<"jabber:server:dialback">>, false} -> - send_db_request(StateData); + send_db_request(NewStateData); {<<"jabber:server">>, <<"jabber:server:dialback">>, true} - when StateData#state.use_v10 -> - {next_state, wait_for_features, StateData, ?FSMTIMEOUT}; + when NewStateData#state.use_v10 -> + {next_state, wait_for_features, NewStateData, ?FSMTIMEOUT}; %% Clause added to handle Tigase's workaround for an old ejabberd bug: {<<"jabber:server">>, <<"jabber:server:dialback">>, true} - when not StateData#state.use_v10 -> - send_db_request(StateData); + when not NewStateData#state.use_v10 -> + send_db_request(NewStateData); {<<"jabber:server">>, <<"">>, true} - when StateData#state.use_v10 -> + when NewStateData#state.use_v10 -> {next_state, wait_for_features, - StateData#state{db_enabled = false}, ?FSMTIMEOUT}; + NewStateData#state{db_enabled = false}, ?FSMTIMEOUT}; {NSProvided, DB, _} -> - send_text(StateData, ?INVALID_NAMESPACE_ERR), + send_text(NewStateData, ?INVALID_NAMESPACE_ERR), ?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid " "namespace).~nNamespace provided: ~p~nNamespac" "e expected: \"jabber:server\"~nxmlns:db " "provided: ~p~nAll attributes: ~p", - [StateData#state.myname, StateData#state.server, + [NewStateData#state.myname, NewStateData#state.server, NSProvided, DB, Attrs]), - {stop, normal, StateData} + {stop, normal, NewStateData} end; wait_for_stream({xmlstreamerror, _}, StateData) -> send_text(StateData, @@ -559,15 +592,19 @@ wait_for_features({xmlstreamelement, El}, StateData) -> if not SASLEXT and not StartTLS and StateData#state.authenticated -> send_queue(StateData, StateData#state.queue), - ?INFO_MSG("Connection established: ~s -> ~s", - [StateData#state.myname, StateData#state.server]), + ?INFO_MSG("Connection established: ~s -> ~s with " + "SASL EXTERNAL and TLS=~p", + [StateData#state.myname, StateData#state.server, + StateData#state.tls_enabled]), ejabberd_hooks:run(s2s_connect_hook, [StateData#state.myname, StateData#state.server]), {next_state, stream_established, StateData#state{queue = queue:new()}}; SASLEXT and StateData#state.try_auth and - (StateData#state.new /= false) -> + (StateData#state.new /= false) and + (StateData#state.tls_enabled or + not StateData#state.tls_required) -> send_element(StateData, #xmlel{name = <<"auth">>, attrs = @@ -725,8 +762,8 @@ wait_for_starttls_proceed({xmlstreamelement, El}, tls_options = TLSOpts}, send_text(NewStateData, io_lib:format(?STREAM_HEADER, - [StateData#state.myname, - StateData#state.server, + [NewStateData#state.myname, + NewStateData#state.server, <<" version='1.0'">>])), {next_state, wait_for_stream, NewStateData, ?FSMTIMEOUT}; diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl index 35f7c187a..04b29d380 100644 --- a/src/ejabberd_service.erl +++ b/src/ejabberd_service.erl @@ -5,7 +5,7 @@ %%% Created : 6 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 6bcacbe78..094918cd9 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -5,7 +5,7 @@ %%% Created : 24 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -40,6 +39,7 @@ bounce_offline_message/3, disconnect_removed_user/2, get_user_resources/2, + get_user_present_resources/2, set_presence/7, unset_presence/6, close_session_unset_presence/5, @@ -54,9 +54,11 @@ connected_users/0, connected_users_number/0, user_resources/2, + disconnect_user/2, get_session_pid/3, get_user_info/3, get_user_ip/3, + get_max_user_sessions/2, is_existing_resource/3 ]). @@ -174,6 +176,20 @@ get_user_resources(User, Server) -> [element(3, S#session.usr) || S <- clean_session_list(Ss)] end. +-spec get_user_present_resources(binary(), binary()) -> [tuple()]. + +get_user_present_resources(LUser, LServer) -> + US = {LUser, LServer}, + case catch mnesia:dirty_index_read(session, US, + #session.us) + of + {'EXIT', _Reason} -> []; + Ss -> + [{S#session.priority, element(3, S#session.usr)} + || S <- clean_session_list(Ss), + is_integer(S#session.priority)] + end. + -spec get_user_ip(binary(), binary(), binary()) -> ip(). get_user_ip(User, Server, Resource) -> @@ -677,20 +693,6 @@ clean_session_list([S1, S2 | Rest], Res) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -get_user_present_resources(LUser, LServer) -> - US = {LUser, LServer}, - case catch mnesia:dirty_index_read(session, US, - #session.us) - of - {'EXIT', _Reason} -> []; - Ss -> - [{S#session.priority, element(3, S#session.usr)} - || S <- clean_session_list(Ss), - is_integer(S#session.priority)] - end. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %% On new session, check if some existing connections need to be replace check_for_sessions_to_replace(User, Server, Resource) -> LUser = jlib:nodeprep(User), @@ -807,8 +809,14 @@ commands() -> tags = [session], desc = "List user's connected resources", module = ?MODULE, function = user_resources, - args = [{user, string}, {host, string}], - result = {resources, {list, {resource, string}}}}]. + args = [{user, binary}, {host, binary}], + result = {resources, {list, {resource, string}}}}, + #ejabberd_commands{name = disconnect_user, + tags = [session], + desc = "Disconnect user's active sessions", + module = ?MODULE, function = disconnect_user, + args = [{user, binary}, {host, binary}], + result = {num_resources, integer}}]. -spec connected_users() -> [binary()]. @@ -825,6 +833,14 @@ user_resources(User, Server) -> Resources = get_user_resources(User, Server), lists:sort(Resources). +disconnect_user(User, Server) -> + Resources = get_user_resources(User, Server), + lists:foreach( + fun(Resource) -> + PID = get_session_pid(User, Server, Resource), + PID ! disconnect + end, Resources), + length(Resources). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% Update Mnesia tables @@ -834,6 +850,7 @@ update_tables() -> [ur, user, node] -> mnesia:delete_table(session); [ur, user, pid] -> mnesia:delete_table(session); [usr, us, pid] -> mnesia:delete_table(session); + [usr, us, sid, priority, info] -> mnesia:delete_table(session); [sid, usr, us, priority] -> mnesia:delete_table(session); [sid, usr, us, priority, info] -> ok; diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl index 58bb80efe..165c53f23 100644 --- a/src/ejabberd_socket.erl +++ b/src/ejabberd_socket.erl @@ -5,7 +5,7 @@ %%% Created : 23 Aug 2006 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index b3da8369d..c89a068b7 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -5,7 +5,7 @@ %%% Created : 31 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl index 92a41b9d8..368c5a0ff 100644 --- a/src/ejabberd_system_monitor.erl +++ b/src/ejabberd_system_monitor.erl @@ -5,7 +5,7 @@ %%% Created : 21 Mar 2007 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- @@ -245,9 +244,8 @@ s2s_out_info(Pid) -> [<<"Process type: s2s_out">>, case FromTo of [{From, To}] -> - <<"\n", - (io_lib:format("S2S connection: from ~s to ~s", - [From, To]))/binary>>; + list_to_binary(io_lib:format("\nS2S connection: from ~s to ~s", + [From, To])); _ -> <<"">> end, check_send_queue(Pid), <<"\n">>, diff --git a/src/ejabberd_tmp_sup.erl b/src/ejabberd_tmp_sup.erl index c3d2a186e..9bc2046a9 100644 --- a/src/ejabberd_tmp_sup.erl +++ b/src/ejabberd_tmp_sup.erl @@ -5,7 +5,7 @@ %%% Created : 18 Jul 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_update.erl b/src/ejabberd_update.erl index 41c2ea510..17db47fb1 100644 --- a/src/ejabberd_update.erl +++ b/src/ejabberd_update.erl @@ -5,7 +5,7 @@ %%% Created : 27 Jan 2006 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl index 70f62de7f..43119fead 100644 --- a/src/ejabberd_web.erl +++ b/src/ejabberd_web.erl @@ -6,7 +6,7 @@ %%% Created : 28 Feb 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl index 7a676f674..56172fa16 100644 --- a/src/ejabberd_web_admin.erl +++ b/src/ejabberd_web_admin.erl @@ -5,7 +5,7 @@ %%% Created : 9 Apr 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -341,7 +340,7 @@ make_xhtml(Els, Host, Node, Lang, JID) -> ?XAE(<<"div">>, [{<<"id">>, <<"copyrightouter">>}], [?XAE(<<"div">>, [{<<"id">>, <<"copyright">>}], [?XC(<<"p">>, - <<"ejabberd (c) 2002-2013 ProcessOne">>)])])])]}}. + <<"ejabberd (c) 2002-2014 ProcessOne">>)])])])]}}. get_base_path(global, cluster) -> <<"/admin/">>; get_base_path(Host, cluster) -> @@ -1138,7 +1137,7 @@ string_to_spec2(ACLName, Val) -> jlib:string_to_jid(Val), case U of <<"">> -> {ACLName, S}; - _ -> {ACLName, U, S} + _ -> {ACLName, {U, S}} end. acl_parse_delete(ACLs, Query) -> @@ -2183,7 +2182,7 @@ get_node(global, Node, [<<"update">>], Query, Lang) -> ?XCT(<<"h3">>, <<"Update script">>), FmtScript, ?XCT(<<"h3">>, <<"Low level update script">>), FmtLowLevelScript, ?XCT(<<"h3">>, <<"Script check">>), - ?XC(<<"pre">>, (iolist_to_binary(Check))), + ?XC(<<"pre">>, (jlib:atom_to_binary(Check))), ?BR, ?INPUTT(<<"submit">>, <<"update">>, <<"Update">>)])]; get_node(Host, Node, NPath, Query, Lang) -> diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl index acda0c7f9..ff89d2858 100644 --- a/src/ejabberd_xmlrpc.erl +++ b/src/ejabberd_xmlrpc.erl @@ -345,14 +345,18 @@ build_fault_response(Code, ParseString, ParseArgs) -> do_command(AccessCommands, Auth, Command, AttrL, ArgsF, ResultF) -> ArgsFormatted = format_args(AttrL, ArgsF), - {UserT, ServerT, PasswordT} = Auth, - AuthBin = {list_to_binary(UserT), list_to_binary(ServerT), list_to_binary(PasswordT)}, + AuthBin = convert_auth(Auth), Result = ejabberd_commands:execute_command(AccessCommands, AuthBin, Command, ArgsFormatted), ResultFormatted = format_result(Result, ResultF), {command_result, ResultFormatted}. +convert_auth(noauth) -> + noauth; +convert_auth({UserT, ServerT, PasswordT}) -> + {list_to_binary(UserT), list_to_binary(ServerT), list_to_binary(PasswordT)}. + %%----------------------------- %% Format arguments %%----------------------------- @@ -424,7 +428,11 @@ format_arg({array, Elements}, {list, ElementsDef}) format_arg(Arg, integer) when is_integer(Arg) -> Arg; format_arg(Arg, binary) when is_list(Arg) -> list_to_binary(Arg); format_arg(Arg, binary) when is_binary(Arg) -> Arg; -format_arg(Arg, string) when is_binary(Arg) -> Arg. +format_arg(Arg, string) when is_list(Arg) -> list_to_binary(Arg); +format_arg(Arg, string) when is_binary(Arg) -> Arg; +format_arg(Arg, Format) -> + ?ERROR_MSG("don't know how to format Arg ~p for format ~p", [Arg, Format]), + throw({error_formatting_argument, Arg, Format}). %% ----------------------------- %% Result diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl index 7afcd6154..892b8df62 100644 --- a/src/ejd2odbc.erl +++ b/src/ejd2odbc.erl @@ -5,7 +5,7 @@ %%% Created : 22 Aug 2005 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/eldap.erl b/src/eldap.erl index 0dae3cbe8..0f1a1a445 100644 --- a/src/eldap.erl +++ b/src/eldap.erl @@ -18,9 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %%% GNU General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% Modified by Sean Hinde 7th Dec 2000 %%% Turned into gen_fsm, made non-blocking, added timers etc to support this. diff --git a/src/eldap_filter.erl b/src/eldap_filter.erl index 6771fc2af..fc2a31219 100644 --- a/src/eldap_filter.erl +++ b/src/eldap_filter.erl @@ -6,7 +6,7 @@ %%% Author: Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- -module(eldap_filter). diff --git a/src/eldap_pool.erl b/src/eldap_pool.erl index 35fabeb74..87bb3182f 100644 --- a/src/eldap_pool.erl +++ b/src/eldap_pool.erl @@ -5,7 +5,7 @@ %%% Created : 12 Nov 2006 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- diff --git a/src/eldap_utils.erl b/src/eldap_utils.erl index a18a04ed6..a87023437 100644 --- a/src/eldap_utils.erl +++ b/src/eldap_utils.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Mickael Remond %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/extauth.erl b/src/extauth.erl index e57ac0b8d..51b4611be 100644 --- a/src/extauth.erl +++ b/src/extauth.erl @@ -5,7 +5,7 @@ %%% Created : 30 Jul 2004 by Leif Johansson %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl index 628c1c90c..d8dffa0e9 100644 --- a/src/gen_iq_handler.erl +++ b/src/gen_iq_handler.erl @@ -5,7 +5,7 @@ %%% Created : 22 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/gen_mod.erl b/src/gen_mod.erl index 0b06529b5..261e6c6dd 100644 --- a/src/gen_mod.erl +++ b/src/gen_mod.erl @@ -6,7 +6,7 @@ %%% Created : 24 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl index 0cf1fd2ff..a1252f9f8 100644 --- a/src/gen_pubsub_node.erl +++ b/src/gen_pubsub_node.erl @@ -11,12 +11,12 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl index 8acba659c..e343f4581 100644 --- a/src/gen_pubsub_nodetree.erl +++ b/src/gen_pubsub_nodetree.erl @@ -11,12 +11,12 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/idna.erl b/src/idna.erl index 7e3d0aefb..ec62d4c7a 100644 --- a/src/idna.erl +++ b/src/idna.erl @@ -5,7 +5,7 @@ %%% Created : 10 Apr 2004 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl index a60033998..1a75b1739 100644 --- a/src/jd2ejd.erl +++ b/src/jd2ejd.erl @@ -5,7 +5,7 @@ %%% Created : 2 Feb 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/jlib.erl b/src/jlib.erl index ffabb3ffe..7735d7dbc 100644 --- a/src/jlib.erl +++ b/src/jlib.erl @@ -5,7 +5,7 @@ %%% Created : 23 Nov 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl index ae37bb9d6..47ce625b3 100644 --- a/src/mod_adhoc.erl +++ b/src/mod_adhoc.erl @@ -5,7 +5,7 @@ %%% Created : 15 Nov 2005 by Magnus Henoch %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_announce.erl b/src/mod_announce.erl index b558897a0..fba6d3b81 100644 --- a/src/mod_announce.erl +++ b/src/mod_announce.erl @@ -5,7 +5,7 @@ %%% Created : 11 Aug 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl index 2aaff7bae..797b7573b 100644 --- a/src/mod_blocking.erl +++ b/src/mod_blocking.erl @@ -5,7 +5,7 @@ %%% Created : 24 Aug 2008 by Stephan Maka %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_caps.erl b/src/mod_caps.erl index ac115d646..5f529bd28 100644 --- a/src/mod_caps.erl +++ b/src/mod_caps.erl @@ -5,7 +5,7 @@ %%% Created : 7 Oct 2006 by Magnus Henoch %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%% 2009, improvements from ProcessOne to support correct PEP handling %%% through s2s, use less memory, and speedup global caps handling diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl index cc5cb83b0..16f0c06fc 100644 --- a/src/mod_carboncopy.erl +++ b/src/mod_carboncopy.erl @@ -7,7 +7,7 @@ %%% {mod_carboncopy, []} %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -19,10 +19,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- -module (mod_carboncopy). @@ -128,30 +127,37 @@ iq_handler(From, _To, #iq{type=set, sub_el = #xmlel{name = Operation, children iq_handler(_From, _To, IQ, _CC)-> IQ#iq{type=error, sub_el = [?ERR_NOT_ALLOWED]}. -user_send_packet(From, _To, Packet) -> - check_and_forward(From, Packet, sent). +user_send_packet(From, To, Packet) -> + check_and_forward(From, To, Packet, sent). -%% Only make carbon copies if the original destination was not a bare jid. -%% If the original destination was a bare jid, the message is going to be delivered to all -%% connected resources anyway. Avoid duplicate delivery. "XEP-0280 : 3.5 Receiving Messages" -user_receive_packet(JID, _From, #jid{resource=Resource} = _To, Packet) when Resource /= <<>> -> - check_and_forward(JID, Packet, received); -user_receive_packet(_JID, _From, _To, _Packet) -> - ok. +user_receive_packet(JID, _From, To, Packet) -> + check_and_forward(JID, To, Packet, received). % verifier si le trafic est local % Modified from original version: % - registered to the user_send_packet hook, to be called only once even for multicast % - do not support "private" message mode, and do not modify the original packet in any way % - we also replicate "read" notifications -check_and_forward(JID, #xmlel{name = <<"message">>, attrs = Attrs} = Packet, Direction)-> +check_and_forward(JID, To, #xmlel{name = <<"message">>, attrs = Attrs} = Packet, Direction)-> case xml:get_attr_s(<<"type">>, Attrs) of <<"chat">> -> case xml:get_subtag(Packet, <<"private">>) of false -> case xml:get_subtag(Packet,<<"received">>) of false -> - send_copies(JID, Packet, Direction); + %% We must check if a packet contains "" tags in order to avoid + %% receiving message back to original sender. + SubTag = xml:get_subtag(Packet,<<"sent">>), + if SubTag == false -> + send_copies(JID, To, Packet, Direction); + true -> + case xml:get_subtag(SubTag,<<"forwarded">>) of + false-> + send_copies(JID, To, Packet, Direction); + _ -> + stop + end + end; _ -> %% stop the hook chain, we don't want mod_logdb to register this message (duplicate) stop @@ -163,7 +169,7 @@ check_and_forward(JID, #xmlel{name = <<"message">>, attrs = Attrs} = Packet, Dir ok end; -check_and_forward(_JID, _Packet, _)-> ok. +check_and_forward(_JID, _To, _Packet, _)-> ok. remove_connection(User, Server, Resource, _Status)-> disable(Server, User, Resource), @@ -172,14 +178,35 @@ remove_connection(User, Server, Resource, _Status)-> %%% Internal %% Direction = received | sent -send_copies(JID, Packet, Direction)-> +send_copies(JID, To, Packet, Direction)-> {U, S, R} = jlib:jid_tolower(JID), + PrioRes = ejabberd_sm:get_user_present_resources(U, S), + IsBareTo = case {Direction, To} of + {received, #jid{lresource = <<>>}} -> true; + {received, #jid{lresource = LRes}} -> + %% unavailable resources are handled like bare JIDs + case lists:keyfind(LRes, 2, PrioRes) of + false -> true; + _ -> false + end; + _ -> false + end, %% list of JIDs that should receive a carbon copy of this message (excluding the - %% receiver of the original message - TargetJIDs = [ {jlib:make_jid({U, S, CCRes}), CC_Version} || {CCRes, CC_Version} <- list(U, S), CCRes /= R ], - %TargetJIDs = lists:delete(JID, [ jlib:make_jid({U, S, CCRes}) || CCRes <- list(U, S) ]), - + %% receiver(s) of the original message + TargetJIDs = if IsBareTo -> + MaxPrio = case catch lists:max(PrioRes) of + {Prio, _Res} -> Prio; + _ -> 0 + end, + OrigTo = fun(Res) -> lists:member({MaxPrio, Res}, PrioRes) end, + [ {jlib:make_jid({U, S, CCRes}), CC_Version} + || {CCRes, CC_Version} <- list(U, S), not OrigTo(CCRes) ]; + true -> + [ {jlib:make_jid({U, S, CCRes}), CC_Version} + || {CCRes, CC_Version} <- list(U, S), CCRes /= R ] + %TargetJIDs = lists:delete(JID, [ jlib:make_jid({U, S, CCRes}) || CCRes <- list(U, S) ]), + end, lists:map(fun({Dest,Version}) -> {_, _, Resource} = jlib:jid_tolower(Dest), diff --git a/src/mod_configure.erl b/src/mod_configure.erl index b6c8f55b7..fab594ca1 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -5,7 +5,7 @@ %%% Created : 19 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -1846,13 +1845,14 @@ set_form(From, Host, ?NS_ADMINL(<<"delete-user">>), || {User, Server} <- ASL2], {result, []}; set_form(From, Host, ?NS_ADMINL(<<"end-user-session">>), - _Lang, XData) -> + Lang, XData) -> AccountString = get_value(<<"accountjid">>, XData), JID = jlib:string_to_jid(AccountString), LUser = JID#jid.luser, LServer = JID#jid.lserver, true = LServer == Host orelse get_permission_level(From) == global, + Xmlelement = ?SERRT_POLICY_VIOLATION(Lang, <<"has been kicked">>), case JID#jid.lresource of <<>> -> SIDs = mnesia:dirty_select(session, @@ -1860,14 +1860,14 @@ set_form(From, Host, ?NS_ADMINL(<<"end-user-session">>), usr = {LUser, LServer, '_'}, _ = '_'}, [], ['$1']}]), - [Pid ! replaced || {_, Pid} <- SIDs]; + [Pid ! {kick, kicked_by_admin, Xmlelement} || {_, Pid} <- SIDs]; R -> [{_, Pid}] = mnesia:dirty_select(session, [{#session{sid = '$1', usr = {LUser, LServer, R}, _ = '_'}, [], ['$1']}]), - Pid ! replaced + Pid ! {kick, kicked_by_admin, Xmlelement} end, {result, []}; set_form(From, Host, diff --git a/src/mod_configure2.erl b/src/mod_configure2.erl index 375621441..0d7d727f2 100644 --- a/src/mod_configure2.erl +++ b/src/mod_configure2.erl @@ -5,7 +5,7 @@ %%% Created : 26 Oct 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_disco.erl b/src/mod_disco.erl index b11c9629a..1f0afc3dd 100644 --- a/src/mod_disco.erl +++ b/src/mod_disco.erl @@ -5,7 +5,7 @@ %%% Created : 1 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -488,10 +487,10 @@ get_fields_xml(Host, Module) -> lists:map( fun(Opts) -> Mods = proplists:get_value(modules, Opts, all), - Name = proplists:get_value(names, Opts, <<>>), + Name = proplists:get_value(name, Opts, <<>>), URLs = proplists:get_value(urls, Opts, []), {Mods, Name, URLs} - end, lists:flatten(L)) + end, L) end, []), Fields_good = lists:filter(fun ({Modules, _, _}) -> case Modules of diff --git a/src/mod_echo.erl b/src/mod_echo.erl index 077a4de49..db8771084 100644 --- a/src/mod_echo.erl +++ b/src/mod_echo.erl @@ -5,7 +5,7 @@ %%% Created : 15 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_http_bind.erl b/src/mod_http_bind.erl index dcaa8a91a..2dcac1419 100644 --- a/src/mod_http_bind.erl +++ b/src/mod_http_bind.erl @@ -5,7 +5,7 @@ %%% Created : Tue Feb 20 13:15:52 CET 2007 %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_http_fileserver.erl b/src/mod_http_fileserver.erl index fcfa12b59..8807f24bf 100644 --- a/src/mod_http_fileserver.erl +++ b/src/mod_http_fileserver.erl @@ -5,7 +5,7 @@ %%% Created : %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_ip_blacklist.erl b/src/mod_ip_blacklist.erl index 3af5aaac0..f0feb6551 100644 --- a/src/mod_ip_blacklist.erl +++ b/src/mod_ip_blacklist.erl @@ -7,7 +7,7 @@ %%% {mod_ip_blacklist, []} %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -19,10 +19,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_irc.erl b/src/mod_irc.erl index 3aa57002f..88e0f1dce 100644 --- a/src/mod_irc.erl +++ b/src/mod_irc.erl @@ -5,7 +5,7 @@ %%% Created : 15 Feb 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -466,7 +465,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd IRC module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. command_items(ServerHost, Host, Lang) -> lists:map(fun ({Node, Name, _Function}) -> diff --git a/src/mod_irc_connection.erl b/src/mod_irc_connection.erl index c37ca7cb4..f150d9f53 100644 --- a/src/mod_irc_connection.erl +++ b/src/mod_irc_connection.erl @@ -5,7 +5,7 @@ %%% Created : 15 Feb 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_last.erl b/src/mod_last.erl index 6e35938d2..6b7a06bed 100644 --- a/src/mod_last.erl +++ b/src/mod_last.erl @@ -5,7 +5,7 @@ %%% Created : 24 Oct 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_muc.erl b/src/mod_muc.erl index 7934e6f95..160b9009d 100644 --- a/src/mod_muc.erl +++ b/src/mod_muc.erl @@ -5,7 +5,7 @@ %%% Created : 19 Mar 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -1020,7 +1019,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd MUC module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. broadcast_service_message(Host, Msg) -> diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl index 357d19216..e8724483e 100644 --- a/src/mod_muc_log.erl +++ b/src/mod_muc_log.erl @@ -5,7 +5,7 @@ %%% Created : 12 Mar 2006 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 1ef90b1eb..3842fde40 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -5,7 +5,7 @@ %%% Created : 19 Mar 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -246,7 +245,7 @@ normal_state({route, From, <<"">>, NewState = expulse_participant(Packet, From, StateData, translate:translate(Lang, ErrorText)), - {next_state, normal_state, NewState}; + close_room_if_temporary_and_empty(NewState); _ -> {next_state, normal_state, StateData} end; <<"chat">> -> @@ -419,12 +418,13 @@ normal_state({route, From, <<"">>, StateData) -> case jlib:iq_query_info(Packet) of #iq{type = Type, xmlns = XMLNS, lang = Lang, - sub_el = SubEl} = + sub_el = #xmlel{name = SubElName} = SubEl} = IQ when (XMLNS == (?NS_MUC_ADMIN)) or (XMLNS == (?NS_MUC_OWNER)) or (XMLNS == (?NS_DISCO_INFO)) or (XMLNS == (?NS_DISCO_ITEMS)) + or (XMLNS == (?NS_VCARD)) or (XMLNS == (?NS_CAPTCHA)) -> Res1 = case XMLNS of ?NS_MUC_ADMIN -> @@ -435,6 +435,8 @@ normal_state({route, From, <<"">>, process_iq_disco_info(From, Type, Lang, StateData); ?NS_DISCO_ITEMS -> process_iq_disco_items(From, Type, Lang, StateData); + ?NS_VCARD -> + process_iq_vcard(From, Type, Lang, SubEl, StateData); ?NS_CAPTCHA -> process_iq_captcha(From, Type, Lang, SubEl, StateData) end, @@ -442,7 +444,7 @@ normal_state({route, From, <<"">>, {result, Res, SD} -> {IQ#iq{type = result, sub_el = - [#xmlel{name = <<"query">>, + [#xmlel{name = SubElName, attrs = [{<<"xmlns">>, XMLNS}], @@ -1124,14 +1126,17 @@ process_presence(From, Nick, end; _ -> StateData end, + close_room_if_temporary_and_empty(StateData1). + +close_room_if_temporary_and_empty(StateData1) -> case not (StateData1#state.config)#config.persistent andalso (?DICT):to_list(StateData1#state.users) == [] of true -> ?INFO_MSG("Destroyed MUC room ~s because it's temporary " "and empty", - [jlib:jid_to_string(StateData#state.jid)]), - add_to_log(room_existence, destroyed, StateData), + [jlib:jid_to_string(StateData1#state.jid)]), + add_to_log(room_existence, destroyed, StateData1), {stop, normal, StateData1}; _ -> {next_state, normal_state, StateData1} end. @@ -3895,6 +3900,10 @@ set_opts([{Opt, Val} | Opts], StateData) -> StateData#state{config = (StateData#state.config)#config{max_users = MaxUsers}}; + vcard -> + StateData#state{config = + (StateData#state.config)#config{vcard = + Val}}; affiliations -> StateData#state{affiliations = (?DICT):from_list(Val)}; subject -> StateData#state{subject = Val}; @@ -3927,6 +3936,7 @@ make_opts(StateData) -> ?MAKE_CONFIG_OPT(logging), ?MAKE_CONFIG_OPT(max_users), ?MAKE_CONFIG_OPT(allow_voice_requests), ?MAKE_CONFIG_OPT(voice_request_min_interval), + ?MAKE_CONFIG_OPT(vcard), {captcha_whitelist, (?SETS):to_list((StateData#state.config)#config.captcha_whitelist)}, {affiliations, @@ -3992,6 +4002,8 @@ process_iq_disco_info(_From, get, Lang, StateData) -> {<<"type">>, <<"text">>}, {<<"name">>, get_title(StateData)}], children = []}, + #xmlel{name = <<"feature">>, + attrs = [{<<"var">>, ?NS_VCARD}], children = []}, #xmlel{name = <<"feature">>, attrs = [{<<"var">>, ?NS_MUC}], children = []}, ?CONFIG_OPT_TO_FEATURE((Config#config.public), @@ -4065,6 +4077,26 @@ process_iq_captcha(_From, set, _Lang, SubEl, _ -> {error, ?ERR_NOT_ACCEPTABLE} end. +process_iq_vcard(_From, get, _Lang, _SubEl, StateData) -> + #state{config = #config{vcard = VCardRaw}} = StateData, + case xml_stream:parse_element(VCardRaw) of + #xmlel{children = VCardEls} -> + {result, VCardEls, StateData}; + {error, _} -> + {result, [], StateData} + end; +process_iq_vcard(From, set, Lang, SubEl, StateData) -> + case get_affiliation(From, StateData) of + owner -> + VCardRaw = xml:element_to_binary(SubEl), + Config = StateData#state.config, + NewConfig = Config#config{vcard = VCardRaw}, + change_config(NewConfig, StateData); + _ -> + ErrText = <<"Owner privileges required">>, + {error, ?ERRT_FORBIDDEN(Lang, ErrText)} + end. + get_title(StateData) -> case (StateData#state.config)#config.title of <<"">> -> StateData#state.room; diff --git a/src/mod_offline.erl b/src/mod_offline.erl index f4e0a888f..77d333bd7 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -5,7 +5,7 @@ %%% Created : 5 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_ping.erl b/src/mod_ping.erl index 078b0d13d..15bfd08de 100644 --- a/src/mod_ping.erl +++ b/src/mod_ping.erl @@ -5,7 +5,7 @@ %%% Created : 11 Jul 2009 by Brian Cully %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl index 30f5308c0..d40d54596 100644 --- a/src/mod_pres_counter.erl +++ b/src/mod_pres_counter.erl @@ -5,7 +5,7 @@ %%% Created : 23 Sep 2010 by Ahmed Omar %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl index 5edfccd28..6b852bb47 100644 --- a/src/mod_privacy.erl +++ b/src/mod_privacy.erl @@ -5,7 +5,7 @@ %%% Created : 21 Jul 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_private.erl b/src/mod_private.erl index ae7068480..9fa74d9b7 100644 --- a/src/mod_private.erl +++ b/src/mod_private.erl @@ -5,7 +5,7 @@ %%% Created : 16 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_proxy65.erl b/src/mod_proxy65.erl index 85bec283b..17da3660b 100644 --- a/src/mod_proxy65.erl +++ b/src/mod_proxy65.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_proxy65_lib.erl b/src/mod_proxy65_lib.erl index 388811436..e43ceb7e8 100644 --- a/src/mod_proxy65_lib.erl +++ b/src/mod_proxy65_lib.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl index 33d40b1cc..9f66cf7d2 100644 --- a/src/mod_proxy65_service.erl +++ b/src/mod_proxy65_service.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -248,7 +247,7 @@ iq_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd SOCKS5 Bytestreams module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. parse_options(ServerHost, Opts) -> MyHost = gen_mod:get_opt_host(ServerHost, Opts, diff --git a/src/mod_proxy65_sm.erl b/src/mod_proxy65_sm.erl index fa9d257ef..fc8cd3649 100644 --- a/src/mod_proxy65_sm.erl +++ b/src/mod_proxy65_sm.erl @@ -5,7 +5,7 @@ %%% Created : 12 Oct 2006 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_proxy65_stream.erl b/src/mod_proxy65_stream.erl index b37dcc13a..958aeaa1f 100644 --- a/src/mod_proxy65_stream.erl +++ b/src/mod_proxy65_stream.erl @@ -4,7 +4,7 @@ %%% Purpose : Bytestream process. %%% Created : 12 Oct 2006 by Evgeniy Khramtsov %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -16,10 +16,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 9bb5acfa4..168169a95 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} @@ -827,7 +827,7 @@ send_loop(State) -> end; (_) -> ok end, - Subscriptions) + lists:usort(Subscriptions)) end, State#state.plugins), if not State#state.ignore_pep_from_offline -> @@ -1166,22 +1166,21 @@ disco_items(Host, Node, From) -> %% presence hooks handling functions %% -caps_update(#jid{luser = U, lserver = S, lresource = R} = From, To, _Features) -> - Pid = ejabberd_sm:get_session_pid(U, S, R), - presence_probe(From, To, Pid). +caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features) + when Host =/= S -> + presence(Host, {presence, U, S, [R], JID}); +caps_update(_From, _To, _Feature) -> + ok. -presence_probe(#jid{luser = User, lserver = Server, lresource = Resource} = JID, - JID, Pid) -> - presence(Server, {presence, JID, Pid}), - presence(Server, {presence, User, Server, [Resource], JID}); -presence_probe(#jid{luser = User, lserver = Server}, - #jid{luser = User, lserver = Server}, _Pid) -> - %% ignore presence_probe from other ressources for the current user - %% this way, we do not send duplicated last items if user already connected with other clients +presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) -> + presence(S, {presence, JID, Pid}), + presence(S, {presence, U, S, [R], JID}); +presence_probe(#jid{luser = U, lserver = S}, #jid{luser = U, lserver = S}, _Pid) -> + %% ignore presence_probe from my other ressources + %% to not get duplicated last items ok; -presence_probe(#jid{luser = User, lserver = Server, lresource = Resource}, - #jid{lserver = Host} = JID, _Pid) -> - presence(Host, {presence, User, Server, [Resource], JID}). +presence_probe(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Pid) -> + presence(Host, {presence, U, S, [R], JID}). presence(ServerHost, Presence) -> SendLoop = case @@ -1621,7 +1620,7 @@ command_disco_info(_Host, ?NS_PUBSUB_GET_PENDING, node_disco_info(Host, Node, From) -> node_disco_info(Host, Node, From, true, true). -node_disco_info(Host, Node, From, Identity, Features) -> +node_disco_info(Host, Node, From, _Identity, _Features) -> % Action = % fun(#pubsub_node{type = Type, id = NodeId}) -> % I = case Identity of @@ -1910,7 +1909,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd Publish-Subscribe module">>))/binary, - "\nCopyright (c) 2004-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2004-2014 ProcessOne">>}]}]. -spec(iq_pubsub/6 :: ( @@ -2952,10 +2951,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) -> PublishModel = get_option(Options, publish_model), DeliverPayloads = get_option(Options, deliver_payloads), PersistItems = get_option(Options, persist_items), - MaxItems = case PersistItems of - false -> 0; - true -> max_items(Host, Options) - end, + MaxItems = max_items(Host, Options), PayloadCount = payload_xmlelements(Payload), PayloadSize = byte_size(term_to_binary(Payload)) - 2, PayloadMaxSize = get_option(Options, max_payload_size), @@ -3359,6 +3355,8 @@ send_items(Host, Node, NodeId, Type, {U, S, R} = LJID, _ -> [] end, Stanza = case ToSend of + [] -> + undefined; [LastItem] -> {ModifNow, ModifUSR} = LastItem#pubsub_item.modification, @@ -3372,11 +3370,13 @@ send_items(Host, Node, NodeId, Type, {U, S, R} = LJID, attrs = nodeAttr(Node), children = itemsEls(ToSend)}]) end, - case is_tuple(Host) of - false -> + case {is_tuple(Host), Stanza} of + {_, undefined} -> + ok; + {false, _} -> ejabberd_router:route(service_jid(Host), jlib:make_jid(LJID), Stanza); - true -> + {true, _} -> case ejabberd_sm:get_session_pid(U, S, R) of C2SPid when is_pid(C2SPid) -> ejabberd_c2s:broadcast(C2SPid, @@ -4156,7 +4156,7 @@ presence_can_deliver({User, Server, Resource}, true) -> ({session, _, _ , _, undefined, _}, _Acc) -> false; ({session, _, {_, _, R}, _, _Priority, _}, _Acc) -> case Resource of - [] -> true; + <<>> -> true; R -> true; _ -> false end @@ -4442,15 +4442,7 @@ broadcast_stanza(Host, _Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTy broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) -> broadcast_stanza({LUser, LServer, LResource}, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM), %% Handles implicit presence subscriptions - SenderResource = case LResource of - [] -> - case user_resources(LUser, LServer) of - [Resource|_] -> Resource; - _ -> <<>> - end; - _ -> - LResource - end, + SenderResource = user_resource(LUser, LServer, LResource), case ejabberd_sm:get_session_pid(LUser, LServer, SenderResource) of C2SPid when is_pid(C2SPid) -> Stanza = case get_option(NodeOptions, notification_type, headline) of @@ -4461,8 +4453,8 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod %% Also, add "replyto" if entity has presence subscription to the account owner %% See XEP-0163 1.1 section 4.3.1 ejabberd_c2s:broadcast(C2SPid, - {pep_message, binary_to_list(Node)++"+notify"}, - _Sender = jlib:make_jid(LUser, LServer, ""), + {pep_message, <<((Node))/binary, "+notify">>}, + _Sender = jlib:make_jid(LUser, LServer, <<"">>), _StanzaToSend = add_extended_headers(Stanza, _ReplyTo = extended_headers([jlib:jid_to_string(Publisher)]))); _ -> @@ -4527,6 +4519,13 @@ subscribed_nodes_by_jid(NotifyType, SubsByDepth) -> user_resources(User, Server) -> ejabberd_sm:get_user_resources(User, Server). +user_resource(User, Server, <<>>) -> + case user_resources(User, Server) of + [R | _] -> R; + _ -> <<>> + end; +user_resource(_, _, Resource) -> Resource. + %%%%%%% Configuration handling %%

    There are several reasons why the default node configuration options request might fail:

    diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl index 1a182e4d6..45c30a11b 100644 --- a/src/mod_pubsub_odbc.erl +++ b/src/mod_pubsub_odbc.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} @@ -475,7 +475,7 @@ send_loop(State) -> end; (_) -> ok end, - Subscriptions) + lists:usort(Subscriptions)) end, State#state.plugins), if not State#state.ignore_pep_from_offline -> @@ -817,22 +817,21 @@ disco_items(Host, Node, From) -> %% presence hooks handling functions %% -caps_update(#jid{luser = U, lserver = S, lresource = R} = From, To, _Features) -> - Pid = ejabberd_sm:get_session_pid(U, S, R), - presence_probe(From, To, Pid). +caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features) + when Host =/= S -> + presence(Host, {presence, U, S, [R], JID}); +caps_update(_From, _To, _Feature) -> + ok. -presence_probe(#jid{luser = User, lserver = Server, lresource = Resource} = JID, - JID, Pid) -> - presence(Server, {presence, JID, Pid}), - presence(Server, {presence, User, Server, [Resource], JID}); -presence_probe(#jid{luser = User, lserver = Server}, - #jid{luser = User, lserver = Server}, _Pid) -> - %% ignore presence_probe from other ressources for the current user - %% this way, we do not send duplicated last items if user already connected with other clients +presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) -> + presence(S, {presence, JID, Pid}), + presence(S, {presence, U, S, [R], JID}); +presence_probe(#jid{luser = U, lserver = S}, #jid{luser = U, lserver = S}, _Pid) -> + %% ignore presence_probe from my other ressources + %% to not get duplicated last items ok; -presence_probe(#jid{luser = User, lserver = Server, lresource = Resource}, - #jid{lserver = Host} = JID, _Pid) -> - presence(Host, {presence, User, Server, [Resource], JID}). +presence_probe(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Pid) -> + presence(Host, {presence, U, S, [R], JID}). presence(ServerHost, Presence) -> SendLoop = case @@ -885,10 +884,10 @@ unsubscribe_user(Entity, Owner) -> Host = host(element(2, BJID)), spawn(fun () -> lists:foreach(fun (PType) -> - {result, Subscriptions} = - node_action(Host, PType, + case node_action(Host, PType, get_entity_subscriptions, - [Host, Entity]), + [Host, Entity]) of + {result, Subscriptions} -> lists:foreach(fun ({#pubsub_node{options = Options, @@ -922,7 +921,10 @@ unsubscribe_user(Entity, Owner) -> end; (_) -> ok end, - Subscriptions) + Subscriptions); + Error -> + ?DEBUG("Error at node_action: ~p", [Error]) + end end, plugins(Host)) end). @@ -1270,7 +1272,7 @@ command_disco_info(_Host, ?NS_PUBSUB_GET_PENDING, node_disco_info(Host, Node, From) -> node_disco_info(Host, Node, From, true, true). -node_disco_info(Host, Node, From, Identity, Features) -> +node_disco_info(Host, Node, From, _Identity, _Features) -> % Action = % fun(#pubsub_node{type = Type, id = NodeId}) -> % I = case Identity of @@ -1569,7 +1571,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd Publish-Subscribe module">>))/binary, - "\nCopyright (c) 2004-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2004-2014 ProcessOne">>}]}]. -spec(iq_pubsub/6 :: ( @@ -2615,9 +2617,9 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) -> Features = features(Type), PublishFeature = lists:member(<<"publish">>, Features), PublishModel = get_option(Options, publish_model), - MaxItems = max_items(Host, Options), DeliverPayloads = get_option(Options, deliver_payloads), PersistItems = get_option(Options, persist_items), + MaxItems = max_items(Host, Options), PayloadCount = payload_xmlelements(Payload), PayloadSize = byte_size(term_to_binary(Payload)) - 2, PayloadMaxSize = get_option(Options, max_payload_size), @@ -3010,7 +3012,7 @@ send_items(Host, Node, NodeId, Type, LJID, last) -> ModifNow, ModifUSR) end, ejabberd_router:route(service_jid(Host), jlib:make_jid(LJID), Stanza); -send_items(Host, Node, NodeId, Type, LJID, Number) -> +send_items(Host, Node, NodeId, Type, {U, S, R} = LJID, Number) -> ToSend = case node_action(Host, Type, get_items, [NodeId, LJID]) of @@ -3023,6 +3025,8 @@ send_items(Host, Node, NodeId, Type, LJID, Number) -> _ -> [] end, Stanza = case ToSend of + [] -> + undefined; [LastItem] -> {ModifNow, ModifUSR} = LastItem#pubsub_item.modification, @@ -3036,7 +3040,22 @@ send_items(Host, Node, NodeId, Type, LJID, Number) -> attrs = nodeAttr(Node), children = itemsEls(ToSend)}]) end, - ejabberd_router:route(service_jid(Host), jlib:make_jid(LJID), Stanza). + case {is_tuple(Host), Stanza} of + {_, undefined} -> + ok; + {false, _} -> + ejabberd_router:route(service_jid(Host), + jlib:make_jid(LJID), Stanza); + {true, _} -> + case ejabberd_sm:get_session_pid(U, S, R) of + C2SPid when is_pid(C2SPid) -> + ejabberd_c2s:broadcast(C2SPid, + {pep_message, + <<((Node))/binary, "+notify">>}, + _Sender = service_jid(Host), Stanza); + _ -> ok + end + end. %% @spec (Host, JID, Plugins) -> {error, Reason} | {result, Response} %% Host = host() @@ -3232,8 +3251,7 @@ set_affiliations(Host, Node, From, EntitiesEls) -> error -> {error, ?ERR_BAD_REQUEST}; _ -> Action = fun (#pubsub_node{type = Type, - id = NodeId} = - N) -> + id = NodeId}) -> Owners = node_owners_call(Type, NodeId), case lists:member(Owner, Owners) of true -> @@ -4059,15 +4077,7 @@ broadcast_stanza(Host, _Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTy broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) -> broadcast_stanza({LUser, LServer, LResource}, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM), %% Handles implicit presence subscriptions - SenderResource = case LResource of - [] -> - case user_resources(LUser, LServer) of - [Resource|_] -> Resource; - _ -> <<>> - end; - _ -> - LResource - end, + SenderResource = user_resource(LUser, LServer, LResource), case ejabberd_sm:get_session_pid(LUser, LServer, SenderResource) of C2SPid when is_pid(C2SPid) -> Stanza = case get_option(NodeOptions, notification_type, headline) of @@ -4078,8 +4088,8 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod %% Also, add "replyto" if entity has presence subscription to the account owner %% See XEP-0163 1.1 section 4.3.1 ejabberd_c2s:broadcast(C2SPid, - {pep_message, binary_to_list(Node)++"+notify"}, - _Sender = jlib:make_jid(LUser, LServer, ""), + {pep_message, <<((Node))/binary, "+notify">>}, + _Sender = jlib:make_jid(LUser, LServer, <<"">>), _StanzaToSend = add_extended_headers(Stanza, _ReplyTo = extended_headers([jlib:jid_to_string(Publisher)]))); _ -> @@ -4144,6 +4154,13 @@ subscribed_nodes_by_jid(NotifyType, SubsByDepth) -> user_resources(User, Server) -> ejabberd_sm:get_user_resources(User, Server). +user_resource(User, Server, <<>>) -> + case user_resources(User, Server) of + [R | _] -> R; + _ -> <<>> + end; +user_resource(_, _, Resource) -> Resource. + %%%%%%% Configuration handling %%

    There are several reasons why the default node configuration options request might fail:

    diff --git a/src/mod_register.erl b/src/mod_register.erl index c7da225ef..21e088b5a 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -5,7 +5,7 @@ %%% Created : 8 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl index 841685a94..ee3ff0069 100644 --- a/src/mod_register_web.erl +++ b/src/mod_register_web.erl @@ -5,7 +5,7 @@ %%% Created : 4 May 2008 by Badlop %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -141,7 +140,10 @@ process([<<"change_password">>], list_to_binary([?T(<<"There was an error changing the password: ">>), ?T(get_error_text(Error))]), {404, [], ErrorText} - end. + end; + +process(Path, _Request) -> + {404, [], "Not Found"}. %%%---------------------------------------------------------------------- %%% CSS @@ -485,9 +487,16 @@ form_del_get(Host, Lang) -> %% {error, not_allowed} | %% {error, invalid_jid} register_account(Username, Host, Password) -> + Access = gen_mod:get_module_opt(Host, mod_register, access, + fun(A) when is_atom(A) -> A end, + all), case jlib:make_jid(Username, Host, <<"">>) of error -> {error, invalid_jid}; - _ -> register_account2(Username, Host, Password) + JID -> + case acl:match_rule(Host, Access, JID) of + deny -> {error, not_allowed}; + allow -> register_account2(Username, Host, Password) + end end. register_account2(Username, Host, Password) -> diff --git a/src/mod_roster.erl b/src/mod_roster.erl index 4851b8fb5..4ab8239b5 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -5,7 +5,7 @@ %%% Created : 11 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl index 82497a609..dd4800baa 100644 --- a/src/mod_service_log.erl +++ b/src/mod_service_log.erl @@ -5,7 +5,7 @@ %%% Created : 24 Aug 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 743b1dd62..e572a3a4d 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -5,7 +5,7 @@ %%% Created : 5 Mar 2005 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl index 322909a2c..6bf7c9f7d 100644 --- a/src/mod_shared_roster_ldap.erl +++ b/src/mod_shared_roster_ldap.erl @@ -7,7 +7,7 @@ %%% Created : 5 Mar 2005 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -19,10 +19,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- -module(mod_shared_roster_ldap). diff --git a/src/mod_sic.erl b/src/mod_sic.erl index b1ae44d04..46dfbebc1 100644 --- a/src/mod_sic.erl +++ b/src/mod_sic.erl @@ -5,7 +5,7 @@ %%% Created : 6 Mar 2010 by Karim Gemayel %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_sip.erl b/src/mod_sip.erl new file mode 100644 index 000000000..8ed4ed8cf --- /dev/null +++ b/src/mod_sip.erl @@ -0,0 +1,279 @@ +%%%------------------------------------------------------------------- +%%% @author Evgeny Khramtsov +%%% @copyright (C) 2014, Evgeny Khramtsov +%%% @doc +%%% +%%% @end +%%% Created : 21 Apr 2014 by Evgeny Khramtsov +%%%------------------------------------------------------------------- +-module(mod_sip). + +-behaviour(gen_mod). +-behaviour(esip). + +%% API +-export([start/2, stop/1, prepare_request/1, make_response/2, at_my_host/1]). + +%% esip_callbacks +-export([data_in/2, data_out/2, message_in/2, message_out/2, + request/2, request/3, response/2, locate/1]). + +-include("ejabberd.hrl"). +-include("logger.hrl"). +-include("esip.hrl"). + +%%%=================================================================== +%%% API +%%%=================================================================== +start(_Host, _Opts) -> + ejabberd:start_app(esip), + esip:set_config_value(max_server_transactions, 10000), + esip:set_config_value(max_client_transactions, 10000), + esip:set_config_value(software, <<"ejabberd ", (?VERSION)/binary>>), + esip:set_config_value(module, ?MODULE), + Spec = {mod_sip_registrar, {mod_sip_registrar, start_link, []}, + transient, 2000, worker, [mod_sip_registrar]}, + TmpSupSpec = {mod_sip_proxy_sup, + {ejabberd_tmp_sup, start_link, + [mod_sip_proxy_sup, mod_sip_proxy]}, + permanent, infinity, supervisor, [ejabberd_tmp_sup]}, + supervisor:start_child(ejabberd_sup, Spec), + supervisor:start_child(ejabberd_sup, TmpSupSpec), + ok. + +stop(_Host) -> + ok. + +data_in(Data, #sip_socket{type = Transport, + addr = {MyIP, MyPort}, + peer = {PeerIP, PeerPort}}) -> + ?DEBUG( + "SIP [~p/in] ~s:~p -> ~s:~p:~n~s", + [Transport, inet_parse:ntoa(PeerIP), PeerPort, + inet_parse:ntoa(MyIP), MyPort, Data]). + +data_out(Data, #sip_socket{type = Transport, + addr = {MyIP, MyPort}, + peer = {PeerIP, PeerPort}}) -> + ?DEBUG( + "SIP [~p/out] ~s:~p -> ~s:~p:~n~s", + [Transport, inet_parse:ntoa(MyIP), MyPort, + inet_parse:ntoa(PeerIP), PeerPort, Data]). + +message_in(#sip{type = request, method = M} = Req, SIPSock) + when M /= <<"ACK">>, M /= <<"CANCEL">> -> + case action(Req, SIPSock) of + {relay, _LServer} -> + ok; + Action -> + request(Req, SIPSock, undefined, Action) + end; +message_in(_, _) -> + ok. + +message_out(_, _) -> + ok. + +response(_Resp, _SIPSock) -> + ok. + +request(_Req, _SIPSock) -> + error. + +request(Req, SIPSock, TrID) -> + request(Req, SIPSock, TrID, action(Req, SIPSock)). + +request(Req, SIPSock, TrID, Action) -> + case Action of + to_me -> + process(Req, SIPSock); + register -> + mod_sip_registrar:request(Req, SIPSock); + loop -> + make_response(Req, #sip{status = 483, type = response}); + {unsupported, Require} -> + make_response(Req, #sip{status = 420, + type = response, + hdrs = [{'unsupported', + Require}]}); + {relay, LServer} -> + case mod_sip_proxy:start(LServer, []) of + {ok, Pid} -> + mod_sip_proxy:route(Req, SIPSock, TrID, Pid), + {mod_sip_proxy, route, [Pid]}; + Err -> + ?INFO_MSG("failed to proxy request ~p: ~p", [Req, Err]), + Err + end; + {proxy_auth, Host} -> + make_response( + Req, + #sip{status = 407, + type = response, + hdrs = [{'proxy-authenticate', + make_auth_hdr(Host)}]}); + {auth, Host} -> + make_response( + Req, + #sip{status = 401, + type = response, + hdrs = [{'www-authenticate', + make_auth_hdr(Host)}]}); + deny -> + make_response(Req, #sip{status = 403, + type = response}); + not_found -> + make_response(Req, #sip{status = 480, + type = response}) + end. + +locate(_SIPMsg) -> + ok. + +find(#uri{user = User, host = Host}) -> + LUser = jlib:nodeprep(User), + LServer = jlib:nameprep(Host), + if LUser == <<"">> -> + to_me; + true -> + case mod_sip_registrar:find_sockets(LUser, LServer) of + [] -> + not_found; + [_|_] -> + {relay, LServer} + end + end. + +%%%=================================================================== +%%% Internal functions +%%%=================================================================== +action(#sip{method = <<"REGISTER">>, type = request, hdrs = Hdrs, + uri = #uri{user = <<"">>} = URI} = Req, SIPSock) -> + case at_my_host(URI) of + true -> + case esip:get_hdrs('require', Hdrs) of + [_|_] = Require -> + {unsupported, Require}; + _ -> + {_, ToURI, _} = esip:get_hdr('to', Hdrs), + case at_my_host(ToURI) of + true -> + case check_auth(Req, 'authorization', SIPSock) of + true -> + register; + false -> + {auth, ToURI#uri.host} + end; + false -> + deny + end + end; + false -> + deny + end; +action(#sip{method = Method, hdrs = Hdrs, type = request} = Req, SIPSock) -> + case esip:get_hdr('max-forwards', Hdrs) of + 0 when Method == <<"OPTIONS">> -> + to_me; + 0 -> + loop; + _ -> + case esip:get_hdrs('proxy-require', Hdrs) of + [_|_] = Require -> + {unsupported, Require}; + _ -> + {_, ToURI, _} = esip:get_hdr('to', Hdrs), + {_, FromURI, _} = esip:get_hdr('from', Hdrs), + case at_my_host(FromURI) of + true -> + case check_auth(Req, 'proxy-authorization', SIPSock) of + true -> + case at_my_host(ToURI) of + true -> + find(ToURI); + false -> + LServer = jlib:nameprep(FromURI#uri.host), + {relay, LServer} + end; + false -> + {proxy_auth, FromURI#uri.host} + end; + false -> + case at_my_host(ToURI) of + true -> + find(ToURI); + false -> + deny + end + end + end + end. + +check_auth(#sip{method = <<"CANCEL">>}, _, _SIPSock) -> + true; +check_auth(#sip{method = Method, hdrs = Hdrs, body = Body}, AuthHdr, _SIPSock) -> + Issuer = case AuthHdr of + 'authorization' -> + to; + 'proxy-authorization' -> + from + end, + {_, #uri{user = User, host = Host}, _} = esip:get_hdr(Issuer, Hdrs), + LUser = jlib:nodeprep(User), + LServer = jlib:nameprep(Host), + case lists:filter( + fun({_, Params}) -> + Username = esip:get_param(<<"username">>, Params), + Realm = esip:get_param(<<"realm">>, Params), + (LUser == esip:unquote(Username)) + and (LServer == esip:unquote(Realm)) + end, esip:get_hdrs(AuthHdr, Hdrs)) of + [Auth|_] -> + case ejabberd_auth:get_password_s(LUser, LServer) of + <<"">> -> + false; + Password -> + esip:check_auth(Auth, Method, Body, Password) + end; + [] -> + false + end. + +allow() -> + [<<"OPTIONS">>, <<"REGISTER">>]. + +process(#sip{method = <<"OPTIONS">>} = Req, _) -> + make_response(Req, #sip{type = response, status = 200, + hdrs = [{'allow', allow()}]}); +process(#sip{method = <<"REGISTER">>} = Req, _) -> + make_response(Req, #sip{type = response, status = 400}); +process(Req, _) -> + make_response(Req, #sip{type = response, status = 405, + hdrs = [{'allow', allow()}]}). + +prepare_request(#sip{hdrs = Hdrs1} = Req) -> + MF = esip:get_hdr('max-forwards', Hdrs1), + Hdrs2 = esip:set_hdr('max-forwards', MF-1, Hdrs1), + Hdrs3 = lists:filter( + fun({'proxy-authorization', {_, Params}}) -> + Realm = esip:unquote(esip:get_param(<<"realm">>, Params)), + not is_my_host(jlib:nameprep(Realm)); + (_) -> + true + end, Hdrs2), + Req#sip{hdrs = Hdrs3}. + +make_auth_hdr(LServer) -> + Realm = jlib:nameprep(LServer), + {<<"Digest">>, [{<<"realm">>, esip:quote(Realm)}, + {<<"qop">>, esip:quote(<<"auth">>)}, + {<<"nonce">>, esip:quote(esip:make_hexstr(20))}]}. + +make_response(Req, Resp) -> + esip:make_response(Req, Resp, esip:make_tag()). + +at_my_host(#uri{host = Host}) -> + is_my_host(jlib:nameprep(Host)). + +is_my_host(LServer) -> + gen_mod:is_loaded(LServer, ?MODULE). diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl new file mode 100644 index 000000000..cae75bff8 --- /dev/null +++ b/src/mod_sip_proxy.erl @@ -0,0 +1,277 @@ +%%%------------------------------------------------------------------- +%%% @author Evgeny Khramtsov +%%% @copyright (C) 2014, Evgeny Khramtsov +%%% @doc +%%% +%%% @end +%%% Created : 21 Apr 2014 by Evgeny Khramtsov +%%%------------------------------------------------------------------- +-module(mod_sip_proxy). + +-define(GEN_FSM, p1_fsm). +-behaviour(?GEN_FSM). + +%% API +-export([start/2, start_link/2, route/4]). + +%% gen_fsm callbacks +-export([init/1, wait_for_request/2, wait_for_response/2, + handle_event/3, handle_sync_event/4, + handle_info/3, terminate/3, code_change/4]). + +-include("ejabberd.hrl"). +-include("logger.hrl"). +-include("esip.hrl"). + +-record(state, {host = <<"">> :: binary(), + opts = [] :: [{certfile, binary()}], + orig_trid, + responses = [] :: [#sip{}], + tr_ids = [] :: list(), + orig_req :: #sip{}}). + +%%%=================================================================== +%%% API +%%%=================================================================== +start(LServer, Opts) -> + supervisor:start_child(mod_sip_proxy_sup, [LServer, Opts]). + +start_link(LServer, Opts) -> + ?GEN_FSM:start_link(?MODULE, [LServer, Opts], []). + +route(SIPMsg, _SIPSock, TrID, Pid) -> + ?GEN_FSM:send_event(Pid, {SIPMsg, TrID}). + +%%%=================================================================== +%%% gen_fsm callbacks +%%%=================================================================== +init([Host, Opts]) -> + Opts1 = add_certfile(Host, Opts), + {ok, wait_for_request, #state{opts = Opts1, host = Host}}. + +wait_for_request({#sip{type = request} = Req, TrID}, State) -> + Opts = State#state.opts, + Req1 = mod_sip:prepare_request(Req), + case connect(Req1, Opts) of + {ok, SIPSockets} -> + NewState = + lists:foldl( + fun(_SIPSocket, {error, _} = Err) -> + Err; + (SIPSocket, #state{tr_ids = TrIDs} = AccState) -> + Req2 = add_via(SIPSocket, State#state.host, Req1), + case esip:request(SIPSocket, Req2, + {?MODULE, route, [self()]}) of + {ok, ClientTrID} -> + NewTrIDs = [ClientTrID|TrIDs], + AccState#state{tr_ids = NewTrIDs}; + Err -> + cancel_pending_transactions(AccState), + Err + end + end, State, SIPSockets), + case NewState of + {error, _} = Err -> + {Status, Reason} = esip:error_status(Err), + esip:reply(TrID, mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason})), + {stop, normal, State}; + _ -> + {next_state, wait_for_response, + NewState#state{orig_req = Req, orig_trid = TrID}} + end; + {error, notfound} -> + esip:reply(TrID, mod_sip:make_response( + Req, #sip{type = response, + status = 480, + reason = esip:reason(480)})), + {stop, normal, State}; + Err -> + {Status, Reason} = esip:error_status(Err), + esip:reply(TrID, mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason})), + {stop, normal, State} + end; +wait_for_request(_Event, State) -> + {next_state, wait_for_request, State}. + +wait_for_response({#sip{method = <<"CANCEL">>, type = request}, _TrID}, State) -> + cancel_pending_transactions(State), + {next_state, wait_for_response, State}; +wait_for_response({Resp, TrID}, + #state{orig_req = #sip{method = Method} = Req} = State) -> + case Resp of + {error, timeout} when Method /= <<"INVITE">> -> + %% Absorb useless 408. See RFC4320 + choose_best_response(State), + esip:stop_transaction(State#state.orig_trid), + {stop, normal, State}; + {error, _} -> + {Status, Reason} = esip:error_status(Resp), + State1 = mark_transaction_as_complete(TrID, State), + SIPResp = mod_sip:make_response(Req, + #sip{type = response, + status = Status, + reason = Reason}), + State2 = collect_response(SIPResp, State1), + case State2#state.tr_ids of + [] -> + choose_best_response(State2), + {stop, normal, State2}; + _ -> + {next_state, wait_for_response, State2} + end; + #sip{status = 100} -> + {next_state, wait_for_response, State}; + #sip{status = Status} -> + {[_|Vias], NewHdrs} = esip:split_hdrs('via', Resp#sip.hdrs), + NewResp = case Vias of + [] -> + Resp#sip{hdrs = NewHdrs}; + _ -> + Resp#sip{hdrs = [{'via', Vias}|NewHdrs]} + end, + if Status < 300 -> + esip:reply(State#state.orig_trid, NewResp); + true -> + ok + end, + State1 = if Status >= 200 -> + mark_transaction_as_complete(TrID, State); + true -> + State + end, + State2 = if Status >= 300 -> + collect_response(NewResp, State1); + true -> + State1 + end, + if Status >= 600 -> + cancel_pending_transactions(State2); + true -> + ok + end, + case State2#state.tr_ids of + [] -> + choose_best_response(State2), + {stop, normal, State2}; + _ -> + {next_state, wait_for_response, State2} + end + end; +wait_for_response(_Event, State) -> + {next_state, wait_for_response, State}. + +handle_event(_Event, StateName, State) -> + {next_state, StateName, State}. + +handle_sync_event(_Event, _From, StateName, State) -> + Reply = ok, + {reply, Reply, StateName, State}. + +handle_info(_Info, StateName, State) -> + {next_state, StateName, State}. + +terminate(_Reason, _StateName, _State) -> + ok. + +code_change(_OldVsn, StateName, State, _Extra) -> + {ok, StateName, State}. + +%%%=================================================================== +%%% Internal functions +%%%=================================================================== +connect(#sip{hdrs = Hdrs} = Req, Opts) -> + {_, ToURI, _} = esip:get_hdr('to', Hdrs), + case mod_sip:at_my_host(ToURI) of + true -> + LUser = jlib:nodeprep(ToURI#uri.user), + LServer = jlib:nameprep(ToURI#uri.host), + case mod_sip_registrar:find_sockets(LUser, LServer) of + [_|_] = SIPSocks -> + {ok, SIPSocks}; + [] -> + {error, notfound} + end; + false -> + case esip:connect(Req, Opts) of + {ok, SIPSock} -> + {ok, [SIPSock]}; + {error, _} = Err -> + Err + end + end. + +cancel_pending_transactions(State) -> + lists:foreach(fun esip:cancel/1, State#state.tr_ids). + +add_certfile(LServer, Opts) -> + case ejabberd_config:get_option({domain_certfile, LServer}, + fun iolist_to_binary/1) of + CertFile when is_binary(CertFile), CertFile /= <<"">> -> + [{certfile, CertFile}|Opts]; + _ -> + Opts + end. + +add_via(#sip_socket{type = Transport}, LServer, #sip{hdrs = Hdrs} = Req) -> + ConfiguredVias = get_configured_vias(LServer), + {ViaHost, ViaPort} = proplists:get_value( + Transport, ConfiguredVias, {LServer, undefined}), + ViaTransport = case Transport of + tls -> <<"TLS">>; + tcp -> <<"TCP">>; + udp -> <<"UDP">> + end, + Via = #via{transport = ViaTransport, + host = ViaHost, + port = ViaPort, + params = [{<<"branch">>, esip:make_branch()}, + {<<"rport">>, <<"">>}]}, + Req#sip{hdrs = [{'via', [Via]}|Hdrs]}. + +get_configured_vias(LServer) -> + gen_mod:get_module_opt( + LServer, ?MODULE, via, + fun(L) -> + lists:map( + fun(Opts) -> + Type = proplists:get_value(type, Opts), + Host = proplists:get_value(host, Opts), + Port = proplists:get_value(port, Opts), + true = (Type == tcp) or (Type == tls) or (Type == udp), + true = is_binary(Host) and (Host /= <<"">>), + true = (is_integer(Port) + and (Port > 0) and (Port < 65536)) + or (Port == undefined), + {Type, {Host, Port}} + end, L) + end, []). + +mark_transaction_as_complete(TrID, State) -> + NewTrIDs = lists:delete(TrID, State#state.tr_ids), + State#state{tr_ids = NewTrIDs}. + +collect_response(Resp, #state{responses = Resps} = State) -> + State#state{responses = [Resp|Resps]}. + +choose_best_response(#state{responses = Responses} = State) -> + SortedResponses = lists:keysort(#sip.status, Responses), + case lists:filter( + fun(#sip{status = Status}) -> + Status >= 600 + end, SortedResponses) of + [Resp|_] -> + esip:reply(State#state.orig_trid, Resp); + [] -> + case SortedResponses of + [Resp|_] -> + esip:reply(State#state.orig_trid, Resp); + [] -> + ok + end + end. diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl new file mode 100644 index 000000000..57c55be08 --- /dev/null +++ b/src/mod_sip_registrar.erl @@ -0,0 +1,336 @@ +%%%------------------------------------------------------------------- +%%% @author Evgeny Khramtsov +%%% @copyright (C) 2014, Evgeny Khramtsov +%%% @doc +%%% +%%% @end +%%% Created : 23 Apr 2014 by Evgeny Khramtsov +%%%------------------------------------------------------------------- +-module(mod_sip_registrar). + +-define(GEN_SERVER, p1_server). +-behaviour(?GEN_SERVER). + +%% API +-export([start_link/0, request/2, find_sockets/2]). + +%% gen_server callbacks +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3]). + +-include("ejabberd.hrl"). +-include("logger.hrl"). +-include("esip.hrl"). + +-define(CALL_TIMEOUT, timer:seconds(30)). + +-record(binding, {socket = #sip_socket{}, + call_id = <<"">> :: binary(), + cseq = 0 :: non_neg_integer(), + timestamp = now() :: erlang:timestamp(), + tref = make_ref() :: reference(), + expires = 0 :: non_neg_integer()}). + +-record(sip_session, {us = {<<"">>, <<"">>} :: {binary(), binary()}, + bindings = [] :: [#binding{}]}). + +-record(state, {}). + +%%%=================================================================== +%%% API +%%%=================================================================== +start_link() -> + ?GEN_SERVER:start_link({local, ?MODULE}, ?MODULE, [], []). + +request(#sip{hdrs = Hdrs} = Req, SIPSock) -> + {_, #uri{user = U, host = S}, _} = esip:get_hdr('to', Hdrs), + LUser = jlib:nodeprep(U), + LServer = jlib:nameprep(S), + {PeerIP, _} = SIPSock#sip_socket.peer, + US = {LUser, LServer}, + CallID = esip:get_hdr('call-id', Hdrs), + CSeq = esip:get_hdr('cseq', Hdrs), + Expires = esip:get_hdr('expires', Hdrs, 0), + case esip:get_hdrs('contact', Hdrs) of + [<<"*">>] when Expires == 0 -> + case unregister_session(US, SIPSock, CallID, CSeq) of + ok -> + ?INFO_MSG("unregister SIP session for user ~s@~s from ~s", + [LUser, LServer, inet_parse:ntoa(PeerIP)]), + mod_sip:make_response( + Req, #sip{type = response, status = 200}); + {error, Why} -> + {Status, Reason} = make_status(Why), + mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason}) + end; + [{_, _URI, _Params}|_] = Contacts -> + ExpiresList = lists:map( + fun({_, _, Params}) -> + case to_integer( + esip:get_param( + <<"expires">>, Params), + 0, (1 bsl 32)-1) of + {ok, E} -> E; + _ -> Expires + end + end, Contacts), + Expires1 = lists:max(ExpiresList), + Contact = {<<"">>, #uri{user = LUser, host = LServer}, + [{<<"expires">>, jlib:integer_to_binary(Expires1)}]}, + MinExpires = min_expires(), + if Expires1 >= MinExpires -> + case register_session(US, SIPSock, CallID, CSeq, Expires1) of + ok -> + ?INFO_MSG("register SIP session for user ~s@~s from ~s", + [LUser, LServer, inet_parse:ntoa(PeerIP)]), + mod_sip:make_response( + Req, + #sip{type = response, + status = 200, + hdrs = [{'contact', [Contact]}]}); + {error, Why} -> + {Status, Reason} = make_status(Why), + mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason}) + end; + Expires1 > 0, Expires1 < MinExpires -> + mod_sip:make_response( + Req, #sip{type = response, + status = 423, + hdrs = [{'min-expires', MinExpires}]}); + true -> + case unregister_session(US, SIPSock, CallID, CSeq) of + ok -> + ?INFO_MSG("unregister SIP session for user ~s@~s from ~s", + [LUser, LServer, inet_parse:ntoa(PeerIP)]), + mod_sip:make_response( + Req, + #sip{type = response, status = 200, + hdrs = [{'contact', [Contact]}]}); + {error, Why} -> + {Status, Reason} = make_status(Why), + mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason}) + end + end; + [] -> + case mnesia:dirty_read(sip_session, US) of + [#sip_session{bindings = Bindings}] -> + case pop_previous_binding(SIPSock, Bindings) of + {ok, #binding{expires = Expires1}, _} -> + Contact = {<<"">>, + #uri{user = LUser, host = LServer}, + [{<<"expires">>, + jlib:integer_to_binary(Expires1)}]}, + mod_sip:make_response( + Req, #sip{type = response, status = 200, + hdrs = [{'contact', [Contact]}]}); + {error, notfound} -> + {Status, Reason} = make_status(notfound), + mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason}) + end; + [] -> + {Status, Reason} = make_status(notfound), + mod_sip:make_response( + Req, #sip{type = response, + status = Status, + reason = Reason}) + end; + _ -> + mod_sip:make_response(Req, #sip{type = response, status = 400}) + end. + +find_sockets(U, S) -> + case mnesia:dirty_read(sip_session, {U, S}) of + [#sip_session{bindings = Bindings}] -> + [Binding#binding.socket || Binding <- Bindings]; + [] -> + [] + end. + +%%%=================================================================== +%%% gen_server callbacks +%%%=================================================================== +init([]) -> + mnesia:create_table(sip_session, + [{ram_copies, [node()]}, + {attributes, record_info(fields, sip_session)}]), + mnesia:add_table_copy(sip_session, node(), ram_copies), + {ok, #state{}}. + +handle_call({write, Session}, _From, State) -> + Res = write_session(Session), + {reply, Res, State}; +handle_call({delete, US, SIPSocket, CallID, CSeq}, _From, State) -> + Res = delete_session(US, SIPSocket, CallID, CSeq), + {reply, Res, State}; +handle_call(_Request, _From, State) -> + Reply = ok, + {reply, Reply, State}. + +handle_cast(_Msg, State) -> + {noreply, State}. + +handle_info({write, Session}, State) -> + write_session(Session), + {noreply, State}; +handle_info({delete, US, SIPSocket, CallID, CSeq}, State) -> + delete_session(US, SIPSocket, CallID, CSeq), + {noreply, State}; +handle_info({timeout, TRef, US}, State) -> + delete_expired_session(US, TRef), + {noreply, State}; +handle_info(_Info, State) -> + ?ERROR_MSG("got unexpected info: ~p", [_Info]), + {noreply, State}. + +terminate(_Reason, _State) -> + ok. + +code_change(_OldVsn, State, _Extra) -> + {ok, State}. + +%%%=================================================================== +%%% Internal functions +%%%=================================================================== +register_session(US, SIPSocket, CallID, CSeq, Expires) -> + Session = #sip_session{us = US, + bindings = [#binding{socket = SIPSocket, + call_id = CallID, + cseq = CSeq, + timestamp = now(), + expires = Expires}]}, + call({write, Session}). + +unregister_session(US, SIPSocket, CallID, CSeq) -> + Msg = {delete, US, SIPSocket, CallID, CSeq}, + call(Msg). + +write_session(#sip_session{us = {U, S} = US, + bindings = [#binding{socket = SIPSocket, + call_id = CallID, + expires = Expires, + cseq = CSeq} = Binding]}) -> + case mnesia:dirty_read(sip_session, US) of + [#sip_session{bindings = Bindings}] -> + case pop_previous_binding(SIPSocket, Bindings) of + {ok, #binding{call_id = CallID, cseq = PrevCSeq}, _} + when PrevCSeq > CSeq -> + {error, cseq_out_of_order}; + {ok, #binding{tref = Tref}, Bindings1} -> + erlang:cancel_timer(Tref), + NewTRef = erlang:start_timer(Expires * 1000, self(), US), + NewBindings = [Binding#binding{tref = NewTRef}|Bindings1], + mnesia:dirty_write( + #sip_session{us = US, bindings = NewBindings}); + {error, notfound} -> + MaxSessions = ejabberd_sm:get_max_user_sessions(U, S), + if length(Bindings) < MaxSessions -> + NewTRef = erlang:start_timer(Expires * 1000, self(), US), + NewBindings = [Binding#binding{tref = NewTRef}|Bindings], + mnesia:dirty_write( + #sip_session{us = US, bindings = NewBindings}); + true -> + {error, too_many_sessions} + end + end; + [] -> + NewTRef = erlang:start_timer(Expires * 1000, self(), US), + NewBindings = [Binding#binding{tref = NewTRef}], + mnesia:dirty_write(#sip_session{us = US, bindings = NewBindings}) + end. + +delete_session(US, SIPSocket, CallID, CSeq) -> + case mnesia:dirty_read(sip_session, US) of + [#sip_session{bindings = Bindings}] -> + case pop_previous_binding(SIPSocket, Bindings) of + {ok, #binding{call_id = CallID, cseq = PrevCSeq}, _} + when PrevCSeq > CSeq -> + {error, cseq_out_of_order}; + {ok, #binding{tref = TRef}, []} -> + erlang:cancel_timer(TRef), + mnesia:dirty_delete(sip_session, US); + {ok, #binding{tref = TRef}, NewBindings} -> + erlang:cancel_timer(TRef), + mnesia:dirty_write(sip_session, + #sip_session{us = US, + bindings = NewBindings}); + {error, notfound} -> + {error, notfound} + end; + [] -> + {error, notfound} + end. + +delete_expired_session(US, TRef) -> + case mnesia:dirty_read(sip_session, US) of + [#sip_session{bindings = Bindings}] -> + case lists:filter( + fun(#binding{tref = TRef1}) when TRef1 == TRef -> + false; + (_) -> + true + end, Bindings) of + [] -> + mnesia:dirty_delete(sip_session, US); + NewBindings -> + mnesia:dirty_write(sip_session, + #sip_session{us = US, + bindings = NewBindings}) + end; + [] -> + ok + end. + +min_expires() -> + 60. + +to_integer(Bin, Min, Max) -> + case catch list_to_integer(binary_to_list(Bin)) of + N when N >= Min, N =< Max -> + {ok, N}; + _ -> + error + end. + +pop_previous_binding(#sip_socket{peer = Peer}, Bindings) -> + case lists:partition( + fun(#binding{socket = #sip_socket{peer = Peer1}}) -> + Peer1 == Peer + end, Bindings) of + {[Binding], RestBindings} -> + {ok, Binding, RestBindings}; + _ -> + {error, notfound} + end. + +call(Msg) -> + case catch ?GEN_SERVER:call(?MODULE, Msg, ?CALL_TIMEOUT) of + {'EXIT', {timeout, _}} -> + {error, timeout}; + {'EXIT', Why} -> + {error, Why}; + Reply -> + Reply + end. + +make_status(notfound) -> + {404, esip:reason(404)}; +make_status(cseq_out_of_order) -> + {500, <<"CSeq is Out of Order">>}; +make_status(timeout) -> + {408, esip:reason(408)}; +make_status(too_many_sessions) -> + {503, <<"Too Many Registered Sessions">>}; +make_status(_) -> + {500, esip:reason(500)}. diff --git a/src/mod_stats.erl b/src/mod_stats.erl index a35928975..15caa31ca 100644 --- a/src/mod_stats.erl +++ b/src/mod_stats.erl @@ -5,7 +5,7 @@ %%% Created : 11 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_time.erl b/src/mod_time.erl index d6c8363d7..119661c33 100644 --- a/src/mod_time.erl +++ b/src/mod_time.erl @@ -6,7 +6,7 @@ %%% Created : 18 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 08feb071a..c98750ed0 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -5,7 +5,7 @@ %%% Created : 2 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -163,7 +162,7 @@ process_local_iq(_From, _To, [{xmlcdata, <<(translate:translate(Lang, <<"Erlang Jabber Server">>))/binary, - "\nCopyright (c) 2002-2013 ProcessOne">>}]}, + "\nCopyright (c) 2002-2014 ProcessOne">>}]}, #xmlel{name = <<"BDAY">>, attrs = [], children = [{xmlcdata, <<"2002-11-16">>}]}]}]} @@ -533,7 +532,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd vCard module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. find_xdata_el(#xmlel{children = SubEls}) -> find_xdata_el1(SubEls). diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl index 1c96dd4a1..96ba25ac9 100644 --- a/src/mod_vcard_ldap.erl +++ b/src/mod_vcard_ldap.erl @@ -5,7 +5,7 @@ %%% Created : 2 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -221,7 +220,7 @@ process_local_iq(_From, _To, [{xmlcdata, <<(translate:translate(Lang, <<"Erlang Jabber Server">>))/binary, - "\nCopyright (c) 2002-2013 ProcessOne">>}]}, + "\nCopyright (c) 2002-2014 ProcessOne">>}]}, #xmlel{name = <<"BDAY">>, attrs = [], children = [{xmlcdata, <<"2002-11-16">>}]}]}]} @@ -582,7 +581,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, <<(translate:translate(Lang, <<"ejabberd vCard module">>))/binary, - "\nCopyright (c) 2003-2013 ProcessOne">>}]}]. + "\nCopyright (c) 2003-2014 ProcessOne">>}]}]. -define(LFIELD(Label, Var), #xmlel{name = <<"field">>, diff --git a/src/mod_version.erl b/src/mod_version.erl index 3ae9b8428..1aa026c51 100644 --- a/src/mod_version.erl +++ b/src/mod_version.erl @@ -5,7 +5,7 @@ %%% Created : 18 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/node.template b/src/node.template index b31d8a8e2..45744c059 100644 --- a/src/node.template +++ b/src/node.template @@ -11,11 +11,11 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_buddy.erl b/src/node_buddy.erl index 23269b1eb..6db076935 100644 --- a/src/node_buddy.erl +++ b/src/node_buddy.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_club.erl b/src/node_club.erl index 10849b36d..5e6581ad8 100644 --- a/src/node_club.erl +++ b/src/node_club.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_dispatch.erl b/src/node_dispatch.erl index 9b72af7e7..81fe20d2b 100644 --- a/src/node_dispatch.erl +++ b/src/node_dispatch.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_flat.erl b/src/node_flat.erl index 836858520..e28fd3477 100644 --- a/src/node_flat.erl +++ b/src/node_flat.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_flat_odbc.erl b/src/node_flat_odbc.erl index 5736832ea..d299c8d52 100644 --- a/src/node_flat_odbc.erl +++ b/src/node_flat_odbc.erl @@ -13,11 +13,11 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_hometree.erl b/src/node_hometree.erl index ff291635f..f59d8d9c0 100644 --- a/src/node_hometree.erl +++ b/src/node_hometree.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_hometree_odbc.erl b/src/node_hometree_odbc.erl index a98e56dcf..dfb9886f2 100644 --- a/src/node_hometree_odbc.erl +++ b/src/node_hometree_odbc.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_mb.erl b/src/node_mb.erl index c626b7a93..6587b5c07 100644 --- a/src/node_mb.erl +++ b/src/node_mb.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Eric Cestari %%% @version {@vsn}, {@date} {@time} %%% @end diff --git a/src/node_pep.erl b/src/node_pep.erl index 5635dee94..47afee945 100644 --- a/src/node_pep.erl +++ b/src/node_pep.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_pep_odbc.erl b/src/node_pep_odbc.erl index e4e1fafa9..4c7d8909b 100644 --- a/src/node_pep_odbc.erl +++ b/src/node_pep_odbc.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_private.erl b/src/node_private.erl index 27b7158a1..61f6d6a68 100644 --- a/src/node_private.erl +++ b/src/node_private.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/node_public.erl b/src/node_public.erl index 3c391cfe8..bcabec6eb 100644 --- a/src/node_public.erl +++ b/src/node_public.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl index 23159d7a2..1dc7fa9fb 100644 --- a/src/nodetree_tree.erl +++ b/src/nodetree_tree.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/nodetree_tree_odbc.erl b/src/nodetree_tree_odbc.erl index 1cc45cfb5..1a5a4317f 100644 --- a/src/nodetree_tree_odbc.erl +++ b/src/nodetree_tree_odbc.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/nodetree_virtual.erl b/src/nodetree_virtual.erl index 1486fbc05..9e2e31f9f 100644 --- a/src/nodetree_virtual.erl +++ b/src/nodetree_virtual.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/odbc_queries.erl b/src/odbc_queries.erl index 314b7cc13..e0637f840 100644 --- a/src/odbc_queries.erl +++ b/src/odbc_queries.erl @@ -5,7 +5,7 @@ %%% Created : by Mickael Remond %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/p1_fsm.erl b/src/p1_fsm.erl index 70773e9b8..80f08c609 100644 --- a/src/p1_fsm.erl +++ b/src/p1_fsm.erl @@ -14,7 +14,7 @@ %% AB. All Rights Reserved.'' %% %% The code has been modified and improved by ProcessOne. -%% Copyright 2007-2013, ProcessOne +%% Copyright 2007-2014, ProcessOne %% %% The change adds the following features: %% - You can send exit(priority_shutdown) to the p1_fsm process to diff --git a/src/p1_mnesia.erl b/src/p1_mnesia.erl index fa308176c..b792472a6 100644 --- a/src/p1_mnesia.erl +++ b/src/p1_mnesia.erl @@ -13,10 +13,10 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' %%% -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. -module(p1_mnesia). diff --git a/src/pubsub_db_odbc.erl b/src/pubsub_db_odbc.erl index ca1318865..320a58c90 100644 --- a/src/pubsub_db_odbc.erl +++ b/src/pubsub_db_odbc.erl @@ -11,9 +11,9 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% @author Pablo Polvorin %%% @version {@vsn}, {@date} {@time} diff --git a/src/pubsub_index.erl b/src/pubsub_index.erl index 1ff5a1e45..9859141df 100644 --- a/src/pubsub_index.erl +++ b/src/pubsub_index.erl @@ -13,12 +13,12 @@ %%% %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% -%%% @copyright 2006-2013 ProcessOne +%%% @copyright 2006-2014 ProcessOne %%% @author Christophe Romain %%% [http://www.process-one.net/] %%% @version {@vsn}, {@date} {@time} diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl index bb09cdd60..64bb8c2da 100644 --- a/src/pubsub_subscription.erl +++ b/src/pubsub_subscription.erl @@ -11,9 +11,9 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% @author Brian Cully %%% @version {@vsn}, {@date} {@time} diff --git a/src/pubsub_subscription_odbc.erl b/src/pubsub_subscription_odbc.erl index 55b337c80..f0efcefb5 100644 --- a/src/pubsub_subscription_odbc.erl +++ b/src/pubsub_subscription_odbc.erl @@ -11,9 +11,9 @@ %%% under the License. %%% %%% The Initial Developer of the Original Code is ProcessOne. -%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne +%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne %%% All Rights Reserved.'' -%%% This software is copyright 2006-2013, ProcessOne. +%%% This software is copyright 2006-2014, ProcessOne. %%% %%% @author Pablo Polvorin %%% @author based on pubsub_subscription.erl by Brian Cully diff --git a/src/randoms.erl b/src/randoms.erl index 0fd1f304c..db2d20ccd 100644 --- a/src/randoms.erl +++ b/src/randoms.erl @@ -5,7 +5,7 @@ %%% Created : 13 Dec 2002 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/scram.erl b/src/scram.erl index 407f69d2f..19684cb46 100644 --- a/src/scram.erl +++ b/src/scram.erl @@ -5,7 +5,7 @@ %%% Created : 7 Aug 2011 by Stephen Röttger %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/shaper.erl b/src/shaper.erl index b9f460395..a31ec5560 100644 --- a/src/shaper.erl +++ b/src/shaper.erl @@ -5,7 +5,7 @@ %%% Created : 9 Feb 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -84,8 +83,6 @@ new(Name) -> [#shaper{maxrate = R}] -> R; [] -> - ?WARNING_MSG("Attempt to initialize an " - "unspecified shaper '~s'", [Name]), none end, new1(MaxRate). diff --git a/src/str.erl b/src/str.erl index d4d448594..cd0325e84 100644 --- a/src/str.erl +++ b/src/str.erl @@ -5,7 +5,7 @@ %%% Created : 23 Feb 2012 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/translate.erl b/src/translate.erl index fd2ebcc64..846b33e06 100644 --- a/src/translate.erl +++ b/src/translate.erl @@ -5,7 +5,7 @@ %%% Created : 6 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- @@ -77,33 +76,54 @@ load_dir(Dir) -> end. load_file(Lang, File) -> - case file:consult(File) of - {ok, Terms} -> - lists:foreach(fun ({Orig, Trans}) -> - Trans1 = case Trans of - <<"">> -> Orig; - _ -> Trans - end, - ets:insert(translations, - {{Lang, iolist_to_binary(Orig)}, - iolist_to_binary(Trans1)}) - end, - Terms); - %% Code copied from ejabberd_config.erl - {error, - {_LineNumber, erl_parse, _ParseMessage} = Reason} -> - ExitText = iolist_to_binary([File, - " approximately in the line ", - file:format_error(Reason)]), - ?ERROR_MSG("Problem loading translation file ~n~s", - [ExitText]), - exit(ExitText); - {error, Reason} -> - ExitText = iolist_to_binary([File, ": ", - file:format_error(Reason)]), - ?ERROR_MSG("Problem loading translation file ~n~s", - [ExitText]), - exit(ExitText) + case file:open(File, [read]) of + {ok, Fd} -> + io:setopts(Fd, [{encoding,latin1}]), + load_file_loop(Fd, 1, File, Lang), + file:close(Fd); + Error -> + ExitText = iolist_to_binary([File, ": ", + file:format_error(Error)]), + ?ERROR_MSG("Problem loading translation file ~n~s", + [ExitText]), + exit(ExitText) + end. + +load_file_loop(Fd, Line, File, Lang) -> + case io:read(Fd, '', Line) of + {ok,{Orig, Trans}, NextLine} -> + Trans1 = case Trans of + <<"">> -> Orig; + _ -> Trans + end, + ets:insert(translations, + {{Lang, iolist_to_binary(Orig)}, + iolist_to_binary(Trans1)}), + + load_file_loop(Fd, NextLine, File, Lang); + {ok,_, _NextLine} -> + ExitText = iolist_to_binary([File, + " approximately in the line ", + Line]), + ?ERROR_MSG("Problem loading translation file ~n~s", + [ExitText]), + exit(ExitText); + {error, + {_LineNumber, erl_parse, _ParseMessage} = Reason} -> + ExitText = iolist_to_binary([File, + " approximately in the line ", + file:format_error(Reason)]), + ?ERROR_MSG("Problem loading translation file ~n~s", + [ExitText]), + exit(ExitText); + {error, Reason} -> + ExitText = iolist_to_binary([File, ": ", + file:format_error(Reason)]), + ?ERROR_MSG("Problem loading translation file ~n~s", + [ExitText]), + exit(ExitText); + {eof,_Line} -> + ok end. -spec translate(binary(), binary()) -> binary(). diff --git a/src/treap.erl b/src/treap.erl index 607f2c8ab..9d1d69fc9 100644 --- a/src/treap.erl +++ b/src/treap.erl @@ -5,7 +5,7 @@ %%% Created : 22 Apr 2008 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/src/win32_dns.erl b/src/win32_dns.erl index 9f80a08de..d3f25648b 100644 --- a/src/win32_dns.erl +++ b/src/win32_dns.erl @@ -5,7 +5,7 @@ %%% Created : 5 Mar 2009 by Geoff Cant %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/test/README b/test/README index 7ccd27454..d2aa5654a 100644 --- a/test/README +++ b/test/README @@ -12,6 +12,6 @@ template1=# CREATE DATABASE ejabberd_test; template1=# GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test; $ mysql -mysql> CREATE USER ejabberd_test IDENTIFIED BY 'ejabberd_test'; +mysql> CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test'; mysql> CREATE DATABASE ejabberd_test; -mysql> GRANT ALL ON ejabberd_test.* TO ejabberd_test; +mysql> GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost'; diff --git a/tools/configure.erl b/tools/configure.erl index 6f0b1dd4e..bc0f87eb7 100644 --- a/tools/configure.erl +++ b/tools/configure.erl @@ -5,7 +5,7 @@ %%% Created : 27 Jan 2003 by Alexey Shchepin %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -17,10 +17,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%---------------------------------------------------------------------- diff --git a/tools/ejabberdctl.bc b/tools/ejabberdctl.bc new file mode 100644 index 000000000..72a5356f2 --- /dev/null +++ b/tools/ejabberdctl.bc @@ -0,0 +1,99 @@ +# +# bash completion for ejabberdctl +# +get_help() +{ + local COMMANDCACHE=/var/log/ejabberd/bash_completion_$RANDOM + ejabberdctl $CTLARGS help >$COMMANDCACHE + if [[ $? == 2 ]] ; then + ISRUNNING=1 + runningcommands=`cat $COMMANDCACHE | grep "^ [a-z]" | awk '{print $1}' | xargs` + fi + rm $COMMANDCACHE +} + +_ejabberdctl() +{ + local cur prev + local ISRUNNING=0 + local runningcommands + + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + local startcoms="start debug live" + local startpars="--config-dir --config --ctl-config --logs --spool" + + local i=1 + local CTLARGS="" + while [ $i -lt $COMP_CWORD ] ; do + local PARAM="${COMP_WORDS[i]}" + i=$((i+1)) + case $PARAM in + --*) + CTLARGS="--node ${COMP_WORDS[i]}" + i=$((i+1)) ;; + *) break ;; + esac + done + + case "${prev##*/}" in + ejabberdctl) + # This clause matches even when calling `/sbin/ejabberdctl` thanks to the ##*/ in the case + get_help + COMPREPLY=($(compgen -W "--node --auth ${startpars} ${startcoms} ${runningcommands}" -- $cur)) + return 0 + ;; + start|live) + COMPREPLY=($(compgen -W "--node ${startpars}" -- $cur)) + return 0 + ;; + debug) + COMPREPLY=($(compgen -W "--node" -- $cur)) + return 0 + ;; + help) + get_help + COMPREPLY=($(compgen -W "${runningcommands}" -- $cur)) + return 0 + ;; + --node) + RUNNINGNODES=`epmd -names | grep name | awk '{print $2"@localhost"}' | xargs` + COMPREPLY=($(compgen -W "$RUNNINGNODES" -- $cur)) + return 0 + ;; + --config|--ctl-config) + _filedir '?(u)cfg' + return 0 + ;; + --config-dir|--logs|--spool) + _filedir + return 0 + ;; + *) + prev2="${COMP_WORDS[COMP_CWORD-2]}" + get_help + if [[ "$prev2" == --* ]]; then + COMPREPLY=($(compgen -W "--node --auth ${startpars} ${startcoms} ${runningcommands}" -- $cur)) + else + if [[ $ISRUNNING == 1 ]]; then + echo "" + ejabberdctl $CTLARGS help ${PARAM} + echo -n "${COMP_LINE}" + fi + fi + return 0 + ;; + esac +} + +complete -F _ejabberdctl ejabberdctl + +# Local variables: +# mode: shell-script +# sh-basic-offset: 4 +# sh-indent-comment: t +# indent-tabs-mode: nil +# End: +# ex: ts=4 sw=4 et filetype=sh diff --git a/tools/p1_prof.erl b/tools/p1_prof.erl index d73f06f05..c085f64fc 100644 --- a/tools/p1_prof.erl +++ b/tools/p1_prof.erl @@ -6,7 +6,7 @@ %%% Created : 23 Jan 2010 by Evgeniy Khramtsov %%% %%% -%%% ejabberd, Copyright (C) 2002-2013 ProcessOne +%%% ejabberd, Copyright (C) 2002-2014 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -18,10 +18,9 @@ %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% General Public License for more details. %%% -%%% You should have received a copy of the GNU General Public License -%%% along with this program; if not, write to the Free Software -%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -%%% 02111-1307 USA +%%% You should have received a copy of the GNU General Public License along +%%% with this program; if not, write to the Free Software Foundation, Inc., +%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. %%% %%%------------------------------------------------------------------- -module(p1_prof).