From cf7128fc955661eebbf1217eaf5ee807db550b8a Mon Sep 17 00:00:00 2001 From: Leif Battermann Date: Thu, 30 Nov 2023 10:52:45 +0000 Subject: [PATCH 1/2] account for null --- .../src/Brig/Effects/FederationConfigStore/Cassandra.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/brig/src/Brig/Effects/FederationConfigStore/Cassandra.hs b/services/brig/src/Brig/Effects/FederationConfigStore/Cassandra.hs index 734a22ba170..8eb569920ba 100644 --- a/services/brig/src/Brig/Effects/FederationConfigStore/Cassandra.hs +++ b/services/brig/src/Brig/Effects/FederationConfigStore/Cassandra.hs @@ -103,10 +103,10 @@ getFederationConfig' cfgs rDomain = case find ((== rDomain) . domain) cfgs of Nothing -> do mCnf <- retry x1 (query1 q (params LocalQuorum (Identity rDomain))) case mCnf of - Just (p, r) -> Just . FederationDomainConfig rDomain p <$> toRestriction rDomain r + Just (p, r) -> Just . FederationDomainConfig rDomain p <$> toRestriction rDomain (fromMaybe 0 r) Nothing -> pure Nothing where - q :: PrepQuery R (Identity Domain) (FederatedUserSearchPolicy, Int32) + q :: PrepQuery R (Identity Domain) (FederatedUserSearchPolicy, Maybe Int32) q = "SELECT search_policy, restriction FROM federation_remotes WHERE domain = ?" getFederationRemotesFromDb :: forall m. MonadClient m => m [FederationDomainConfig] @@ -116,9 +116,9 @@ getFederationRemotesFromDb = (\(d, p, r) -> FederationDomainConfig d p r) <$$> q qry = do res <- retry x1 . query get $ params LocalQuorum () forM res $ \(d, p, rInt) -> do - (d,p,) <$> toRestriction d rInt + (d,p,) <$> toRestriction d (fromMaybe 0 rInt) - get :: PrepQuery R () (Domain, FederatedUserSearchPolicy, Int32) + get :: PrepQuery R () (Domain, FederatedUserSearchPolicy, Maybe Int32) get = fromString $ "SELECT domain, search_policy, restriction FROM federation_remotes LIMIT " <> show maxKnownNodes addFederationConfig' :: MonadClient m => Map Domain FederationDomainConfig -> FederationDomainConfig -> m AddFederationRemoteResult From 6133966862e84b01396ffe9e86b332d9991a014f Mon Sep 17 00:00:00 2001 From: Leif Battermann Date: Thu, 30 Nov 2023 10:55:48 +0000 Subject: [PATCH 2/2] changelog --- changelog.d/2-features/WPB-5105 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/2-features/WPB-5105 b/changelog.d/2-features/WPB-5105 index 933b56ee005..24e8d671c1b 100644 --- a/changelog.d/2-features/WPB-5105 +++ b/changelog.d/2-features/WPB-5105 @@ -1,4 +1,4 @@ Allowlist for who on cloud can connect to on-prem: - Internal API to configure allowlist - Restrict federated user search according to team federation policy -(#3697, #3732) +(#3697, #3732, #3758)