From a92b82b679240b05ddc442b59e7546c56cbae37b Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Thu, 8 Sep 2022 14:31:11 +0200 Subject: [PATCH 1/2] Update documentation --- docs/src/developer/reference/team/legalhold.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/src/developer/reference/team/legalhold.md b/docs/src/developer/reference/team/legalhold.md index b1cee83b9b..5a3c9bb31c 100644 --- a/docs/src/developer/reference/team/legalhold.md +++ b/docs/src/developer/reference/team/legalhold.md @@ -137,23 +137,27 @@ blocked from using wire by their team admin (if they are a team user), but they cannot be assigned a LH device, and they cannot enter conversations with LH devices present. -For now, there is on way in the UI for the user to grant consent. -Instead, "implict consent" can be given by the site operator for any -team in the server configuration file `galley.yaml`: +For now, there isn't any UI for the user to grant their initial consent. +Instead, an "implict consent" can be given by the site operator by setting ```yaml featureFlags: # [...] legalhold: whitelist-teams-and-implicit-consent - legalHoldTeamsWhitelist: - - 14172c08-b3c8-11eb-a763-6fe8c2ea993d - - 162d7894-b3c8-11eb-b137-074ff453399d ``` +in galleys' config and then using non-exposed, internal endpoints on the galley +pod to update the set of teams whose users are considered to have given their +initial consent: + +- `put /i/legalhold/whitelisted-teams/:team-id` - Add team +- `delete /i/legalhold/whitelisted-teams/:team-id` - Remove team +- `get /i/legalhold/whitelisted-teams` - List all teams + Since consent is required for LH to work, users in teams that are not whitelisted cannot be assigned LH devices (pull request #1502), and they are blocked or removed from conversations that are exposed to LH -devices (TODO: name the PRs where this happens). +devices (#1507, #1595). ### Implementation status and future work From 32b7eff9a29e70bc7e52940f197f011483db7762 Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Thu, 8 Sep 2022 14:32:50 +0200 Subject: [PATCH 2/2] fix typo --- docs/src/developer/reference/team/legalhold.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/developer/reference/team/legalhold.md b/docs/src/developer/reference/team/legalhold.md index 5a3c9bb31c..081796610e 100644 --- a/docs/src/developer/reference/team/legalhold.md +++ b/docs/src/developer/reference/team/legalhold.md @@ -146,7 +146,7 @@ Instead, an "implict consent" can be given by the site operator by setting legalhold: whitelist-teams-and-implicit-consent ``` -in galleys' config and then using non-exposed, internal endpoints on the galley +in galley's config and then using non-exposed, internal endpoints on the galley pod to update the set of teams whose users are considered to have given their initial consent: