2.1.x redis roster

contrib/extract_translations/extract_translations.erl

@@ -281,14 +281,14 @@ build_additional_translators(List) ->
       List).
 
 print_translation(File, Line, Str, StrT) ->
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    StrQ = ejabberd_regexp:greplace(Str, "\\\"", "\\\\\""),
+    StrTQ = ejabberd_regexp:greplace(StrT, "\\\"", "\\\\\""),
     io:format("#: ~s:~p~nmsgid \"~s\"~nmsgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
 
 print_translation_obsolete(Str, StrT) ->
     File = "unknown.erl",
     Line = 1,
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    StrQ = ejabberd_regexp:greplace(Str, "\\\"", "\\\\\""),
+    StrTQ = ejabberd_regexp:greplace(StrT, "\\\"", "\\\\\""),
     io:format("#: ~s:~p~n#~~ msgid \"~s\"~n#~~ msgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).
 

doc/release_notes_2.1.11.txt

@@ -0,0 +1,58 @@
+
+                              Release Notes
+                             ejabberd 2.1.11
+
+  ejabberd 2.1.11 includes a few bugfixes and improvements.
+
+  Read more details about the changes in:
+    http://redir.process-one.net/ejabberd-2.1.11
+
+  Download the source code and installers from:
+    http://www.process-one.net/en/ejabberd/
+
+
+  The major changes are:
+
+* HTTP service
+- Fix ejabberd_http:get_line
+- Don't use binary:match to extract lines from binaries
+- Parse and encode https header names like native http parser does
+- Parse correctly https request split into multiple packets
+- Properly handle HEAD request in mod_http_bind (EJAB-1538)
+- New option default_host for handling requests with ambiguous Host (EJAB-1261)
+
+* ODBC
+- New ODBC support for mod_announce
+- New ODBC support for mod_blocking
+- New ODBC support for mod_irc
+- New ODBC support for mod_muc
+- New ODBC support for mod_shared_roster
+- New ODBC support for mod_vcard_xupdate
+- Add ODBC exporting function for privacy table
+- Work also with some unicode strings in PgSQL (EJAB-1490)
+- Replace a single quote with double quotes in an ODBC escape
+
+* SSL
+- Make sure that res is initialized in all cases
+- Parse correctly https request split into multiple packets (EJAB-1537)
+- Added missed tls:recv_data/2
+- Don't ignore Length parameter in tls:recv
+- Avoid quadratic behavior in reading SSL data
+- Dix http_bind webserver TLS fail on Chrome (EJAB-1530)
+
+* Miscelanea
+- Assume we have only one CPU when an auto-detection fails (EJAB-1516)
+- Auth: Relax digest-uri handling (EJAB-1529)
+- Caps: Cache caps timestamp before the IQ-request is done
+- IRC: Use of MUC password
+- Private: misc errors cases fixes
+- Pubsub: return user affiliation for a specified node (EJAB-1294)
+- Shared Roster: Foreign items were not pushed (EJAB-1509)
+- Shared Roster LDAP: user substitution in ldap_rfilter (EJAB-1555)
+- Windows: Fix makefile rules for building DLLs
+
+
+  Bug reports
+
+  You can officially report bugs on ProcessOne support site:
+  http://support.process-one.net/

src/Makefile.win32

@@ -170,7 +170,7 @@ LD=link.exe
 LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(EXPAT_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
 
 $(DLL) : $(OBJECT)
-	$(LD) $(LD_FLAGS) -out:$(DLL) $(OBJECT)
+	$(LD) $(LD_FLAGS) -out:$@ $<
 
 $(OBJECT) : $(SOURCE)
-	$(CC) $(CC_FLAGS) -c -Fo$(OBJECT) $(SOURCE)
+	$(CC) $(CC_FLAGS) -c -Fo$@ $<

src/acl.erl

@@ -181,9 +181,11 @@ match_acl(ACL, JID, Host) ->
 					lists:member(Server, ?MYHOSTS)))
 					  andalso is_regexp_match(User, UR);
 				  {shared_group, G} ->
-				      mod_shared_roster:is_user_in_group({User, Server}, G, Host);
+                                      Mod = loaded_shared_roster_module(Host),
+				      Mod:is_user_in_group({User, Server}, G, Host);
 				  {shared_group, G, H} ->
-				      mod_shared_roster:is_user_in_group({User, Server}, 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);
@@ -238,4 +240,10 @@ is_regexp_match(String, RegExp) ->
 is_glob_match(String, Glob) ->
     is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)).
 
-
+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.

src/basho_bench_driver_eredis.erl

@@ -0,0 +1,89 @@
+-module(basho_bench_driver_eredis).
+
+-export([new/1,
+         run/4]).
+
+-export([value_gen/1]).
+
+new(_Id) ->
+    case whereis(eredis_driver) of
+        undefined ->
+            case eredis:start_link() of
+                {ok, Client} ->
+                    register(eredis_driver, Client),
+                    {ok, Client};
+                {error, Reason} ->
+                    {error, Reason}
+            end;
+        Pid ->
+            {ok, Pid}
+    end.
+
+run(get, KeyGen, _ValueGen, Client) ->
+    Start = KeyGen(),
+    %%case eredis:q(["MGET" | lists:seq(Start, Start + 500)]) of
+    case catch(eredis:q(Client, ["GET", Start], 100)) of
+        {ok, _Value} ->
+            {ok, Client};
+        {error, Reason} ->
+            {error, Reason, Client};
+        {'EXIT', {timeout, _}} ->
+            {error, timeout, Client}
+    end;
+
+run(pipeline_get, KeyGen, _ValueGen, Client) ->
+    Seq = lists:seq(1, 5),
+    P = [["GET", KeyGen()] || _ <- Seq],
+
+    case catch(eredis:qp(Client, P, 500)) of
+        {error, Reason} ->
+            {error, Reason, Client};
+        {'EXIT', {timeout, _}} ->
+            {error, timeout, Client};
+        Res ->
+            case check_pipeline_get(Res, Seq) of
+                ok ->
+                    {ok, Client};
+                {error, Reason} ->
+                    {error, Reason, Client}
+            end
+    end;
+
+run(put, KeyGen, ValueGen, Client) ->
+    case catch(eredis:q(Client, ["SET", KeyGen(), ValueGen()], 100)) of
+        {ok, <<"OK">>} ->
+            {ok, Client};
+        {error, Reason} ->
+            {error, Reason, Client};
+        {'EXIT', {timeout, _}} ->
+            {error, timeout, Client}
+    end;
+
+run(pipeline_put, KeyGen, ValueGen, Client) ->
+    Seq = lists:seq(1, 5),
+    P = [["SET", KeyGen(), ValueGen()] || _ <- Seq],
+    R = [{ok, <<"OK">>} || _ <- Seq],
+
+    case catch(eredis:qp(Client, P, 500)) of
+        R ->
+            {ok, Client};
+        {error, Reason} ->
+            {error, Reason, Client};
+        {'EXIT', {timeout, _}} ->
+            {error, timeout, Client}
+    end.
+
+
+check_pipeline_get([], []) ->
+    ok;
+check_pipeline_get([{ok, _}|Res], [_|Seq]) ->
+    check_pipeline_get(Res, Seq);
+check_pipeline_get([{error, Reason}], _) ->
+    {error, Reason}.
+
+
+value_gen(_Id) ->
+    fun() ->
+            %% %% Example data from http://json.org/example.html
+            <<"{\"web-app\":{\"servlet\":[{\"servlet-name\":\"cofaxCDS\",\"servlet-class\":\"org.cofax.cds.CDSServlet\",\"init-param\":{\"configGlossary:installationAt\":\"Philadelphia,PA\",\"configGlossary:adminEmail\":\"ksm@pobox.com\",\"configGlossary:poweredBy\":\"Cofax\",\"configGlossary:poweredByIcon\":\"/images/cofax.gif\",\"configGlossary:staticPath\":\"/content/static\",\"templateProcessorClass\":\"org.cofax.WysiwygTemplate\",\"templateLoaderClass\":\"org.cofax.FilesTemplateLoader\",\"templatePath\":\"templates\",\"templateOverridePath\":\"\",\"defaultListTemplate\":\"listTemplate.htm\",\"defaultFileTemplate\":\"articleTemplate.htm\",\"useJSP\":false,\"jspListTemplate\":\"listTemplate.jsp\",\"jspFileTemplate\":\"articleTemplate.jsp\",\"cachePackageTagsTrack\":200,\"cachePackageTagsStore\":200,\"cachePackageTagsRefresh\":60,\"cacheTemplatesTrack\":100,\"cacheTemplatesStore\":50,\"cacheTemplatesRefresh\":15,\"cachePagesTrack\":200,\"cachePagesStore\":100,\"cachePagesRefresh\":10,\"cachePagesDirtyRead\":10,\"searchEngineListTemplate\":\"forSearchEnginesList.htm\",\"searchEngineFileTemplate\":\"forSearchEngines.htm\",\"searchEngineRobotsDb\":\"WEB-INF/robots.db\",\"useDataStore\":true,\"dataStoreClass\":\"org.cofax.SqlDataStore\",\"redirectionClass\":\"org.cofax.SqlRedirection\",\"dataStoreName\":\"cofax\",\"dataStoreDriver\":\"com.microsoft.jdbc.sqlserver.SQLServerDriver\",\"dataStoreUrl\":\"jdbc:microsoft:sqlserver://LOCALHOST:1433;DatabaseName=goon\",\"dataStoreUser\":\"sa\",\"dataStorePassword\":\"dataStoreTestQuery\",\"dataStoreTestQuery\":\"SETNOCOUNTON;selecttest='test';\",\"dataStoreLogFile\":\"/usr/local/tomcat/logs/datastore.log\",\"dataStoreInitConns\":10,\"dataStoreMaxConns\":100,\"dataStoreConnUsageLimit\":100,\"dataStoreLogLevel\":\"debug\",\"maxUrlLength\":500}},{\"servlet-name\":\"cofaxEmail\",\"servlet-class\":\"org.cofax.cds.EmailServlet\",\"init-param\":{\"mailHost\":\"mail1\",\"mailHostOverride\":\"mail2\"}},{\"servlet-name\":\"cofaxAdmin\",\"servlet-class\":\"org.cofax.cds.AdminServlet\"},{\"servlet-name\":\"fileServlet\",\"servlet-class\":\"org.cofax.cds.FileServlet\"},{\"servlet-name\":\"cofaxTools\",\"servlet-class\":\"org.cofax.cms.CofaxToolsServlet\",\"init-param\":{\"templatePath\":\"toolstemplates/\",\"log\":1,\"logLocation\":\"/usr/local/tomcat/logs/CofaxTools.log\",\"logMaxSize\":\"\",\"dataLog\":1,\"dataLogLocation\":\"/usr/local/tomcat/logs/dataLog.log\",\"dataLogMaxSize\":\"\",\"removePageCache\":\"/content/admin/remove?cache=pages&id=\",\"removeTemplateCache\":\"/content/admin/remove?cache=templates&id=\",\"fileTransferFolder\":\"/usr/local/tomcat/webapps/content/fileTransferFolder\",\"lookInContext\":1,\"adminGroupID\":4,\"betaServer\":true}}],\"servlet-mapping\":{\"cofaxCDS\":\"/\",\"cofaxEmail\":\"/cofaxutil/aemail/*\",\"cofaxAdmin\":\"/admin/*\",\"fileServlet\":\"/static/*\",\"cofaxTools\":\"/tools/*\"},\"taglib\":{\"taglib-uri\":\"cofax.tld\",\"taglib-location\":\"/WEB-INF/tlds/cofax.tld\"}}">>
+    end.

src/basho_bench_driver_erldis.erl

@@ -0,0 +1,29 @@
+-module(basho_bench_driver_erldis).
+
+-export([new/1,
+         run/4]).
+
+new(_Id) ->
+    case erldis_client:connect() of
+        {ok, Pid} ->
+            {ok, Pid};
+        {error, {already_started, Pid}} ->
+            {ok, Pid}
+    end.
+
+run(get, KeyGen, _ValueGen, Client) ->
+    Start = KeyGen(),
+    case erldis:mget(Client, lists:seq(Start, Start + 500)) of
+        {error, Reason} ->
+            {error, Reason, Client};
+        _Value ->
+            {ok, Client}
+    end;
+
+run(put, KeyGen, ValueGen, Client) ->
+    case erldis:set(Client, integer_to_list(KeyGen()), ValueGen()) of
+        {error, Reason} ->
+            {error, Reason, Client};
+        _Value ->
+            {ok, Client}
+    end.

src/cyrsasl_digest.erl

@@ -37,9 +37,11 @@
 -behaviour(cyrsasl).
 
 -record(state, {step, nonce, username, authzid, get_password, check_password, auth_module,
-		host}).
+		host, hostfqdn}).
 
 start(_Opts) ->
+    Fqdn = get_local_fqdn(),
+    ?INFO_MSG("FQDN used to check DIGEST-MD5 SASL authentication: ~p", [Fqdn]),
     cyrsasl:register_mechanism("DIGEST-MD5", ?MODULE, digest).
 
 stop() ->
@@ -49,6 +51,7 @@ mech_new(Host, GetPassword, _CheckPassword, CheckPasswordDigest) ->
     {ok, #state{step = 1,
 		nonce = randoms:get_string(),
 		host = Host,
+		hostfqdn = get_local_fqdn(),
 		get_password = GetPassword,
 		check_password = CheckPasswordDigest}}.
 
@@ -64,10 +67,11 @@ mech_step(#state{step = 3, nonce = Nonce} = State, ClientIn) ->
 	KeyVals ->
 	    DigestURI = xml:get_attr_s("digest-uri", KeyVals),
 	    UserName = xml:get_attr_s("username", KeyVals),
-	    case is_digesturi_valid(DigestURI, State#state.host) of
+	    case is_digesturi_valid(DigestURI, State#state.host, State#state.hostfqdn) of
 		false ->
 		    ?DEBUG("User login not authorized because digest-uri "
-			   "seems invalid: ~p", [DigestURI]),
+			   "seems invalid: ~p (checking for Host ~p, FQDN ~p)", [DigestURI,
+			   State#state.host, State#state.hostfqdn]),
 		    {error, "not-authorized", UserName};
 		true ->
 		    AuthzId = xml:get_attr_s("authzid", KeyVals),
@@ -154,21 +158,46 @@ parse4([], Key, Val, Ts) ->
 %% however ejabberd doesn't allow that.
 %% If the service (for example jabber.example.org)
 %% is provided by several hosts (being one of them server3.example.org),
-%% then digest-uri can be like xmpp/server3.example.org/jabber.example.org
-%% In that case, ejabberd only checks the service name, not the host.
-is_digesturi_valid(DigestURICase, JabberHost) ->
+%% then acceptable digest-uris would be:
+%% xmpp/server3.example.org/jabber.example.org, xmpp/server3.example.org and
+%% xmpp/jabber.example.org
+%% The last version is not actually allowed by the RFC, but implemented by popular clients
+is_digesturi_valid(DigestURICase, JabberDomain, JabberFQDN) ->
     DigestURI = stringprep:tolower(DigestURICase),
     case catch string:tokens(DigestURI, "/") of
-	["xmpp", Host] when Host == JabberHost ->
-	    true;
-	["xmpp", _Host, ServName] when ServName == JabberHost ->
-	    true;
+	["xmpp", Host] ->
+	    IsHostFqdn = is_host_fqdn(Host, JabberFQDN),
+	    (Host == JabberDomain) or IsHostFqdn;
+	["xmpp", Host, ServName] ->
+	    IsHostFqdn = is_host_fqdn(Host, JabberFQDN),
+	    (ServName == JabberDomain) and IsHostFqdn;
 	_ ->
 	    false
     end.
 
-
-
+is_host_fqdn(Host, [Letter | _Tail] = Fqdn) when not is_list(Letter) ->
+    Host == Fqdn;
+is_host_fqdn(_Host, []) ->
+    false;
+is_host_fqdn(Host, [Fqdn | _FqdnTail]) when Host == Fqdn ->
+    true;
+is_host_fqdn(Host, [Fqdn | FqdnTail]) when Host /= Fqdn ->
+    is_host_fqdn(Host, FqdnTail).
+
+get_local_fqdn() ->
+    case (catch get_local_fqdn2()) of
+	Str when is_list(Str) -> Str;
+	_ -> "unknown-fqdn, please configure fqdn option in ejabberd.cfg!"
+    end.
+get_local_fqdn2() ->
+    case ejabberd_config:get_local_option(fqdn) of
+	ConfiguredFqdn when is_list(ConfiguredFqdn) ->
+	    ConfiguredFqdn;
+	_undefined ->
+	    {ok, Hostname} = inet:gethostname(),
+	    {ok, {hostent, Fqdn, _, _, _, _}} = inet:gethostbyname(Hostname),
+	    Fqdn
+    end.
 
 digit_to_xchar(D) when (D >= 0) and (D < 10) ->
     D + 48;

src/ejabberd.app

@@ -78,16 +78,12 @@
 	     mod_irc,
 	     mod_irc_connection,
 	     mod_last,
-	     mod_last_odbc,
 	     mod_muc,
 	     mod_muc_log,
 	     mod_muc_room,
 	     mod_offline,
-	     mod_offline_odbc,
 	     mod_privacy,
-	     mod_privacy_odbc,
 	     mod_private,
-	     mod_private_odbc,
 	     mod_proxy65,
 	     mod_proxy65_lib,
 	     mod_proxy65_service,
@@ -96,14 +92,12 @@
 	     mod_pubsub,
 	     mod_register,
 	     mod_roster,
-	     mod_roster_odbc,
 	     mod_service_log,
 	     mod_shared_roster,
 	     mod_stats,
 	     mod_time,
 	     mod_vcard,
 	     mod_vcard_ldap,
-	     mod_vcard_odbc,
 	     mod_version,
 	     node_buddy,
 	     node_club,

src/ejabberd.cfg.example

@@ -222,6 +222,9 @@
 %% 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