From 570800a54077e2a3788768894dff909f854c435b Mon Sep 17 00:00:00 2001
From: Nathan Bruning <nathan@iperity.com>
Date: Sat, 27 Oct 2018 15:26:37 +0200
Subject: [PATCH] Fix mod_privacy race condition

mod_privacy updates the c2s state in user_receive_packet, which
tracks the *result* of the IQ set for active privacy lists.

When a second stanza is sent directly after a privacy list request,
the second stanza will be processed using the old privacy list,
because the IQ result has not yet been routed.
---
 src/mod_privacy.erl | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
index 0b534d272..0204e0917 100644
--- a/src/mod_privacy.erl
+++ b/src/mod_privacy.erl
@@ -419,6 +419,27 @@ user_send_packet({#iq{type = Type,
 		false -> IQ
 	    end,
     {NewIQ, State};
+
+user_send_packet({#iq{type = Type,
+          from = #jid{luser = U, lserver = S},
+          to = #jid{luser = U, lserver = S},
+          sub_els = [_]} = IQ,
+        State})
+  when Type == set ->
+    case xmpp:get_subtag(IQ, #privacy_query{}) of
+      #privacy_query{active = undefined} -> {IQ, State};
+      #privacy_query{default = undefined, active = Active} ->
+        case get_user_list(U, S, Active) of
+          {ok, _} ->
+            % Adjust the client's state directly, so the next to-be-processed
+            % packet will take the active list into account.
+            {IQ, State#{privacy_active_list => Active}};
+          true ->
+            {IQ, State}
+        end;
+      _ -> {IQ, State}
+    end;
+
 user_send_packet(Acc) ->
     Acc.