Merge pull request #205 from weiss/xep-0198

XEP-0198: Improve handling of incorrect stanza counts reported by client

.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

.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

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.

Makefile.in

@@ -77,7 +77,7 @@ deps/.got:
 	rm -rf deps/.built
 	$(REBAR) get-deps && :> deps/.got
 
-deps/.built:
+deps/.built: deps/.got
 	$(REBAR) compile && :> deps/.built
 
 src: deps/.built
@@ -109,9 +109,9 @@ install: all
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
-	[ -f $(ETCDIR)/ejabberd.cfg ] \
-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
+	[ -f $(ETCDIR)/ejabberd.yml ] \
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
 	$(SED) -e "s*{{rootdir}}*@prefix@*" \
 		-e "s*{{installuser}}*@INSTALLUSER@*" \
 		-e "s*{{libdir}}*@libdir@*" \
@@ -215,6 +215,7 @@ uninstall-all: uninstall-binary
 clean:
 	rm -rf deps/.got
 	rm -rf deps/.built
+	rm -rf test/*.beam
 	$(REBAR) clean
 
 clean-rel:

README

@@ -1,14 +1,19 @@
 ejabberd - High-Performance Enterprise Instant Messaging Server 
+---------------------------------------------------------------
 
 Quickstart guide
+================
 
 
 0. Requirements
+---------------
 
 To compile ejabberd you need:
+
  - GNU Make
  - GCC
  - Libexpat 1.95 or higher
+ - Libyaml 1.4 or higher
  - Erlang/OTP R15B or higher.
  - OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
  - Zlib 1.2.3 or higher, for Stream Compression support
@@ -17,35 +22,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

README.md

@@ -0,0 +1 @@
+README

autogen.sh

@@ -1,3 +1,3 @@
 # generate a new autoconf
 aclocal -I m4
-autoconf
+autoconf -f

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.53)
-AC_INIT(ejabberd, community, [ejabberd@process-one.net], [ejabberd])
+AC_INIT(ejabberd, community m4_esyscmd([git describe --tags | tr -d '\n']), [ejabberd@process-one.net], [ejabberd])
 REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)"
 REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
 
@@ -35,7 +35,7 @@ AC_ERLANG_NEED_ERLC
 AC_ARG_ENABLE(erlang-version-check,
 [AC_HELP_STRING([--enable-erlang-version-check],
 	[Check Erlang/OTP version @<:@default=yes@:>@])])
-	case "$enable_erlang_version_check" in
+case "$enable_erlang_version_check" in
 	yes|'')
 		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
 		;;
@@ -105,21 +105,21 @@ AC_ARG_ENABLE(mssql,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
 esac],[db_type=generic])
 
+AC_ARG_ENABLE(all,
+[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-stun --enable-riak --enable-json --enable-iconv --enable-debug --enable-http --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])],
+[case "${enableval}" in
+  yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true stun=true riak=true json=true iconv=true debug=true http=true lager=true tools=true ;;
+  no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false stun=false riak=false json=false iconv=false debug=false http=false lager=false tools=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
+esac],[])
+
 AC_ARG_ENABLE(tools,
-[AC_HELP_STRING([--enable-tools], [build development tools (currently the ejabberd profiler only, default: no)])],
+[AC_HELP_STRING([--enable-tools], [build development tools (default: no)])],
 [case "${enableval}" in
   yes) tools=true ;;
   no)  tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
-esac],[tools=false])
-
-AC_ARG_ENABLE(all,
-[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-stun --enable-json --enable-iconv --enable-debug --enable-http (useful for Dialyzer checks, default: no)])],
-[case "${enableval}" in
-  yes) nif=true odbc=true mysql=true pgsql=true pam=true zlib=true stun=true json=true iconv=true debug=true http=true ;;
-  no) nif=false odbc=false mysql=false pgsql=false pam=false zlib=false stun=false json=false iconv=false debug=false http=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
-esac],[])
+esac],[if test "x$tools" = "x"; then tools=false; fi])
 
 AC_ARG_ENABLE(nif,
 [AC_HELP_STRING([--enable-nif], [replace some functions with C equivalents. Requires Erlang R13B04 or higher (default: no)])],
@@ -210,12 +210,12 @@ AC_ARG_ENABLE(http,
 esac],[if test "x$http" = "x"; then http=false; fi])
 
 AC_ARG_ENABLE(lager,
-[AC_HELP_STRING([--enable-lager], [enable lager support (default: no)])],
+[AC_HELP_STRING([--enable-lager], [enable lager support (default: yes)])],
 [case "${enableval}" in
   yes) lager=true ;;
   no)  lager=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-lager) ;;
-esac],[if test "x$lager" = "x"; then lager=false; fi])
+esac],[if test "x$lager" = "x"; then lager=true; fi])
 
 AC_CONFIG_FILES([Makefile
 		 vars.config

contrib/extract_translations/prepare-translation.sh

@@ -230,7 +230,8 @@ extract_lang_po2msg ()
 	msgattrib $PO_PATH --translated --no-fuzzy --no-obsolete --no-location --no-wrap | grep "^msg" | tail --lines=+3 >$MS_PATH
 	grep "^msgid" $PO_PATH.ms | sed 's/^msgid //g' >$MSGID_PATH
 	grep "^msgstr" $PO_PATH.ms | sed 's/^msgstr //g' >$MSGSTR_PATH
-	paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >$MSGS_PATH
+	echo "%% -*- coding: latin-1 -*-" >$MSGS_PATH
+	paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >>$MSGS_PATH
 
 	rm $MS_PATH
 	rm $MSGID_PATH

doc/Makefile

@@ -13,12 +13,12 @@ all:	release pdf html
 release:
 	@echo "Notes for the releaser:"
 	@echo "* Do not forget to add a link to the release notes in guide.tex"
-	@echo "* Do not forget to update the version number in src/ejabberd.app!"
+	@echo "* Do not forget to update the version number in ebin/ejabberd.app!"
 	@echo "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)."
 	@echo "Press any key to continue"
 	##@read foo
 	@echo "% ejabberd version (automatically generated)." > version.tex
-	@echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.app`"}" >> version.tex
+	@echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../ebin/ejabberd.app`"}" >> version.tex
 	@echo -n "% Contributed modules (automatically generated)."  > contributed_modules.tex
 	@echo -e "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex
 

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}

doc/version.tex

@@ -1,2 +0,0 @@
-% ejabberd version (automatically generated).
-\newcommand{\version}{13.03-beta2}

ejabberd.cfg.example

@@ -1,609 +0,0 @@
-%%%
-%%%               ejabberd configuration file
-%%%
-%%%'
-
-%%% The parameters used in this configuration file are explained in more detail
-%%% in the ejabberd Installation and Operation Guide.
-%%% Please consult the Guide in case of doubts, it is included with
-%%% your copy of ejabberd, and is also available online at
-%%% http://www.process-one.net/en/ejabberd/docs/
-
-%%% This configuration file contains Erlang terms.
-%%% In case you want to understand the syntax, here are the concepts:
-%%%
-%%%  - The character to comment a line is %
-%%%
-%%%  - Each term ends in a dot, for example:
-%%%      override_global.
-%%%
-%%%  - A tuple has a fixed definition, its elements are
-%%%    enclosed in {}, and separated with commas:
-%%%      {loglevel, 4}.
-%%%
-%%%  - A list can have as many elements as you want,
-%%%    and is enclosed in [], for example:
-%%%      [http_poll, web_admin, tls]
-%%%
-%%%  - A keyword of ejabberd is a word in lowercase.
-%%%    Strings are enclosed in "" and can contain spaces, dots, ...
-%%%      {language, "en"}.
-%%%      {ldap_rootdn, "dc=example,dc=com"}.
-%%%
-%%%  - This term includes a tuple, a keyword, a list, and two strings:
-%%%      {hosts, ["jabber.example.net", "im.example.com"]}.
-%%%
-
-
-%%%.   =======================
-%%%'   OVERRIDE STORED OPTIONS
-
-%%
-%% Override the old values stored in the database.
-%%
-
-%%
-%% Override global options (shared by all ejabberd nodes in a cluster).
-%%
-%%override_global.
-
-%%
-%% Override local options (specific for this particular ejabberd node).
-%%
-%%override_local.
-
-%%
-%% Remove the Access Control Lists before new ones are added.
-%%
-%%override_acls.
-
-
-%%%.   =========
-%%%'   DEBUGGING
-
-%%
-%% loglevel: Verbosity of log files generated by ejabberd.
-%% 0: No ejabberd log at all (not recommended)
-%% 1: Critical
-%% 2: Error
-%% 3: Warning
-%% 4: Info
-%% 5: Debug
-%%
-{loglevel, 4}.
-
-%%
-%% watchdog_admins: Only useful for developers: if an ejabberd process
-%% consumes a lot of memory, send live notifications to these XMPP
-%% accounts.
-%%
-%%{watchdog_admins, ["bob@example.com"]}.
-
-
-%%%.   ================
-%%%'   SERVED HOSTNAMES
-
-%%
-%% hosts: Domains served by ejabberd.
-%% You can define one or several, for example:
-%% {hosts, ["example.net", "example.com", "example.org"]}.
-%%
-{hosts, ["localhost"]}.
-
-%%
-%% route_subdomains: Delegate subdomains to other XMPP servers.
-%% For example, if this ejabberd serves example.org and you want
-%% to allow communication with an XMPP server called im.example.org.
-%%
-%%{route_subdomains, s2s}.
-
-
-%%%.   ===============
-%%%'   LISTENING PORTS
-
-%%
-%% listen: The ports ejabberd will listen on, which service each is handled
-%% by and what options to start it with.
-%%
-{listen,
- [
-
-  {5222, ejabberd_c2s, [
-
-			%%
-			%% If TLS is compiled in and you installed a SSL
-			%% certificate, specify the full path to the
-			%% file and uncomment this line:
-			%%
-			%%{certfile, "/path/to/ssl.pem"}, starttls,
-
-			{access, c2s},
-			{shaper, c2s_shaper},
-			{max_stanza_size, 65536}
-		       ]},
-
-  %%
-  %% To enable the old SSL connection method on port 5223:
-  %%
-  %%{5223, ejabberd_c2s, [
-  %%			{access, c2s},
-  %%			{shaper, c2s_shaper},
-  %%			{certfile, "/path/to/ssl.pem"}, tls,
-  %%			{max_stanza_size, 65536}
-  %%		       ]},
-
-  {5269, ejabberd_s2s_in, [
-			   {shaper, s2s_shaper},
-			   {max_stanza_size, 131072}
-			  ]},
-
-  %%
-  %% ejabberd_service: Interact with external components (transports, ...)
-  %%
-  %%{8888, ejabberd_service, [
-  %%			    {access, all},
-  %%			    {shaper_rule, fast},
-  %%			    {hosts, ["icq.example.org", "sms.example.org"],
-  %%			     [{password, "secret"}]
-  %%			    }
-  %%			   ]},
-
-  %%
-  %% ejabberd_stun: Handles STUN Binding requests
-  %%
-  %%{{3478, udp}, ejabberd_stun, []},
-
-  {5280, ejabberd_http, [
-			 %%{request_handlers,
-			 %% [
-			 %%  {["pub", "archive"], mod_http_fileserver}
-			 %% ]},
-			 captcha,
-			 http_bind,
-			 http_poll,
-			 %%register,
-			 web_admin
-			]}
-
- ]}.
-
-%%
-%% s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
-%% Allowed values are: false optional required required_trusted
-%% You must specify a certificate file.
-%%
-%%{s2s_use_starttls, optional}.
-
-%%
-%% s2s_certfile: Specify a certificate file.
-%%
-%%{s2s_certfile, "/path/to/ssl.pem"}.
-
-%%
-%% domain_certfile: Specify a different certificate for each served hostname.
-%%
-%%{domain_certfile, "example.org", "/path/to/example_org.pem"}.
-%%{domain_certfile, "example.com", "/path/to/example_com.pem"}.
-
-%%
-%% S2S whitelist or blacklist
-%%
-%% Default s2s policy for undefined hosts.
-%%
-%%{s2s_default_policy, allow}.
-
-%%
-%% Allow or deny communication with specific servers.
-%%
-%%{{s2s_host, "goodhost.org"}, allow}.
-%%{{s2s_host, "badhost.org"}, deny}.
-
-%%
-%% Outgoing S2S options
-%%
-%% Preferred address families (which to try first) and connect timeout
-%% in milliseconds.
-%%
-%%{outgoing_s2s_options, [ipv4, ipv6], 10000}.
-
-
-%%%.   ==============
-%%%'   AUTHENTICATION
-
-%%
-%% auth_method: Method used to authenticate the users.
-%% The default method is the internal.
-%% If you want to use a different method,
-%% comment this line and enable the correct ones.
-%%
-{auth_method, internal}.
-%%
-%% Store the plain passwords or hashed for SCRAM:
-%%{auth_password_format, plain}.
-%%{auth_password_format, scram}.
-%%
-%% Define the FQDN if ejabberd doesn't detect it:
-%%{fqdn, "server3.example.com"}.
-
-%%
-%% Authentication using external script
-%% Make sure the script is executable by ejabberd.
-%%
-%%{auth_method, external}.
-%%{extauth_program, "/path/to/authentication/script"}.
-
-%%
-%% Authentication using ODBC
-%% Remember to setup a database in the next section.
-%%
-%%{auth_method, odbc}.
-
-%%
-%% Authentication using PAM
-%%
-%%{auth_method, pam}.
-%%{pam_service, "pamservicename"}.
-
-%%
-%% Authentication using LDAP
-%%
-%%{auth_method, ldap}.
-%%
-%% List of LDAP servers:
-%%{ldap_servers, ["localhost"]}.
-%%
-%% Encryption of connection to LDAP servers:
-%%{ldap_encrypt, none}.
-%%{ldap_encrypt, tls}.
-%%
-%% Port to connect to on LDAP servers:
-%%{ldap_port, 389}.
-%%{ldap_port, 636}.
-%%
-%% LDAP manager:
-%%{ldap_rootdn, "dc=example,dc=com"}.
-%%
-%% Password of LDAP manager:
-%%{ldap_password, "******"}.
-%%
-%% Search base of LDAP directory:
-%%{ldap_base, "dc=example,dc=com"}.
-%%
-%% LDAP attribute that holds user ID:
-%%{ldap_uids, [{"mail", "%u@mail.example.org"}]}.
-%%
-%% LDAP filter:
-%%{ldap_filter, "(objectClass=shadowAccount)"}.
-
-%%
-%% Anonymous login support:
-%%   auth_method: anonymous
-%%   anonymous_protocol: sasl_anon | login_anon | both
-%%   allow_multiple_connections: true | false
-%%
-%%{host_config, "public.example.org", [{auth_method, anonymous},
-%%                                     {allow_multiple_connections, false},
-%%                                     {anonymous_protocol, sasl_anon}]}.
-%%
-%% To use both anonymous and internal authentication:
-%%
-%%{host_config, "public.example.org", [{auth_method, [internal, anonymous]}]}.
-
-
-%%%.   ==============
-%%%'   DATABASE SETUP
-
-%% ejabberd by default uses the internal Mnesia database,
-%% so you do not necessarily need this section.
-%% This section provides configuration examples in case
-%% you want to use other database backends.
-%% Please consult the ejabberd Guide for details on database creation.
-
-%%
-%% MySQL server:
-%%
-%%{odbc_server, {mysql, "server", "database", "username", "password"}}.
-%%
-%% If you want to specify the port:
-%%{odbc_server, {mysql, "server", 1234, "database", "username", "password"}}.
-
-%%
-%% PostgreSQL server:
-%%
-%%{odbc_server, {pgsql, "server", "database", "username", "password"}}.
-%%
-%% If you want to specify the port:
-%%{odbc_server, {pgsql, "server", 1234, "database", "username", "password"}}.
-%%
-%% If you use PostgreSQL, have a large database, and need a
-%% faster but inexact replacement for "select count(*) from users"
-%%
-%%{pgsql_users_number_estimate, true}.
-
-%%
-%% ODBC compatible or MSSQL server:
-%%
-%%{odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}.
-
-%%
-%% Number of connections to open to the database for each virtual host
-%%
-%%{odbc_pool_size, 10}.
-
-%%
-%% Interval to make a dummy SQL request to keep the connections to the
-%% database alive. Specify in seconds: for example 28800 means 8 hours
-%%
-%%{odbc_keepalive_interval, undefined}.
-
-
-%%%.   ===============
-%%%'   TRAFFIC SHAPERS
-
-%%
-%% The "normal" shaper limits traffic speed to 1000 B/s
-%%
-{shaper, normal, {maxrate, 1000}}.
-
-%%
-%% The "fast" shaper limits traffic speed to 50000 B/s
-%%
-{shaper, fast, {maxrate, 50000}}.
-
-%%
-%% This option specifies the maximum number of elements in the queue
-%% of the FSM. Refer to the documentation for details.
-%%
-{max_fsm_queue, 1000}.
-
-
-%%%.   ====================
-%%%'   ACCESS CONTROL LISTS
-
-%%
-%% The 'admin' ACL grants administrative privileges to XMPP accounts.
-%% You can put here as many accounts as you want.
-%%
-%%{acl, admin, {user, "aleksey", "localhost"}}.
-%%{acl, admin, {user, "ermine", "example.org"}}.
-
-%%
-%% Blocked users
-%%
-%%{acl, blocked, {user, "baduser", "example.org"}}.
-%%{acl, blocked, {user, "test"}}.
-
-%%
-%% Local users: don't modify this line.
-%%
-{acl, local, {user_regexp, ""}}.
-
-%%
-%% More examples of ACLs
-%%
-%%{acl, jabberorg, {server, "jabber.org"}}.
-%%{acl, aleksey, {user, "aleksey", "jabber.ru"}}.
-%%{acl, test, {user_regexp, "^test"}}.
-%%{acl, test, {user_glob, "test*"}}.
-
-%%
-%% Define specific ACLs in a virtual host.
-%%
-%%{host_config, "localhost",
-%% [
-%%  {acl, admin, {user, "bob-local", "localhost"}}
-%% ]
-%%}.
-
-
-%%%.   ============
-%%%'   ACCESS RULES
-
-%% Maximum number of simultaneous sessions allowed for a single user:
-{access, max_user_sessions, [{10, all}]}.
-
-%% Maximum number of offline messages that users can have:
-{access, max_user_offline_messages, [{5000, admin}, {100, all}]}.
-
-%% This rule allows access only for local users:
-{access, local, [{allow, local}]}.
-
-%% Only non-blocked users can use c2s connections:
-{access, c2s, [{deny, blocked},
-	       {allow, all}]}.
-
-%% For C2S connections, all users except admins use the "normal" shaper
-{access, c2s_shaper, [{none, admin},
-		      {normal, all}]}.
-
-%% All S2S connections use the "fast" shaper
-{access, s2s_shaper, [{fast, all}]}.
-
-%% Only admins can send announcement messages:
-{access, announce, [{allow, admin}]}.
-
-%% Only admins can use the configuration interface:
-{access, configure, [{allow, admin}]}.
-
-%% Admins of this server are also admins of the MUC service:
-{access, muc_admin, [{allow, admin}]}.
-
-%% Only accounts of the local ejabberd server can create rooms:
-{access, muc_create, [{allow, local}]}.
-
-%% All users are allowed to use the MUC service:
-{access, muc, [{allow, all}]}.
-
-%% Only accounts on the local ejabberd server can create Pubsub nodes:
-{access, pubsub_createnode, [{allow, local}]}.
-
-%% In-band registration allows registration of any possible username.
-%% To disable in-band registration, replace 'allow' with 'deny'.
-{access, register, [{allow, all}]}.
-
-%% By default the frequency of account registrations from the same IP
-%% is limited to 1 account every 10 minutes. To disable, specify: infinity
-%%{registration_timeout, 600}.
-
-%%
-%% Define specific Access Rules in a virtual host.
-%%
-%%{host_config, "localhost",
-%% [
-%%  {access, c2s, [{allow, admin}, {deny, all}]},
-%%  {access, register, [{deny, all}]}
-%% ]
-%%}.
-
-
-%%%.   ================
-%%%'   DEFAULT LANGUAGE
-
-%%
-%% language: Default language used for server messages.
-%%
-{language, "en"}.
-
-%%
-%% Set a different default language in a virtual host.
-%%
-%%{host_config, "localhost",
-%% [{language, "ru"}]
-%%}.
-
-
-%%%.   =======
-%%%'   CAPTCHA
-
-%%
-%% Full path to a script that generates the image.
-%%
-%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}.
-
-%%
-%% Host for the URL and port where ejabberd listens for CAPTCHA requests.
-%%
-%%{captcha_host, "example.org:5280"}.
-
-%%
-%% Limit CAPTCHA calls per minute for JID/IP to avoid DoS.
-%%
-%%{captcha_limit, 5}.
-
-%%%.   =======
-%%%'   MODULES
-
-%%
-%% Modules enabled in all ejabberd virtual hosts.
-%%
-{modules,
- [
-  {mod_adhoc,    []},
-  {mod_announce, [{access, announce}]}, % recommends mod_adhoc
-  {mod_blocking,[]}, % requires mod_privacy
-  {mod_caps,     []},
-  {mod_configure,[]}, % requires mod_adhoc
-  {mod_disco,    []},
-  %%{mod_echo,   [{host, "echo.localhost"}]},
-  {mod_irc,      []},
-  {mod_http_bind, []},
-  %%{mod_http_fileserver, [
-  %%                       {docroot, "/var/www"},
-  %%                       {accesslog, "/var/log/ejabberd/access.log"}
-  %%                      ]},
-  {mod_last,     []},
-  {mod_muc,      [
-		  %%{host, "conference.@HOST@"},
-		  {access, muc},
-		  {access_create, muc_create},
-		  {access_persistent, muc_create},
-		  {access_admin, muc_admin}
-		 ]},
-  %%{mod_muc_log,[]},
-  {mod_offline,  [{access_max_user_messages, max_user_offline_messages}]},
-  {mod_ping,     []},
-  %%{mod_pres_counter,[{count, 5}, {interval, 60}]},
-  {mod_privacy,  []},
-  {mod_private,  []},
-  %%{mod_proxy65,[]},
-  {mod_pubsub,   [
-		  {access_createnode, pubsub_createnode},
-		  {ignore_pep_from_offline, true}, % reduces resource comsumption, but XEP incompliant
-		  %%{ignore_pep_from_offline, false},  % XEP compliant, but increases resource comsumption
-		  {last_item_cache, false},
-		  {plugins, ["flat", "hometree", "pep"]}  % pep requires mod_caps
-		 ]},
-  {mod_register, [
-		  %%
-		  %% Protect In-Band account registrations with CAPTCHA.
-		  %%
-		  %%{captcha_protected, true},
-
-		  %%
-		  %% Set the minimum informational entropy for passwords.
-		  %%
-		  %%{password_strength, 32},
-
-		  %%
-		  %% After successful registration, the user receives
-		  %% a message with this subject and body.
-		  %%
-		  {welcome_message, {"Welcome!",
-				     "Hi.\nWelcome to this XMPP server."}},
-
-		  %%
-		  %% When a user registers, send a notification to
-		  %% these XMPP accounts.
-		  %%
-		  %%{registration_watchers, ["admin1@example.org"]},
-
-		  %%
-		  %% Only clients in the server machine can register accounts
-		  %%
-		  {ip_access, [{allow, "127.0.0.0/8"},
-			       {deny, "0.0.0.0/0"}]},
-
-		  %%
-		  %% Local c2s or remote s2s users cannot register accounts
-		  %%
-		  %%{access_from, deny},
-
-		  {access, register}
-		 ]},
-  %%{mod_register_web, [
-		  %%
-		  %% When a user registers, send a notification to
-		  %% these XMPP accounts.
-		  %%
-		  %%{registration_watchers, ["admin1@example.org"]}
-  %%		 ]},
-  {mod_roster,   []},
-  %%{mod_service_log,[]},
-  {mod_shared_roster,[]},
-  {mod_stats,    []},
-  {mod_time,     []},
-  {mod_vcard,    []},
-  {mod_version,  []}
- ]}.
-
-%%
-%% Enable modules with custom options in a specific virtual host
-%%
-%%{host_config, "localhost",
-%% [{{add, modules},
-%%   [
-%%    {mod_echo, [{host, "mirror.localhost"}]}
-%%   ]
-%%  }
-%% ]}.
-
-
-%%%.
-%%%'
-
-%%% $Id$
-
-%%% Local Variables:
-%%% mode: erlang
-%%% End:
-%%% vim: set filetype=erlang tabstop=8 foldmarker=%%%',%%%. foldmethod=marker:

ejabberd.yml.example

@@ -0,0 +1,624 @@
+###
+###               ejabberd configuration file
+###
+###
+
+### The parameters used in this configuration file are explained in more detail
+### in the ejabberd Installation and Operation Guide.
+### Please consult the Guide in case of doubts, it is included with
+### your copy of ejabberd, and is also available online at
+### http://www.process-one.net/en/ejabberd/docs/
+
+### The configuration file is written in YAML.
+### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
+### However, ejabberd treats different literals as different types:
+###
+### - unquoted or single-quoted strings. They are called "atoms".
+###   Example: dog, 'Jupiter', '3.14159', YELLOW
+###
+### - numeric literals. Example: 3, -45.0, .0
+###
+### - quoted or folded strings.
+###   Examples of quoted string: "Lizzard", "orange".
+###   Example of folded string:
+###   > Art thou not Romeo,
+###     and a Montague?
+
+###   =========
+###   DEBUGGING
+
+##
+## loglevel: Verbosity of log files generated by ejabberd.
+## 0: No ejabberd log at all (not recommended)
+## 1: Critical
+## 2: Error
+## 3: Warning
+## 4: Info
+## 5: Debug
+##
+loglevel: 4
+
+##
+## watchdog_admins: Only useful for developers: if an ejabberd process
+## consumes a lot of memory, send live notifications to these XMPP
+## accounts.
+##
+## watchdog_admins:
+##   - "bob@example.com"
+
+
+###   ================
+###   SERVED HOSTNAMES
+
+##
+## hosts: Domains served by ejabberd.
+## You can define one or several, for example:
+## hosts: 
+##   - "example.net"
+##   - "example.com"
+##   - "example.org"
+##
+hosts:
+  - "localhost"
+
+##
+## route_subdomains: Delegate subdomains to other XMPP servers.
+## For example, if this ejabberd serves example.org and you want
+## to allow communication with an XMPP server called im.example.org.
+##
+## route_subdomains: s2s
+
+###   ===============
+###   LISTENING PORTS
+
+##
+## listen: The ports ejabberd will listen on, which service each is handled
+## by and what options to start it with.
+##
+listen: 
+  - 
+    port: 5222
+    module: ejabberd_c2s
+    ##
+    ## If TLS is compiled in and you installed a SSL
+    ## certificate, specify the full path to the
+    ## file and uncomment this line:
+    ##
+    ## 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
+  - 
+    port: 5269
+    module: ejabberd_s2s_in
+  ##
+  ## ejabberd_service: Interact with external components (transports, ...)
+  ##
+  ## - 
+  ##   port: 8888
+  ##   module: ejabberd_service
+  ##   access: all
+  ##   shaper_rule: fast
+  ##   ip: "127.0.0.1"
+  ##   hosts:
+  ##     "icq.example.org":
+  ##       password: "secret"
+  ##     "sms.example.org":
+  ##       password: "secret"
+
+  ##
+  ## ejabberd_stun: Handles STUN Binding requests
+  ##
+  ## - 
+  ##   port: 3478
+  ##   transport: udp
+  ##   module: ejabberd_stun
+
+  ##
+  ## To handle XML-RPC requests that provide admin credentials:
+  ##
+  ## - 
+  ##   port: 4560
+  ##   module: ejabberd_xmlrpc
+  - 
+    port: 5280
+    module: ejabberd_http
+    ## request_handlers:
+    ##   "/pub/archive": mod_http_fileserver
+    web_admin: true
+    http_poll: true
+    http_bind: true
+    ## register: true
+    captcha: true
+
+##
+## s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
+## Allowed values are: false optional required required_trusted
+## You must specify a certificate file.
+##
+## s2s_use_starttls: optional
+
+##
+## s2s_certfile: Specify a certificate file.
+##
+## 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.
+##
+## host_config:
+##   "example.org":
+##     domain_certfile: "/path/to/example_org.pem"
+##   "example.com":
+##     domain_certfile: "/path/to/example_com.pem"
+
+##
+## S2S whitelist or blacklist
+##
+## Default s2s policy for undefined hosts.
+##
+## s2s_policy: s2s_access
+
+##
+## Outgoing S2S options
+##
+## Preferred address families (which to try first) and connect timeout
+## in milliseconds.
+##
+## outgoing_s2s_families:
+##   - ipv4
+##   - ipv6
+## outgoing_s2s_timeout: 10000
+
+###   ==============
+###   AUTHENTICATION
+
+##
+## auth_method: Method used to authenticate the users.
+## The default method is the internal.
+## If you want to use a different method,
+## comment this line and enable the correct ones.
+##
+auth_method: internal
+
+##
+## Store the plain passwords or hashed for SCRAM:
+## auth_password_format: plain
+## auth_password_format: scram
+##
+## Define the FQDN if ejabberd doesn't detect it:
+## fqdn: "server3.example.com"
+
+##
+## Authentication using external script
+## Make sure the script is executable by ejabberd.
+##
+## auth_method: external
+## extauth_program: "/path/to/authentication/script"
+
+##
+## Authentication using ODBC
+## Remember to setup a database in the next section.
+##
+## auth_method: odbc
+
+##
+## Authentication using PAM
+##
+## auth_method: pam
+## pam_service: "pamservicename"
+
+##
+## Authentication using LDAP
+##
+## auth_method: ldap
+##
+## List of LDAP servers:
+## ldap_servers:
+##   - "localhost"
+##
+## Encryption of connection to LDAP servers:
+## ldap_encrypt: none
+## ldap_encrypt: tls
+##
+## Port to connect to on LDAP servers:
+## ldap_port: 389
+## ldap_port: 636
+##
+## LDAP manager:
+## ldap_rootdn: "dc=example,dc=com"
+##
+## Password of LDAP manager:
+## ldap_password: "******"
+##
+## Search base of LDAP directory:
+## ldap_base: "dc=example,dc=com"
+##
+## LDAP attribute that holds user ID:
+## ldap_uids:
+##   - "mail": "%u@mail.example.org"
+##
+## LDAP filter:
+## ldap_filter: "(objectClass=shadowAccount)"
+
+##
+## Anonymous login support:
+##   auth_method: anonymous
+##   anonymous_protocol: sasl_anon | login_anon | both
+##   allow_multiple_connections: true | false
+##
+## host_config:
+##   "public.example.org":
+##     auth_method: anonymous
+##     allow_multiple_connections: false
+##     anonymous_protocol: sasl_anon
+##
+## To use both anonymous and internal authentication:
+##
+## host_config:
+##   "public.example.org":
+##     auth_method:
+##       - internal
+##       - anonymous
+
+###   ==============
+###   DATABASE SETUP
+
+## ejabberd by default uses the internal Mnesia database,
+## so you do not necessarily need this section.
+## This section provides configuration examples in case
+## you want to use other database backends.
+## Please consult the ejabberd Guide for details on database creation.
+
+##
+## MySQL server:
+##
+## odbc_type: mysql
+## odbc_server: "server"
+## odbc_database: "database"
+## odbc_username: "username"
+## odbc_password: "password"
+##
+## If you want to specify the port:
+## odbc_port: 1234
+
+##
+## PostgreSQL server:
+##
+## odbc_type: pgsql
+## odbc_server: "server"
+## odbc_database: "database"
+## odbc_username: "username"
+## odbc_password: "password"
+##
+## If you want to specify the port:
+## odbc_port: 1234
+##
+## If you use PostgreSQL, have a large database, and need a
+## faster but inexact replacement for "select count(*) from users"
+##
+## pgsql_users_number_estimate: true
+
+##
+## ODBC compatible or MSSQL server:
+##
+## odbc_type: odbc
+## odbc_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
+
+##
+## Number of connections to open to the database for each virtual host
+##
+## odbc_pool_size: 10
+
+##
+## Interval to make a dummy SQL request to keep the connections to the
+## database alive. Specify in seconds: for example 28800 means 8 hours
+##
+## odbc_keepalive_interval: undefined
+
+###   ===============
+###   TRAFFIC SHAPERS
+
+shaper:
+  ##
+  ## The "normal" shaper limits traffic speed to 1000 B/s
+  ##
+  normal: 1000
+
+  ##
+  ## The "fast" shaper limits traffic speed to 50000 B/s
+  ##
+  fast: 50000
+
+##
+## This option specifies the maximum number of elements in the queue
+## of the FSM. Refer to the documentation for details.
+##
+max_fsm_queue: 1000
+
+###.   ====================
+###'   ACCESS CONTROL LISTS
+acl:
+  ##
+  ## The 'admin' ACL grants administrative privileges to XMPP accounts.
+  ## You can put here as many accounts as you want.
+  ##
+  ## admin:
+  ##   user:
+  ##     - "aleksey": "localhost"
+  ##     - "ermine": "example.org"
+  ##
+  ## Blocked users
+  ##
+  ## blocked:
+  ##   user:
+  ##     - "baduser": "example.org"
+  ##     - "test"
+
+  ## Local users: don't modify this.
+  ##
+  local: 
+    user_regexp: ""
+
+  ##
+  ## More examples of ACLs
+  ##
+  ## jabberorg:
+  ##   server:
+  ##     - "jabber.org"
+  ## aleksey:
+  ##   user:
+  ##     - "aleksey": "jabber.ru"
+  ## test:
+  ##   user_regexp: "^test"
+  ##   user_glob: "test*"
+
+  ##
+  ## Loopback network
+  ##
+  loopback:
+    ip:
+      - "127.0.0.0/8"
+
+  ##
+  ## Bad XMPP servers
+  ##
+  ## bad_servers:
+  ##   server:
+  ##     - "xmpp.zombie.org"
+  ##     - "xmpp.spam.com"
+
+##
+## Define specific ACLs in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     acl:
+##       admin:
+##         user:
+##           - "bob-local": "localhost"
+
+###   ============
+###   ACCESS RULES
+access:
+  ## Maximum number of simultaneous sessions allowed for a single user:
+  max_user_sessions: 
+    all: 10
+  ## Maximum number of offline messages that users can have:
+  max_user_offline_messages: 
+    admin: 5000
+    all: 100
+  ## This rule allows access only for local users:
+  local: 
+    local: allow
+  ## Only non-blocked users can use c2s connections:
+  c2s: 
+    blocked: deny
+    all: allow
+  ## For C2S connections, all users except admins use the "normal" shaper
+  c2s_shaper: 
+    admin: none
+    all: normal
+  ## All S2S connections use the "fast" shaper
+  s2s_shaper: 
+    all: fast
+  ## Only admins can send announcement messages:
+  announce: 
+    admin: allow
+  ## Only admins can use the configuration interface:
+  configure: 
+    admin: allow
+  ## Admins of this server are also admins of the MUC service:
+  muc_admin: 
+    admin: allow
+  ## Only accounts of the local ejabberd server can create rooms:
+  muc_create: 
+    local: allow
+  ## All users are allowed to use the MUC service:
+  muc: 
+    all: allow
+  ## Only accounts on the local ejabberd server can create Pubsub nodes:
+  pubsub_createnode: 
+    local: allow
+  ## In-band registration allows registration of any possible username.
+  ## To disable in-band registration, replace 'allow' with 'deny'.
+  register: 
+    all: allow
+  ## Only allow to register from localhost
+  trusted_network: 
+    loopback: allow
+  ## Do not establish S2S connections with bad servers
+  ## s2s_access:
+  ##   bad_servers: deny
+  ##   all: allow
+
+## By default the frequency of account registrations from the same IP
+## is limited to 1 account every 10 minutes. To disable, specify: infinity
+## registration_timeout: 600
+  
+##
+## Define specific Access Rules in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     access:
+##       c2s:
+##         admin: allow
+##         all: deny
+##       register:
+##         all: deny
+
+###   ================
+###   DEFAULT LANGUAGE
+
+##
+## language: Default language used for server messages.
+##
+language: "en"
+
+##
+## Set a different default language in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     language: "ru"
+
+###   =======
+###   CAPTCHA
+
+##
+## Full path to a script that generates the image.
+##
+## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
+
+##
+## Host for the URL and port where ejabberd listens for CAPTCHA requests.
+##
+## captcha_host: "example.org:5280"
+
+##
+## Limit CAPTCHA calls per minute for JID/IP to avoid DoS.
+##
+## captcha_limit: 5
+
+###   =======
+###   MODULES
+
+##
+## Modules enabled in all ejabberd virtual hosts.
+##
+modules: 
+  mod_adhoc: {}
+  mod_announce: # recommends mod_adhoc
+    access: announce
+  mod_blocking: {} # requires mod_privacy
+  mod_caps: {}
+  mod_carboncopy: {}
+  mod_configure: {} # requires mod_adhoc
+  mod_disco: {}
+  ## mod_echo: {}
+  mod_irc: {}
+  mod_http_bind: {}
+  ## mod_http_fileserver:
+  ##   docroot: "/var/www"
+  ##   accesslog: "/var/log/ejabberd/access.log"
+  mod_last: {}
+  mod_muc: 
+    ## host: "conference.@HOST@"
+    access: muc
+    access_create: muc_create
+    access_persistent: muc_create
+    access_admin: muc_admin
+  ## mod_muc_log: {}
+  mod_offline: 
+    access_max_user_messages: max_user_offline_messages
+  mod_ping: {}
+  ## mod_pres_counter:
+  ##   count: 5
+  ##   interval: 60
+  mod_privacy: {}
+  mod_private: {}
+  ## mod_proxy65: {}
+  mod_pubsub: 
+    access_createnode: pubsub_createnode
+    ## reduces resource comsumption, but XEP incompliant
+    ignore_pep_from_offline: true
+    ## XEP compliant, but increases resource comsumption
+    ## ignore_pep_from_offline: false
+    last_item_cache: false
+    plugins: 
+      - "flat"
+      - "hometree"
+      - "pep" # pep requires mod_caps
+  mod_register: 
+    ##
+    ## Protect In-Band account registrations with CAPTCHA.
+    ##
+    ## captcha_protected: true
+
+    ##
+    ## Set the minimum informational entropy for passwords.
+    ##
+    ## password_strength: 32
+
+    ##
+    ## After successful registration, the user receives
+    ## a message with this subject and body.
+    ##
+    welcome_message: 
+      subject: "Welcome!"
+      body: |-
+        Hi.
+        Welcome to this XMPP server.
+
+    ##
+    ## When a user registers, send a notification to
+    ## these XMPP accounts.
+    ##
+    ## registration_watchers:
+    ##   - "admin1@example.org"
+
+    ##
+    ## Only clients in the server machine can register accounts
+    ##
+    ip_access: trusted_network
+
+    ##
+    ## Local c2s or remote s2s users cannot register accounts
+    ##
+    ## access_from: deny
+
+    access: register
+  mod_roster: {}
+  mod_shared_roster: {}
+  mod_stats: {}
+  mod_time: {}
+  mod_vcard: {}
+  mod_version: {}
+
+##
+## Enable modules with custom options in a specific virtual host
+##
+## append_host_config:
+##   "localhost":
+##     modules:
+##       mod_echo:
+##         host: "mirror.localhost"
+
+### Local Variables:
+### mode: yaml
+### End:
+### vim: set filetype=yaml tabstop=8

ejabberdctl.template

@@ -65,7 +65,7 @@ if [ -f "$EJABBERDCTL_CONFIG_PATH" ] ; then
     . "$EJABBERDCTL_CONFIG_PATH"
 fi
 if [ "$EJABBERD_CONFIG_PATH" = "" ] ; then
-    EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.cfg
+    EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml
 fi
 if [ "$LOGS_DIR" = "" ] ; then
     LOGS_DIR={{localstatedir}}/log/ejabberd

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

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

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

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,22 +12,18 @@
 %%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
--record(config, {key :: any(), value :: any()}).
-
 -record(local_config, {key :: any(), value :: any()}).
 
--type config() :: #config{}.
 -type local_config() :: #local_config{}.
 
 -record(state,
-	{opts = []               :: [acl:acl() | config() | local_config()],
+	{opts = []               :: [acl:acl() | local_config()],
          hosts = []              :: [binary()],
          override_local = false  :: boolean(),
 	 override_global = false :: boolean(),

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

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

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

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

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

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

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)).
@@ -41,17 +40,17 @@
 -else.
 
 -define(DEBUG(Format, Args),
-	ejabberd_logger:debug_msg(?MODULE, ?LINE, Format, Args)).
+	p1_logger:debug_msg(?MODULE, ?LINE, Format, Args)).
 
 -define(INFO_MSG(Format, Args),
-	ejabberd_logger:info_msg(?MODULE, ?LINE, Format, Args)).
+	p1_logger:info_msg(?MODULE, ?LINE, Format, Args)).
 
 -define(WARNING_MSG(Format, Args),
-	ejabberd_logger:warning_msg(?MODULE, ?LINE, Format, Args)).
+	p1_logger:warning_msg(?MODULE, ?LINE, Format, Args)).
 
 -define(ERROR_MSG(Format, Args),
-	ejabberd_logger:error_msg(?MODULE, ?LINE, Format, Args)).
+	p1_logger:error_msg(?MODULE, ?LINE, Format, Args)).
 
 -define(CRITICAL_MSG(Format, Args),
-	ejabberd_logger:critical_msg(?MODULE, ?LINE, Format, Args)).
+	p1_logger:critical_msg(?MODULE, ?LINE, Format, Args)).
 -endif.

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()
 }).
 

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

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

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

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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -144,3 +143,5 @@
 -define(NS_MEDIA, <<"urn:xmpp:media-element">>).
 -define(NS_BOB, <<"urn:xmpp:bob">>).
 -define(NS_PING, <<"urn:xmpp:ping">>).
+-define(NS_STREAM_MGMT_2,  <<"urn:xmpp:sm:2">>).
+-define(NS_STREAM_MGMT_3,  <<"urn:xmpp:sm:3">>).

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.
 %%% ====================================================================

m4/erlang-extra.m4

@@ -50,6 +50,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, _}  ->

rebar.config.script

@@ -16,7 +16,7 @@ Cfg = case file:consult("vars.config") of
 Macros = lists:flatmap(
            fun({roster_gateway_workaround, true}) ->
                    [{d, 'ROSTER_GATEWAY_WORKAROUND'}];
-              ({transient_supervisors, true}) ->
+              ({transient_supervisors, false}) ->
                    [{d, 'NO_TRANSIENT_SUPERVISORS'}];
               ({nif, true}) ->
                    [{d, 'NIF'}];
@@ -30,9 +30,9 @@ Macros = lists:flatmap(
 
 DebugInfo = case lists:keysearch(debug, 1, Cfg) of
                 {value, {debug, true}} ->
-                    [debug_info];
+                    [];
                 _ ->
-                    []
+                    [no_debug_info]
             end,
 
 HiPE = case lists:keysearch(hipe, 1, Cfg) of
@@ -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(
@@ -52,11 +53,12 @@ SrcDirs = lists:foldl(
                     Acc
             end, [], Cfg),
 
-Deps = [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}},
-        {p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}},
+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"}}],
 
 ConfigureCmd = fun(Pkg, Flags) ->
@@ -76,6 +78,8 @@ XMLFlags = lists:foldl(
 
 PostHooks = [ConfigureCmd("p1_tls", ""),
              ConfigureCmd("p1_stringprep", ""),
+             ConfigureCmd("p1_yaml", ""),
+	     ConfigureCmd("esip", ""),
              ConfigureCmd("p1_xml", XMLFlags)],
 
 CfgDeps = lists:flatmap(
@@ -98,6 +102,8 @@ CfgDeps = lists:flatmap(
                      {lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}];
                ({lager, true}) ->
                     [{lager, ".*", {git, "git://github.com/basho/lager"}}];
+               ({lager, false}) ->
+                    [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}];
                (_) ->
                     []
             end, Cfg),
@@ -118,6 +124,7 @@ CfgPostHooks = lists:flatmap(
 Config = [{erl_opts, Includes ++ Macros ++ HiPE ++ DebugInfo ++
                [{src_dirs, [asn1, src | SrcDirs]}]},
           {sub_dirs, ["rel"]},
+          {keep_build_info, true},
           {ct_extra_params, "-include "
            ++ filename:join([Cwd, "tools"]) ++ " "
            ++ filename:join([Cwd, "deps", "p1_xml", "include"])},

rel/reltool.config.script

@@ -28,7 +28,7 @@ ConfiguredOTPApps = lists:flatmap(
 
 OTPApps = RequiredOTPApps ++ ConfiguredOTPApps,
 
-DepRequiredApps = [p1_logger, p1_cache_tab, p1_tls, p1_stringprep, p1_xml, xmlrpc],
+DepRequiredApps = [p1_cache_tab, p1_tls, p1_stringprep, p1_xml, p1_yaml, xmlrpc],
 
 DepConfiguredApps = lists:flatmap(
                       fun({mysql, true}) -> [p1_mysql];
@@ -39,7 +39,8 @@ DepConfiguredApps = lists:flatmap(
                          ({json, true}) -> [jiffy];
                          ({iconv, true}) -> [p1_iconv];
                          ({http, true}) -> [ibrowse, lhttpc];
-                         ({lager, true}) -> [lager];
+                         ({lager, true}) -> [lager, goldrush];
+                         ({lager, false}) -> [p1_logger];
                          (_) -> []
                       end, Vars),
 
@@ -88,7 +89,7 @@ Overlay = [
            {template, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
            {template, "../ejabberdctl.template", "bin/ejabberdctl"},
            {copy, "../ejabberdctl.cfg.example", "etc/ejabberd/ejabberdctl.cfg"},
-           {copy, "../ejabberd.cfg.example", "etc/ejabberd/ejabberd.cfg"},
+           {copy, "../ejabberd.yml.example", "etc/ejabberd/ejabberd.yml"},
            {copy, "../inetrc", "etc/ejabberd/inetrc"},
            {copy, "files/install_upgrade.escript", "bin/install_upgrade.escript"}
           ],

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.
  *
  */
 

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.
  *
  */
 

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,27 +11,23 @@
 -- 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.
 --
 
--- Needs MySQL (at least 4.0.x) with innodb back-end
-SET table_type=InnoDB;
-
 CREATE TABLE users (
     username varchar(250) PRIMARY KEY,
     password text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 
 CREATE TABLE last (
     username varchar(250) PRIMARY KEY,
     seconds text NOT NULL,
     state text NOT NULl
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 
 CREATE TABLE rosterusers (
@@ -45,7 +41,7 @@ CREATE TABLE rosterusers (
     subscribe text NOT NULL,
     type text,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE UNIQUE INDEX i_rosteru_user_jid ON rosterusers(username(75), jid(75));
 CREATE INDEX i_rosteru_username ON rosterusers(username);
@@ -55,7 +51,7 @@ CREATE TABLE rostergroups (
     username varchar(250) NOT NULL,
     jid varchar(250) NOT NULL,
     grp text NOT NULL
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX pk_rosterg_user_jid ON rostergroups(username(75), jid(75));
 
@@ -63,13 +59,13 @@ CREATE TABLE sr_group (
     name varchar(250) NOT NULL,
     opts text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE TABLE sr_user (
     jid varchar(250) NOT NULL,
     grp varchar(250) NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE UNIQUE INDEX i_sr_user_jid_group ON sr_user(jid(75), grp(75));
 CREATE INDEX i_sr_user_jid ON sr_user(jid);
@@ -80,22 +76,21 @@ CREATE TABLE spool (
     xml text NOT NULL,
     seq BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX i_despool USING BTREE ON spool(username);
 
-
 CREATE TABLE vcard (
     username varchar(250) PRIMARY KEY,
     vcard mediumtext NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE TABLE vcard_xupdate (
     username varchar(250) PRIMARY KEY,
     hash text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE TABLE vcard_search (
     username varchar(250) NOT NULL,
@@ -122,7 +117,7 @@ CREATE TABLE vcard_search (
     lorgname varchar(250) NOT NULL,
     orgunit text NOT NULL,
     lorgunit varchar(250) NOT NULL
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX i_vcard_search_lfn       ON vcard_search(lfn);
 CREATE INDEX i_vcard_search_lfamily   ON vcard_search(lfamily);
@@ -139,14 +134,14 @@ CREATE INDEX i_vcard_search_lorgunit  ON vcard_search(lorgunit);
 CREATE TABLE privacy_default_list (
     username varchar(250) PRIMARY KEY,
     name varchar(250) NOT NULL
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE TABLE privacy_list (
     username varchar(250) NOT NULL,
     name varchar(250) NOT NULL,
     id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX i_privacy_list_username  USING BTREE ON privacy_list(username);
 CREATE UNIQUE INDEX i_privacy_list_username_name USING BTREE ON privacy_list (username(75), name(75));
@@ -162,14 +157,15 @@ CREATE TABLE privacy_list_data (
     match_message boolean NOT NULL,
     match_presence_in boolean NOT NULL,
     match_presence_out boolean NOT NULL
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
+CREATE INDEX i_privacy_list_data_id ON privacy_list_data(id);
 
 CREATE TABLE private_storage (
     username varchar(250) NOT NULL,
     namespace varchar(250) NOT NULL,
     data text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX i_private_storage_username USING BTREE ON private_storage(username);
 CREATE UNIQUE INDEX i_private_storage_username_namespace USING BTREE ON private_storage(username(75), namespace(75));
@@ -178,7 +174,7 @@ CREATE UNIQUE INDEX i_private_storage_username_namespace USING BTREE ON private_
 CREATE TABLE roster_version (
     username varchar(250) PRIMARY KEY,
     version text NOT NULL
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 -- To update from 1.x:
 -- ALTER TABLE rosterusers ADD COLUMN askmessage text AFTER ask;
@@ -191,7 +187,7 @@ CREATE TABLE pubsub_node (
   parent text,
   type text,
   nodeid bigint auto_increment primary key
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 CREATE INDEX i_pubsub_node_parent ON pubsub_node(parent(120));
 CREATE UNIQUE INDEX i_pubsub_node_tuple ON pubsub_node(host(20), node(120));
 
@@ -199,14 +195,14 @@ CREATE TABLE pubsub_node_option (
   nodeid bigint,
   name text,
   val text
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 CREATE INDEX i_pubsub_node_option_nodeid ON pubsub_node_option(nodeid);
 ALTER TABLE `pubsub_node_option` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
 
 CREATE TABLE pubsub_node_owner (
   nodeid bigint,
   owner text
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 CREATE INDEX i_pubsub_node_owner_nodeid ON pubsub_node_owner(nodeid);
 ALTER TABLE `pubsub_node_owner` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
 
@@ -216,7 +212,7 @@ CREATE TABLE pubsub_state (
   affiliation character(1),
   subscriptions text,
   stateid bigint auto_increment primary key
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 CREATE INDEX i_pubsub_state_jid ON pubsub_state(jid(60));
 CREATE UNIQUE INDEX i_pubsub_state_tuple ON pubsub_state(nodeid, jid(60));
 ALTER TABLE `pubsub_state` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
@@ -228,7 +224,7 @@ CREATE TABLE pubsub_item (
   creation text,
   modification text,
   payload text
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 CREATE INDEX i_pubsub_item_itemid ON pubsub_item(itemid(36));
 CREATE UNIQUE INDEX i_pubsub_item_tuple ON pubsub_item(nodeid, itemid(36));
 ALTER TABLE `pubsub_item` ADD FOREIGN KEY (`nodeid`) REFERENCES `pubsub_node` (`nodeid`) ON DELETE CASCADE;
@@ -245,7 +241,7 @@ CREATE TABLE muc_room (
     host text NOT NULL,
     opts text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE UNIQUE INDEX i_muc_room_name_host USING BTREE ON muc_room(name(75), host(75));
 
@@ -254,7 +250,7 @@ CREATE TABLE muc_registered (
     host text NOT NULL,
     nick text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX i_muc_registered_nick USING BTREE ON muc_registered(nick(75));
 CREATE UNIQUE INDEX i_muc_registered_jid_host USING BTREE ON muc_registered(jid(75), host(75));
@@ -264,7 +260,7 @@ CREATE TABLE irc_custom (
     host text NOT NULL,
     data text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE UNIQUE INDEX i_irc_custom_jid_host USING BTREE ON irc_custom(jid(75), host(75));
 
@@ -272,13 +268,13 @@ CREATE TABLE motd (
     username varchar(250) PRIMARY KEY,
     xml text,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE TABLE caps_features (
     node varchar(250) NOT NULL,
     subnode varchar(250) NOT NULL,
     feature text,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
-) CHARACTER SET utf8;
+) ENGINE=InnoDB CHARACTER SET utf8;
 
 CREATE INDEX i_caps_features_node_subnode ON caps_features(node(75), subnode(75));

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 (

src/acl.erl

@@ -5,7 +5,7 @@
 %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -29,34 +28,38 @@
 -author('alexey@process-one.net').
 
 -export([start/0, to_record/3, add/3, add_list/3,
-	 match_rule/3, match_acl/3]).
+         add_local/3, add_list_local/3, load_from_config/0,
+	 match_rule/3, match_acl/3, transform_options/1]).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
 -include("jlib.hrl").
 
 -record(acl, {aclname, aclspec}).
+-record(access, {name       :: aclname(),
+                 rules = [] :: [access_rule()]}).
 
 -type regexp() :: binary().
 -type glob() :: binary().
+-type access_name() :: atom().
+-type access_rule() :: {atom(), any()}.
+-type host() :: binary().
 -type aclname() :: {atom(), binary() | global}.
 -type aclspec() :: all | none |
-                   {user, binary()} |
-                   {user, binary(), binary()} |
+                   {user, {binary(), host()} | binary()} |
                    {server, binary()} |
                    {resource, binary()} |
-                   {user_regexp, regexp()} |
-                   {shared_group, binary()} |
-                   {shared_group, binary(), binary()} |
-                   {user_regexp, regexp(), binary()} |
+                   {user_regexp, {regexp(), host()} | regexp()} |
+                   {shared_group, {binary(), host()} | binary()} |
+                   {user_regexp, {regexp(), host()} | regexp()} |
                    {server_regexp, regexp()} |
                    {resource_regexp, regexp()} |
-                   {node_regexp, regexp(), regexp()} |
-                   {user_glob, glob()} |
-                   {user_glob, glob(), binary()} |
+                   {node_regexp, {regexp(), regexp()}} |
+                   {user_glob, {glob(), host()} | glob()} |
                    {server_glob, glob()} |
                    {resource_glob, glob()} |
-                   {node_glob, glob(), glob()}.
+                   {ip, {inet:ip_address(), integer()}} |
+                   {node_glob, {glob(), glob()}}.
 
 -type acl() :: #acl{aclname :: aclname(),
                     aclspec :: aclspec()}.
@@ -64,11 +67,23 @@
 -export_type([acl/0]).
 
 start() ->
+    case catch mnesia:table_info(acl, storage_type) of
+        disc_copies ->
+            mnesia:delete_table(acl);
+        _ ->
+            ok
+    end,
     mnesia:create_table(acl,
-			[{disc_copies, [node()]}, {type, bag},
+			[{ram_copies, [node()]}, {type, bag},
+                         {local_content, true},
 			 {attributes, record_info(fields, acl)}]),
+    mnesia:create_table(access,
+                        [{ram_copies, [node()]},
+                         {local_content, true},
+			 {attributes, record_info(fields, access)}]),
     mnesia:add_table_copy(acl, node(), ram_copies),
-    update_table(),
+    mnesia:add_table_copy(access, node(), ram_copies),
+    load_from_config(),
     ok.
 
 -spec to_record(binary(), atom(), aclspec()) -> acl().
@@ -77,18 +92,49 @@ to_record(Host, ACLName, ACLSpec) ->
     #acl{aclname = {ACLName, Host},
 	 aclspec = normalize_spec(ACLSpec)}.
 
--spec add(binary(), aclname(), aclspec()) -> {atomic, ok} | {aborted, any()}.
+-spec add(binary(), aclname(), aclspec()) -> ok | {error, any()}.
 
 add(Host, ACLName, ACLSpec) ->
+    {ResL, BadNodes} = rpc:multicall(mnesia:system_info(running_db_nodes),
+                                     ?MODULE, add_local,
+                                     [Host, ACLName, ACLSpec]),
+    case lists:keyfind(aborted, 1, ResL) of
+        false when BadNodes == [] ->
+            ok;
+        false ->
+            {error, {failed_nodes, BadNodes}};
+        Err ->
+            {error, Err}
+    end.
+
+add_local(Host, ACLName, ACLSpec) ->
     F = fun () ->
 		mnesia:write(#acl{aclname = {ACLName, Host},
 				  aclspec = normalize_spec(ACLSpec)})
 	end,
-    mnesia:transaction(F).
+    case mnesia:transaction(F) of
+        {atomic, ok} ->
+            ok;
+        Err ->
+            Err
+    end.
 
--spec add_list(binary(), [acl()], boolean()) -> false | ok.
+-spec add_list(binary(), [acl()], boolean()) -> ok | {error, any()}.
 
 add_list(Host, ACLs, Clear) ->
+    {ResL, BadNodes} = rpc:multicall(mnesia:system_info(running_db_nodes),
+                                     ?MODULE, add_list_local,
+                                     [Host, ACLs, Clear]),
+    case lists:keyfind(aborted, 1, ResL) of
+        false when BadNodes == [] ->
+            ok;
+        false ->
+            {error, {failed_nodes, BadNodes}};
+        Err ->
+            {error, Err}
+    end.
+
+add_list_local(Host, ACLs, Clear) ->
     F = fun () ->
 		if Clear ->
 		       Ks = mnesia:select(acl,
@@ -112,135 +158,197 @@ add_list(Host, ACLs, Clear) ->
 			      end,
 			      ACLs)
 	end,
-    case mnesia:transaction(F) of
-      {atomic, _} -> ok;
-      _ -> false
+    mnesia:transaction(F).
+
+-spec add_access(binary() | global,
+                 access_name(), [access_rule()]) ->  ok | {error, any()}.
+
+add_access(Host, Access, Rules) ->
+    case mnesia:transaction(
+           fun() ->
+                   mnesia:write(
+                     #access{name = {Access, Host},
+                             rules = Rules})
+           end) of
+        {atomic, ok} ->
+            ok;
+        Err ->
+            {error, Err}
     end.
 
-normalize(A) -> jlib:nodeprep(iolist_to_binary(A)).
+-spec load_from_config() -> ok.
 
-normalize_spec({A, B}) -> {A, normalize(B)};
-normalize_spec({A, B, C}) ->
-    {A, normalize(B), normalize(C)};
-normalize_spec(all) -> all;
-normalize_spec(none) -> none.
+load_from_config() ->
+    Hosts = [global|?MYHOSTS],
+    lists:foreach(
+      fun(Host) ->
+              ACLs = ejabberd_config:get_option(
+                       {acl, Host}, fun(V) -> V end, []),
+              AccessRules = ejabberd_config:get_option(
+                              {access, Host}, fun(V) -> V end, []),
+              lists:foreach(
+                fun({ACLName, SpecList}) ->
+                        lists:foreach(
+                          fun({ACLType, ACLSpecs}) when is_list(ACLSpecs) ->
+                                  lists:foreach(
+                                    fun(ACLSpec) ->
+                                            add(Host, ACLName,
+                                                {ACLType, ACLSpec})
+                                    end, lists:flatten(ACLSpecs));
+                             ({ACLType, ACLSpecs}) ->
+                                  add(Host, ACLName, {ACLType, ACLSpecs})
+                          end, lists:flatten(SpecList))
+                end, ACLs),
+              lists:foreach(
+                fun({Access, Rules}) ->
+                        add_access(Host, Access, Rules)
+                end, AccessRules)
+      end, Hosts).
 
--spec match_rule(global | binary(), atom(), jid() | ljid()) -> any().
+b(S) ->
+    iolist_to_binary(S).
 
-match_rule(global, Rule, JID) ->
-    case Rule of
-      all -> allow;
-      none -> deny;
-      _ ->
-	  case ejabberd_config:get_global_option(
-                 {access, Rule, global}, fun(V) -> V end)
-	      of
-	    undefined -> deny;
-	    GACLs -> match_acls(GACLs, JID, global)
-	  end
-    end;
-match_rule(Host, Rule, JID) ->
-    case Rule of
-      all -> allow;
-      none -> deny;
-      _ ->
-	  case ejabberd_config:get_global_option(
-                 {access, Rule, global}, fun(V) -> V end)
-	      of
-	    undefined ->
-		case ejabberd_config:get_global_option(
-                       {access, Rule, Host}, fun(V) -> V end)
-		    of
-		  undefined -> deny;
-		  ACLs -> match_acls(ACLs, JID, Host)
-		end;
-	    GACLs ->
-		case ejabberd_config:get_global_option(
-                       {access, Rule, Host}, fun(V) -> V end)
-		    of
-		  undefined -> match_acls(GACLs, JID, Host);
-		  ACLs ->
-		      case lists:reverse(GACLs) of
-			[{allow, all} | Rest] ->
-			    match_acls(lists:reverse(Rest) ++
-					 ACLs ++ [{allow, all}],
-				       JID, Host);
-			_ -> match_acls(GACLs ++ ACLs, JID, Host)
-		      end
-		end
-	  end
+nodeprep(S) ->
+    jlib:nodeprep(b(S)).
+
+nameprep(S) ->
+    jlib:nameprep(b(S)).
+
+resourceprep(S) ->
+    jlib:resourceprep(b(S)).
+
+normalize_spec(Spec) ->
+    case Spec of
+        all -> all;
+        none -> none;
+        {user, {U, S}} -> {user, {nodeprep(U), nameprep(S)}};
+        {user, U} -> {user, nodeprep(U)};
+        {shared_group, {G, H}} -> {shared_group, {b(G), nameprep(H)}};
+        {shared_group, G} -> {shared_group, b(G)};
+        {user_regexp, {UR, S}} -> {user_regexp, {b(UR), nameprep(S)}};
+        {user_regexp, UR} -> {user_regexp, b(UR)};
+        {node_regexp, {UR, SR}} -> {node_regexp, {b(UR), b(SR)}};
+        {user_glob, {UR, S}} -> {user_glob, {b(UR), nameprep(S)}};
+        {user_glob, UR} -> {user_glob, b(UR)};
+        {node_glob, {UR, SR}} -> {node_glob, {b(UR), b(SR)}};
+        {server, S} -> {server, nameprep(S)};
+        {resource, R} -> {resource, resourceprep(R)};
+        {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} ->
+                    {ip, {Net, Mask}};
+                error ->
+                    ?INFO_MSG("Invalid network address: ~p", [S]),
+                    none
+            end
+    end.
+
+-spec match_rule(global | binary(), access_name(),
+                 jid() | ljid() | inet:ip_address()) -> any().
+
+match_rule(_Host, all, _JID) ->
+    allow;
+match_rule(_Host, none, _JID) ->
+    deny;
+match_rule(Host, Access, JID) ->
+    GAccess = ets:lookup(access, {Access, global}),
+    LAccess = if Host /= global ->
+                      ets:lookup(access, {Access, Host});
+                 true ->
+                      []
+              end,
+    case GAccess ++ LAccess of
+        [] ->
+            deny;
+        AccessList ->
+            Rules = lists:flatmap(
+                      fun(#access{rules = Rs}) ->
+                              Rs
+                      end, AccessList),
+            match_acls(Rules, JID, Host)
     end.
 
 match_acls([], _, _Host) -> deny;
-match_acls([{Access, ACL} | ACLs], JID, Host) ->
+match_acls([{ACL, Access} | ACLs], JID, Host) ->
     case match_acl(ACL, JID, Host) of
       true -> Access;
       _ -> match_acls(ACLs, JID, Host)
     end.
 
--spec match_acl(atom(), jid() | ljid(), binary()) -> boolean().
+-spec match_acl(atom(),
+                jid() | ljid() | inet:ip_address(),
+                binary()) -> boolean().
 
+match_acl(all, _JID, _Host) ->
+    true;
+match_acl(none, _JID, _Host) ->
+    false;
+match_acl(ACL, IP, Host) when tuple_size(IP) == 4;
+                              tuple_size(IP) == 8 ->
+    lists:any(
+      fun(#acl{aclspec = {ip, {Net, Mask}}}) ->
+              is_ip_match(IP, Net, Mask);
+         (_) ->
+              false
+      end,
+      ets:lookup(acl, {ACL, Host}) ++
+          ets:lookup(acl, {ACL, global}));
 match_acl(ACL, JID, Host) ->
-    case ACL of
-      all -> true;
-      none -> false;
-      _ ->
-	  {User, Server, Resource} = jlib:jid_tolower(JID),
-	  lists:any(fun (#acl{aclspec = Spec}) ->
-			    case Spec of
-			      all -> true;
-			      {user, U} ->
-				  U == User andalso
-				    (Host == Server orelse
-				       Host == global andalso
-					 lists:member(Server, ?MYHOSTS));
-			      {user, U, S} -> U == User andalso S == Server;
-			      {server, S} -> S == Server;
-			      {resource, R} -> R == Resource;
-			      {user_regexp, UR} ->
-				  (Host == Server orelse
-				     Host == global andalso
-				       lists:member(Server, ?MYHOSTS))
-				    andalso is_regexp_match(User, UR);
-			      {shared_group, G} ->
-				  Mod = loaded_shared_roster_module(Host),
-				  Mod:is_user_in_group({User, Server}, G, Host);
-			      {shared_group, G, H} ->
-				  Mod = loaded_shared_roster_module(H),
-				  Mod:is_user_in_group({User, Server}, G, H);
-			      {user_regexp, UR, S} ->
-				  S == Server andalso is_regexp_match(User, UR);
-			      {server_regexp, SR} ->
-				  is_regexp_match(Server, SR);
-			      {resource_regexp, RR} ->
-				  is_regexp_match(Resource, RR);
-			      {node_regexp, UR, SR} ->
-				  is_regexp_match(Server, SR) andalso
-				    is_regexp_match(User, UR);
-			      {user_glob, UR} ->
-				  (Host == Server orelse
-				     Host == global andalso
-				       lists:member(Server, ?MYHOSTS))
-				    andalso is_glob_match(User, UR);
-			      {user_glob, UR, S} ->
-				  S == Server andalso is_glob_match(User, UR);
-			      {server_glob, SR} -> is_glob_match(Server, SR);
-			      {resource_glob, RR} ->
-				  is_glob_match(Resource, RR);
-			      {node_glob, UR, SR} ->
-				  is_glob_match(Server, SR) andalso
-				    is_glob_match(User, UR);
-			      WrongSpec ->
-				  ?ERROR_MSG("Wrong ACL expression: ~p~nCheck your "
-					     "config file and reload it with the override_a"
-					     "cls option enabled",
-					     [WrongSpec]),
-				  false
-			    end
-		    end,
-		    ets:lookup(acl, {ACL, global}) ++
-		      ets:lookup(acl, {ACL, Host}))
-    end.
+    {User, Server, Resource} = jlib:jid_tolower(JID),
+    lists:any(
+      fun(#acl{aclspec = Spec}) ->
+              case Spec of
+                  all -> true;
+                  {user, {U, S}} -> U == User andalso S == Server;
+                  {user, U} ->
+                      U == User andalso
+                          lists:member(Server, ?MYHOSTS);
+                  {server, S} -> S == Server;
+                  {resource, R} -> R == Resource;
+                  {shared_group, {G, H}} ->
+                      Mod = loaded_shared_roster_module(H),
+                      Mod:is_user_in_group({User, Server}, G, H);
+                  {shared_group, G} ->
+                      Mod = loaded_shared_roster_module(Host),
+                      Mod:is_user_in_group({User, Server}, G, Host);
+                  {user_regexp, {UR, S}} ->
+                      S == Server andalso is_regexp_match(User, UR);
+                  {user_regexp, UR} ->
+                      lists:member(Server, ?MYHOSTS)
+                          andalso is_regexp_match(User, UR);
+                  {server_regexp, SR} ->
+                      is_regexp_match(Server, SR);
+                  {resource_regexp, RR} ->
+                      is_regexp_match(Resource, RR);
+                  {node_regexp, {UR, SR}} ->
+                      is_regexp_match(Server, SR) andalso
+                          is_regexp_match(User, UR);
+                  {user_glob, {UR, S}} ->
+                      S == Server andalso is_glob_match(User, UR);
+                  {user_glob, UR} ->
+                      lists:member(Server, ?MYHOSTS)
+                          andalso is_glob_match(User, UR);
+                  {server_glob, SR} -> is_glob_match(Server, SR);
+                  {resource_glob, RR} ->
+                      is_glob_match(Resource, RR);
+                  {node_glob, {UR, SR}} ->
+                      is_glob_match(Server, SR) andalso
+                          is_glob_match(User, UR);
+                  WrongSpec ->
+                      ?ERROR_MSG("Wrong ACL expression: ~p~nCheck your "
+                                 "config file and reload it with the override_a"
+                                 "cls option enabled",
+                                 [WrongSpec]),
+                      false
+              end
+      end,
+      ets:lookup(acl, {ACL, Host}) ++
+          ets:lookup(acl, {ACL, global})).
 
 is_regexp_match(String, RegExp) ->
     case ejabberd_regexp:run(String, RegExp) of
@@ -256,34 +364,115 @@ is_glob_match(String, Glob) ->
     is_regexp_match(String,
 		    ejabberd_regexp:sh_to_awk(Glob)).
 
+is_ip_match({_, _, _, _} = IP, {_, _, _, _} = Net, Mask) ->
+    IPInt = ip_to_integer(IP),
+    NetInt = ip_to_integer(Net),
+    M = bnot (1 bsl (32 - Mask) - 1),
+    IPInt band M =:= NetInt band M;
+is_ip_match({_, _, _, _, _, _, _, _} = IP,
+            {_, _, _, _, _, _, _, _} = Net, Mask) ->
+    IPInt = ip_to_integer(IP),
+    NetInt = ip_to_integer(Net),
+    M = bnot (1 bsl (128 - Mask) - 1),
+    IPInt band M =:= NetInt band M;
+is_ip_match(_, _, _) ->
+    false.
+
+ip_to_integer({IP1, IP2, IP3, IP4}) ->
+    IP1 bsl 8 bor IP2 bsl 8 bor IP3 bsl 8 bor IP4;
+ip_to_integer({IP1, IP2, IP3, IP4, IP5, IP6, IP7,
+	       IP8}) ->
+    IP1 bsl 16 bor IP2 bsl 16 bor IP3 bsl 16 bor IP4 bsl 16
+      bor IP5
+      bsl 16
+      bor IP6
+      bsl 16
+      bor IP7
+      bsl 16
+      bor IP8.
+
 loaded_shared_roster_module(Host) ->
     case gen_mod:is_loaded(Host, mod_shared_roster_ldap) of
       true -> mod_shared_roster_ldap;
       false -> mod_shared_roster
     end.
 
-update_table() ->
-    Fields = record_info(fields, acl),
-    case mnesia:table_info(acl, attributes) of
-        Fields ->
-            ejabberd_config:convert_table_to_binary(
-              acl, Fields, bag,
-              fun(#acl{aclspec = Spec}) when is_tuple(Spec) ->
-                      element(2, Spec);
-                 (_) ->
-                      '$next'
-              end,
-              fun(#acl{aclname = {ACLName, Host},
-                       aclspec = Spec} = R) ->
-                      NewHost = if Host == global ->
-                                        Host;
-                                   true ->
-                                        iolist_to_binary(Host)
-                                end,
-                      R#acl{aclname = {ACLName, NewHost},
-                            aclspec = normalize_spec(Spec)}
-              end);
-        _ ->
-            ?INFO_MSG("Recreating acl table", []),
-            mnesia:transform_table(acl, ignore, Fields)
+parse_ip_netmask(S) ->
+    case str:tokens(S, <<"/">>) of
+      [IPStr] ->
+	  case inet_parse:address(binary_to_list(IPStr)) of
+	    {ok, {_, _, _, _} = IP} -> {ok, IP, 32};
+	    {ok, {_, _, _, _, _, _, _, _} = IP} -> {ok, IP, 128};
+	    _ -> error
+	  end;
+      [IPStr, MaskStr] ->
+	  case catch jlib:binary_to_integer(MaskStr) of
+	    Mask when is_integer(Mask), Mask >= 0 ->
+		case inet_parse:address(binary_to_list(IPStr)) of
+		  {ok, {_, _, _, _} = IP} when Mask =< 32 ->
+		      {ok, IP, Mask};
+		  {ok, {_, _, _, _, _, _, _, _} = IP} when Mask =< 128 ->
+		      {ok, IP, Mask};
+		  _ -> error
+		end;
+	    _ -> error
+	  end;
+      _ -> error
     end.
+
+transform_options(Opts) ->
+    Opts1 = lists:foldl(fun transform_options/2, [], Opts),
+    {ACLOpts, Opts2} = lists:mapfoldl(
+                         fun({acl, Os}, Acc) ->
+                                 {Os, Acc};
+                            (O, Acc) ->
+                                 {[], [O|Acc]}
+                         end, [], Opts1),
+    {AccessOpts, Opts3} = lists:mapfoldl(
+                            fun({access, Os}, Acc) ->
+                                    {Os, Acc};
+                               (O, Acc) ->
+                                    {[], [O|Acc]}
+                            end, [], Opts2),
+    ACLOpts1 = ejabberd_config:collect_options(lists:flatten(ACLOpts)),
+    AccessOpts1 = case ejabberd_config:collect_options(
+                         lists:flatten(AccessOpts)) of
+                      [] -> [];
+                      L1 -> [{access, L1}]
+                  end,
+    ACLOpts2 = case lists:map(
+                      fun({ACLName, Os}) ->
+                              {ACLName, ejabberd_config:collect_options(Os)}
+                      end, ACLOpts1) of
+                   [] -> [];
+                   L2 -> [{acl, L2}]
+               end,
+    ACLOpts2 ++ AccessOpts1 ++ Opts3.
+
+transform_options({acl, Name, Type}, Opts) ->
+    T = case Type of
+            all -> all;
+            none -> none;
+            {user, U} -> {user, [b(U)]};
+            {user, U, S} -> {user, [[{b(U), b(S)}]]};
+            {shared_group, G} -> {shared_group, [b(G)]};
+            {shared_group, G, H} -> {shared_group, [[{b(G), b(H)}]]};
+            {user_regexp, UR} -> {user_regexp, [b(UR)]};
+            {user_regexp, UR, S} -> {user_regexp, [[{b(UR), b(S)}]]};
+            {node_regexp, UR, SR} -> {node_regexp, [[{b(UR), b(SR)}]]};
+            {user_glob, UR} -> {user_glob, [b(UR)]};
+            {user_glob, UR, S} -> {user_glob, [[{b(UR), b(S)}]]};
+            {node_glob, UR, SR} -> {node_glob, [[{b(UR), b(SR)}]]};
+            {server, S} -> {server, [b(S)]};
+            {resource, R} -> {resource, [b(R)]};
+            {server_regexp, SR} -> {server_regexp, [b(SR)]};
+            {server_glob, S} -> {server_glob, [b(S)]};
+            {ip, S} -> {ip, [b(S)]};
+            {resource_glob, R} -> {resource_glob, [b(R)]}
+        end,
+    [{acl, [{Name, [T]}]}|Opts];
+transform_options({access, Name, Rules}, Opts) ->
+    NewRules = [{ACL, Action} || {Action, ACL} <- Rules],
+    [{access, [{Name, NewRules}]}|Opts];
+transform_options(Opt, Opts) ->
+    [Opt|Opts].

src/adhoc.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Oct 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_anonymous.erl

@@ -6,7 +6,7 @@
 %%% Created : 23 Aug 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_digest.erl

@@ -5,7 +5,7 @@
 %%% Created : 11 Mar 2003 by Alexey Shchepin <alexey@sevcom.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -204,11 +203,11 @@ get_local_fqdn() ->
       Str when is_binary(Str) -> Str;
       _ ->
 	  <<"unknown-fqdn, please configure fqdn "
-	    "option in ejabberd.cfg!">>
+	    "option in ejabberd.yml!">>
     end.
 
 get_local_fqdn2() ->
-    case ejabberd_config:get_local_option(
+    case ejabberd_config:get_option(
            fqdn, fun iolist_to_binary/1) of
         ConfiguredFqdn when is_binary(ConfiguredFqdn) ->
             ConfiguredFqdn;
@@ -237,7 +236,7 @@ response(KeyVals, User, Passwd, Nonce, AuthzId,
     DigestURI = proplists_get_bin_value(<<"digest-uri">>, KeyVals, <<>>),
     NC = proplists_get_bin_value(<<"nc">>, KeyVals, <<>>),
     QOP = proplists_get_bin_value(<<"qop">>, KeyVals, <<>>),
-    MD5Hash = crypto:md5(<<User/binary, ":", Realm/binary, ":",
+    MD5Hash = erlang:md5(<<User/binary, ":", Realm/binary, ":",
                            Passwd/binary>>),
     A1 = case AuthzId of
 	   <<"">> ->
@@ -253,7 +252,7 @@ response(KeyVals, User, Passwd, Nonce, AuthzId,
 	       <<A2Prefix/binary, ":", DigestURI/binary,
 		 ":00000000000000000000000000000000">>
 	 end,
-    T = <<(hex((crypto:md5(A1))))/binary, ":", Nonce/binary,
+    T = <<(hex((erlang:md5(A1))))/binary, ":", Nonce/binary,
 	  ":", NC/binary, ":", CNonce/binary, ":", QOP/binary,
-	  ":", (hex((crypto:md5(A2))))/binary>>,
-    hex((crypto:md5(T))).
+	  ":", (hex((erlang:md5(A2))))/binary>>,
+    hex((erlang:md5(T))).

src/cyrsasl_plain.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/cyrsasl_scram.erl

@@ -5,7 +5,7 @@
 %%% Created : 7 Aug 2011 by Stephen Röttger <stephen.roettger@googlemail.com>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd.erl

@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,18 +17,17 @@
 %%% 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).
 -author('alexey@process-one.net').
 
--export([start/0, stop/0, start_app/1,
-	 get_pid_file/0]).
+-export([start/0, stop/0, start_app/1, start_app/2,
+	 get_pid_file/0, check_app/1]).
 
 -include("logger.hrl").
 
@@ -51,27 +50,93 @@ get_pid_file() ->
 	    Path
     end.
 
-start_app(App) when not is_list(App) ->
-    start_app([App]);
-start_app([App|Apps]) ->
+start_app(App) ->
+    start_app(App, temporary).
+
+start_app(App, Type) ->
+    StartFlag = not is_loaded(),
+    start_app(App, Type, StartFlag).
+
+check_app(App) ->
+    StartFlag = not is_loaded(),
+    spawn(fun() -> check_app_modules(App, StartFlag) end),
+    ok.
+
+is_loaded() ->
+    Apps = application:which_applications(),
+    lists:keymember(ejabberd, 1, Apps).
+
+start_app(App, Type, StartFlag) when not is_list(App) ->
+    start_app([App], Type, StartFlag);
+start_app([App|Apps], Type, StartFlag) ->
     case application:start(App) of
         ok ->
-            start_app(Apps);
+            spawn(fun() -> check_app_modules(App, StartFlag) end),
+            start_app(Apps, Type, StartFlag);
         {error, {already_started, _}} ->
-            start_app(Apps);
+            start_app(Apps, Type, StartFlag);
         {error, {not_started, DepApp}} ->
             case lists:member(DepApp, [App|Apps]) of
                 true ->
-                    ?CRITICAL_MSG("failed to start application '~p': "
-                                  "circular dependency on '~p' detected",
-                                  [App, DepApp]),
-                    erlang:error(application_start_failed);
+                    Reason = io_lib:format(
+                               "failed to start application '~p': "
+                               "circular dependency on '~p' detected",
+                               [App, DepApp]),
+                    exit_or_halt(Reason, StartFlag);
                 false ->
-                    start_app([DepApp,App|Apps])
+                    start_app([DepApp,App|Apps], Type, StartFlag)
             end;
         Err ->
-            ?CRITICAL_MSG("failed to start application '~p': ~p", [App, Err]),
-            erlang:error(application_start_failed)
+            Reason = io_lib:format("failed to start application '~p': ~p",
+                                   [App, Err]),
+            exit_or_halt(Reason, StartFlag)
     end;
-start_app([]) ->
+start_app([], _Type, _StartFlag) ->
     ok.
+
+check_app_modules(App, StartFlag) ->
+    {A, B, C} = now(),
+    random:seed(A, B, C),
+    sleep(5000),
+    case application:get_key(App, modules) of
+        {ok, Mods} ->
+            lists:foreach(
+              fun(Mod) ->
+                      case code:which(Mod) of
+                          non_existing ->
+                              File = get_module_file(App, Mod),
+                              Reason = io_lib:format(
+                                         "couldn't find module ~s "
+                                         "needed for application '~p'",
+                                         [File, App]),
+                              exit_or_halt(Reason, StartFlag);
+                          _ ->
+                              sleep(10)
+                      end
+              end, Mods);
+        _ ->
+            %% No modules? This is strange
+            ok
+    end.
+
+exit_or_halt(Reason, StartFlag) ->
+    ?CRITICAL_MSG(Reason, []),
+    if StartFlag ->
+            %% Wait for the critical message is written in the console/log
+            timer:sleep(1000),
+            halt(string:substr(lists:flatten(Reason), 1, 199));
+       true ->
+            erlang:error(application_start_failed)
+    end.
+
+sleep(N) ->
+    timer:sleep(random:uniform(N)).
+
+get_module_file(App, Mod) ->
+    BaseName = atom_to_list(Mod),
+    case code:lib_dir(App, ebin) of
+        {error, _} ->
+            BaseName;
+        Dir ->
+            filename:join([Dir, BaseName ++ ".beam"])
+    end.

src/ejabberd_admin.erl

@@ -5,7 +5,7 @@
 %%% Created :  7 May 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%-------------------------------------------------------------------
 
@@ -164,6 +163,12 @@ commands() ->
                         module = ejd2odbc, function = export,
                         args = [{host, string}, {file, string}], result = {res, rescode}},
 
+     #ejabberd_commands{name = convert_to_yaml, tags = [config],
+                        desc = "Convert the input file from Erlang to YAML format",
+                        module = ejabberd_config, function = convert_to_yaml,
+                        args = [{in, string}, {out, string}],
+                        result = {res, rescode}},
+
      #ejabberd_commands{name = delete_expired_messages, tags = [purge],
 			desc = "Delete expired offline messages from database",
 			module = ?MODULE, function = delete_expired_messages,

src/ejabberd_app.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -29,7 +28,7 @@
 
 -behaviour(application).
 
--export([start_modules/0,start/2, get_log_path/0, prep_stop/1, stop/1, init/0]).
+-export([start_modules/0,start/2, prep_stop/1, stop/1, init/0]).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
@@ -39,21 +38,22 @@
 %%%
 
 start(normal, _Args) ->
-    maybe_start_lager(),
-    ejabberd_logger:set(4),
+    ejabberd_logger:start(),
     write_pid_file(),
     start_apps(),
+    ejabberd:check_app(ejabberd),
     randoms:start(),
     db_init(),
     start(),
     translate:start(),
-    acl:start(),
     ejabberd_ctl:init(),
     ejabberd_commands:init(),
     ejabberd_admin:start(),
     gen_mod:start(),
     ejabberd_config:start(),
-    ejabberd_check:config(),
+    set_loglevel_from_config(),
+    acl:start(),
+    shaper:start(),
     connect_nodes(),
     Sup = ejabberd_sup:start_link(),
     ejabberd_rdbms:start(),
@@ -98,10 +98,6 @@ start() ->
 
 init() ->
     register(ejabberd, self()),
-    %erlang:system_flag(fullsweep_after, 0),
-    %error_logger:logfile({open, ?LOG_PATH}),
-    LogPath = get_log_path(),
-    ejabberd_logger:set_logfile(LogPath),
     loop().
 
 loop() ->
@@ -117,14 +113,14 @@ db_init() ->
 	_ ->
 	    ok
     end,
-    application:start(mnesia, permanent),
+    ejabberd:start_app(mnesia, permanent),
     mnesia:wait_for_tables(mnesia:system_info(local_tables), infinity).
 
 %% Start all the modules in all the hosts
 start_modules() ->
     lists:foreach(
       fun(Host) ->
-              Modules = ejabberd_config:get_local_option(
+              Modules = ejabberd_config:get_option(
                           {modules, Host},
                           fun(Mods) ->
                                   lists:map(
@@ -142,7 +138,7 @@ start_modules() ->
 stop_modules() ->
     lists:foreach(
       fun(Host) ->
-              Modules = ejabberd_config:get_local_option(
+              Modules = ejabberd_config:get_option(
                           {modules, Host},
                           fun(Mods) ->
                                   lists:map(
@@ -157,7 +153,7 @@ stop_modules() ->
       end, ?MYHOSTS).
 
 connect_nodes() ->
-    Nodes = ejabberd_config:get_local_option(
+    Nodes = ejabberd_config:get_option(
               cluster_nodes,
               fun(Ns) ->
                       true = lists:all(fun is_atom/1, Ns),
@@ -167,26 +163,6 @@ connect_nodes() ->
                           net_kernel:connect_node(Node)
                   end, Nodes).
 
-%% @spec () -> string()
-%% @doc Returns the full path to the ejabberd log file.
-%% It first checks for application configuration parameter 'log_path'.
-%% If not defined it checks the environment variable EJABBERD_LOG_PATH.
-%% And if that one is neither defined, returns the default value:
-%% "ejabberd.log" in current directory.
-get_log_path() ->
-    case application:get_env(log_path) of
-	{ok, Path} ->
-	    Path;
-	undefined ->
-	    case os:getenv("EJABBERD_LOG_PATH") of
-		false ->
-		    ?LOG_PATH;
-		Path ->
-		    Path
-	    end
-    end.
-
-
 %% If ejabberd is running on some Windows machine, get nameservers and add to Erlang
 maybe_add_nameservers() ->
     case os:type() of
@@ -201,10 +177,12 @@ add_windows_nameservers() ->
 
 
 broadcast_c2s_shutdown() ->
-    Children = supervisor:which_children(ejabberd_c2s_sup),
+    Children = ejabberd_sm:get_all_pids(),
     lists:foreach(
-      fun({_, C2SPid, _, _}) ->
-	      C2SPid ! system_shutdown
+      fun(C2SPid) when node(C2SPid) == node() ->
+	      C2SPid ! system_shutdown;
+	 (_) ->
+	      ok
       end, Children).
 
 %%%
@@ -237,23 +215,17 @@ delete_pid_file() ->
 	    file:delete(PidFilename)
     end.
 
-
--ifdef(LAGER).
-
-maybe_start_lager() ->
-    lager:start().
-
--else.
-
-maybe_start_lager() ->
-    ok.
-
--endif.
-
+set_loglevel_from_config() ->
+    Level = ejabberd_config:get_option(
+              loglevel,
+              fun(P) when P>=0, P=<5 -> P end,
+              4),
+    ejabberd_logger:set(Level).
 
 start_apps() ->
     ejabberd:start_app(sasl),
     ejabberd:start_app(ssl),
+    ejabberd:start_app(p1_yaml),
     ejabberd:start_app(p1_tls),
     ejabberd:start_app(p1_xml),
     ejabberd:start_app(p1_stringprep),

src/ejabberd_auth.erl

@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -35,8 +34,8 @@
 	 check_password/5, check_password_with_authmodule/3,
 	 check_password_with_authmodule/5, try_register/3,
 	 dirty_get_registered_users/0, get_vh_registered_users/1,
-	 get_vh_registered_users/2, export/1,
-	 get_vh_registered_users_number/1,
+	 get_vh_registered_users/2, export/1, import/1,
+	 get_vh_registered_users_number/1, import/3,
 	 get_vh_registered_users_number/2, get_password/2,
 	 get_password_s/2, get_password_with_authmodule/2,
 	 is_user_exists/2, is_user_exists_in_other_modules/3,
@@ -301,6 +300,9 @@ get_password_with_authmodule(User, Server) ->
 
 -spec is_user_exists(binary(), binary()) -> boolean().
 
+is_user_exists(User, <<"">>) ->
+    false;
+
 is_user_exists(User, Server) ->
 %% Check if the user exists in all authentications module except the module
 %% passed as parameter
@@ -423,7 +425,7 @@ auth_modules() ->
 %% Return the list of authenticated modules for a given host
 auth_modules(Server) ->
     LServer = jlib:nameprep(Server),
-    Methods = ejabberd_config:get_local_option(
+    Methods = ejabberd_config:get_option(
                 {auth_method, LServer},
                 fun(V) when is_list(V) ->
                         true = lists:all(fun is_atom/1, V),
@@ -437,3 +439,11 @@ auth_modules(Server) ->
 
 export(Server) ->
     ejabberd_auth_internal:export(Server).
+
+import(Server) ->
+    ejabberd_auth_internal:import(Server).
+
+import(Server, mnesia, Passwd) ->
+    ejabberd_auth_internal:import(Server, mnesia, Passwd);
+import(_, _, _) ->
+    pass.

src/ejabberd_auth_anonymous.erl

@@ -5,7 +5,7 @@
 %%% Created : 17 Feb 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -104,7 +103,7 @@ is_login_anonymous_enabled(Host) ->
 %% Return the anonymous protocol to use: sasl_anon|login_anon|both
 %% defaults to login_anon
 anonymous_protocol(Host) ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       {anonymous_protocol, Host},
       fun(sasl_anon) -> sasl_anon;
          (login_anon) -> login_anon;
@@ -115,7 +114,7 @@ anonymous_protocol(Host) ->
 %% Return true if multiple connections have been allowed in the config file
 %% defaults to false
 allow_multiple_connections(Host) ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       {allow_multiple_connections, Host},
       fun(V) when is_boolean(V) -> V end,
       false).

src/ejabberd_auth_external.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -48,17 +47,15 @@
 %%% API
 %%%----------------------------------------------------------------------
 start(Host) ->
-    Cmd = ejabberd_config:get_local_option(
+    Cmd = ejabberd_config:get_option(
             {extauth_program, Host},
             fun(V) ->
                     binary_to_list(iolist_to_binary(V))
             end,
             "extauth"),
     extauth:start(Host, Cmd),
-    case check_cache_last_options(Host) of
-      cache -> ok = ejabberd_auth_internal:start(Host);
-      no_cache -> ok
-    end.
+    check_cache_last_options(Host),
+    ejabberd_auth_internal:start(Host).
 
 check_cache_last_options(Server) ->
     case get_cache_option(Server) of
@@ -171,9 +168,11 @@ remove_user(User, Server, Password) ->
 
 %% @spec (Host::string()) -> false | {true, CacheTime::integer()}
 get_cache_option(Host) ->
-    case ejabberd_config:get_local_option(
+    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.

src/ejabberd_auth_internal.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,8 +37,8 @@
 	 get_vh_registered_users_number/1,
 	 get_vh_registered_users_number/2, get_password/2,
 	 get_password_s/2, is_user_exists/2, remove_user/2,
-	 remove_user/3, store_type/0, export/1,
-	 plain_password_required/0]).
+	 remove_user/3, store_type/0, export/1, import/1,
+	 import/3, plain_password_required/0]).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
@@ -406,7 +405,7 @@ is_scrammed() ->
 
 is_option_scram() ->
     scram ==
-      ejabberd_config:get_local_option({auth_password_format, ?MYNAME},
+      ejabberd_config:get_option({auth_password_format, ?MYNAME},
                                        fun(V) -> V end).
 
 maybe_alert_password_scrammed_without_option() ->
@@ -474,3 +473,14 @@ export(_Server) ->
          (_Host, _R) ->
               []
       end}].
+
+import(LServer) ->
+    [{<<"select username, password from users;">>,
+      fun([LUser, Password]) ->
+              #passwd{us = {LUser, LServer}, password = Password}
+      end}].
+
+import(_LServer, mnesia, #passwd{} = P) ->
+    mnesia:dirty_write(P);
+import(_, _, _) ->
+    pass.

src/ejabberd_auth_ldap.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -369,8 +368,10 @@ parse_options(Host) ->
                                    {iolist_to_binary(U),
                                     iolist_to_binary(P)};
                               ({U}) ->
+                                   {iolist_to_binary(U)};
+                              (U) ->
                                    {iolist_to_binary(U)}
-                           end, Us)
+                           end, lists:flatten(Us))
                  end, [{<<"uid">>, <<"%u">>}]),
     UIDs = eldap_utils:uids_domain_subst(Host, UIDsTemp),
     SubFilter =	eldap_utils:generate_subfilter(UIDs),

src/ejabberd_auth_odbc.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_auth_pam.erl

@@ -5,7 +5,7 @@
 %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% 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).
@@ -107,13 +106,13 @@ store_type() -> external.
 %% Internal functions
 %%====================================================================
 get_pam_service(Host) ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       {pam_service, Host},
       fun iolist_to_binary/1,
       <<"ejabberd">>).
 
 get_pam_userinfotype(Host) ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       {pam_userinfotype, Host},
       fun(username) -> username;
          (jid) -> jid

src/ejabberd_c2s_config.erl

@@ -6,7 +6,7 @@
 %%% Created :  2 Nov 2007 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -34,7 +33,7 @@
 %% Get first c2s configuration limitations to apply it to other c2s
 %% connectors.
 get_c2s_limits() ->
-    case ejabberd_config:get_local_option(listen, fun(V) -> V end) of
+    case ejabberd_config:get_option(listen, fun(V) -> V end) of
       undefined -> [];
       C2SFirstListen ->
 	  case lists:keysearch(ejabberd_c2s, 2, C2SFirstListen) of

src/ejabberd_captcha.erl

@@ -5,7 +5,7 @@
 %%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov@gmail.com>
 %%%
 %%%
-%%% 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.
 %%%
 %%%-------------------------------------------------------------------
 
@@ -504,7 +503,7 @@ do_create_image(Key) ->
     end.
 
 get_prog_name() ->
-    case ejabberd_config:get_local_option(
+    case ejabberd_config:get_option(
            captcha_cmd,
            fun(FileName) ->
                    F = iolist_to_binary(FileName),
@@ -521,7 +520,7 @@ get_prog_name() ->
     end.
 
 get_url(Str) ->
-    CaptchaHost = ejabberd_config:get_local_option(
+    CaptchaHost = ejabberd_config:get_option(
                     captcha_host,
                     fun iolist_to_binary/1,
                     <<"">>),
@@ -549,7 +548,7 @@ get_transfer_protocol(PortString) ->
     get_captcha_transfer_protocol(PortListeners).
 
 get_port_listeners(PortNumber) ->
-    AllListeners = ejabberd_config:get_local_option(listen, fun(V) -> V end),
+    AllListeners = ejabberd_config:get_option(listen, fun(V) -> V end),
     lists:filter(fun ({{Port, _Ip, _Netp}, _Module1,
 		       _Opts1})
 			 when Port == PortNumber ->
@@ -579,7 +578,7 @@ get_captcha_transfer_protocol([_ | Listeners]) ->
 
 is_limited(undefined) -> false;
 is_limited(Limiter) ->
-    case ejabberd_config:get_local_option(
+    case ejabberd_config:get_option(
            captcha_limit,
            fun(I) when is_integer(I), I > 0 -> I end) of
       undefined -> false;

src/ejabberd_check.erl

@@ -1,111 +0,0 @@
-%%%----------------------------------------------------------------------
-%%% File    : ejabberd_check.erl
-%%% Author  : Mickael Remond <mremond@process-one.net>
-%%% Purpose : Check ejabberd configuration and 
-%%% Created : 27 Feb 2008 by Mickael Remond <mremond@process-one.net>
-%%%
-%%%
-%%% ejabberd, Copyright (C) 2002-2013   ProcessOne
-%%%
-%%% This program 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 program 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 this program; if not, write to the Free Software
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-%%% 02111-1307 USA
-%%%
-%%%----------------------------------------------------------------------
-
--module(ejabberd_check).
-
--export([libs/0, config/0]).
-
--include("ejabberd.hrl").
--include("logger.hrl").
--include("ejabberd_config.hrl").
-
-%% TODO:
-%% We want to implement library checking at launch time to issue
-%% human readable user messages.
-libs() ->
-    ok.
-
-%% @doc Consistency check on ejabberd configuration
-config() ->
-    check_database_modules().
-
-check_database_modules() ->
-     [check_database_module(M)||M<-get_db_used()].
-
-check_database_module(odbc) ->
-    check_modules(odbc, [odbc, odbc_app, odbc_sup, ejabberd_odbc, ejabberd_odbc_sup, odbc_queries]);
-check_database_module(mysql) ->
-    check_modules(mysql, [mysql, mysql_auth, mysql_conn, mysql_recv]);
-check_database_module(pgsql) ->
-    check_modules(pgsql, [pgsql, pgsql_proto, pgsql_tcp, pgsql_util]).
-
-%% @doc Issue a critical error and throw an exit if needing module is
-%% missing.
-check_modules(DB, Modules) ->
-    case get_missing_modules(Modules) of
-	[] ->
-	    ok;
-	MissingModules when is_list(MissingModules) ->
-	    ?CRITICAL_MSG("ejabberd is configured to use '~p', but the following Erlang modules are not installed: '~p'", [DB, MissingModules]),
-	    exit(database_module_missing)
-    end.
-
-
-%% @doc Return the list of undefined modules
-get_missing_modules(Modules) ->
-    lists:filter(fun(Module) ->
-			 case catch Module:module_info() of
-			     {'EXIT', {undef, _}} ->
-				 true;
-			     _ -> false
-			 end
-		 end, Modules).
-
-%% @doc Return the list of databases used
-get_db_used() ->
-    %% Retrieve domains with a database configured:
-    Domains = 
-	ets:match(local_config, #local_config{key={odbc_server, '$1'},
-					      value='$2'}),
-    %% Check that odbc is the auth method used for those domains:
-    %% and return the database name
-    DBs = lists:foldr(
-	    fun([Domain, DB], Acc) ->
-		    case check_odbc_option(
-			   ejabberd_config:get_local_option(
-			     {auth_method, Domain}, fun(V) -> V end)) of
-			true -> [get_db_type(DB)|Acc];
-			_ -> Acc
-		    end
-	    end,
-	    [], Domains),
-    lists:usort(DBs).
-
-%% @doc Depending in the DB definition, return which type of DB this is.
-%% Note that MSSQL is detected as ODBC.
-%% @spec (DB) -> mysql | pgsql | odbc
-get_db_type(DB) when is_tuple(DB) ->
-    element(1, DB);
-get_db_type(DB) when is_list(DB) ->
-    odbc.
-
-%% @doc Return true if odbc option is used
-check_odbc_option(odbc) ->
-    true;
-check_odbc_option(AuthMethods) when is_list(AuthMethods) ->
-    lists:member(odbc, AuthMethods);
-check_odbc_option(_) ->
-    false.

src/ejabberd_commands.erl

@@ -5,7 +5,7 @@
 %%% Created : 20 May 2008 by Badlop <badlop@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_config.erl

@@ -5,7 +5,7 @@
 %%% Created : 14 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,25 +17,25 @@
 %%% 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_config).
 -author('alexey@process-one.net').
 
--export([start/0, load_file/1,
+-export([start/0, load_file/1, read_file/1,
 	 add_global_option/2, add_local_option/2,
 	 get_global_option/2, get_local_option/2,
-         get_global_option/3, get_local_option/3]).
--export([get_vh_by_auth_method/1]).
--export([is_file_readable/1]).
--export([get_version/0, get_myhosts/0, get_mylang/0]).
--export([prepare_opt_val/4]).
--export([convert_table_to_binary/5]).
+         get_global_option/3, get_local_option/3,
+         get_option/2, get_option/3, add_option/2,
+         get_vh_by_auth_method/1, is_file_readable/1,
+         get_version/0, get_myhosts/0, get_mylang/0,
+         prepare_opt_val/4, convert_table_to_binary/5,
+         transform_options/1, collect_options/1,
+         convert_to_yaml/1, convert_to_yaml/2]).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
@@ -52,25 +52,29 @@
 
 
 start() ->
-    mnesia:create_table(config,
-			[{disc_copies, [node()]},
-			 {attributes, record_info(fields, config)}]),
-    mnesia:add_table_copy(config, node(), ram_copies),
+    case catch mnesia:table_info(local_config, storage_type) of
+        disc_copies ->
+            mnesia:delete_table(local_config);
+        _ ->
+            ok
+    end,
     mnesia:create_table(local_config,
-			[{disc_copies, [node()]},
+			[{ram_copies, [node()]},
 			 {local_content, true},
 			 {attributes, record_info(fields, local_config)}]),
     mnesia:add_table_copy(local_config, node(), ram_copies),
     Config = get_ejabberd_config_path(),
-    load_file(Config),
+    State = read_file(Config),
     %% This start time is used by mod_last:
-    add_local_option(node_start, now()),
-    ok.
+    {MegaSecs, Secs, _} = now(),
+    UnixTime = MegaSecs*1000000 + Secs,
+    State1 = set_option({node_start, global}, UnixTime, State),
+    set_opts(State1).
 
 %% @doc Get the filename of the ejabberd configuration file.
-%% The filename can be specified with: erl -config "/path/to/ejabberd.cfg".
+%% The filename can be specified with: erl -config "/path/to/ejabberd.yml".
 %% It can also be specified with the environtment variable EJABBERD_CONFIG_PATH.
-%% If not specified, the default value 'ejabberd.cfg' is assumed.
+%% If not specified, the default value 'ejabberd.yml' is assumed.
 %% @spec () -> string()
 get_ejabberd_config_path() ->
     case application:get_env(config) of
@@ -84,16 +88,59 @@ get_ejabberd_config_path() ->
 	    end
     end.
 
-%% @doc Load the ejabberd configuration file.
+%% @doc Read the ejabberd configuration file.
 %% It also includes additional configuration files and replaces macros.
 %% This function will crash if finds some error in the configuration file.
-%% @spec (File::string()) -> ok
-load_file(File) ->
-    Terms = get_plain_terms_file(File),
+%% @spec (File::string()) -> #state{}.
+read_file(File) ->
+    read_file(File, [{replace_macros, true},
+                     {include_files, true}]).
+
+read_file(File, Opts) ->
+    Terms1 = get_plain_terms_file(File, Opts),
+    Terms_macros = case proplists:get_bool(replace_macros, Opts) of
+                       true -> replace_macros(Terms1);
+                       false -> Terms1
+                   end,
+    Terms = transform_terms(Terms_macros),
     State = lists:foldl(fun search_hosts/2, #state{}, Terms),
-    Terms_macros = replace_macros(Terms),
-    Res = lists:foldl(fun process_term/2, State, Terms_macros),
-    set_opts(Res).
+    {Head, Tail} = lists:partition(
+                     fun({host_config, _}) -> false;
+                        ({append_host_config, _}) -> false;
+                        (_) -> true
+                     end, Terms),
+    State1 = lists:foldl(fun process_term/2, State, Head ++ Tail),
+    State1#state{opts = compact(State1#state.opts)}.
+
+-spec load_file(string()) -> ok.
+
+load_file(File) ->
+    State = read_file(File),
+    set_opts(State).
+
+-spec convert_to_yaml(file:filename()) -> ok | {error, any()}.
+
+convert_to_yaml(File) ->
+    convert_to_yaml(File, stdout).
+
+-spec convert_to_yaml(file:filename(),
+                      stdout | file:filename()) -> ok | {error, any()}.
+
+convert_to_yaml(File, Output) ->
+    State = read_file(File, [{include_files, false}]),
+    Opts = [{K, V} || #local_config{key = K, value = V} <- State#state.opts],
+    {GOpts, HOpts} = split_by_hosts(Opts),
+    NewOpts = GOpts ++ lists:map(
+                         fun({Host, Opts1}) ->
+                                 {host_config, [{Host, Opts1}]}
+                         end, HOpts),
+    Data = p1_yaml:encode(lists:reverse(NewOpts)),
+    case Output of
+        stdout ->
+            io:format("~s~n", [Data]);
+        FileName ->
+            file:write_file(FileName, Data)
+    end.
 
 %% @doc Read an ejabberd configuration file and return the terms.
 %% Input is an absolute or relative path to an ejabberd config file.
@@ -102,22 +149,47 @@ load_file(File) ->
 %% and the terms in those files were included.
 %% @spec(string()) -> [term()]
 %% @spec(iolist()) -> [term()]
-get_plain_terms_file(File) when is_binary(File) ->
-    get_plain_terms_file(binary_to_list(File));
-get_plain_terms_file(File1) ->
+get_plain_terms_file(File) ->
+    get_plain_terms_file(File, [{include_files, true}]).
+
+get_plain_terms_file(File, Opts) when is_binary(File) ->
+    get_plain_terms_file(binary_to_list(File), Opts);
+get_plain_terms_file(File1, Opts) ->
     File = get_absolute_path(File1),
-    case file:consult(File) of
+    case consult(File) of
 	{ok, Terms} ->
             BinTerms = strings_to_binary(Terms),
-	    include_config_files(BinTerms);
-	{error, {LineNumber, erl_parse, _ParseMessage} = Reason} ->
-	    ExitText = describe_config_problem(File, Reason, LineNumber),
-	    ?ERROR_MSG(ExitText, []),
-	    exit_or_halt(ExitText);
+            case proplists:get_bool(include_files, Opts) of
+                true ->
+                    include_config_files(BinTerms);
+                false ->
+                    BinTerms
+            end;
 	{error, Reason} ->
-	    ExitText = describe_config_problem(File, Reason),
-	    ?ERROR_MSG(ExitText, []),
-	    exit_or_halt(ExitText)
+	    ?ERROR_MSG(Reason, []),
+	    exit_or_halt(Reason)
+    end.
+
+consult(File) ->
+    case filename:extension(File) of
+        ".yml" ->
+            case p1_yaml:decode_from_file(File, [plain_as_atom]) of
+                {ok, []} ->
+                    {ok, []};
+                {ok, [Document|_]} ->
+                    {ok, Document};
+                {error, Err} ->
+                    {error, p1_yaml:format_error(Err)}
+            end;
+        _ ->
+            case file:consult(File) of
+                {ok, Terms} ->
+                    {ok, Terms};
+                {error, {LineNumber, erl_parse, _ParseMessage} = Reason} ->
+                    {error, describe_config_problem(File, Reason, LineNumber)};
+                {error, Reason} ->
+                    {error, describe_config_problem(File, Reason)}
+            end
     end.
 
 %% @doc Convert configuration filename to absolute path.
@@ -161,7 +233,7 @@ search_hosts(Term, State) ->
 
 add_hosts_to_option(Hosts, State) ->
     PrepHosts = normalize_hosts(Hosts),
-    add_option(hosts, PrepHosts, State#state{hosts = PrepHosts}).
+    set_option({hosts, global}, PrepHosts, State#state{hosts = PrepHosts}).
 
 normalize_hosts(Hosts) ->
     normalize_hosts(Hosts,[]).
@@ -235,21 +307,37 @@ exit_or_halt(ExitText) ->
 %% @doc Include additional configuration files in the list of terms.
 %% @spec ([term()]) -> [term()]
 include_config_files(Terms) ->
-    include_config_files(Terms, []).
+    {FileOpts, Terms1} =
+        lists:mapfoldl(
+          fun({include_config_file, _} = T, Ts) ->
+                  {[transform_include_option(T)], Ts};
+             ({include_config_file, _, _} = T, Ts) ->
+                  {[transform_include_option(T)], Ts};
+             (T, Ts) ->
+                  {[], [T|Ts]}
+          end, [], Terms),
+    Terms2 = lists:flatmap(
+               fun({File, Opts}) ->
+                       include_config_file(File, Opts)
+               end, lists:flatten(FileOpts)),
+    Terms1 ++ Terms2.
 
-include_config_files([], Res) ->
-    Res;
-include_config_files([{include_config_file, Filename} | Terms], Res) ->
-    include_config_files([{include_config_file, Filename, []} | Terms], Res);
-include_config_files([{include_config_file, Filename, Options} | Terms], Res) ->
+transform_include_option({include_config_file, File}) when is_list(File) ->
+    case is_string(File) of
+        true -> {File, []};
+        false -> File
+    end;
+transform_include_option({include_config_file, Filename}) ->
+    {Filename, []};
+transform_include_option({include_config_file, Filename, Options}) ->
+    {Filename, Options}.
+
+include_config_file(Filename, Options) ->
     Included_terms = get_plain_terms_file(Filename),
     Disallow = proplists:get_value(disallow, Options, []),
     Included_terms2 = delete_disallowed(Disallow, Included_terms),
     Allow_only = proplists:get_value(allow_only, Options, all),
-    Included_terms3 = keep_only_allowed(Allow_only, Included_terms2),
-    include_config_files(Terms, Res ++ Included_terms3);
-include_config_files([Term | Terms], Res) ->
-    include_config_files(Terms, Res ++ [Term]).
+    keep_only_allowed(Allow_only, Included_terms2).
 
 %% @doc Filter from the list of terms the disallowed.
 %% Returns a sublist of Terms without the ones which first element is
@@ -311,12 +399,19 @@ split_terms_macros(Terms) ->
       fun(Term, {TOs, Ms}) ->
 	      case Term of
 		  {define_macro, Key, Value} -> 
-		      case is_atom(Key) and is_all_uppercase(Key) of
+		      case is_correct_macro({Key, Value}) of
 			  true -> 
 			      {TOs, Ms++[{Key, Value}]};
 			  false -> 
 			      exit({macro_not_properly_defined, Term})
 		      end;
+                  {define_macro, KeyVals} ->
+                      case lists:all(fun is_correct_macro/1, KeyVals) of
+                          true ->
+                              {TOs, Ms ++ KeyVals};
+                          false ->
+                              exit({macros_not_properly_defined, Term})
+                      end;
 		  Term ->
 		      {TOs ++ [Term], Ms}
 	      end
@@ -324,6 +419,11 @@ split_terms_macros(Terms) ->
       {[], []},
       Terms).
 
+is_correct_macro({Key, _Val}) ->
+    is_atom(Key) and is_all_uppercase(Key);
+is_correct_macro(_) ->
+    false.
+
 %% @doc Recursively replace in Terms macro usages with the defined value.
 %% @spec (Terms, Macros) -> Terms
 %%       Terms = [term()]
@@ -331,7 +431,9 @@ split_terms_macros(Terms) ->
 replace([], _) ->
     [];
 replace([Term|Terms], Macros) ->
-    [replace_term(Term, Macros) | replace(Terms, Macros)].
+    [replace_term(Term, Macros) | replace(Terms, Macros)];
+replace(Term, Macros) ->
+    replace_term(Term, Macros).
 
 replace_term(Key, Macros) when is_atom(Key) ->
     case is_all_uppercase(Key) of
@@ -365,197 +467,65 @@ is_all_uppercase(Atom) ->
 
 process_term(Term, State) ->
     case Term of
-	override_global ->
-	    State#state{override_global = true};
-	override_local ->
-	    State#state{override_local = true};
-	override_acls ->
-	    State#state{override_acls = true};
-	{acl, _ACLName, _ACLData} ->
-	    process_host_term(Term, global, State);
-	{access, _RuleName, _Rules} ->
-	    process_host_term(Term, global, State);
-	{shaper, _Name, _Data} ->
-	    %%lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end,
-	    %%    	State, State#state.hosts);
-	    process_host_term(Term, global, State);
-	{host, _Host} ->
-	    State;
-	{hosts, _Hosts} ->
-	    State;
-	{fqdn, HostFQDN} ->
-	    ?DEBUG("FQDN set to: ~p", [HostFQDN]),
-	    add_option(fqdn, HostFQDN, State);
-	{host_config, Host, Terms} ->
-	    lists:foldl(fun(T, S) -> process_host_term(T, Host, S) end,
-			State, Terms);
-	{listen, Listeners} ->
-	    Listeners2 =
-		lists:map(
-		  fun({PortIP, Module, Opts}) ->
-			  {Port, IPT, _, _, Proto, OptsClean} =
-			      ejabberd_listener:parse_listener_portip(PortIP, Opts),
-			  {{Port, IPT, Proto}, Module, OptsClean}
-		  end,
-		  Listeners),
-	    add_option(listen, Listeners2, State);
-	{language, Val} ->
-	    add_option(language, Val, State);
-	{outgoing_s2s_port, Port} ->
-	    add_option(outgoing_s2s_port, Port, State);
-	{outgoing_s2s_options, Methods, Timeout} ->
-	    add_option(outgoing_s2s_options, {Methods, Timeout}, State);
-        {s2s_dns_options, PropList} ->
-            add_option(s2s_dns_options, PropList, State);
-	{s2s_use_starttls, Port} ->
-	    add_option(s2s_use_starttls, Port, State);
-	{s2s_certfile, CertFile} ->
-            CertFileS = binary_to_list(CertFile),
-	    case ejabberd_config:is_file_readable(CertFileS) of
-		true -> add_option(s2s_certfile, CertFile, State);
-		false ->
-		    ErrorText = "There is a problem in the configuration: "
-			"the specified file is not readable: ",
-		    throw({error, ErrorText ++ CertFileS})
-	    end;
-	{domain_certfile, Domain, CertFile} ->
-            CertFileS = binary_to_list(CertFile),
-	    case ejabberd_config:is_file_readable(CertFileS) of
-		true -> add_option({domain_certfile, Domain}, CertFile, State);
-		false ->
-		    ErrorText = "There is a problem in the configuration: "
-			"the specified file is not readable: ",
-		    throw({error, ErrorText ++ CertFileS})
-	    end;
-	{node_type, NodeType} ->
-	    add_option(node_type, NodeType, State);
-	{cluster_nodes, Nodes} ->
-	    add_option(cluster_nodes, Nodes, State);
-	{domain_balancing, Domain, Balancing} ->
-	    add_option({domain_balancing, Domain}, Balancing, State);
-	{domain_balancing_component_number, Domain, N} ->
-	    add_option({domain_balancing_component_number, Domain}, N, State);
-	{watchdog_admins, Admins} ->
-	    add_option(watchdog_admins, Admins, State);
-	{watchdog_large_heap, LH} ->
-	    add_option(watchdog_large_heap, LH, State);
-	{registration_timeout, Timeout} ->
-	    add_option(registration_timeout, Timeout, State);
-	{captcha_cmd, Cmd} ->
-	    add_option(captcha_cmd, Cmd, State);
-	{captcha_host, Host} ->
-	    add_option(captcha_host, Host, State);
-        {captcha_limit, Limit} ->
-            add_option(captcha_limit, Limit, State);
-	{ejabberdctl_access_commands, ACs} ->
-	    add_option(ejabberdctl_access_commands, ACs, State);
-	{loglevel, Loglevel} ->
-	    ejabberd_logger:set(Loglevel),
-	    State;
-	{max_fsm_queue, N} ->
-	    add_option(max_fsm_queue, N, State);
-	{_Opt, _Val} ->
-	    lists:foldl(fun(Host, S) -> process_host_term(Term, Host, S) end,
-			State, State#state.hosts)
-    end.
-
-process_host_term(Term, Host, State) ->
-    case Term of
-	{acl, ACLName, ACLData} ->
-	    State#state{opts =
-			[acl:to_record(Host, ACLName, ACLData) | State#state.opts]};
-	{access, RuleName, Rules} ->
-	    State#state{opts = [#config{key = {access, RuleName, Host},
-					value = Rules} |
-				State#state.opts]};
-	{shaper, Name, Data} ->
-	    State#state{opts = [#config{key = {shaper, Name, Host},
-					value = Data} |
-				State#state.opts]};
-	{host, Host} ->
-	    State;
-	{hosts, _Hosts} ->
-	    State;
-	{odbc_server, ODBC_server} ->
-	    add_option({odbc_server, Host}, ODBC_server, State);
-        {modules, Modules} ->
-            add_option({modules, Host}, replace_modules(Modules), State);
-	{Opt, Val} ->
-	    add_option({Opt, Host}, Val, State)
-    end.
-
-add_option(Opt, Val, State) ->
-    Table = case Opt of
-		hosts ->
-		    config;
-		language ->
-		    config;
-		_ ->
-		    local_config
-	    end,
-    case Table of
-	config ->
-	    State#state{opts = [#config{key = Opt, value = Val} |
-				State#state.opts]};
-	local_config ->
-	    case Opt of
-		{{add, OptName}, Host} ->
-		    State#state{opts = compact({OptName, Host}, Val,
-					       State#state.opts, [])};
-		_ ->
-		    State#state{opts = [#local_config{key = Opt, value = Val} |
-					State#state.opts]}
-	    end
-    end.
-
-compact({OptName, Host} = Opt, Val, [], Os) ->
-    ?WARNING_MSG("The option '~p' is defined for the host ~p using host_config "
-    "before the global '~p' option. This host_config option may get overwritten.", [OptName, Host, OptName]),
-    [#local_config{key = Opt, value = Val}] ++ Os;
-%% Traverse the list of the options already parsed
-compact(Opt, Val, [O | Os1], Os2) ->
-    case catch O#local_config.key of
-	%% If the key of a local_config matches the Opt that wants to be added
-	Opt ->
-	    %% Then prepend the new value to the list of old values
-	    Os2 ++ [#local_config{key = Opt,
-				  value = Val++O#local_config.value}
-		   ] ++ Os1;
+	{host_config, HostTerms} ->
+            lists:foldl(
+              fun({Host, Terms}, AccState) ->
+                      lists:foldl(fun(T, S) ->
+                                          process_host_term(T, Host, S, set)
+                                  end, AccState, Terms)
+              end, State, HostTerms);
+        {append_host_config, HostTerms} ->
+            lists:foldl(
+              fun({Host, Terms}, AccState) ->
+                      lists:foldl(fun(T, S) ->
+                                          process_host_term(T, Host, S, append)
+                                  end, AccState, Terms)
+              end, State, HostTerms);
 	_ ->
-	    compact(Opt, Val, Os1, Os2++[O])
+            process_host_term(Term, global, State, set)
     end.
 
+process_host_term(Term, Host, State, Action) ->
+    case Term of
+        {modules, Modules} when Action == set ->
+            set_option({modules, Host}, replace_modules(Modules), State);
+        {modules, Modules} when Action == append ->
+            append_option({modules, Host}, replace_modules(Modules), State);
+        {host, _} ->
+            State;
+        {hosts, _} ->
+            State;
+	{Opt, Val} when Action == set ->
+	    set_option({Opt, Host}, Val, State);
+        {Opt, Val} when Action == append ->
+            append_option({Opt, Host}, Val, State);
+        Opt ->
+            ?WARNING_MSG("Ignore invalid (outdated?) option ~p", [Opt]),
+            State
+    end.
+
+set_option(Opt, Val, State) ->
+    State#state{opts = [#local_config{key = Opt, value = Val} |
+                        State#state.opts]}.
+
+append_option({Opt, Host}, Val, State) ->
+    GlobalVals = lists:flatmap(
+                   fun(#local_config{key = {O, global}, value = V})
+                         when O == Opt ->
+                           if is_list(V) -> V;
+                              true -> [V]
+                           end;
+                      (_) ->
+                           []
+                   end, State#state.opts),
+    NewVal = if is_list(Val) -> Val ++ GlobalVals;
+                true -> [Val|GlobalVals]
+             end,
+    set_option({Opt, Host}, NewVal, State).
 
 set_opts(State) ->
-    Opts = lists:reverse(State#state.opts),
+    Opts = State#state.opts,
     F = fun() ->
-		if
-		    State#state.override_global ->
-			Ksg = mnesia:all_keys(config),
-			lists:foreach(fun(K) ->
-					      mnesia:delete({config, K})
-				      end, Ksg);
-		    true ->
-			ok
-		end,
-		if
-		    State#state.override_local ->
-			Ksl = mnesia:all_keys(local_config),
-			lists:foreach(fun(K) ->
-					      mnesia:delete({local_config, K})
-				      end, Ksl);
-		    true ->
-			ok
-		end,
-		if
-		    State#state.override_acls ->
-			Ksa = mnesia:all_keys(acl),
-			lists:foreach(fun(K) ->
-					      mnesia:delete({acl, K})
-				      end, Ksa);
-		    true ->
-			ok
-		end,
 		lists:foreach(fun(R) ->
 				      mnesia:write(R)
 			      end, Opts)
@@ -576,12 +546,14 @@ set_opts(State) ->
     end.
 
 add_global_option(Opt, Val) ->
-    mnesia:transaction(fun() ->
-			       mnesia:write(#config{key = Opt,
-						    value = Val})
-		       end).
+    add_option(Opt, Val).
 
 add_local_option(Opt, Val) ->
+    add_option(Opt, Val).
+
+add_option(Opt, Val) when is_atom(Opt) ->
+    add_option({Opt, global}, Val);
+add_option(Opt, Val) ->
     mnesia:transaction(fun() ->
 			       mnesia:write(#local_config{key = Opt,
 							  value = Val})
@@ -615,31 +587,49 @@ prepare_opt_val(Opt, Val, F, Default) ->
 -spec get_global_option(any(), check_fun()) -> any().
 
 get_global_option(Opt, F) ->
-    get_global_option(Opt, F, undefined).
+    get_option(Opt, F, undefined).
 
 -spec get_global_option(any(), check_fun(), any()) -> any().
 
 get_global_option(Opt, F, Default) ->
-    case ets:lookup(config, Opt) of
-	[#config{value = Val}] ->
-	    prepare_opt_val(Opt, Val, F, Default);
-	_ ->
-            Default
-    end.
+    get_option(Opt, F, Default).
 
 -spec get_local_option(any(), check_fun()) -> any().
 
 get_local_option(Opt, F) ->
-    get_local_option(Opt, F, undefined).
+    get_option(Opt, F, undefined).
 
 -spec get_local_option(any(), check_fun(), any()) -> any().
 
 get_local_option(Opt, F, Default) ->
+    get_option(Opt, F, Default).
+
+-spec get_option(any(), check_fun()) -> any().
+
+get_option(Opt, F) ->
+    get_option(Opt, F, undefined).
+
+-spec get_option(any(), check_fun(), any()) -> any().
+
+get_option(Opt, F, Default) when is_atom(Opt) ->
+    get_option({Opt, global}, F, Default);
+get_option(Opt, F, Default) ->
+    case Opt of
+        {O, global} when is_atom(O) -> ok;
+        {O, H} when is_atom(O), is_binary(H) -> ok;
+        _ -> ?WARNING_MSG("Option ~p has invalid (outdated?) format. "
+                          "This is likely a bug", [Opt])
+    end,
     case ets:lookup(local_config, Opt) of
 	[#local_config{value = Val}] ->
 	    prepare_opt_val(Opt, Val, F, Default);
-	_ ->
-	    Default
+        _ ->
+            case Opt of
+                {Key, Host} when Host /= global ->
+                    get_option({Key, global}, F, Default);
+                _ ->
+                    Default
+            end
     end.
 
 -spec get_vh_by_auth_method(atom()) -> [binary()].
@@ -669,12 +659,12 @@ get_version() ->
 -spec get_myhosts() -> [binary()].
 
 get_myhosts() ->
-    ejabberd_config:get_global_option(hosts, fun(V) -> V end).
+    get_option(hosts, fun(V) -> V end).
 
 -spec get_mylang() -> binary().
 
 get_mylang() ->
-    ejabberd_config:get_global_option(
+    get_option(
       language,
       fun iolist_to_binary/1,
       <<"en">>).
@@ -702,14 +692,14 @@ replace_modules(Modules) ->
                       emit_deprecation_warning(Module, NewModule, DBType),
                       NewOpts = [{db_type, DBType} |
                                  lists:keydelete(db_type, 1, Opts)],
-                      {NewModule, NewOpts};
+                      {NewModule, transform_module_options(Module, NewOpts)};
                   NewModule ->
                       if Module /= NewModule ->
                               emit_deprecation_warning(Module, NewModule);
                          true ->
                               ok
                       end,
-                      {NewModule, Opts}
+                      {NewModule, transform_module_options(Module, Opts)}
               end
       end, Modules).
 
@@ -722,6 +712,9 @@ strings_to_binary(L) when is_list(L) ->
         false ->
             strings_to_binary1(L)
     end;
+strings_to_binary({A, B, C, D}) when
+	is_integer(A), is_integer(B), is_integer(C), is_integer(D) ->
+    {A, B, C ,D};
 strings_to_binary(T) when is_tuple(T) ->
     list_to_tuple(strings_to_binary1(tuple_to_list(T)));
 strings_to_binary(X) ->
@@ -762,6 +755,142 @@ format_term(S) when is_list(S), S /= [] ->
 format_term(T) ->
     io_lib:format("~p", [binary_to_strings(T)]).
 
+transform_terms(Terms) ->
+    %% We could check all ejabberd beams, but this
+    %% slows down start-up procedure :(
+    Mods = [mod_register,
+            mod_last,
+            ejabberd_s2s,
+            ejabberd_listener,
+            ejabberd_odbc_sup,
+            shaper,
+            ejabberd_s2s_out,
+            acl,
+            ejabberd_config],
+    collect_options(transform_terms(Mods, Terms)).
+
+transform_terms([Mod|Mods], Terms) ->
+    case catch Mod:transform_options(Terms) of
+        {'EXIT', _} = Err ->
+            ?ERROR_MSG("Failed to transform terms by ~p: ~p", [Mod, Err]),
+            transform_terms(Mods, Terms);
+        NewTerms ->
+            transform_terms(Mods, NewTerms)
+    end;
+transform_terms([], NewTerms) ->
+    NewTerms.
+
+transform_module_options(Module, Opts) ->
+    Opts1 = gen_iq_handler:transform_module_options(Opts),
+    try
+        Module:transform_module_options(Opts1)
+    catch error:undef ->
+            Opts1
+    end.
+
+compact(Cfg) ->
+    Opts = [{K, V} || #local_config{key = K, value = V} <- Cfg],
+    {GOpts, HOpts} = split_by_hosts(Opts),
+    [#local_config{key = {O, global}, value = V} || {O, V} <- GOpts] ++
+        lists:flatmap(
+          fun({Host, OptVal}) ->
+                  case lists:member(OptVal, GOpts) of
+                      true ->
+                          [];
+                      false ->
+                          [#local_config{key = {Opt, Host}, value = Val}
+                           || {Opt, Val} <- OptVal]
+                  end
+          end, lists:flatten(HOpts)).
+
+split_by_hosts(Opts) ->
+    Opts1 = orddict:to_list(
+              lists:foldl(
+                fun({{Opt, Host}, Val}, D) ->
+                        orddict:append(Host, {Opt, Val}, D)
+                end, orddict:new(), Opts)),
+    case lists:keytake(global, 1, Opts1) of
+        {value, {global, GlobalOpts}, HostOpts} ->
+            {GlobalOpts, HostOpts};
+        _ ->
+            {[], Opts1}
+    end.
+
+collect_options(Opts) ->
+    {D, InvalidOpts} =
+        lists:foldl(
+          fun({K, V}, {D, Os}) when is_list(V) ->
+                  {orddict:append_list(K, V, D), Os};
+             ({K, V}, {D, Os}) ->
+                  {orddict:store(K, V, D), Os};
+             (Opt, {D, Os}) ->
+                  {D, [Opt|Os]}
+          end, {orddict:new(), []}, Opts),
+    InvalidOpts ++ orddict:to_list(D).
+
+transform_options(Opts) ->
+    Opts1 = lists:foldl(fun transform_options/2, [], Opts),
+    {HOpts, Opts2} = lists:mapfoldl(
+                       fun({host_config, O}, Os) ->
+                               {[O], Os};
+                          (O, Os) ->
+                               {[], [O|Os]}
+                       end, [], Opts1),
+    {AHOpts, Opts3} = lists:mapfoldl(
+                        fun({append_host_config, O}, Os) ->
+                                {[O], Os};
+                           (O, Os) ->
+                                {[], [O|Os]}
+                        end, [], Opts2),
+    HOpts1 = case collect_options(lists:flatten(HOpts)) of
+                 [] ->
+                     [];
+                 HOs ->
+                     [{host_config,
+                       [{H, transform_terms(O)} || {H, O} <- HOs]}]
+             end,
+    AHOpts1 = case collect_options(lists:flatten(AHOpts)) of
+                  [] ->
+                      [];
+                  AHOs ->
+                      [{append_host_config,
+                        [{H, transform_terms(O)} || {H, O} <- AHOs]}]
+              end,
+    HOpts1 ++ AHOpts1 ++ Opts3.
+
+transform_options({domain_certfile, Domain, CertFile}, Opts) ->
+    ?WARNING_MSG("Option 'domain_certfile' now should be defined "
+                 "per virtual host or globally. The old format is "
+                 "still supported but it is better to fix your config", []),
+    [{host_config, [{Domain, [{domain_certfile, CertFile}]}]}|Opts];
+transform_options(Opt, Opts) when Opt == override_global;
+                                  Opt == override_local;
+                                  Opt == override_acls ->
+    ?WARNING_MSG("Ignoring '~s' option which has no effect anymore", [Opt]),
+    Opts;
+transform_options({host_config, Host, HOpts}, Opts) ->
+    {AddOpts, HOpts1} =
+        lists:mapfoldl(
+          fun({{add, Opt}, Val}, Os) ->
+                  ?WARNING_MSG("Option 'add' is deprecated. "
+                               "The option is still supported "
+                               "but it is better to fix your config: "
+                               "use 'append_host_config' instead.", []),
+                  {[{Opt, Val}], Os};
+             (O, Os) ->
+                  {[], [O|Os]}
+          end, [], HOpts),
+    [{append_host_config, [{Host, lists:flatten(AddOpts)}]},
+     {host_config, [{Host, HOpts1}]}|Opts];
+transform_options({define_macro, Macro, Val}, Opts) ->
+    [{define_macro, [{Macro, Val}]}|Opts];
+transform_options({include_config_file, _} = Opt, Opts) ->
+    [{include_config_file, [transform_include_option(Opt)]} | Opts];
+transform_options({include_config_file, _, _} = Opt, Opts) ->
+    [{include_config_file, [transform_include_option(Opt)]} | Opts];
+transform_options(Opt, Opts) ->
+    [Opt|Opts].
+
 -spec convert_table_to_binary(atom(), [atom()], atom(),
                               fun(), fun()) -> ok.
 

src/ejabberd_ctl.erl

@@ -5,7 +5,7 @@
 %%% Created : 11 Jan 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,7 +83,7 @@ start() ->
 	    Node = list_to_atom(SNode1),
 	    Status = case rpc:call(Node, ?MODULE, process, [Args]) of
 			 {badrpc, Reason} ->
-			     ?PRINT("Failed RPC connection to the node ~p: ~p~n",
+			     print("Failed RPC connection to the node ~p: ~p~n",
 				    [Node, Reason]),
 			     %% TODO: show minimal start help
 			     ?STATUS_BADRPC;
@@ -131,17 +130,17 @@ unregister_commands(CmdDescs, Module, Function) ->
 %% they are usable even if ejabberd is completely stopped.
 process(["status"]) ->
     {InternalStatus, ProvidedStatus} = init:get_status(),
-    ?PRINT("The node ~p is ~p with status: ~p~n",
+    print("The node ~p is ~p with status: ~p~n",
 	   [node(), InternalStatus, ProvidedStatus]),
     case lists:keysearch(ejabberd, 1, application:which_applications()) of
         false ->
-            EjabberdLogPath = ejabberd_app:get_log_path(),
-            ?PRINT("ejabberd is not running in that node~n"
+            EjabberdLogPath = ejabberd_logger:get_log_path(),
+            print("ejabberd is not running in that node~n"
 		   "Check for error messages: ~s~n"
 		   "or other files in that directory.~n", [EjabberdLogPath]),
             ?STATUS_ERROR;
         {value, {_, _, Version}} ->
-            ?PRINT("ejabberd ~s is running in that node~n", [Version]),
+            print("ejabberd ~s is running in that node~n", [Version]),
             ?STATUS_SUCCESS
     end;
 
@@ -155,7 +154,7 @@ process(["restart"]) ->
     ?STATUS_SUCCESS;
 
 process(["mnesia"]) ->
-    ?PRINT("~p~n", [mnesia:system_info(all)]),
+    print("~p~n", [mnesia:system_info(all)]),
     ?STATUS_SUCCESS;
 
 process(["mnesia", "info"]) ->
@@ -164,8 +163,8 @@ process(["mnesia", "info"]) ->
 
 process(["mnesia", Arg]) ->
     case catch mnesia:system_info(list_to_atom(Arg)) of
-	{'EXIT', Error} -> ?PRINT("Error: ~p~n", [Error]);
-	Return -> ?PRINT("~p~n", [Return])
+	{'EXIT', Error} -> print("Error: ~p~n", [Error]);
+	Return -> print("~p~n", [Return])
     end,
     ?STATUS_SUCCESS;
 
@@ -237,7 +236,7 @@ process2(Args, Auth, AccessCommands) ->
     end.
 
 get_accesscommands() ->
-    ejabberd_config:get_local_option(ejabberdctl_access_commands,
+    ejabberd_config:get_option(ejabberdctl_access_commands,
                                      fun(V) when is_list(V) -> V end, []).
 
 %%-----------------------------
@@ -261,7 +260,7 @@ try_run_ctp(Args, Auth, AccessCommands) ->
 	Error:Why ->
             %% In this case probably ejabberd is not started, so let's show Status
             process(["status"]),
-            ?PRINT("~n", []),
+            print("~n", []),
 	    {io_lib:format("Error in ejabberd ctl process: '~p' ~p", [Error, Why]), ?STATUS_USAGE}
     end.
 
@@ -419,6 +418,7 @@ is_supported_args(Args) ->
       fun({_Name, Format}) ->
 	      (Format == integer)
 		  or (Format == string)
+		      or (Format == binary)
       end,
       Args).
 
@@ -457,14 +457,14 @@ print_usage(HelpMode, MaxC, ShCode) ->
 	get_list_commands() ++
 	get_list_ctls(),
 
-    ?PRINT(
+    print(
        ["Usage: ", ?B("ejabberdctl"), " [--node ", ?U("nodename"), "] [--auth ",
 	?U("user"), " ", ?U("host"), " ", ?U("password"), "] ",
 	?U("command"), " [", ?U("options"), "]\n"
 	"\n"
 	"Available commands in this ejabberd node:\n"], []),
     print_usage_commands(HelpMode, MaxC, ShCode, AllCommands),
-    ?PRINT(
+    print(
        ["\n"
 	"Examples:\n"
 	"  ejabberdctl restart\n"
@@ -498,7 +498,7 @@ print_usage_commands(HelpMode, MaxC, ShCode, Commands) ->
     %% Convert its definition to a line
     FmtCmdDescs = format_command_lines(CmdArgsLenDescsSorted, MaxCmdLen, MaxC, ShCode, HelpMode),
 
-    ?PRINT([FmtCmdDescs], []).
+    print([FmtCmdDescs], []).
 
 
 %% Get some info about the shell:
@@ -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).
 
@@ -584,20 +584,20 @@ format_command_lines(CALD, _MaxCmdLen, MaxC, ShCode, long) ->
 %%-----------------------------
 
 print_usage_tags(MaxC, ShCode) ->
-    ?PRINT("Available tags and commands:", []),
+    print("Available tags and commands:", []),
     TagsCommands = ejabberd_commands:get_tags_commands(),
     lists:foreach(
       fun({Tag, Commands} = _TagCommands) ->
-	      ?PRINT(["\n\n  ", ?B(Tag), "\n     "], []),
+	      print(["\n\n  ", ?B(Tag), "\n     "], []),
 	      Words = lists:sort(Commands),
 	      Desc = prepare_long_line(5, MaxC, Words),
-	      ?PRINT(Desc, [])
+	      print(Desc, [])
       end,
       TagsCommands),
-    ?PRINT("\n\n", []).
+    print("\n\n", []).
 
 print_usage_tags(Tag, MaxC, ShCode) ->
-    ?PRINT(["Available commands with tag ", ?B(Tag), ":", "\n"], []),
+    print(["Available commands with tag ", ?B(Tag), ":", "\n"], []),
     HelpMode = long,
     TagsCommands = ejabberd_commands:get_tags_commands(),
     CommandsNames = case lists:keysearch(Tag, 1, TagsCommands) of
@@ -615,7 +615,7 @@ print_usage_tags(Tag, MaxC, ShCode) ->
 		     end,
 		     CommandsNames),
     print_usage_commands(HelpMode, MaxC, ShCode, CommandsList),
-    ?PRINT("\n", []).
+    print("\n", []).
 
 
 %%-----------------------------
@@ -673,7 +673,7 @@ print_usage_commands2(Cmds, MaxC, ShCode) ->
       fun(Cmd, Remaining) ->
 	      print_usage_command(Cmd, MaxC, ShCode),
 	      case Remaining > 1 of
-		  true -> ?PRINT([" ", lists:duplicate(MaxC, 126), " \n"], []);
+		  true -> print([" ", lists:duplicate(MaxC, 126), " \n"], []);
 		  false -> ok
 	      end,
 	      {ok, Remaining-1}
@@ -749,7 +749,7 @@ print_usage_command(Cmd, C, MaxC, ShCode) ->
 			  false -> ["  ", ?B("Note:"), " This command cannot be executed using ejabberdctl. Try ejabberd_xmlrpc.\n\n"]
 		      end,
 
-    ?PRINT(["\n", NameFmt, "\n", ArgsFmt, "\n", ReturnsFmt, "\n\n", XmlrpcFmt, TagsFmt, "\n\n", DescFmt, "\n\n", LongDescFmt, NoteEjabberdctl], []).
+    print(["\n", NameFmt, "\n", ArgsFmt, "\n", ReturnsFmt, "\n\n", XmlrpcFmt, TagsFmt, "\n\n", DescFmt, "\n\n", LongDescFmt, NoteEjabberdctl], []).
 
 format_usage_ctype(Type, _Indentation)
   when (Type==atom) or (Type==integer) or (Type==string) or (Type==binary) or (Type==rescode) or (Type==restuple)->
@@ -780,6 +780,8 @@ format_usage_tuple([ElementDef | ElementsDef], Indentation) ->
     MarginString = lists:duplicate(Indentation, $\s), % Put spaces
     [ElementFmt, ",\n", MarginString, format_usage_tuple(ElementsDef, Indentation)].
 
+print(Format, Args) ->
+    io:format(lists:flatten(Format), Args).
 
 %%-----------------------------
 %% Command managment

src/ejabberd_frontend_socket.erl

@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -280,7 +279,7 @@ code_change(_OldVsn, State, _Extra) -> {ok, State}.
 %%% Internal functions
 %%--------------------------------------------------------------------
 check_starttls(SockMod, Socket, Receiver, Opts) ->
-    TLSEnabled = lists:member(tls, Opts),
+    TLSEnabled = proplists:get_bool(tls, Opts),
     TLSOpts = lists:filter(fun({certfile, _}) -> true;
 			      (_) -> false
 			   end, Opts),
@@ -292,4 +291,3 @@ check_starttls(SockMod, Socket, Receiver, Opts) ->
 	true ->
 	    {SockMod, Socket}
     end.
-

src/ejabberd_hooks.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Aug 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_http.erl

@@ -5,7 +5,7 @@
 %%% Created : 27 Feb 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -30,7 +29,8 @@
 
 %% External exports
 -export([start/2, start_link/2, become_controller/1,
-	 socket_type/0, receive_headers/1, url_encode/1]).
+	 socket_type/0, receive_headers/1, url_encode/1,
+         transform_listen_option/2]).
 
 %% Callbacks
 -export([init/2]).
@@ -50,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
@@ -91,12 +91,16 @@ start_link(SockData, Opts) ->
 			 [SockData, Opts])}.
 
 init({SockMod, Socket}, Opts) ->
-    TLSEnabled = lists:member(tls, Opts),
+    TLSEnabled = proplists:get_bool(tls, Opts),
     TLSOpts1 = lists:filter(fun ({certfile, _}) -> true;
 				(_) -> false
 			    end,
 			    Opts),
-    TLSOpts = [verify_none | TLSOpts1],
+    TLSOpts2 = case proplists:get_bool(tls_compression, Opts) of
+                   false -> [compression_none | TLSOpts1];
+                   true -> TLSOpts1
+               end,
+    TLSOpts = [verify_none | TLSOpts2],
     {SockMod1, Socket1} = if TLSEnabled ->
 				 inet:setopts(Socket, [{recbuf, 8192}]),
 				 {ok, TLSSocket} = p1_tls:tcp_to_tls(Socket,
@@ -109,32 +113,33 @@ init({SockMod, Socket}, Opts) ->
 	  inet:setopts(Socket1, [{packet, http_bin}, {recbuf, 8192}]);
       _ -> ok
     end,
-    Captcha = case lists:member(captcha, Opts) of
+    Captcha = case proplists:get_bool(captcha, Opts) of
                   true -> [{[<<"captcha">>], ejabberd_captcha}];
                   false -> []
               end,
-    Register = case lists:member(register, Opts) of
+    Register = case proplists:get_bool(register, Opts) of
                  true -> [{[<<"register">>], mod_register_web}];
                  false -> []
                end,
-    Admin = case lists:member(web_admin, Opts) of
+    Admin = case proplists:get_bool(web_admin, Opts) of
               true -> [{[<<"admin">>], ejabberd_web_admin}];
               false -> []
             end,
-    Bind = case lists:member(http_bind, Opts) of
+    Bind = case proplists:get_bool(http_bind, Opts) of
              true -> [{[<<"http-bind">>], mod_http_bind}];
              false -> []
            end,
-    Poll = case lists:member(http_poll, Opts) of
+    Poll = case proplists:get_bool(http_poll, Opts) of
              true -> [{[<<"http-poll">>], ejabberd_http_poll}];
              false -> []
            end,
-    DefinedHandlers = case lists:keysearch(request_handlers,
-					   1, Opts)
-			  of
-			{value, {request_handlers, H}} -> H;
-			false -> []
-		      end,
+    DefinedHandlers = gen_mod:get_opt(
+                        request_handlers, Opts,
+                        fun(Hs) ->
+                                [{str:tokens(
+                                    iolist_to_binary(Path), <<"/">>),
+                                  Mod} || {Path, Mod} <- Hs]
+                        end, []),
     RequestHandlers = DefinedHandlers ++ Captcha ++ Register ++
         Admin ++ Bind ++ Poll,
     ?DEBUG("S: ~p~n", [RequestHandlers]),
@@ -195,8 +200,8 @@ parse_headers(#state{request_method = Method,
 		     trail = Data} =
 		  State) ->
     PktType = case Method of
-                  undefined -> http;
-                  _ -> httph
+                  undefined -> http_bin;
+                  _ -> httph_bin
               end,
     case erlang:decode_packet(PktType, Data, []) of
         {ok, Pkt, Rest} ->
@@ -480,7 +485,7 @@ analyze_ip_xff(IP, [], _Host) -> IP;
 analyze_ip_xff({IPLast, Port}, XFF, Host) ->
     [ClientIP | ProxiesIPs] = str:tokens(XFF, <<", ">>) ++
 				[jlib:ip_to_list(IPLast)],
-    TrustedProxies = ejabberd_config:get_local_option(
+    TrustedProxies = ejabberd_config:get_option(
                        {trusted_proxies, Host},
                        fun(TPs) ->
                                [iolist_to_binary(TP) || TP <- TPs]
@@ -830,3 +835,25 @@ normalize_path([_Parent, <<"..">>|Path], Norm) ->
     normalize_path(Path, Norm);
 normalize_path([Part | Path], Norm) ->
     normalize_path(Path, [Part|Norm]).
+
+transform_listen_option(captcha, Opts) ->
+    [{captcha, true}|Opts];
+transform_listen_option(register, Opts) ->
+    [{register, true}|Opts];
+transform_listen_option(web_admin, Opts) ->
+    [{web_admin, true}|Opts];
+transform_listen_option(http_bind, Opts) ->
+    [{http_bind, true}|Opts];
+transform_listen_option(http_poll, Opts) ->
+    [{http_poll, true}|Opts];
+transform_listen_option({request_handlers, Hs}, Opts) ->
+    Hs1 = lists:map(
+            fun({PList, Mod}) when is_list(PList) ->
+                    Path = iolist_to_binary([[$/, P] || P <- PList]),
+                    {Path, Mod};
+               (Opt) ->
+                    Opt
+            end, Hs),
+    [{request_handlers, Hs1} | Opts];
+transform_listen_option(Opt, Opts) ->
+    [Opt|Opts].

src/ejabberd_http_poll.erl

@@ -5,7 +5,7 @@
 %%% Created :  4 Mar 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -49,7 +48,7 @@
 -export_type([poll_socket/0]).
 
 -record(state,
-	{id, key, socket, output = <<"">>, input = <<"">>,
+	{id, key, socket, output = [], input = <<"">>,
 	 waiting_input = false, last_receiver, http_poll_timeout,
 	 timer}).
 
@@ -205,7 +204,7 @@ get_human_html_xmlel() ->
 init([ID, Key, IP]) ->
     ?INFO_MSG("started: ~p", [{ID, Key, IP}]),
     Opts = ejabberd_c2s_config:get_c2s_limits(),
-    HTTPPollTimeout = ejabberd_config:get_local_option(
+    HTTPPollTimeout = ejabberd_config:get_option(
                         {http_poll_timeout, ?MYNAME},
                         fun(I) when is_integer(I), I>0 -> I end,
                         ?HTTP_POLL_TIMEOUT) * 1000,
@@ -253,7 +252,7 @@ handle_event({activate, From}, StateName, StateData) ->
       Input ->
 	  Receiver = From,
 	  Receiver !
-	    {tcp, StateData#state.socket, iolist_to_binary(Input)},
+	    {tcp, StateData#state.socket, Input},
 	  {next_state, StateName,
 	   StateData#state{input = <<"">>, waiting_input = false,
 			   last_receiver = Receiver}}
@@ -272,11 +271,8 @@ handle_event(_Event, StateName, StateData) ->
 %%----------------------------------------------------------------------
 handle_sync_event({send, Packet}, _From, StateName,
 		  StateData) ->
-    Packet2 = if is_binary(Packet) -> (Packet);
-		 true -> Packet
-	      end,
-    Output = StateData#state.output ++
-	       [lists:flatten(Packet2)],
+    Packet2 = iolist_to_binary(Packet),
+    Output = StateData#state.output ++ [Packet2],
     Reply = ok,
     {reply, Reply, StateName,
      StateData#state{output = Output}};
@@ -287,7 +283,7 @@ handle_sync_event({http_put, Key, NewKey, Packet},
     Allow = case StateData#state.key of
 	      <<"">> -> true;
 	      OldKey ->
-		  NextKey = jlib:encode_base64((crypto:sha(Key))),
+		  NextKey = jlib:encode_base64((p1_sha:sha1(Key))),
 		  if OldKey == NextKey -> true;
 		     true -> false
 		  end
@@ -295,7 +291,7 @@ handle_sync_event({http_put, Key, NewKey, Packet},
     if Allow ->
 	   case StateData#state.waiting_input of
 	     false ->
-		 Input = [StateData#state.input | Packet],
+		 Input = <<(StateData#state.input)/binary, Packet/binary>>,
 		 Reply = ok,
 		 {reply, Reply, StateName,
 		  StateData#state{input = Input, key = NewKey}};
@@ -320,7 +316,7 @@ handle_sync_event(http_get, _From, StateName,
 		  StateData) ->
     Reply = {ok, StateData#state.output},
     {reply, Reply, StateName,
-     StateData#state{output = <<"">>}};
+     StateData#state{output = []}};
 handle_sync_event(_Event, _From, StateName,
 		  StateData) ->
     Reply = ok, {reply, Reply, StateName, StateData}.

src/ejabberd_listener.erl

@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -36,7 +35,8 @@
 	 parse_listener_portip/2,
 	 add_listener/3,
 	 delete_listener/2,
-	 validate_cfg/1
+         transform_options/1,
+         validate_cfg/1
 	]).
 
 -include("ejabberd.hrl").
@@ -55,7 +55,7 @@ init(_) ->
     {ok, {{one_for_one, 10, 1}, []}}.
 
 bind_tcp_ports() ->
-    case ejabberd_config:get_local_option(listen, fun validate_cfg/1) of
+    case ejabberd_config:get_option(listen, fun validate_cfg/1) of
 	undefined ->
 	    ignore;
 	Ls ->
@@ -88,7 +88,7 @@ bind_tcp_port(PortIP, Module, RawOpts) ->
     end.
 
 start_listeners() ->
-    case ejabberd_config:get_local_option(listen, fun validate_cfg/1) of
+    case ejabberd_config:get_option(listen, fun validate_cfg/1) of
 	undefined ->
 	    ignore;
 	Ls ->
@@ -151,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.
@@ -160,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
@@ -267,7 +292,7 @@ strip_ip_option(Opts) ->
 			Opts),
     case IPL of
 	%% Only the first ip option is considered
-	[{ip, T1} | _] when is_tuple(T1) ->
+	[{ip, T1} | _] ->
 	    {T1, OptsNoIP};
 	[] ->
 	    {no_ip_option, OptsNoIP}
@@ -284,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,
@@ -310,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})
@@ -340,6 +366,7 @@ start_listener2(Port, Module, Opts) ->
     %% It is only required to start the supervisor in some cases.
     %% 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_sip(Module),
     start_module_sup(Port, Module),
     start_listener_sup(Port, Module, Opts).
 
@@ -364,7 +391,7 @@ start_listener_sup(Port, Module, Opts) ->
     supervisor:start_child(ejabberd_listeners, ChildSpec).
 
 stop_listeners() ->
-    Ports = ejabberd_config:get_local_option(listen, fun validate_cfg/1),
+    Ports = ejabberd_config:get_option(listen, fun validate_cfg/1),
     lists:foreach(
       fun({PortIpNetp, Module, _Opts}) ->
 	      delete_listener(PortIpNetp, Module)
@@ -397,7 +424,7 @@ add_listener(PortIP, Module, Opts) ->
     PortIP1 = {Port, IPT, Proto},
     case start_listener(PortIP1, Module, Opts) of
 	{ok, _Pid} ->
-	    Ports = case ejabberd_config:get_local_option(
+	    Ports = case ejabberd_config:get_option(
                            listen, fun validate_cfg/1) of
 			undefined ->
 			    [];
@@ -406,7 +433,8 @@ add_listener(PortIP, Module, Opts) ->
 		    end,
 	    Ports1 = lists:keydelete(PortIP1, 1, Ports),
 	    Ports2 = [{PortIP1, Module, Opts} | Ports1],
-	    ejabberd_config:add_local_option(listen, Ports2),
+            Ports3 = lists:map(fun transform_option/1, Ports2),
+	    ejabberd_config:add_option(listen, Ports3),
 	    ok;
 	{error, {already_started, _Pid}} ->
 	    {error, {already_started, PortIP}};
@@ -428,7 +456,7 @@ delete_listener(PortIP, Module) ->
 delete_listener(PortIP, Module, Opts) ->
     {Port, IPT, _, _, Proto, _} = parse_listener_portip(PortIP, Opts),
     PortIP1 = {Port, IPT, Proto},
-    Ports = case ejabberd_config:get_local_option(
+    Ports = case ejabberd_config:get_option(
                    listen, fun validate_cfg/1) of
 		undefined ->
 		    [];
@@ -436,7 +464,8 @@ delete_listener(PortIP, Module, Opts) ->
 		    Ls
 	    end,
     Ports1 = lists:keydelete(PortIP1, 1, Ports),
-    ejabberd_config:add_local_option(listen, Ports1),
+    Ports2 = lists:map(fun transform_option/1, Ports1),
+    ejabberd_config:add_option(listen, Ports2),
     stop_listener(PortIP1, Module).
 
 
@@ -452,6 +481,10 @@ is_frontend(_) -> false.
 strip_frontend({frontend, Module}) -> Module;
 strip_frontend(Module) when is_atom(Module) -> Module.
 
+maybe_start_sip(esip_socket) ->
+    ejabberd:start_app(esip);
+maybe_start_sip(_) ->
+    ok.
 
 %%%
 %%% Check options
@@ -541,6 +574,55 @@ format_error(Reason) ->
 -define(IS_PORT(P), (is_integer(P) and (P > 0) and (P =< 65535))).
 -define(IS_TRANSPORT(T), ((T == tcp) or (T == udp))).
 
+transform_option({{Port, IP, Transport}, Mod, Opts}) ->
+    IPStr = if is_tuple(IP) ->
+                    list_to_binary(inet_parse:ntoa(IP));
+               true ->
+                    IP
+            end,
+    Opts1 = lists:map(
+              fun({ip, IPT}) when is_tuple(IPT) ->
+                      {ip, list_to_binary(inet_parse:ntoa(IP))};
+                 (tls) -> {tls, true};
+                 (ssl) -> {tls, true};
+                 (zlib) -> {zlib, true};
+                 (starttls) -> {starttls, true};
+                 (starttls_required) -> {starttls_required, true};
+                 (Opt) -> Opt
+              end, Opts),
+    Opts2 = lists:foldl(
+              fun(Opt, Acc) ->
+                      try
+                          Mod:transform_listen_option(Opt, Acc)
+                      catch error:undef ->
+                              Acc
+                      end
+              end, [], Opts1),
+    TransportOpt = if Transport == tcp -> [];
+                      true -> [{transport, Transport}]
+                   end,
+    IPOpt = if IPStr == <<"0.0.0.0">> -> [];
+               true -> [{ip, IPStr}]
+            end,
+    IPOpt ++ TransportOpt ++ [{port, Port}, {module, Mod} | Opts2];
+transform_option({{Port, Transport}, Mod, Opts})
+  when ?IS_TRANSPORT(Transport) ->
+    transform_option({{Port, {0,0,0,0}, Transport}, Mod, Opts});
+transform_option({{Port, IP}, Mod, Opts}) ->
+    transform_option({{Port, IP, tcp}, Mod, Opts});
+transform_option({Port, Mod, Opts}) ->
+    transform_option({{Port, {0,0,0,0}, tcp}, Mod, Opts});
+transform_option(Opt) ->
+    Opt.
+
+transform_options(Opts) ->
+    lists:foldl(fun transform_options/2, [], Opts).
+
+transform_options({listen, LOpts}, Opts) ->
+    [{listen, lists:map(fun transform_option/1, LOpts)} | Opts];
+transform_options(Opt, Opts) ->
+    [Opt|Opts].
+
 -type transport() :: udp | tcp.
 -type port_ip_transport() :: inet:port_number() |
                              {inet:port_number(), transport()} |
@@ -551,18 +633,21 @@ format_error(Reason) ->
 
 validate_cfg(L) ->
     lists:map(
-      fun({PortIPTransport, Mod1, Opts}) when is_atom(Mod1), is_list(Opts) ->
-              Mod = prepare_mod(Mod1),
-              case PortIPTransport of
-                  Port when ?IS_PORT(Port) ->
-                      {Port, Mod, Opts};
-                  {Port, Trans} when ?IS_PORT(Port) and ?IS_TRANSPORT(Trans) ->
-                      {{Port, Trans}, Mod, Opts};
-                  {Port, IP} when ?IS_PORT(Port) ->
-                      {{Port, prepare_ip(IP)}, Mod, Opts};
-                  {Port, IP, Trans} when ?IS_PORT(Port) and ?IS_TRANSPORT(Trans) ->
-                      {{Port, prepare_ip(IP), Trans}, Mod, Opts}
-              end
+      fun(LOpts) ->
+              lists:foldl(
+                fun({port, Port}, {{_, IP, T}, Mod, Opts}) ->
+                        true = ?IS_PORT(Port),
+                        {{Port, IP, T}, Mod, Opts};
+                   ({ip, IP}, {{Port, _, T}, Mod, Opts}) ->
+                        {{Port, prepare_ip(IP), T}, Mod, Opts};
+                   ({transport, T}, {{Port, IP, _}, Mod, Opts}) ->
+                        true = ?IS_TRANSPORT(T),
+                        {{Port, IP, T}, Mod, Opts};
+                   ({module, Mod}, {Port, _, Opts}) ->
+                        {Port, prepare_mod(Mod), Opts};
+                   (Opt, {Port, Mod, Opts}) ->
+                        {Port, Mod, [Opt|Opts]}
+                end, {{5222, {0,0,0,0}, tcp}, ejabberd_c2s, []}, LOpts)
       end, L).
 
 prepare_ip({A, B, C, D} = IP)
@@ -578,10 +663,9 @@ prepare_ip(IP) when is_list(IP) ->
 prepare_ip(IP) when is_binary(IP) ->
     prepare_ip(binary_to_list(IP)).
 
-prepare_mod(ejabberd_stun) ->
-    prepare_mod(stun);
-prepare_mod(stun) ->
-    ejabberd:start_app(p1_stun),
-    stun;
-prepare_mod(Mod) ->
+prepare_mod(ejabberd_sip) ->
+    prepare_mod(sip);
+prepare_mod(sip) ->
+    esip_socket;
+prepare_mod(Mod) when is_atom(Mod) ->
     Mod.

src/ejabberd_local.erl

@@ -5,7 +5,7 @@
 %%% Created : 30 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_logger.erl

@@ -18,40 +18,126 @@
 %%% 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).
 
 %% API
--export([start/0, set_logfile/1, reopen_log/0, get/0, set/1,
-         debug_msg/4, info_msg/4, warning_msg/4, error_msg/4,
-         critical_msg/4]).
+-export([start/0, reopen_log/0, get/0, set/1, get_log_path/0]).
+
+-include("ejabberd.hrl").
+
+-type loglevel() :: 0 | 1 | 2 | 3 | 4 | 5.
+
+-spec start() -> ok.
+-spec get_log_path() -> string().
+-spec reopen_log() -> ok.
+-spec get() -> {loglevel(), atom(), string()}.
+-spec set(loglevel() | {loglevel(), list()}) -> {module, module()}.
 
 %%%===================================================================
 %%% API
 %%%===================================================================
+%% @doc Returns the full path to the ejabberd log file.
+%% It first checks for application configuration parameter 'log_path'.
+%% If not defined it checks the environment variable EJABBERD_LOG_PATH.
+%% And if that one is neither defined, returns the default value:
+%% "ejabberd.log" in current directory.
+get_log_path() ->
+    case application:get_env(ejabberd, log_path) of
+	{ok, Path} ->
+	    Path;
+	undefined ->
+	    case os:getenv("EJABBERD_LOG_PATH") of
+		false ->
+		    ?LOG_PATH;
+		Path ->
+		    Path
+	    end
+    end.
+
+-ifdef(LAGER).
+
 start() ->
+    application:load(lager),
+    ConsoleLog = get_log_path(),
+    Dir = filename:dirname(ConsoleLog),
+    ErrorLog = filename:join([Dir, "error.log"]),
+    CrashLog = filename:join([Dir, "crash.log"]),
+    application:set_env(
+      lager, handlers,
+      [{lager_console_backend, info},
+       {lager_file_backend, [{file, ConsoleLog}, {level, info}, {count, 1}]},
+       {lager_file_backend, [{file, ErrorLog}, {level, error}, {count, 1}]}]),
+    application:set_env(lager, crash_log, CrashLog),
+    ejabberd:start_app(lager),
     ok.
 
-set_logfile(FileName) ->
-    error_logger:add_report_handler(p1_logger_h, FileName).
+reopen_log() ->
+    lists:foreach(
+      fun({lager_file_backend, File}) ->
+              whereis(lager_event) ! {rotate, File};
+         (_) ->
+              ok
+      end, gen_event:which_handlers(lager_event)),
+    reopen_sasl_log().
+
+get() ->
+    case lager:get_loglevel(lager_console_backend) of
+        none -> {0, no_log, "No log"};
+        emergency -> {1, critical, "Critical"};
+        alert -> {1, critical, "Critical"};
+        critical -> {1, critical, "Critical"};
+        error -> {2, error, "Error"};
+        warning -> {3, warning, "Warning"};
+        notice -> {3, warning, "Warning"};
+        info -> {4, info, "Info"};
+        debug -> {5, debug, "Debug"}
+    end.
+
+set(LogLevel) when is_integer(LogLevel) ->
+    LagerLogLevel = case LogLevel of
+                        0 -> none;
+                        1 -> critical;
+                        2 -> error;
+                        3 -> warning;
+                        4 -> info;
+                        5 -> debug
+                    end,
+    case lager:get_loglevel(lager_console_backend) of
+        LagerLogLevel ->
+            ok;
+        _ ->
+            ConsoleLog = get_log_path(),
+            lists:foreach(
+              fun({lager_file_backend, File} = H) when File == ConsoleLog ->
+                      lager:set_loglevel(H, LagerLogLevel);
+                 (lager_console_backend = H) ->
+                      lager:set_loglevel(H, LagerLogLevel);
+                 (_) ->
+                      ok
+              end, gen_event:which_handlers(lager_event))
+    end,
+    {module, lager};
+set({_LogLevel, _}) ->
+    error_logger:error_msg("custom loglevels are not supported for 'lager'"),
+    {module, lager}.
+
+-else.
+
+start() ->
+    set(4),
+    LogPath = get_log_path(),
+    error_logger:add_report_handler(p1_logger_h, LogPath),
+    ok.
 
 reopen_log() ->
     %% TODO: Use the Reopen log API for logger_h ?
     p1_logger_h:reopen_log(),
-    case application:get_env(sasl,sasl_error_logger) of
-	{ok, {file, SASLfile}} ->
-	    error_logger:delete_report_handler(sasl_report_file_h),
-	    p1_logger_h:rotate_log(SASLfile),
-	    error_logger:add_report_handler(sasl_report_file_h,
-	        {SASLfile, get_sasl_error_logger_type()});
-	_ -> false
-	end,
-    ok.
+    reopen_sasl_log().
 
 get() ->
     p1_loglevel:get().
@@ -59,24 +145,31 @@ get() ->
 set(LogLevel) ->
     p1_loglevel:set(LogLevel).
 
-debug_msg(Mod, Line, Format, Args) ->
-    p1_logger:debug_msg(Mod, Line, Format, Args).
-
-info_msg(Mod, Line, Format, Args) ->
-    p1_logger:info_msg(Mod, Line, Format, Args).
-
-warning_msg(Mod, Line, Format, Args) ->
-    p1_logger:warning_msg(Mod, Line, Format, Args).
-
-error_msg(Mod, Line, Format, Args) ->
-    p1_logger:error_msg(Mod, Line, Format, Args).
-
-critical_msg(Mod, Line, Format, Args) ->
-    p1_logger:critical_msg(Mod, Line, Format, Args).
+-endif.
 
 %%%===================================================================
 %%% Internal functions
 %%%===================================================================
+reopen_sasl_log() ->
+    case application:get_env(sasl,sasl_error_logger) of
+	{ok, {file, SASLfile}} ->
+	    error_logger:delete_report_handler(sasl_report_file_h),
+            rotate_sasl_log(SASLfile),
+	    error_logger:add_report_handler(sasl_report_file_h,
+	        {SASLfile, get_sasl_error_logger_type()});
+	_ -> false
+	end,
+    ok.
+
+rotate_sasl_log(Filename) ->
+    case file:read_file_info(Filename) of
+        {ok, _FileInfo} ->
+            file:rename(Filename, [Filename, ".0"]),
+            ok;
+        {error, _Reason} ->
+            ok
+    end.
+
 %% Function copied from Erlang/OTP lib/sasl/src/sasl.erl which doesn't export it
 get_sasl_error_logger_type () ->
     case application:get_env (sasl, errlog_type) of

src/ejabberd_node_groups.erl

@@ -5,7 +5,7 @@
 %%% Created :  1 Nov 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,7 +83,12 @@ get_closest_node(Name) ->
 %%--------------------------------------------------------------------
 init([]) ->
     {FE, BE} =
-	case ejabberd_config:get_local_option(node_type, fun(N) -> N end) of
+	case ejabberd_config:get_option(
+               node_type,
+               fun(frontend) -> frontend;
+                  (backend) -> backend;
+                  (generic) -> generic
+               end, generic) of
 	    frontend ->
 		{true, false};
 	    backend ->

src/ejabberd_odbc.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -71,12 +70,12 @@
 
 -define(TOP_LEVEL_TXN, 0).
 
--define(MAX_TRANSACTION_RESTARTS, 10).
-
 -define(PGSQL_PORT, 5432).
 
 -define(MYSQL_PORT, 3306).
 
+-define(MAX_TRANSACTION_RESTARTS, 10).
+
 -define(TRANSACTION_TIMEOUT, 60000).
 
 -define(KEEPALIVE_TIMEOUT, 60000).
@@ -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, <<"Unknown Host">>};
+          Pid ->
+            (?GEN_FSM):sync_send_event(Pid,{sql_cmd, Msg, now()},
+                                       ?TRANSACTION_TIMEOUT)
+          end;
       _State -> nested_op(Msg)
     end.
 
@@ -201,8 +203,8 @@ decode_term(Bin) ->
 %%% Callback functions from gen_fsm
 %%%----------------------------------------------------------------------
 init([Host, StartInterval]) ->
-    case ejabberd_config:get_local_option(
-           {odbc_keepalive_interval, Host},
+    case ejabberd_config:get_option(
+           {keepalive_interval, Host},
            fun(I) when is_integer(I), I>0 -> I end) of
         undefined ->
             ok;
@@ -325,7 +327,7 @@ handle_info(Info, StateName, State) ->
 terminate(_Reason, _StateName, State) ->
     ejabberd_odbc_sup:remove_pid(State#state.host, self()),
     case State#state.db_type of
-      mysql -> catch mysql_conn:stop(State#state.db_ref);
+      mysql -> catch p1_mysql_conn:stop(State#state.db_ref);
       _ -> ok
     end,
     ok.
@@ -447,9 +449,9 @@ sql_query_internal(Query) ->
 	    mysql ->
 		?DEBUG("MySQL, Send query~n~p~n", [Query]),  
 		%%squery to be able to specify result_type = binary
-		%%[Query] because mysql_conn expect query to be a list (elements can be binaries, or iolist)
+		%%[Query] because p1_mysql_conn expect query to be a list (elements can be binaries, or iolist)
 		%%        but doesn't accept just a binary 
-		R = mysql_to_odbc(mysql_conn:squery(State#state.db_ref,
+		R = mysql_to_odbc(p1_mysql_conn:squery(State#state.db_ref,
 						   [Query], self(),
 						   [{timeout, (?TRANSACTION_TIMEOUT) - 1000},
 						    {result_type, binary}])),
@@ -484,7 +486,7 @@ abort_on_driver_error(Reply, From) ->
 %% Open an ODBC database connection
 odbc_connect(SQLServer) ->
     ejabberd:start_app(odbc),
-    odbc:connect(SQLServer, [{scrollable_cursors, off}]).
+    odbc:connect(binary_to_list(SQLServer), [{scrollable_cursors, off}]).
 
 %% == Native PostgreSQL code
 
@@ -515,6 +517,9 @@ pgsql_to_odbc({ok, PGSQLResult}) ->
 pgsql_item_to_odbc({<<"SELECT", _/binary>>, Rows,
 		    Recs}) ->
     {selected, [element(1, Row) || Row <- Rows], Recs};
+pgsql_item_to_odbc({<<"FETCH", _/binary>>, Rows,
+		    Recs}) ->
+    {selected, [element(1, Row) || Row <- Rows], Recs};
 pgsql_item_to_odbc(<<"INSERT ", OIDN/binary>>) ->
     [_OID, N] = str:tokens(OIDN, <<" ">>),
     {updated, jlib:binary_to_integer(N)};
@@ -530,12 +535,12 @@ pgsql_item_to_odbc(_) -> {updated, undefined}.
 %% part of init/1
 %% Open a database connection to MySQL
 mysql_connect(Server, Port, DB, Username, Password) ->
-    case mysql_conn:start(binary_to_list(Server), Port,
+    case p1_mysql_conn:start(binary_to_list(Server), Port,
                           binary_to_list(Username), binary_to_list(Password),
 			  binary_to_list(DB), fun log/3)
 	of
       {ok, Ref} ->
-	  mysql_conn:fetch(Ref, [<<"set names 'utf8';">>],
+	  p1_mysql_conn:fetch(Ref, [<<"set names 'utf8';">>],
 			   self()),
 	  {ok, Ref};
       Err -> Err
@@ -543,15 +548,15 @@ mysql_connect(Server, Port, DB, Username, Password) ->
 
 %% Convert MySQL query result to Erlang ODBC result formalism
 mysql_to_odbc({updated, MySQLRes}) ->
-    {updated, mysql:get_result_affected_rows(MySQLRes)};
+    {updated, p1_mysql:get_result_affected_rows(MySQLRes)};
 mysql_to_odbc({data, MySQLRes}) ->
-    mysql_item_to_odbc(mysql:get_result_field_info(MySQLRes),
-		       mysql:get_result_rows(MySQLRes));
+    mysql_item_to_odbc(p1_mysql:get_result_field_info(MySQLRes),
+		       p1_mysql:get_result_rows(MySQLRes));
 mysql_to_odbc({error, MySQLRes})
     when is_binary(MySQLRes) ->
     {error, MySQLRes};
 mysql_to_odbc({error, MySQLRes}) ->
-    {error, mysql:get_result_reason(MySQLRes)}.
+    {error, p1_mysql:get_result_reason(MySQLRes)}.
 
 %% When tabular data is returned, convert it to the ODBC formalism
 mysql_item_to_odbc(Columns, Recs) ->
@@ -570,39 +575,39 @@ log(Level, Format, Args) ->
     end.
 
 db_opts(Host) ->
-    case ejabberd_config:get_local_option(
-           {odbc_server, Host},
-           fun({Type, Server, DB, User, Pass}) ->
-                   {Type,
-                    iolist_to_binary(Server),
-                    case Type of
-                        mysql -> ?MYSQL_PORT;
-                        pgsql -> ?PGSQL_PORT
-                    end,
-                    iolist_to_binary(DB),
-                    iolist_to_binary(User),
-                    iolist_to_binary(Pass)};
-              ({Type, Server, Port, DB, User, Pass})
-                 when ((Type == mysql) or (Type == pgsql))
-                      and (is_integer(Port) and ((Port > 0)
-                                                 and (Port < 65536))) ->
-                   {Type,
-                    iolist_to_binary(Server),
-                    Port,
-                    iolist_to_binary(DB),
-                    iolist_to_binary(User),
-                    iolist_to_binary(Pass)};
-              (S) ->
-                   iolist_to_binary(S)
-           end, <<"localhost">>) of
-        {Type, Server, Port, DB, User, Pass} ->
-            [Type, Server, Port, DB, User, Pass];
-        SQLServer ->
-            [odbc, SQLServer]
+    Type = ejabberd_config:get_option({odbc_type, Host},
+                                      fun(mysql) -> mysql;
+                                         (pgsql) -> pgsql;
+                                         (odbc) -> odbc
+                                      end, odbc),
+    Server = ejabberd_config:get_option({odbc_server, Host},
+                                        fun iolist_to_binary/1,
+                                        <<"localhost">>),
+    case Type of
+        odbc ->
+            [odbc, Server];
+        _ ->
+            Port = ejabberd_config:get_option(
+                     {port, Host},
+                     fun(P) when is_integer(P), P > 0, P < 65536 -> P end,
+                     case Type of
+                         mysql -> ?MYSQL_PORT;
+                         pgsql -> ?PGSQL_PORT
+                     end),
+            DB = ejabberd_config:get_option({odbc_database, Host},
+                                            fun iolist_to_binary/1,
+                                            <<"ejabberd">>),
+            User = ejabberd_config:get_option({odbc_username, Host},
+                                              fun iolist_to_binary/1,
+                                              <<"ejabberd">>),
+            Pass = ejabberd_config:get_option({odbc_password, Host},
+                                              fun iolist_to_binary/1,
+                                              <<"">>),
+            [Type, Server, Port, DB, User, Pass]
     end.
 
 max_fsm_queue() ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       max_fsm_queue,
       fun(N) when is_integer(N), N > 0 -> N end).
 

src/ejabberd_odbc_sup.erl

@@ -5,7 +5,7 @@
 %%% Created : 22 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -30,11 +29,15 @@
 
 %% API
 -export([start_link/1, init/1, add_pid/2, remove_pid/2,
-	 get_pids/1, get_random_pid/1]).
+	 get_pids/1, get_random_pid/1, transform_options/1]).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
+-define(PGSQL_PORT, 5432).
+
+-define(MYSQL_PORT, 3306).
+
 -define(DEFAULT_POOL_SIZE, 10).
 
 -define(DEFAULT_ODBC_START_INTERVAL, 30).
@@ -56,11 +59,11 @@ start_link(Host) ->
 			  ?MODULE, [Host]).
 
 init([Host]) ->
-    PoolSize = ejabberd_config:get_local_option(
+    PoolSize = ejabberd_config:get_option(
                  {odbc_pool_size, Host},
                  fun(I) when is_integer(I), I>0 -> I end,
                  ?DEFAULT_POOL_SIZE),
-    StartInterval = ejabberd_config:get_local_option(
+    StartInterval = ejabberd_config:get_option(
                       {odbc_start_interval, Host},
                       fun(I) when is_integer(I), I>0 -> I end,
                       ?DEFAULT_ODBC_START_INTERVAL),
@@ -79,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 () ->
@@ -93,3 +98,20 @@ remove_pid(Host, Pid) ->
 		mnesia:delete_object(#sql_pool{host = Host, pid = Pid})
 	end,
     mnesia:ets(F).
+
+transform_options(Opts) ->
+    lists:foldl(fun transform_options/2, [], Opts).
+
+transform_options({odbc_server, {Type, Server, Port, DB, User, Pass}}, Opts) ->
+    [{odbc_type, Type},
+     {odbc_server, Server},
+     {odbc_port, Port},
+     {odbc_database, DB},
+     {odbc_username, User},
+     {odbc_password, Pass}|Opts];
+transform_options({odbc_server, {mysql, Server, DB, User, Pass}}, Opts) ->
+    transform_options({odbc_server, {mysql, Server, ?MYSQL_PORT, DB, User, Pass}}, Opts);
+transform_options({odbc_server, {pgsql, Server, DB, User, Pass}}, Opts) ->
+    transform_options({odbc_server, {pgsql, Server, ?PGSQL_PORT, DB, User, Pass}}, Opts);
+transform_options(Opt, Opts) ->
+    [Opt|Opts].

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

src/ejabberd_rdbms.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -34,7 +33,8 @@
 -include("logger.hrl").
 
 start() ->
-    case lists:any(fun needs_odbc/1, ?MYHOSTS) of
+    case lists:any(fun(H) -> needs_odbc(H) /= false end,
+                   ?MYHOSTS) of
         true ->
             start_hosts();
         false ->
@@ -45,14 +45,15 @@ start() ->
 start_hosts() ->
     lists:foreach(fun (Host) ->
 			  case needs_odbc(Host) of
-			    true -> start_odbc(Host);
+			    {true, App} -> start_odbc(Host, App);
 			    false -> ok
 			  end
 		  end,
 		  ?MYHOSTS).
 
 %% Start the ODBC module on the given host
-start_odbc(Host) ->
+start_odbc(Host, App) ->
+    ejabberd:start_app(App),
     Supervisor_name = gen_mod:get_module_proc(Host,
 					      ejabberd_odbc_sup),
     ChildSpec = {Supervisor_name,
@@ -64,11 +65,19 @@ start_odbc(Host) ->
 	  ?ERROR_MSG("Start of supervisor ~p failed:~n~p~nRetrying."
 		     "..~n",
 		     [Supervisor_name, _Error]),
-	  start_odbc(Host)
+	  start_odbc(Host, App)
     end.
 
-%% Returns true if we have configured odbc_server for the given host
+%% Returns {true, App} if we have configured odbc for the given host
 needs_odbc(Host) ->
     LHost = jlib:nameprep(Host),
-    ejabberd_config:get_local_option(
-      {odbc_server, LHost}, fun(_) -> true end, false).
+    case ejabberd_config:get_option({odbc_type, LHost},
+                                    fun(mysql) -> mysql;
+                                       (pgsql) -> pgsql;
+                                       (odbc) -> odbc
+                                    end, undefined) of
+        mysql -> {true, p1_mysql};
+        pgsql -> {true, p1_pgsql};
+        odbc -> {true, odbc};
+        undefined -> false
+    end.

src/ejabberd_receiver.erl

@@ -5,7 +5,7 @@
 %%% Created : 10 Nov 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

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

src/ejabberd_router.erl

@@ -5,7 +5,7 @@
 %%% Created : 27 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -387,20 +386,17 @@ do_route(OrigFrom, OrigTo, OrigPacket) ->
     end.
 
 get_component_number(LDomain) ->
-    case
-      ejabberd_config:get_local_option({domain_balancing_component_number,
-					LDomain}, fun(D) -> D end)
-	of
-      N when is_integer(N), N > 1 -> N;
-      _ -> undefined
-    end.
-
+    ejabberd_config:get_option(
+      {domain_balancing_component_number, LDomain},
+      fun(N) when is_integer(N), N > 1 -> N end,
+      undefined).
 
 update_tables() ->
     case catch mnesia:table_info(route, attributes) of
       [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,

src/ejabberd_s2s.erl

@@ -5,7 +5,7 @@
 %%% Created :  7 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,14 +37,15 @@
 	 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,
 	 handle_info/2, terminate/2, code_change/3]).
 
 %% ejabberd API
--export([get_info_s2s_connections/1]).
+-export([get_info_s2s_connections/1, transform_options/1]).
 
 -include("ejabberd.hrl").
 -include("logger.hrl").
@@ -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
 %%====================================================================
@@ -461,12 +494,12 @@ needed_connections_number(Ls, MaxS2SConnectionsNumber,
 %% --------------------------------------------------------------------
 is_service(From, To) ->
     LFromDomain = From#jid.lserver,
-    case ejabberd_config:get_local_option(
+    case ejabberd_config:get_option(
            {route_subdomains, LFromDomain},
-           fun(s2s) -> s2s end) of
+           fun(s2s) -> s2s; (local) -> local end, local) of
       s2s -> % bypass RFC 3920 10.3
 	  false;
-      undefined ->
+      local ->
 	  Hosts = (?MYHOSTS),
 	  P = fun (ParentDomain) ->
 		      lists:member(ParentDomain, Hosts)
@@ -548,34 +581,50 @@ allow_host2(MyServer, S2SHost) ->
     end.
 
 allow_host1(MyHost, S2SHost) ->
-    case ejabberd_config:get_local_option(
-           {{s2s_host, S2SHost}, MyHost},
-           fun(deny) -> deny; (allow) -> allow end)
-	of
-      deny -> false;
-      allow -> true;
-      undefined ->
-	  case ejabberd_config:get_local_option(
-                 {s2s_default_policy, MyHost},
-                 fun(deny) -> deny; (allow) -> allow end)
-	      of
-	    deny -> false;
-	    _ ->
-		case ejabberd_hooks:run_fold(s2s_allow_host, MyHost,
-					     allow, [MyHost, S2SHost])
-		    of
-		  deny -> false;
-		  allow -> true;
-		  _ -> true
-		end
-	  end
+    Rule = ejabberd_config:get_option(
+             s2s_access,
+             fun(A) when is_atom(A) -> A end,
+             all),
+    JID = jlib:make_jid(<<"">>, S2SHost, <<"">>),
+    case acl:match_rule(MyHost, Rule, JID) of
+        deny -> false;
+        allow ->
+            case ejabberd_hooks:run_fold(s2s_allow_host, MyHost,
+                                         allow, [MyHost, S2SHost]) of
+                deny -> false;
+                allow -> true;
+                _ -> true
+            end
     end.
 
+transform_options(Opts) ->
+    lists:foldl(fun transform_options/2, [], Opts).
+
+transform_options({{s2s_host, Host}, Action}, Opts) ->
+    ?WARNING_MSG("Option 's2s_host' is deprecated. "
+                 "The option is still supported but it is better to "
+                 "fix your config: use access rules instead.", []),
+    ACLName = jlib:binary_to_atom(
+                iolist_to_binary(["s2s_access_", Host])),
+    [{acl, ACLName, {server, Host}},
+     {access, s2s, [{Action, ACLName}]},
+     {s2s_access, s2s} |
+     Opts];
+transform_options({s2s_default_policy, Action}, Opts) ->
+    ?WARNING_MSG("Option 's2s_default_policy' is deprecated. "
+                 "The option is still supported but it is better to "
+                 "fix your config: "
+                 "use 's2s_access' with an access rule.", []),
+    [{access, s2s, [{Action, all}]},
+     {s2s_access, s2s} |
+     Opts];
+transform_options(Opt, Opts) ->
+    [Opt|Opts].
+
 %% Get information about S2S connections of the specified type.
 %% @spec (Type) -> [Info]
 %% where Type = in | out
 %%       Info = [{InfoName::atom(), InfoValue::any()}]
-
 get_info_s2s_connections(Type) ->
     ChildType = case Type of
 		  in -> ejabberd_s2s_in_sup;
@@ -604,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.

src/ejabberd_s2s_in.erl

@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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,
@@ -88,7 +78,7 @@
 
 -define(SUPERVISOR_START,
 	p1_fsm:start(ejabberd_s2s_in, [SockData, Opts],
-                     ?FSMOPTS ++ fsm_limit_opts(Opts)).
+                     ?FSMOPTS ++ fsm_limit_opts(Opts))).
 
 -else.
 
@@ -149,7 +139,7 @@ init([{SockMod, Socket}, Opts]) ->
 	       _ -> none
 	     end,
     {StartTLS, TLSRequired, TLSCertverify} =
-        case ejabberd_config:get_local_option(
+        case ejabberd_config:get_option(
                s2s_use_starttls,
                fun(false) -> false;
                   (true) -> true;
@@ -171,12 +161,33 @@ init([{SockMod, Socket}, Opts]) ->
             required_trusted ->
                 {true, true, true}
         end,
-    TLSOpts = case ejabberd_config:get_local_option(
+    TLSOpts1 = case ejabberd_config:get_option(
                      s2s_certfile,
                      fun iolist_to_binary/1) of
                   undefined -> [];
                   CertFile -> [{certfile, CertFile}]
 	      end,
+    TLSOpts2 = case ejabberd_config:get_option(
+                      s2s_ciphers, fun iolist_to_binary/1) of
+                   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 | TLSOpts3];
+                  true -> TLSOpts3
+              end,
     Timer = erlang:start_timer(?S2STIMEOUT, self(), []),
     {ok, wait_for_stream,
      #state{socket = Socket, sockmod = SockMod,
@@ -204,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
@@ -247,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 ++
@@ -275,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 ->
@@ -289,7 +297,9 @@ wait_for_stream({xmlstreamstart, _Name, Attrs},
 							  [Server])}),
 	  {next_state, stream_established, StateData};
       {<<"jabber:server">>, <<"jabber:server:dialback">>,
-       _Server, _} ->
+       _Server, _} when
+	      (StateData#state.tls_required and StateData#state.tls_enabled)
+	      or (not StateData#state.tls_required) ->
 	  send_text(StateData, ?STREAM_HEADER(<<"">>)),
 	  {next_state, stream_established, StateData};
       _ ->
@@ -308,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 =
@@ -319,8 +329,8 @@ wait_for_feature_request({xmlstreamelement, El},
 	       SockMod == gen_tcp ->
 	  ?DEBUG("starttls", []),
 	  Socket = StateData#state.socket,
-	  TLSOpts = case
-		      ejabberd_config:get_local_option(
+	  TLSOpts1 = case
+		      ejabberd_config:get_option(
                         {domain_certfile, StateData#state.server},
                         fun iolist_to_binary/1) of
 		      undefined -> StateData#state.tls_options;
@@ -328,6 +338,14 @@ wait_for_feature_request({xmlstreamelement, El},
 			  [{certfile, CertFile} | lists:keydelete(certfile, 1,
 								  StateData#state.tls_options)]
 		    end,
+          TLSOpts = case ejabberd_config:get_option(
+                           {s2s_tls_compression, StateData#state.server},
+                           fun(true) -> true;
+                              (false) -> false
+                           end, true) of
+                        true -> lists:delete(compression_none, TLSOpts1);
+                        false -> [compression_none | TLSOpts1]
+                    end,
 	  TLSSocket = (StateData#state.sockmod):starttls(Socket,
 							 TLSOpts,
 							 xml:element_to_binary(#xmlel{name
@@ -346,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">>,
@@ -390,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">>,
@@ -708,130 +697,11 @@ 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}];
       _ ->
-	  case ejabberd_config:get_local_option(
+	  case ejabberd_config:get_option(
                  max_fsm_queue,
                  fun(I) when is_integer(I), I > 0 -> I end) of
             undefined -> [];

src/ejabberd_s2s_out.erl

@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -35,7 +34,8 @@
 	 start_link/3,
 	 start_connection/1,
 	 terminate_if_waiting_delay/2,
-	 stop_connection/1]).
+	 stop_connection/1,
+         transform_options/1]).
 
 %% p1_fsm callbacks (same as gen_fsm)
 -export([init/1,
@@ -69,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(),
@@ -160,36 +161,60 @@ 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_local_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,
-    TLSOpts = case
-		ejabberd_config:get_local_option(
+    TLSOpts1 = case
+		ejabberd_config:get_option(
                   s2s_certfile, fun iolist_to_binary/1)
 		  of
 		undefined -> [connect];
 		CertFile -> [{certfile, CertFile}, connect]
 	      end,
+    TLSOpts2 = case ejabberd_config:get_option(
+                      s2s_ciphers, fun iolist_to_binary/1) of
+                   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 | TLSOpts3];
+                  true -> TLSOpts3
+              end,
     {New, Verify} = case Type of
 		      {new, Key} -> {Key, false};
 		      {verify, Pid, Key, SID} ->
@@ -198,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
@@ -320,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,
@@ -545,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 =
@@ -694,7 +745,7 @@ wait_for_starttls_proceed({xmlstreamelement, El},
 		       [{StateData#state.myname, StateData#state.server}]),
 		Socket = StateData#state.socket,
 		TLSOpts = case
-			    ejabberd_config:get_local_option(
+			    ejabberd_config:get_option(
                               {domain_certfile, StateData#state.myname},
                               fun iolist_to_binary/1)
 			      of
@@ -711,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};
@@ -1134,16 +1185,15 @@ get_addr_port(Server) ->
     end.
 
 srv_lookup(Server) ->
-    Options = case
-		ejabberd_config:get_local_option(
-                  s2s_dns_options, fun(L) when is_list(L) -> L end)
-		  of
-                undefined -> [];
-                L -> L
-	      end,
-    TimeoutMs = timer:seconds(proplists:get_value(timeout,
-						  Options, 10)),
-    Retries = proplists:get_value(retries, Options, 2),
+    TimeoutMs = timer:seconds(
+                  ejabberd_config:get_option(
+                    s2s_dns_timeout,
+                    fun(I) when is_integer(I), I>=0 -> I end,
+                    10)),
+    Retries = ejabberd_config:get_option(
+                s2s_dns_retries,
+                fun(I) when is_integer(I), I>=0 -> I end,
+                2),
     srv_lookup(binary_to_list(Server), TimeoutMs, Retries).
 
 %% XXX - this behaviour is suboptimal in the case that the domain
@@ -1203,15 +1253,15 @@ get_addrs(Host, Family) ->
     end.
 
 outgoing_s2s_port() ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       outgoing_s2s_port,
       fun(I) when is_integer(I), I > 0, I =< 65536 -> I end,
       5269).
 
 outgoing_s2s_families() ->
-    ejabberd_config:get_local_option(
-      outgoing_s2s_options,
-      fun({Families, _}) ->
+    ejabberd_config:get_option(
+      outgoing_s2s_families,
+      fun(Families) ->
               true = lists:all(
                        fun(ipv4) -> true;
                           (ipv6) -> true
@@ -1220,14 +1270,43 @@ outgoing_s2s_families() ->
       end, [ipv4, ipv6]).
 
 outgoing_s2s_timeout() ->
-    ejabberd_config:get_local_option(
-      outgoing_s2s_options,
-      fun({_, TimeOut}) when is_integer(TimeOut), TimeOut > 0 ->
+    ejabberd_config:get_option(
+      outgoing_s2s_timeout,
+      fun(TimeOut) when is_integer(TimeOut), TimeOut > 0 ->
               TimeOut;
-         ({_, infinity}) ->
+         (infinity) ->
               infinity
       end, 10000).
 
+transform_options(Opts) ->
+    lists:foldl(fun transform_options/2, [], Opts).
+
+transform_options({outgoing_s2s_options, Families, Timeout}, Opts) ->
+    ?WARNING_MSG("Option 'outgoing_s2s_options' is deprecated. "
+                 "The option is still supported "
+                 "but it is better to fix your config: "
+                 "use 'outgoing_s2s_timeout' and "
+                 "'outgoing_s2s_families' instead.", []),
+    [{outgoing_s2s_families, Families},
+     {outgoing_s2s_timeout, Timeout}
+     | Opts];
+transform_options({s2s_dns_options, S2SDNSOpts}, AllOpts) ->
+    ?WARNING_MSG("Option 's2s_dns_options' is deprecated. "
+                 "The option is still supported "
+                 "but it is better to fix your config: "
+                 "use 's2s_dns_timeout' and "
+                 "'s2s_dns_retries' instead", []),
+    lists:foldr(
+      fun({timeout, T}, AccOpts) ->
+              [{s2s_dns_timeout, T}|AccOpts];
+         ({retries, R}, AccOpts) ->
+              [{s2s_dns_retries, R}|AccOpts];
+         (_, AccOpts) ->
+              AccOpts
+      end, AllOpts, S2SDNSOpts);
+transform_options(Opt, Opts) ->
+    [Opt|Opts].
+
 %% Human readable S2S logging: Log only new outgoing connections as INFO
 %% Do not log dialback
 log_s2s_out(false, _, _, _) -> ok;
@@ -1270,7 +1349,7 @@ wait_before_reconnect(StateData) ->
 		     queue = queue:new()}}.
 
 get_max_retry_delay() ->
-    case ejabberd_config:get_local_option(
+    case ejabberd_config:get_option(
            s2s_max_retry_delay,
            fun(I) when is_integer(I), I > 0 -> I end) of
         undefined -> ?MAX_RETRY_DELAY;
@@ -1287,7 +1366,7 @@ terminate_if_waiting_delay(From, To) ->
 		  Pids).
 
 fsm_limit_opts() ->
-    case ejabberd_config:get_local_option(
+    case ejabberd_config:get_option(
            max_fsm_queue,
            fun(I) when is_integer(I), I > 0 -> I end) of
         undefined -> [];

src/ejabberd_service.erl

@@ -5,7 +5,7 @@
 %%% Created :  6 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -34,7 +33,7 @@
 
 %% External exports
 -export([start/2, start_link/2, send_text/2,
-	 send_element/2, socket_type/0]).
+	 send_element/2, socket_type/0, transform_listen_option/2]).
 
 %% gen_fsm callbacks
 -export([init/1, wait_for_stream/2,
@@ -124,29 +123,18 @@ init([{SockMod, Socket}, Opts]) ->
 	       {value, {_, A}} -> A;
 	       _ -> all
 	     end,
-    {Hosts, Password} = case lists:keysearch(hosts, 1, Opts)
-			    of
-			  {value, {_, Hs, HOpts}} ->
-			      case lists:keysearch(password, 1, HOpts) of
-				{value, {_, P}} -> {Hs, P};
-				_ ->
-				    % TODO: generate error
-				    false
-			      end;
-			  _ ->
-			      case lists:keysearch(host, 1, Opts) of
-				{value, {_, H, HOpts}} ->
-				    case lists:keysearch(password, 1, HOpts) of
-				      {value, {_, P}} -> {[H], P};
-				      _ ->
-					  % TODO: generate error
-					  false
-				    end;
-				_ ->
-				    % TODO: generate error
-				    false
-			      end
-			end,
+    %% This should be improved probably
+    {Hosts, HostOpts} = case lists:keyfind(hosts, 1, Opts) of
+                            {_, HOpts} ->
+                                {[H || {H, _} <- HOpts],
+                                 lists:flatten(
+                                   [O || {_, O} <- HOpts])};
+                            _ ->
+                                {[], []}
+                        end,
+    Password = gen_mod:get_opt(password, HostOpts,
+                               fun iolist_to_binary/1,
+                               p1_sha:sha(crypto:rand_bytes(20))),
     Shaper = case lists:keysearch(shaper_rule, 1, Opts) of
 	       {value, {_, S}} -> S;
 	       _ -> none
@@ -384,12 +372,30 @@ send_element(StateData, El) ->
 
 new_id() -> randoms:get_string().
 
+transform_listen_option({hosts, Hosts, O}, Opts) ->
+    case lists:keyfind(hosts, 1, Opts) of
+        {_, PrevHostOpts} ->
+            NewHostOpts =
+                lists:foldl(
+                  fun(H, Acc) ->
+                          dict:append_list(H, O, Acc)
+                  end, dict:from_list(PrevHostOpts), Hosts),
+            [{hosts, dict:to_list(NewHostOpts)}|
+             lists:keydelete(hosts, 1, Opts)];
+        _ ->
+            [{hosts, [{H, O} || H <- Hosts]}|Opts]
+    end;
+transform_listen_option({host, Host, Os}, Opts) ->
+    transform_listen_option({hosts, [Host], Os}, Opts);
+transform_listen_option(Opt, Opts) ->
+    [Opt|Opts].
+
 fsm_limit_opts(Opts) ->
     case lists:keysearch(max_fsm_queue, 1, Opts) of
         {value, {_, N}} when is_integer(N) ->
             [{max_queue, N}];
         _ ->
-            case ejabberd_config:get_local_option(
+            case ejabberd_config:get_option(
                    max_fsm_queue,
                    fun(I) when is_integer(I), I > 0 -> I end) of
                 undefined -> [];

src/ejabberd_sm.erl

@@ -5,7 +5,7 @@
 %%% Created : 24 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -33,11 +32,14 @@
 %% API
 -export([start_link/0,
 	 route/3,
-	 open_session/5, close_session/4,
+	 open_session/5,
+	 open_session/6,
+	 close_session/4,
 	 check_in_subscription/6,
 	 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,
@@ -52,9 +54,12 @@
 	 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,
+	 get_all_pids/0,
 	 is_existing_resource/3
 	]).
 
@@ -68,7 +73,7 @@
 -include("jlib.hrl").
 
 -include("ejabberd_commands.hrl").
-
+-include_lib("stdlib/include/ms_transform.hrl").
 -include("mod_privacy.hrl").
 
 -record(session, {sid, usr, us, priority, info}).
@@ -107,10 +112,10 @@ route(From, To, Packet) ->
       _ -> ok
     end.
 
--spec open_session(sid(), binary(), binary(), binary(), info()) -> ok.
+-spec open_session(sid(), binary(), binary(), binary(), prio(), info()) -> ok.
 
-open_session(SID, User, Server, Resource, Info) ->
-    set_session(SID, User, Server, Resource, undefined, Info),
+open_session(SID, User, Server, Resource, Priority, Info) ->
+    set_session(SID, User, Server, Resource, Priority, Info),
     mnesia:dirty_update_counter(session_counter,
 				jlib:nameprep(Server), 1),
     check_for_sessions_to_replace(User, Server, Resource),
@@ -118,6 +123,11 @@ open_session(SID, User, Server, Resource, Info) ->
     ejabberd_hooks:run(sm_register_connection_hook,
 		       JID#jid.lserver, [SID, JID, Info]).
 
+-spec open_session(sid(), binary(), binary(), binary(), info()) -> ok.
+
+open_session(SID, User, Server, Resource, Info) ->
+    open_session(SID, User, Server, Resource, undefined, Info).
+
 -spec close_session(sid(), binary(), binary(), binary()) -> ok.
 
 close_session(SID, User, Server, Resource) ->
@@ -167,6 +177,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) ->
@@ -260,13 +284,23 @@ dirty_get_my_sessions_list() ->
 	[{'==', {node, '$1'}, node()}],
 	['$_']}]).
 
+-spec get_vh_session_list(binary()) -> [ljid()].
+
 get_vh_session_list(Server) ->
     LServer = jlib:nameprep(Server),
     mnesia:dirty_select(session,
 			[{#session{usr = '$1', _ = '_'},
 			  [{'==', {element, 2, '$1'}, LServer}], ['$1']}]).
 
--spec get_vh_session_list(binary()) -> [ljid()].
+-spec get_all_pids() -> [pid()].
+
+get_all_pids() ->
+    mnesia:dirty_select(
+      session,
+      ets:fun2ms(
+        fun(#session{sid = {_, Pid}}) ->
+		Pid
+        end)).
 
 get_vh_session_number(Server) ->
     LServer = jlib:nameprep(Server),
@@ -670,20 +704,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),
@@ -800,8 +820,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()].
 
@@ -818,6 +844,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
@@ -827,6 +861,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;

src/ejabberd_socket.erl

@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_stun.erl

@@ -0,0 +1,83 @@
+%%%-------------------------------------------------------------------
+%%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%% @copyright (C) 2014, Evgeny Khramtsov
+%%% @doc
+%%%
+%%% @end
+%%% Created :  8 May 2014 by Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%%-------------------------------------------------------------------
+-module(ejabberd_stun).
+
+%% API
+-export([tcp_init/2, udp_init/2, udp_recv/5, start/2, socket_type/0]).
+
+-include("ejabberd.hrl").
+-include("logger.hrl").
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+tcp_init(Socket, Opts) ->
+    ejabberd:start_app(p1_stun),
+    stun:tcp_init(Socket, prepare_turn_opts(Opts)).
+
+udp_init(Socket, Opts) ->
+    ejabberd:start_app(p1_stun),
+    stun:udp_init(Socket, prepare_turn_opts(Opts)).
+
+udp_recv(Socket, Addr, Port, Packet, Opts) ->
+    stun:udp_recv(Socket, Addr, Port, Packet, Opts).
+
+start(Opaque, Opts) ->
+    stun:start(Opaque, Opts).
+
+socket_type() ->
+    raw.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+prepare_turn_opts(Opts) ->
+    UseTurn = proplists:get_bool(use_turn, Opts),
+    prepare_turn_opts(Opts, UseTurn).
+
+prepare_turn_opts(Opts, _UseTurn = false) ->
+    Opts;
+prepare_turn_opts(Opts, _UseTurn = true) ->
+    NumberOfMyHosts = length(?MYHOSTS),
+    case proplists:get_value(turn_ip, Opts) of
+	undefined ->
+	    ?WARNING_MSG("option 'turn_ip' is undefined, "
+			 "more likely the TURN relay won't be working "
+			 "properly", []);
+	_ ->
+	    ok
+    end,
+    AuthFun = fun ejabberd_auth:get_password_s/2,
+    Shaper = gen_mod:get_opt(shaper, Opts,
+			     fun(S) when is_atom(S) -> S end,
+			     none),
+    AuthType = gen_mod:get_opt(auth_type, Opts,
+			       fun(anonymous) -> anonymous;
+				  (user) -> user
+			       end, user),
+    Realm = case gen_mod:get_opt(auth_realm, Opts, fun iolist_to_binary/1) of
+		undefined when AuthType == user ->
+		    if NumberOfMyHosts > 1 ->
+			    ?WARNING_MSG("you have several virtual "
+					 "hosts configured, but option "
+					 "'auth_realm' is undefined and "
+					 "'auth_type' is set to 'user', "
+					 "more likely the TURN relay won't "
+					 "be working properly. Using ~s as "
+					 "a fallback", [?MYNAME]);
+		       true ->
+			    ok
+		    end,
+		    [{auth_realm, ?MYNAME}];
+		_ ->
+		    []
+	    end,
+    MaxRate = shaper:get_max_rate(Shaper),
+    Realm ++ [{auth_fun, AuthFun},{shaper, MaxRate} |
+	      lists:keydelete(shaper, 1, Opts)].

src/ejabberd_sup.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_system_monitor.erl

@@ -5,7 +5,7 @@
 %%% Created : 21 Mar 2007 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%-------------------------------------------------------------------
 
@@ -53,7 +52,7 @@
 %% Description: Starts the server
 %%--------------------------------------------------------------------
 start_link() ->
-    LH = ejabberd_config:get_local_option(
+    LH = ejabberd_config:get_option(
            watchdog_large_heap,
            fun(I) when is_integer(I), I > 0 -> I end,
 	   1000000),
@@ -200,7 +199,7 @@ send_message(From, To, Body) ->
 						 [{xmlcdata, Body}]}]}).
 
 get_admin_jids() ->
-    ejabberd_config:get_local_option(
+    ejabberd_config:get_option(
       watchdog_admins,
       fun(JIDs) ->
               [jlib:jid_tolower(
@@ -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">>,

src/ejabberd_tmp_sup.erl

@@ -5,7 +5,7 @@
 %%% Created : 18 Jul 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_update.erl

@@ -5,7 +5,7 @@
 %%% Created : 27 Jan 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%-------------------------------------------------------------------
 

src/ejabberd_web.erl

@@ -6,7 +6,7 @@
 %%% Created : 28 Feb 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 

src/ejabberd_web_admin.erl

@@ -5,7 +5,7 @@
 %%% Created :  9 Apr 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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) ->
@@ -646,10 +645,7 @@ process_admin(Host,
 		  {ok, Tokens, _} ->
 		      case erl_parse:parse_term(Tokens) of
 			{ok, NewACLs} ->
-			    case acl:add_list(Host, NewACLs, true) of
-			      ok -> ok;
-			      _ -> error
-			    end;
+                            acl:add_list(Host, NewACLs, true);
 			_ -> error
 		      end;
 		  _ -> error
@@ -689,10 +685,7 @@ process_admin(Host,
 		  {'EXIT', _} -> error;
 		  NewACLs ->
 		      ?INFO_MSG("NewACLs at ~s: ~p", [Host, NewACLs]),
-		      case acl:add_list(Host, NewACLs, true) of
-			ok -> ?INFO_MSG("NewACLs: ok", []), ok;
-			_ -> error
-		      end
+		      acl:add_list(Host, NewACLs, true)
 		end;
 	    _ -> nothing
 	  end,
@@ -724,8 +717,8 @@ process_admin(Host,
 		       auth = {_, _Auth, AJID}, q = Query, lang = Lang}) ->
     SetAccess = fun (Rs) ->
 			mnesia:transaction(fun () ->
-						   Os = mnesia:select(config,
-								      [{{config,
+						   Os = mnesia:select(local_config,
+								      [{{local_config,
 									 {access,
 									  '$1',
 									  Host},
@@ -739,7 +732,7 @@ process_admin(Host,
 						   lists:foreach(fun ({access,
 								       Name,
 								       Rules}) ->
-									 mnesia:write({config,
+									 mnesia:write({local_config,
 										       {access,
 											Name,
 											Host},
@@ -764,8 +757,8 @@ process_admin(Host,
 		end;
 	    _ -> nothing
 	  end,
-    Access = ets:select(config,
-			[{{config, {access, '$1', Host}, '$2'}, [],
+    Access = ets:select(local_config,
+			[{{local_config, {access, '$1', Host}, '$2'}, [],
 			  [{{access, '$1', '$2'}}]}]),
     {NumLines, AccessP} = term_to_paragraph(lists:keysort(2,Access), 80),
     make_xhtml((?H1GL((?T(<<"Access Rules">>)),
@@ -798,8 +791,8 @@ process_admin(Host,
 		end;
 	    _ -> nothing
 	  end,
-    AccessRules = ets:select(config,
-			     [{{config, {access, '$1', Host}, '$2'}, [],
+    AccessRules = ets:select(local_config,
+			     [{{local_config, {access, '$1', Host}, '$2'}, [],
 			       [{{access, '$1', '$2'}}]}]),
     make_xhtml((?H1GL((?T(<<"Access Rules">>)),
 		      <<"AccessRights">>, <<"Access Rights">>))
@@ -827,14 +820,14 @@ process_admin(Host,
 	    {value, {_, String}} ->
 		case parse_access_rule(String) of
 		  {ok, Rs} ->
-		      ejabberd_config:add_global_option({access, Name, Host},
+		      ejabberd_config:add_option({access, Name, Host},
 							Rs),
 		      ok;
 		  _ -> error
 		end;
 	    _ -> nothing
 	  end,
-    Rules = case ejabberd_config:get_global_option(
+    Rules = case ejabberd_config:get_option(
                    {access, Name, Host}, fun(V) -> V end)
 		of
 	      undefined -> [];
@@ -1004,24 +997,24 @@ acls_to_xhtml(ACLs) ->
 			    [?INPUT(<<"text">>, <<"namenew">>, <<"">>)])]
 			 ++ acl_spec_to_xhtml(<<"new">>, {user, <<"">>})))]))]).
 
+acl_spec_to_text({user, {U, S}}) ->
+    {user, <<U/binary, "@", S/binary>>};
 acl_spec_to_text({user, U}) -> {user, U};
 acl_spec_to_text({server, S}) -> {server, S};
-acl_spec_to_text({user, U, S}) ->
-    {user, <<U/binary, "@", S/binary>>};
+acl_spec_to_text({user_regexp, {RU, S}}) ->
+    {user_regexp, <<RU/binary, "@", S/binary>>};
 acl_spec_to_text({user_regexp, RU}) ->
     {user_regexp, RU};
-acl_spec_to_text({user_regexp, RU, S}) ->
-    {user_regexp, <<RU/binary, "@", S/binary>>};
 acl_spec_to_text({server_regexp, RS}) ->
     {server_regexp, RS};
-acl_spec_to_text({node_regexp, RU, RS}) ->
+acl_spec_to_text({node_regexp, {RU, RS}}) ->
     {node_regexp, <<RU/binary, "@", RS/binary>>};
-acl_spec_to_text({user_glob, RU}) -> {user_glob, RU};
-acl_spec_to_text({user_glob, RU, S}) ->
+acl_spec_to_text({user_glob, {RU, S}}) ->
     {user_glob, <<RU/binary, "@", S/binary>>};
+acl_spec_to_text({user_glob, RU}) -> {user_glob, RU};
 acl_spec_to_text({server_glob, RS}) ->
     {server_glob, RS};
-acl_spec_to_text({node_glob, RU, RS}) ->
+acl_spec_to_text({node_glob, {RU, RS}}) ->
     {node_glob, <<RU/binary, "@", RS/binary>>};
 acl_spec_to_text(all) -> {all, <<"">>};
 acl_spec_to_text(Spec) -> {raw, term_to_string(Spec)}.
@@ -1144,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) ->
@@ -1181,8 +1174,8 @@ access_rules_to_xhtml(AccessRules, Lang) ->
 				    <<"Add New">>)])])]))]).
 
 access_parse_query(Host, Query) ->
-    AccessRules = ets:select(config,
-			     [{{config, {access, '$1', Host}, '$2'}, [],
+    AccessRules = ets:select(local_config,
+			     [{{local_config, {access, '$1', Host}, '$2'}, [],
 			       [{{access, '$1', '$2'}}]}]),
     case lists:keysearch(<<"addnew">>, 1, Query) of
       {value, _} ->
@@ -1198,7 +1191,7 @@ access_parse_addnew(_AccessRules, Host, Query) ->
     case lists:keysearch(<<"namenew">>, 1, Query) of
       {value, {_, String}} when String /= <<"">> ->
 	  Name = jlib:binary_to_atom(String),
-	  ejabberd_config:add_global_option({access, Name, Host},
+	  ejabberd_config:add_option({access, Name, Host},
 					    []),
 	  ok
     end.
@@ -1210,7 +1203,7 @@ access_parse_delete(AccessRules, Host, Query) ->
 			  case lists:member({<<"selected">>, ID}, Query) of
 			    true ->
 				mnesia:transaction(fun () ->
-							   mnesia:delete({config,
+							   mnesia:delete({local_config,
 									  {access,
 									   Name,
 									   Host}})
@@ -1576,9 +1569,7 @@ user_info(User, Server, Query, Lang) ->
                         end,
                         lists:sort(Resources))))]
         end,
-    Password = ejabberd_auth:get_password_s(User, Server),
-    FPassword = [?INPUT(<<"password">>, <<"password">>,
-			Password),
+    FPassword = [?INPUT(<<"text">>, <<"password">>, <<"">>),
 		 ?C(<<" ">>),
 		 ?INPUTT(<<"submit">>, <<"chpassword">>,
 			 <<"Change Password">>)],
@@ -2191,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) ->
@@ -2447,7 +2438,7 @@ get_port_data(PortIP, Opts) ->
                                  io_lib:format("~.16b", [N])
                          end,
                          binary_to_list(
-                           crypto:md5(
+                           erlang:md5(
                              [SPort, IPS, atom_to_list(NetProt)])))),
     {Port, SPort, IPT, IPS, SSPort, NetProt, OptsClean}.
 

src/ejabberd_xmlrpc.erl

@@ -0,0 +1,494 @@
+%%%----------------------------------------------------------------------
+%%% File    : ejabberd_xmlrpc.erl
+%%% Author  : Badlop <badlop@process-one.net>
+%%% Purpose : XML-RPC server that frontends ejabberd commands
+%%% Created : 21 Aug 2007 by Badlop <badlop@ono.com>
+%%% Id      : $Id: ejabberd_xmlrpc.erl 595 2008-05-20 11:39:31Z badlop $
+%%%----------------------------------------------------------------------
+
+%%% TODO: Implement a command in ejabberdctl 'help COMMAND LANGUAGE' that shows
+%%% a coding example to call that command in a specific language (python, php).
+
+%%% TODO: Remove support for plaintext password
+
+%%% TODO: commands strings should be strings without ~n
+
+-module(ejabberd_xmlrpc).
+
+-author('badlop@process-one.net').
+
+-export([start/2, handler/2, socket_type/0, transform_listen_option/2]).
+
+-include("ejabberd.hrl").
+-include("logger.hrl").
+
+-include("mod_roster.hrl").
+
+-include("jlib.hrl").
+
+-record(state,
+	{access_commands = [] :: list(),
+         auth = noauth        :: noauth | {binary(), binary(), binary()},
+         get_auth = true      :: boolean()}).
+
+%% Test:
+
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, take_integer, [{struct, [{thisinteger, 5}]}]}).
+%% {ok,{response,[{struct,[{zero,0}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_string, [{struct, [{thisstring, "abcd"}]}]}).
+%% {ok,{response,[{struct,[{thatstring,"abcd"}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, tell_tuple_3integer, [{struct, [{thisstring, "abcd"}]}]}).
+%% {ok,{response,
+%%         [{struct,
+%%              [{thattuple,
+%%                   {array,
+%%                       [{struct,[{first,123}]},
+%%                        {struct,[{second,456}]},
+%%                        {struct,[{third,789}]}]}}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, pow, [{struct, [{base, 5}, {exponent, 7}]}]}).
+%% {ok,{response,[{struct,[{pow,78125}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, seq, [{struct, [{from, 3}, {to, 7}]}]}).
+%% {ok,{response,[{array,[{struct,[{intermediate,3}]},
+%%                        {struct,[{intermediate,4}]},
+%%                        {struct,[{intermediate,5}]},
+%%                        {struct,[{intermediate,6}]},
+%%                        {struct,[{intermediate,7}]}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, substrs, [{struct, [{word, "abcd"}]}]}).
+%% NO:
+%% {ok,{response,[{array,[{struct,[{miniword,"a"}]},
+%%                        {struct,[{miniword,"ab"}]},
+%%                        {struct,[{miniword,"abc"}]},
+%%                        {struct,[{miniword,"abcd"}]}]}]}}
+%% {ok,{response,
+%%         [{struct,
+%%              [{substrings,
+%%                   {array,
+%%                       [{struct,[{miniword,"a"}]},
+%%                        {struct,[{miniword,"ab"}]},
+%%                        {struct,[{miniword,"abc"}]},
+%%                        {struct,[{miniword,"abcd"}]}]}}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, splitjid, [{struct, [{jid, "abcd@localhost/work"}]}]}).
+%% {ok,{response,
+%%         [{struct,
+%%              [{jidparts,
+%%                   {array,
+%%                       [{struct,[{user,"abcd"}]},
+%%                        {struct,[{server,"localhost"}]},
+%%                        {struct,[{resource,"work"}]}]}}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_integer_string, [{struct, [{thisstring, "abc"}, {thisinteger, 55}]}]}).
+%% {ok,{response,
+%%         [{struct,
+%%              [{thistuple,
+%%                   {array,
+%%                       [{struct,[{thisinteger,55}]},
+%%                        {struct,[{thisstring,"abc"}]}]}}]}]}}
+%%
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_list_integer, [{struct, [{thislist, {array, [{struct, [{thisinteger, 55}, {thisinteger, 4567}]}]}}]}]}).
+%% {ok,{response,
+%%         [{struct,
+%%              [{thatlist,
+%%                   {array,
+%%                       [{struct,[{thatinteger,55}]},
+%%                        {struct,[{thatinteger,4567}]}]}}]}]}}
+%%
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_integer_list_string, [{struct, [{thisinteger, 123456}, {thislist, {array, [{struct, [{thisstring, "abc"}, {thisstring, "bobo baba"}]}]}}]}]}).
+%% {ok,
+%%  {response,
+%%   [{struct,
+%%     [{thistuple,
+%%       {array,
+%%        [{struct,[{thatinteger,123456}]},
+%%         {struct,
+%%          [{thatlist,
+%%            {array,
+%%             [{struct,[{thatstring,"abc"}]},
+%%              {struct,[{thatstring,"bobo baba"}]}]}}]}]}}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, take_tuple_2integer, [{struct, [{thistuple, {array, [{struct, [{thisinteger1, 55}, {thisinteger2, 4567}]}]}}]}]}).
+%% {ok,{response,[{struct,[{zero,0}]}]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_isatils, [{struct,
+%% 	                                      [{thisinteger, 123456990},
+%% 			                               {thisstring, "This is ISATILS"},
+%% 			                               {thisatom, "test_isatils"},
+%% 			                               {thistuple, {array, [{struct, [
+%%                                            {listlen, 2},
+%% 			                                  {thislist, {array, [{struct, [
+%%                                               {contentstring, "word1"},
+%%                                               {contentstring, "word 2"}
+%%                                            ]}]}}
+%% 										   ]}]}}
+%% 										  ]}]}).
+%% {ok,{response,
+%%         [{struct,
+%%              [{results,
+%%                   {array,
+%%                       [{struct,[{thatinteger,123456990}]},
+%%                        {struct,[{thatstring,"This is ISATILS"}]},
+%%                        {struct,[{thatatom,"test_isatils"}]},
+%%                        {struct,
+%%                            [{thattuple,
+%%                                 {array,
+%%                                     [{struct,[{listlen,123456990}]},
+%%                                      {struct,[{thatlist,...}]}]}}]}]}}]}]}}
+
+%% ecommand doesn't exist:
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_integer_string2, [{struct, [{thisstring, "abc"}]}]}).
+%% {ok,{response,{fault,-1, "Unknown call: {call,echo_integer_string2,[{struct,[{thisstring,\"abc\"}]}]}"}}}
+%%
+%% Duplicated argument:
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_integer_string, [{struct, [{thisstring, "abc"}, {thisinteger, 44}, {thisinteger, 55}]}]}).
+%% {ok,{response,{fault,-104, "Error -104\nAttribute 'thisinteger' duplicated:\n[{thisstring,\"abc\"},{thisinteger,44},{thisinteger,55}]"}}}
+%%
+%% Missing argument:
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echo_integer_string, [{struct, [{thisstring, "abc"}]}]}).
+%% {ok,{response,{fault,-106, "Error -106\nRequired attribute 'thisinteger' not found:\n[{thisstring,\"abc\"}]"}}}
+%%
+%% Duplicated tuple element:
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, take_tuple_2integer, [{struct, [{thistuple, {array, [{struct, [{thisinteger1, 55}, {thisinteger1, 66}, {thisinteger2, 4567}]}]}}]}]}).
+%% {ok,{response,{fault,-104, "Error -104\nAttribute 'thisinteger1' defined multiple times:\n[{thisinteger1,55},{thisinteger1,66},{thisinteger2,4567}]"}}}
+%%
+%% Missing element in tuple:
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, take_tuple_2integer, [{struct, [{thistuple, {array, [{struct, [{thisinteger1, 55}, {thisintegerc, 66}, {thisinteger, 4567}]}]}}]}]}).
+%% {ok,{response,{fault,-106, "Error -106\nRequired attribute 'thisinteger2' not found:\n[{thisintegerc,66},{thisinteger,4567}]"}}}
+%%
+%% The ecommand crashed:
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, this_crashes, [{struct, []}]}).
+%% {ok,{response,{fault,-100, "Error -100\nA problem 'error' occurred executing the command this_crashes with arguments []: badarith"}}}
+
+%% -----------------------------
+%% Listener interface
+%% -----------------------------
+
+start({gen_tcp = _SockMod, Socket}, Opts) ->
+    %MaxSessions = gen_mod:get_opt(maxsessions, Opts,
+    %                              fun(I) when is_integer(I), I>0 -> I end,
+    %                              10),
+    Timeout = gen_mod:get_opt(timeout, Opts,
+                              fun(I) when is_integer(I), I>0 -> I end,
+                              5000),
+    AccessCommandsOpts = gen_mod:get_opt(access_commands, Opts,
+                                         fun(L) when is_list(L) -> L end,
+                                         []),
+    AccessCommands = lists:flatmap(
+                       fun({Ac, AcOpts}) ->
+                               Commands = gen_mod:get_opt(
+                                            commands, AcOpts,
+                                            fun(A) when is_atom(A) ->
+                                                    A;
+                                               (L) when is_list(L) ->
+                                                    true = lists:all(
+                                                             fun is_atom/1,
+                                                             L),
+                                                    L
+                                            end, all),
+                               CommOpts = gen_mod:get_opt(
+                                            options, AcOpts,
+                                            fun(L) when is_list(L) -> L end,
+                                            []),
+                               [{Ac, Commands, CommOpts}];
+                          (Wrong) ->
+                               ?WARNING_MSG("wrong options format for ~p: ~p",
+                                            [?MODULE, Wrong]),
+                               []
+                       end, AccessCommandsOpts),
+    GetAuth = case [ACom
+		    || {Ac, _, _} = ACom <- AccessCommands, Ac /= all]
+		  of
+		[] -> false;
+		_ -> true
+	      end,
+    Handler = {?MODULE, handler},
+    State = #state{access_commands = AccessCommands,
+		   get_auth = GetAuth},
+    Pid = proc_lib:spawn(xmlrpc_http, handler, [Socket, Timeout, Handler, State]),
+    {ok, Pid}.
+
+socket_type() -> raw.
+
+%% -----------------------------
+%% Access verification
+%% -----------------------------
+
+get_auth(AuthList) ->
+    [User, Server, Password] = try get_attrs([user, server,
+					      password],
+					     AuthList)
+			       of
+				 [U, S, P] -> [U, S, P]
+			       catch
+				 exit:{attribute_not_found, Attr, _} ->
+				     throw({error, missing_auth_arguments,
+					    Attr})
+			       end,
+    {User, Server, Password}.
+
+%% -----------------------------
+%% Handlers
+%% -----------------------------
+
+%% Call:           Arguments:                                      Returns:
+
+%% .............................
+%%  Access verification
+
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echothis, [152]}).
+%% {ok,{response,{fault,-103, "Error -103\nRequired authentication: {call,echothis,[152]}"}}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echothis, [{struct, [{user, "badlop"}, {server, "localhost"}, {password, "ada"}]}, 152]}).
+%% {ok,{response,{fault,-103,
+%%      "Error -103\nAuthentication non valid: [{user,\"badlop\"},\n
+%% 	 {server,\"localhost\"},\n
+%% 	 {password,\"ada\"}]"}}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echothis, [{struct, [{user, "badlop"}, {server, "localhost"}, {password, "ada90ada"}]}, 152]}).
+%% {ok,{response,[152]}}
+%%
+%% xmlrpc:call({127, 0, 0, 1}, 4560, "/", {call, echothis, [{struct, [{user, "badlop"}, {server, "localhost"}, {password, "79C1574A43BC995F2B145A299EF97277"}]}, 152]}).
+%% {ok,{response,[152]}}
+
+handler(#state{get_auth = true, auth = noauth} = State,
+	{call, Method,
+	 [{struct, AuthList} | Arguments] = AllArgs}) ->
+    try get_auth(AuthList) of
+      Auth ->
+	  handler(State#state{get_auth = false, auth = Auth},
+		  {call, Method, Arguments})
+    catch
+      {error, missing_auth_arguments, _Attr} ->
+	  handler(State#state{get_auth = false, auth = noauth},
+		  {call, Method, AllArgs})
+    end;
+%% .............................
+%%  Debug
+%% echothis       String                                          String
+handler(_State, {call, echothis, [A]}) ->
+    {false, {response, [A]}};
+%% echothisnew    struct[{sentence, String}]   struct[{repeated, String}]
+handler(_State,
+	{call, echothisnew, [{struct, [{sentence, A}]}]}) ->
+    {false, {response, [{struct, [{repeated, A}]}]}};
+%% multhis        struct[{a, Integer}, {b, Integer}]              Integer
+handler(_State,
+	{call, multhis, [{struct, [{a, A}, {b, B}]}]}) ->
+    {false, {response, [A * B]}};
+%% multhisnew     struct[{a, Integer}, {b, Integer}]    struct[{mu, Integer}]
+handler(_State,
+	{call, multhisnew, [{struct, [{a, A}, {b, B}]}]}) ->
+    {false, {response, [{struct, [{mu, A * B}]}]}};
+%% .............................
+%% ejabberd commands
+handler(State, {call, Command, []}) ->
+    handler(State, {call, Command, [{struct, []}]});
+handler(State,
+	{call, Command, [{struct, AttrL}]} = Payload) ->
+    case ejabberd_commands:get_command_format(Command) of
+      {error, command_unknown} ->
+	  build_fault_response(-112, "Unknown call: ~p",
+			       [Payload]);
+      {ArgsF, ResultF} ->
+	  try_do_command(State#state.access_commands,
+			 State#state.auth, Command, AttrL, ArgsF, ResultF)
+    end;
+%% If no other guard matches
+handler(_State, Payload) ->
+    build_fault_response(-112, "Unknown call: ~p",
+			 [Payload]).
+
+%% -----------------------------
+%% Command
+%% -----------------------------
+
+try_do_command(AccessCommands, Auth, Command, AttrL,
+	       ArgsF, ResultF) ->
+    try do_command(AccessCommands, Auth, Command, AttrL,
+		   ArgsF, ResultF)
+    of
+      {command_result, ResultFormatted} ->
+	  {false, {response, [ResultFormatted]}}
+    catch
+      exit:{duplicated_attribute, ExitAt, ExitAtL} ->
+	  build_fault_response(-114,
+			       "Attribute '~p' duplicated:~n~p",
+			       [ExitAt, ExitAtL]);
+      exit:{attribute_not_found, ExitAt, ExitAtL} ->
+	  build_fault_response(-116,
+			       "Required attribute '~p' not found:~n~p",
+			       [ExitAt, ExitAtL]);
+      exit:{additional_unused_args, ExitAtL} ->
+	  build_fault_response(-120,
+			       "The call provided additional unused "
+				 "arguments:~n~p",
+			       [ExitAtL]);
+      Why ->
+	  build_fault_response(-118,
+			       "A problem '~p' occurred executing the "
+				 "command ~p with arguments~n~p",
+			       [Why, Command, AttrL])
+    end.
+
+build_fault_response(Code, ParseString, ParseArgs) ->
+    FaultString = "Error " ++ integer_to_list(Code) ++ "\n"
+        ++ lists:flatten(io_lib:format(ParseString, ParseArgs)),
+    ?WARNING_MSG(FaultString, []),
+    {false, {response, {fault, Code, FaultString}}}.
+
+do_command(AccessCommands, Auth, Command, AttrL, ArgsF,
+	   ResultF) ->
+    ArgsFormatted = format_args(AttrL, ArgsF),
+    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
+%%-----------------------------
+
+get_attrs(Attribute_names, L) ->
+    [get_attr(A, L) || A <- Attribute_names].
+
+get_attr(A, L) ->
+    case lists:keysearch(A, 1, L) of
+      {value, {A, Value}} -> Value;
+      false ->
+	  %% Report the error and then force a crash
+	  exit({attribute_not_found, A, L})
+    end.
+
+get_elem_delete(A, L) ->
+    case proplists:get_all_values(A, L) of
+      [Value] -> {Value, proplists:delete(A, L)};
+      [_, _ | _] ->
+	  %% Crash reporting the error
+	  exit({duplicated_attribute, A, L});
+      [] ->
+	  %% Report the error and then force a crash
+	  exit({attribute_not_found, A, L})
+    end.
+
+format_args(Args, ArgsFormat) ->
+    {ArgsRemaining, R} = lists:foldl(fun ({ArgName,
+					   ArgFormat},
+					  {Args1, Res}) ->
+					     {ArgValue, Args2} =
+						 get_elem_delete(ArgName,
+								 Args1),
+					     Formatted = format_arg(ArgValue,
+								    ArgFormat),
+					     {Args2, Res ++ [Formatted]}
+				     end,
+				     {Args, []}, ArgsFormat),
+    case ArgsRemaining of
+      [] -> R;
+      L when is_list(L) -> exit({additional_unused_args, L})
+    end.
+
+format_arg({array, Elements},
+	   {list, {ElementDefName, ElementDefFormat}})
+    when is_list(Elements) ->
+    lists:map(fun ({struct, [{ElementName, ElementValue}]}) when
+                        ElementDefName == ElementName ->
+		      format_arg(ElementValue, ElementDefFormat)
+	      end,
+	      Elements);
+format_arg({array, [{struct, Elements}]},
+	   {list, {ElementDefName, ElementDefFormat}})
+    when is_list(Elements) ->
+    lists:map(fun ({ElementName, ElementValue}) ->
+		      true = ElementDefName == ElementName,
+		      format_arg(ElementValue, ElementDefFormat)
+	      end,
+	      Elements);
+format_arg({array, [{struct, Elements}]},
+	   {tuple, ElementsDef})
+    when is_list(Elements) ->
+    FormattedList = format_args(Elements, ElementsDef),
+    list_to_tuple(FormattedList);
+format_arg({array, Elements}, {list, ElementsDef})
+    when is_list(Elements) and is_atom(ElementsDef) ->
+    [format_arg(Element, ElementsDef)
+     || Element <- Elements];
+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_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
+%% -----------------------------
+
+format_result({error, Error}, _) ->
+    throw({error, Error});
+format_result(String, string) -> lists:flatten(String);
+format_result(Atom, {Name, atom}) ->
+    {struct,
+     [{Name, iolist_to_binary(atom_to_list(Atom))}]};
+format_result(Int, {Name, integer}) ->
+    {struct, [{Name, Int}]};
+format_result(String, {Name, string}) when is_list(String) ->
+    {struct, [{Name, lists:flatten(String)}]};
+format_result(Binary, {Name, string}) when is_binary(Binary) ->
+    {struct, [{Name, binary_to_list(Binary)}]};
+format_result(Code, {Name, rescode}) ->
+    {struct, [{Name, make_status(Code)}]};
+format_result({Code, Text}, {Name, restuple}) ->
+    {struct,
+     [{Name, make_status(Code)},
+      {text, lists:flatten(Text)}]};
+%% Result is a list of something: [something()]
+format_result(Elements, {Name, {list, ElementsDef}}) ->
+    FormattedList = lists:map(fun (Element) ->
+				      format_result(Element, ElementsDef)
+			      end,
+			      Elements),
+    {struct, [{Name, {array, FormattedList}}]};
+%% Result is a tuple with several elements: {something1(), something2(), ...}
+format_result(ElementsTuple,
+	      {Name, {tuple, ElementsDef}}) ->
+    ElementsList = tuple_to_list(ElementsTuple),
+    ElementsAndDef = lists:zip(ElementsList, ElementsDef),
+    FormattedList = lists:map(fun ({Element, ElementDef}) ->
+				      format_result(Element, ElementDef)
+			      end,
+			      ElementsAndDef),
+    {struct, [{Name, {array, FormattedList}}]};
+format_result(404, {Name, _}) ->
+    {struct, [{Name, make_status(not_found)}]}.
+
+make_status(ok) -> 0;
+make_status(true) -> 0;
+make_status(false) -> 1;
+make_status(error) -> 1;
+make_status(_) -> 1.
+
+transform_listen_option({access_commands, ACOpts}, Opts) ->
+    NewACOpts = lists:map(
+                  fun({AName, ACmds, AOpts}) ->
+                          {AName, [{commands, ACmds}, {options, AOpts}]};
+                     (Opt) ->
+                          Opt
+                  end, ACOpts),
+    [{access_commands, NewACOpts}|Opts];
+transform_listen_option(Opt, Opts) ->
+    [Opt|Opts].

src/ejd2odbc.erl

@@ -5,7 +5,7 @@
 %%% Created : 22 Aug 2005 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% 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.
 %%%
 %%%----------------------------------------------------------------------
 
@@ -28,10 +27,14 @@
 
 -author('alexey@process-one.net').
 
--export([export/2, export/3]).
+-include("logger.hrl").
+
+-export([export/2, export/3, import_file/2, import/2, import/3]).
 
 -define(MAX_RECORDS_PER_TRANSACTION, 100).
 
+-record(dump, {fd, cont = start}).
+
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
@@ -42,21 +45,25 @@
 %%% - Output can be either odbc to export to the configured relational
 %%%   database or "Filename" to export to text file.
 
+modules() ->
+    [ejabberd_auth,
+     mod_announce,
+     mod_caps,
+     mod_irc,
+     mod_last,
+     mod_muc,
+     mod_offline,
+     mod_privacy,
+     mod_private,
+     mod_pubsub,
+     mod_roster,
+     mod_shared_roster,
+     mod_vcard,
+     mod_vcard_xupdate].
+
 export(Server, Output) ->
     LServer = jlib:nameprep(iolist_to_binary(Server)),
-    Modules = [ejabberd_auth,
-               mod_announce,
-               mod_caps,
-               mod_irc,
-               mod_last,
-               mod_muc,
-               mod_offline,
-               mod_privacy,
-               mod_private,
-               mod_roster,
-               mod_shared_roster,
-               mod_vcard,
-               mod_vcard_xupdate],
+    Modules = modules(),
     IO = prepare_output(Output),
     lists:foreach(
       fun(Module) ->
@@ -73,6 +80,50 @@ export(Server, Output, Module) ->
       end, Module:export(Server)),
     close_output(Output, IO).
 
+import_file(Server, FileName) when is_binary(FileName) ->
+    import(Server, binary_to_list(FileName));
+import_file(Server, FileName) ->
+    case disk_log:open([{name, make_ref()},
+                        {file, FileName},
+                        {mode, read_only}]) of
+        {ok, Fd} ->
+            LServer = jlib:nameprep(Server),
+            Mods = [{Mod, gen_mod:db_type(LServer, Mod)}
+                    || Mod <- modules(), gen_mod:is_loaded(LServer, Mod)],
+            AuthMods = case lists:member(ejabberd_auth_internal,
+                                         ejabberd_auth:auth_modules(LServer)) of
+                           true ->
+                               [{ejabberd_auth, mnesia}];
+                           false ->
+                               []
+                       end,
+            import_dump(LServer, AuthMods ++ Mods, #dump{fd = Fd});
+        Err ->
+            exit(Err)
+    end.
+
+import(Server, Output) ->
+    import(Server, Output, [{fast, true}]).
+
+import(Server, Output, Opts) ->
+    LServer = jlib:nameprep(iolist_to_binary(Server)),
+    Modules = modules(),
+    IO = prepare_output(Output, disk_log),
+    lists:foreach(
+      fun(Module) ->
+              import(LServer, IO, Opts, Module)
+      end, Modules),
+    close_output(Output, IO).
+
+import(Server, Output, Opts, Module) ->
+    LServer = jlib:nameprep(iolist_to_binary(Server)),
+    IO = prepare_output(Output, disk_log),
+    lists:foreach(
+      fun({SelectQuery, ConvertFun}) ->
+              import(LServer, SelectQuery, IO, ConvertFun, Opts)
+      end, Module:import(Server)),
+    close_output(Output, IO).
+
 %%%----------------------------------------------------------------------
 %%% Internal functions
 %%%----------------------------------------------------------------------
@@ -109,18 +160,110 @@ output(_LServer, Table, Fd, SQLs) ->
     file:write(Fd, ["-- \n-- Mnesia table: ", atom_to_list(Table),
                     "\n--\n", SQLs]).
 
-prepare_output(FileName) when is_list(FileName); is_binary(FileName) ->
+import(LServer, SelectQuery, IO, ConvertFun, Opts) ->
+    F = case proplists:get_bool(fast, Opts) of
+            true ->
+                fun() ->
+                        case ejabberd_odbc:sql_query_t(SelectQuery) of
+                            {selected, _, Rows} ->
+                                lists:foldl(fun process_sql_row/2,
+                                            {IO, ConvertFun, undefined}, Rows);
+                            Err ->
+                                erlang:error(Err)
+                        end
+                end;
+            false ->
+                fun() ->
+                        ejabberd_odbc:sql_query_t(
+                          [iolist_to_binary(
+                             [<<"declare c cursor for ">>, SelectQuery])]),
+                        fetch(IO, ConvertFun, undefined)
+                end
+        end,
+    ejabberd_odbc:sql_transaction(LServer, F).
+
+fetch(IO, ConvertFun, PrevRow) ->
+    case ejabberd_odbc:sql_query_t([<<"fetch c;">>]) of
+        {selected, _, [Row]} ->
+            process_sql_row(Row, {IO, ConvertFun, PrevRow}),
+            fetch(IO, ConvertFun, Row);
+        {selected, _, []} ->
+            ok;
+        Err ->
+            erlang:error(Err)
+    end.
+
+process_sql_row(Row, {IO, ConvertFun, PrevRow}) when Row == PrevRow ->
+    %% Avoid calling ConvertFun with the same input
+    {IO, ConvertFun, Row};
+process_sql_row(Row, {IO, ConvertFun, _PrevRow}) ->
+    case catch ConvertFun(Row) of
+        {'EXIT', _} = Err ->
+            ?ERROR_MSG("failed to convert ~p: ~p", [Row, Err]);
+        Term ->
+            ok = disk_log:log(IO#dump.fd, Term)
+    end,
+    {IO, ConvertFun, Row}.
+
+import_dump(LServer, Mods, #dump{fd = Fd, cont = Cont}) ->
+    case disk_log:chunk(Fd, Cont) of
+        {NewCont, Terms} ->
+            import_terms(LServer, Mods, Terms),
+            import_dump(LServer, Mods, #dump{fd = Fd, cont = NewCont});
+        eof ->
+            ok;
+        Err ->
+            exit(Err)
+    end.
+
+import_terms(LServer, Mods, [Term|Terms]) ->
+    import_term(LServer, Mods, Term),
+    import_terms(LServer, Mods, Terms);
+import_terms(_LServer, _Mods, []) ->
+    ok.
+
+import_term(LServer, [{Mod, DBType}|Mods], Term) ->
+    case catch Mod:import(LServer, DBType, Term) of
+        pass -> import_term(LServer, Mods, Term);
+        ok -> ok;
+        Err ->
+            ?ERROR_MSG("failed to import ~p for module ~p: ~p",
+                       [Term, Mod, Err])
+    end;
+import_term(_LServer, [], _Term) ->
+    ok.
+
+prepare_output(FileName) ->
+    prepare_output(FileName, normal).
+
+prepare_output(FileName, Type) when is_binary(FileName) ->
+    prepare_output(binary_to_list(FileName), Type);
+prepare_output(FileName, normal) when is_list(FileName) ->
     case file:open(FileName, [write, raw]) of
         {ok, Fd} ->
             Fd;
         Err ->
             exit(Err)
     end;
-prepare_output(Output) ->
+prepare_output(FileName, disk_log) when is_list(FileName) ->
+    case disk_log:open([{name, make_ref()},
+                        {repair, truncate},
+			{file, FileName}]) of
+        {ok, Fd} ->
+            #dump{fd = Fd};
+        Err ->
+            exit(Err)
+    end;
+prepare_output(Output, _Type) ->
     Output.
 
 close_output(FileName, Fd) when FileName /= Fd ->
-    file:close(Fd),
+    case Fd of
+        #dump{} ->
+            disk_log:close(Fd#dump.fd);
+        _ ->
+            file:close(Fd)
+    end,
     ok;
 close_output(_, _) ->
     ok.

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 <shinde@iee.org> 7th Dec 2000
 %%% Turned into gen_fsm, made non-blocking, added timers etc to support this.