Merge pull request #4748 from wireapp/release_2025-09-02_15_54

Release 2025-09-02 - (expected chart version 5.22.0)

Author: battermann

.envrc

@@ -27,7 +27,7 @@ if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(<
     fi
   fi
   echo "🔧 Building environment"
-  $bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env
+  $bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env --fallback
   echo "$store_paths" >"$layout_dir/nix-rebuild"
 fi
 

CHANGELOG.md

@@ -1,3 +1,40 @@
+# [2025-09-02] (Chart Release 5.22.0)
+
+## Release notes
+
+
+* Increase the default of `setChallengeTTL` from 2 to 7 days in Brig's Helm chart. (#4737)
+
+
+## Features
+
+
+* Introduce `galley.conversation.parent_conv` to support shadow conversations. (#4708)
+
+* Add an endpoint to allow team admins to bulk add users to user groups. (#4712)
+
+* Add member count to user group list endpoint. (#4714)
+
+
+## Bug fixes and other updates
+
+
+* Fix bug in reset logic for one2one conversations (#4735)
+
+
+## Internal changes
+
+
+* Refactoring of store effects in galley as a prerequisite for the postgres migration (#4732, #4738, #4740)
+
+
+* Unused UserGroup User events were removed (#4734)
+
+* Update `nixpkgs` (source of dependencies) to [latest of `unstable`
+  channel](https://github.com/NixOS/nixpkgs/commits/c53baa6685261e5253a1c355a1b322f82674a824).
+  This has no specific reason other than preventing tech-debt. (#4733)
+
+
 # [2025-08-25] (Chart Release 5.21.0)
 
 ## API changes

cassandra-schema.cql

@@ -1626,7 +1626,8 @@ CREATE TABLE galley_test.conversation (
     public_group_state blob,
     receipt_mode int,
     team uuid,
-    type int
+    type int,
+    parent_conv uuid
 ) WITH bloom_filter_fp_chance = 0.1
     AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
     AND comment = ''

charts/brig/templates/configmap.yaml

@@ -387,7 +387,7 @@ data:
       {{- if .setAuditLogEmailRecipient }}
       setAuditLogEmailRecipient: {{ .setAuditLogEmailRecipient }}
       {{- end }}
-      setChallengeTTL: {{ or .setChallengeTTL 172800 }}
+      setChallengeTTL: {{ or .setChallengeTTL 604800 }}
       setEphemeralUserCreationEnabled: {{ .setEphemeralUserCreationEnabled }}
     {{- end }}
   {{- end }}

docs/src/developer/reference/config-options.md

@@ -1024,6 +1024,19 @@ brig:
       setEphemeralUserCreationEnabled: false
 ```
 
+### Domain Verification Challenge TTL
+
+```yaml
+brig:
+  config:
+    optSettings:
+      setChallengeTTL: <seconds>
+```
+
+`setChallengeTTL` defines how long a domain verification challenge should be
+stored. The challenge (`StoredDomainVerificationChallenge`) will be deleted
+after this period.
+
 ## Settings in cargohold
 
 AWS S3 (or an alternative provider / service) is used to upload and download

hack/bin/upload-images.sh

@@ -23,10 +23,10 @@ readonly SCRIPT_DIR ROOT_DIR
 
 tmp_link_store=$(mktemp -d)
 image_list_file="$tmp_link_store/image-list"
-nix -v --show-trace -L build -f "$ROOT_DIR/nix" wireServer.imagesList -o "$image_list_file"
+nix -v --show-trace -L build -f "$ROOT_DIR/nix" wireServer.imagesList -o "$image_list_file" --fallback
 
 # Build everything first so we can benefit the most from having many cores.
-nix -v --show-trace -L build -f "$ROOT_DIR/nix" "wireServer.$IMAGES_ATTR" --no-link
+nix -v --show-trace -L build -f "$ROOT_DIR/nix" "wireServer.$IMAGES_ATTR" --no-link --fallback
 
 xargs -I {} -P 10 "$SCRIPT_DIR/upload-image.sh" "wireServer.$IMAGES_ATTR.{}" < "$image_list_file"
 

integration/test/API/Brig.hs

@@ -1063,11 +1063,12 @@ data GetUserGroupsArgs = GetUserGroupsArgs
     pSize :: Maybe Int,
     lastName :: Maybe String,
     lastCreatedAt :: Maybe String,
-    lastId :: Maybe String
+    lastId :: Maybe String,
+    includeMemberCount :: Bool
   }
 
 instance Default GetUserGroupsArgs where
-  def = GetUserGroupsArgs Nothing Nothing Nothing Nothing Nothing Nothing Nothing
+  def = GetUserGroupsArgs Nothing Nothing Nothing Nothing Nothing Nothing Nothing False
 
 getUserGroups :: (MakesValue user) => user -> GetUserGroupsArgs -> App Response
 getUserGroups user GetUserGroupsArgs {..} = do
@@ -1082,7 +1083,8 @@ getUserGroups user GetUserGroupsArgs {..} = do
               (("page_size",) . show) <$> pSize,
               ("last_seen_name",) <$> lastName,
               ("last_seen_created_at",) <$> lastCreatedAt,
-              ("last_seen_id",) <$> lastId
+              ("last_seen_id",) <$> lastId,
+              (if includeMemberCount then Just ("include_member_count", "true") else Nothing)
             ]
         )
 
@@ -1102,6 +1104,15 @@ addUserToGroup user gid uid = do
   req <- baseRequest user Brig Versioned $ joinHttpPath ["user-groups", gid, "users", uid]
   submit "POST" req
 
+addUsersToGroup :: (MakesValue user) => user -> String -> [String] -> App Response
+addUsersToGroup user gid uids = do
+  req <- baseRequest user Brig Versioned $ joinHttpPath ["user-groups", gid, "users"]
+  submit "POST" $
+    req
+      & addJSONObject
+        [ "members" .= uids
+        ]
+
 removeUserFromGroup :: (MakesValue user) => user -> String -> String -> App Response
 removeUserFromGroup user gid uid = do
   req <- baseRequest user Brig Versioned $ joinHttpPath ["user-groups", gid, "users", uid]

integration/test/API/Galley.hs

@@ -33,7 +33,8 @@ data CreateConv = CreateConv
     groupConvType :: Maybe String,
     cells :: Bool,
     addPermission :: Maybe String,
-    skipCreator :: Maybe Bool
+    skipCreator :: Maybe Bool,
+    parent :: Maybe String
   }
 
 defProteus :: CreateConv
@@ -51,7 +52,8 @@ defProteus =
       groupConvType = Nothing,
       cells = False,
       addPermission = Nothing,
-      skipCreator = Nothing
+      skipCreator = Nothing,
+      parent = Nothing
     }
 
 defMLS :: CreateConv
@@ -87,7 +89,8 @@ instance MakesValue CreateConv where
                 "receipt_mode" .=? cc.receiptMode,
                 "group_conv_type" .=? cc.groupConvType,
                 "add_permission" .=? cc.addPermission,
-                "skip_creator" .=? cc.skipCreator
+                "skip_creator" .=? cc.skipCreator,
+                "parent" .=? cc.parent
               ]
         )
 
@@ -177,6 +180,19 @@ getConversation user qcnv = do
   req <- baseRequest user Galley Versioned (joinHttpPath ["conversations", domain, cnv])
   submit "GET" req
 
+getConversationInternal ::
+  ( HasCallStack,
+    MakesValue user,
+    MakesValue qcnv
+  ) =>
+  user ->
+  qcnv ->
+  App Response
+getConversationInternal user qcnv = do
+  (_domain, cnv) <- objQid qcnv
+  req <- baseRequest user Galley Unversioned (joinHttpPath ["i", "conversations", cnv])
+  submit "GET" req
+
 getSubConversation ::
   ( HasCallStack,
     MakesValue user

integration/test/MLS/Util.hs

@@ -654,7 +654,10 @@ consumingMessages mlsProtocol mp = Codensity $ \k -> do
     -- at this point we know that every new user has been added to the
     -- conversation
     for_ (zip clients wss) $ \((cid, t), ws) -> case t of
-      MLSNotificationMessageTag -> void $ consumeMessageNoExternal conv.ciphersuite cid mp ws
+      MLSNotificationMessageTag ->
+        when (conv.epoch > 0) $
+          void $
+            consumeMessageNoExternal conv.ciphersuite cid mp ws
       MLSNotificationWelcomeTag -> consumeWelcome cid mp ws
     pure r
 
@@ -989,3 +992,34 @@ removeMemberFromChannel user channel userToBeRemoved = do
             convId
             mls.convs
       }
+
+resetMLSConversation ::
+  (HasCallStack, MakesValue cid, MakesValue conv) =>
+  cid ->
+  conv ->
+  App Value
+resetMLSConversation cid conv = do
+  convId <- objConvId conv
+  mlsConv <- getMLSConv convId
+  resetConversation cid mlsConv.groupId mlsConv.epoch >>= assertStatus 200
+
+  conv' <- getConversation cid convId >>= getJSON 200
+  groupId <- conv' %. "group_id" & asString
+  groupId `shouldNotMatch` (mlsConv.groupId :: String)
+  conv' %. "epoch" `shouldMatchInt` 0
+  convId' <- objConvId conv'
+
+  modifyMLSState $ \mls ->
+    mls
+      { convs =
+          Map.insert
+            convId'
+            ( mlsConv
+                { groupId,
+                  epoch = 0,
+                  convId = convId'
+                }
+            )
+            $ Map.delete convId mls.convs
+      }
+  pure conv'

integration/test/Notifications.hs

@@ -230,6 +230,9 @@ isConnectionNotif status n =
 isUserGroupCreatedNotif :: (MakesValue a) => a -> App Bool
 isUserGroupCreatedNotif = notifTypeIsEqual "user-group.created"
 
+isUserGroupUpdatedNotif :: (MakesValue a) => a -> App Bool
+isUserGroupUpdatedNotif = notifTypeIsEqual "user-group.updated"
+
 isConvResetNotif :: (HasCallStack, MakesValue n) => n -> App Bool
 isConvResetNotif n =
   fieldEquals n "payload.0.type" "conversation.mls-reset"