From 8c5b312601ce842a073f023fa7b08798f9c25be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
Date: Thu, 28 Jan 2021 12:57:47 +0100
Subject: [PATCH] Add cache for displayed groups in ldap_shared_cache

This is based on pull request by Ivan Agarkov:
 https://github.com/processone/ejabberd/pull/952
---
 src/mod_shared_roster_ldap.erl | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl
index 4b2122904..97bc710c9 100644
--- a/src/mod_shared_roster_ldap.erl
+++ b/src/mod_shared_roster_ldap.erl
@@ -50,6 +50,7 @@
 
 -define(USER_CACHE, shared_roster_ldap_user_cache).
 -define(GROUP_CACHE, shared_roster_ldap_group_cache).
+-define(DISPLAYED_CACHE, shared_roster_ldap_displayed_cache).
 -define(LDAP_SEARCH_TIMEOUT, 5).    %% Timeout for LDAP search queries in seconds
 -define(INVALID_SETTING_MSG, "~ts is not properly set! ~ts will not function.").
 
@@ -94,7 +95,8 @@ reload(Host, NewOpts, _OldOpts) ->
     case init_cache(Host, NewOpts) of
 	true ->
 	    ets_cache:setopts(?USER_CACHE, cache_opts(Host, NewOpts)),
-	    ets_cache:setopts(?GROUP_CACHE, cache_opts(Host, NewOpts));
+	    ets_cache:setopts(?GROUP_CACHE, cache_opts(Host, NewOpts)),
+	    ets_cache:setopts(?DISPLAYED_CACHE, cache_opts(Host, NewOpts));
 	false ->
 	    ok
     end,
@@ -307,6 +309,13 @@ eldap_search(State, FilterParseArgs, AttributesList) ->
 
 get_user_displayed_groups({User, Host}) ->
     {ok, State} = eldap_utils:get_state(Host, ?MODULE),
+    ets_cache:lookup(?DISPLAYED_CACHE,
+		     {User, Host},
+		     fun () ->
+			 search_user_displayed_groups(State, User)
+		     end).
+
+search_user_displayed_groups(State, User) ->
     GroupAttr = State#state.group_attr,
     Entries = eldap_search(State,
 			   [eldap_filter:do_sub(State#state.rfilter,
@@ -533,10 +542,12 @@ init_cache(Host, Opts) ->
 	true ->
 	    CacheOpts = cache_opts(Host, Opts),
 	    ets_cache:new(?USER_CACHE, CacheOpts),
-	    ets_cache:new(?GROUP_CACHE, CacheOpts);
+	    ets_cache:new(?GROUP_CACHE, CacheOpts),
+	    ets_cache:new(?DISPLAYED_CACHE, CacheOpts);
 	false ->
 	    ets_cache:delete(?USER_CACHE),
-	    ets_cache:delete(?GROUP_CACHE)
+	    ets_cache:delete(?GROUP_CACHE),
+	    ets_cache:delete(?DISPLAYED_CACHE)
     end,
     UseCache.