Fix federationStrategy 'allowAll'

changelog.d/5-internal/background-worker-nosync

@@ -0,0 +1 @@
+background-worker: Get list of domains from RabbitMQ instead of brig for pushing backend notifications

charts/background-worker/templates/configmap.yaml

@@ -21,14 +21,6 @@ data:
       host: federator
       port: 8080
 
-    galley:
-      host: galley
-      port: 8080
-
-    brig:
-      host: brig
-      port: 8080
-
     rabbitmq:
 {{toYaml .rabbitmq | indent 6 }}
     backendNotificationPusher:

charts/background-worker/values.yaml

@@ -26,6 +26,7 @@ config:
   backendNotificationPusher:
     pushBackoffMinWait: 10000 # in microseconds, so 10ms
     pushBackoffMaxWait: 300000000 # microseconds, so 300s
+    remotesRefreshInterval: 300000000 # microseconds, so 300s
 
 serviceAccount:
   # When setting this to 'false', either make sure that a service account named

hack/helm_vars/wire-server/values.yaml.gotmpl

@@ -77,21 +77,6 @@ brig:
       setMaxConvSize: 16
       # See helmfile for the real value
       setFederationDomain: integration.example.com
-      setFederationDomainConfigs:
-        # 'setFederationDomainConfigs' is deprecated as of https://github.com/wireapp/wire-server/pull/3260.  See
-        # https://docs.wire.com/understand/federation/backend-communication.html#configuring-remote-connections
-        # for details.
-        - domain: integration.example.com
-          search_policy: full_search
-        - domain: federation-test-helper.{{ .Release.Namespace }}.svc.cluster.local
-          search_policy: full_search
-        # Remove these after fixing https://wearezeta.atlassian.net/browse/WPB-3796
-        - domain: dyn-backend-1
-          search_policy: full_search
-        - domain: dyn-backend-2
-          search_policy: full_search
-        - domain: dyn-backend-3
-          search_policy: full_search
       setFederationStrategy: allowAll
       setFederationDomainConfigsUpdateFreq: 10
       set2FACodeGenerationDelaySecs: 5
@@ -321,6 +306,7 @@ background-worker:
     backendNotificationPusher:
       pushBackoffMinWait: 1000 # 1ms
       pushBackoffMaxWait: 500000 # 0.5s
+      remotesRefreshInterval: 1000000 # 1s
   secrets:
     rabbitmq:
       username: {{ .Values.rabbitmqUsername }}

hack/helmfile.yaml

@@ -127,14 +127,6 @@ releases:
         value: {{ .Values.federationDomain1 }}
       - name: cargohold.config.settings.federationDomain
         value: {{ .Values.federationDomain1 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[0].domain
-        value: {{ .Values.federationDomain2 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[2].domain
-        value: {{ .Values.dynBackendDomain1 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[3].domain
-        value: {{ .Values.dynBackendDomain2 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[4].domain
-        value: {{ .Values.dynBackendDomain3 }}
     needs:
       - 'databases-ephemeral'
 
@@ -151,13 +143,5 @@ releases:
         value: {{ .Values.federationDomain2 }}
       - name: cargohold.config.settings.federationDomain
         value: {{ .Values.federationDomain2 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[0].domain
-        value: {{ .Values.federationDomain1 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[2].domain
-        value: {{ .Values.dynBackendDomain1 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[3].domain
-        value: {{ .Values.dynBackendDomain2 }}
-      - name: brig.config.optSettings.setFederationDomainConfigs[4].domain
-        value: {{ .Values.dynBackendDomain3 }}
     needs:
       - 'databases-ephemeral'

integration/test/API/Brig.hs

@@ -21,6 +21,14 @@ getUser user target = do
       joinHttpPath ["users", domain, uid]
   submit "GET" req
 
+getUserByHandle :: (HasCallStack, MakesValue user, MakesValue domain) => user -> domain -> String -> App Response
+getUserByHandle user domain handle = do
+  domainStr <- asString domain
+  req <-
+    baseRequest user Brig Versioned $
+      joinHttpPath ["users", "by-handle", domainStr, handle]
+  submit "GET" req
+
 getClient ::
   (HasCallStack, MakesValue user, MakesValue client) =>
   user ->
@@ -39,6 +47,12 @@ deleteUser user = do
   submit "DELETE" $
     req & addJSONObject ["password" .= defPassword]
 
+putHandle :: (HasCallStack, MakesValue user) => user -> String -> App Response
+putHandle user handle = do
+  req <- baseRequest user Brig Versioned "/self/handle"
+  submit "PUT" $
+    req & addJSONObject ["handle" .= handle]
+
 data AddClient = AddClient
   { ctype :: String,
     internal :: Bool,

integration/test/API/Common.hs

@@ -26,6 +26,14 @@ randomEmail = liftIO $ do
     chars = mkArray $ ['A' .. 'Z'] <> ['a' .. 'z'] <> ['0' .. '9']
     pick = (chars !) <$> randomRIO (Array.bounds chars)
 
+randomHandle :: App String
+randomHandle = liftIO $ do
+  n <- randomRIO (50, 256)
+  replicateM n pick
+  where
+    chars = mkArray $ ['a' .. 'z'] <> ['0' .. '9'] <> "_-."
+    pick = (chars !) <$> randomRIO (Array.bounds chars)
+
 randomHex :: Int -> App String
 randomHex n = liftIO $ replicateM n pick
   where

integration/test/SetupHelpers.hs

@@ -6,7 +6,6 @@ import API.Brig qualified as Brig
 import API.BrigInternal qualified as Internal
 import API.Common
 import API.Galley
-import Control.Concurrent (threadDelay)
 import Control.Monad.Reader
 import Data.Aeson hiding ((.=))
 import Data.Aeson.Types qualified as Aeson
@@ -17,12 +16,6 @@ import Data.UUID.V4 (nextRandom)
 import GHC.Stack
 import Testlib.Prelude
 
--- | `n` should be 2 x `setFederationDomainConfigsUpdateFreq` in the config
-connectAllDomainsAndWaitToSync :: HasCallStack => Int -> [String] -> App ()
-connectAllDomainsAndWaitToSync n domains = do
-  sequence_ [Internal.createFedConn x (Internal.FedConn y "full_search") | x <- domains, y <- domains, x /= y]
-  liftIO $ threadDelay (n * 1000 * 1000) -- wait for federation status to be updated
-
 randomUser :: (HasCallStack, MakesValue domain) => domain -> Internal.CreateUser -> App Value
 randomUser domain cu = bindResponse (Internal.createUser domain cu) $ \resp -> do
   resp.status `shouldMatchInt` 201

integration/test/Test/Brig.hs

@@ -1,11 +1,12 @@
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
+
 module Test.Brig where
 
 import API.Brig qualified as Public
 import API.BrigInternal qualified as Internal
 import API.Common qualified as API
 import API.GalleyInternal qualified as Internal
 import Control.Concurrent (threadDelay)
-import Data.Aeson qualified as Aeson
 import Data.Aeson.Types hiding ((.=))
 import Data.Set qualified as Set
 import Data.String.Conversions
@@ -143,18 +144,35 @@ testSwagger = do
 
 testRemoteUserSearch :: HasCallStack => App ()
 testRemoteUserSearch = do
-  let overrides =
-        setField "optSettings.setFederationStrategy" "allowDynamic"
-          >=> setField "optSettings.setFederationDomainConfigsUpdateFreq" (Aeson.Number 1)
-  startDynamicBackends [def {brigCfg = overrides}, def {brigCfg = overrides}] $ \dynDomains -> do
-    domains@[d1, d2] <- pure dynDomains
-    connectAllDomainsAndWaitToSync 1 domains
-    [u1, u2] <- createAndConnectUsers [d1, d2]
+  startDynamicBackends [def, def] $ \[d1, d2] -> do
+    void $ Internal.createFedConn d2 (Internal.FedConn d1 "full_search")
+
+    u1 <- randomUser d1 def
+    u2 <- randomUser d2 def
     Internal.refreshIndex d2
     uidD2 <- objId u2
+
     bindResponse (Public.searchContacts u1 (u2 %. "name") d2) $ \resp -> do
       resp.status `shouldMatchInt` 200
       docs <- resp.json %. "documents" >>= asList
       case docs of
         [] -> assertFailure "Expected a non empty result, but got an empty one"
         doc : _ -> doc %. "id" `shouldMatch` uidD2
+
+testRemoteUserSearchExactHandle :: HasCallStack => App ()
+testRemoteUserSearchExactHandle = do
+  startDynamicBackends [def, def] $ \[d1, d2] -> do
+    void $ Internal.createFedConn d2 (Internal.FedConn d1 "exact_handle_search")
+
+    u1 <- randomUser d1 def
+    u2 <- randomUser d2 def
+    u2Handle <- API.randomHandle
+    bindResponse (Public.putHandle u2 u2Handle) $ assertSuccess
+    Internal.refreshIndex d2
+
+    bindResponse (Public.searchContacts u1 u2Handle d2) $ \resp -> do
+      resp.status `shouldMatchInt` 200
+      docs <- resp.json %. "documents" >>= asList
+      case docs of
+        [] -> assertFailure "Expected a non empty result, but got an empty one"
+        doc : _ -> objQid doc `shouldMatch` objQid u2