Skip to content

[fix] WPB-5715 data access layer of federation_remotes #3758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
battermann merged 2 commits into from
Nov 30, 2023
Merged

[fix] WPB-5715 data access layer of federation_remotes #3758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf7128f
account for null
battermann Nov 30, 2023
6133966
changelog
battermann Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog.d/2-features/WPB-5105
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
8 changes: 4 additions & 4 deletions services/brig/src/Brig/Effects/FederationConfigStore/Cassandra.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down