Merge branch 'release/0.23.6/master'

matrix-org · May 19, 2022 · 4c9efc0 · 4c9efc0
2 parents 6cb7100 + ac45ca2
commit 4c9efc0
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+## Changes in 0.23.6 (2022-05-19)
+
+No significant changes.
+
+
 ## Changes in 0.23.5 (2022-05-18)
 
 ✨ Features

diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.23.5"
+  s.version      = "0.23.6"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

diff --git a/MatrixSDK/Crypto/Data/MXMegolmSessionData.m b/MatrixSDK/Crypto/Data/MXMegolmSessionData.m
@@ -16,6 +16,7 @@
 
 #import "MXMegolmSessionData.h"
 #import "MXSharedHistoryKeyService.h"
+#import "MXSDKOptions.h"
 
 @implementation MXMegolmSessionData
 
@@ -29,7 +30,10 @@ + (id)modelFromJSON:(NSDictionary *)JSONDictionary
         MXJSONModelSetString(sessionData.roomId, JSONDictionary[@"room_id"]);
         MXJSONModelSetString(sessionData.sessionId, JSONDictionary[@"session_id"]);
         MXJSONModelSetString(sessionData.sessionKey, JSONDictionary[@"session_key"]);
-        MXJSONModelSetBoolean(sessionData.sharedHistory, JSONDictionary[kMXSharedHistoryKeyName]);
+        if (MXSDKOptions.sharedInstance.enableRoomSharedHistoryOnInvite)
+        {
+            MXJSONModelSetBoolean(sessionData.sharedHistory, JSONDictionary[kMXSharedHistoryKeyName]);
+        }
         MXJSONModelSetString(sessionData.algorithm, JSONDictionary[@"algorithm"]);
         MXJSONModelSetArray(sessionData.forwardingCurve25519KeyChain, JSONDictionary[@"forwarding_curve25519_key_chain"])
     }

diff --git a/MatrixSDK/Crypto/MXCrypto.m b/MatrixSDK/Crypto/MXCrypto.m
@@ -1897,6 +1897,11 @@ - (BOOL)isRoomEncrypted:(NSString *)roomId
 
 - (BOOL)isRoomSharingHistory:(NSString *)roomId
 {
+    if (!MXSDKOptions.sharedInstance.enableRoomSharedHistoryOnInvite)
+    {
+        return NO;
+    }
+
     MXRoom *room = [self.mxSession roomWithRoomId:roomId];
     MXRoomHistoryVisibility visibility = room.summary.historyVisibility;
     return [visibility isEqualToString:kMXRoomHistoryVisibilityWorldReadable] || [visibility isEqualToString:kMXRoomHistoryVisibilityShared];

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.23.5";
+NSString *const MatrixSDKVersion = @"0.23.6";
diff --git a/MatrixSDKTests/Crypto/Algorithms/Megolm/MXMegolmEncryptionTests.swift b/MatrixSDKTests/Crypto/Algorithms/Megolm/MXMegolmEncryptionTests.swift
@@ -49,7 +49,8 @@ class MXMegolmEncryptionTests: XCTestCase {
         return store?.inboundGroupSessions().last?.sharedHistory == true
     }
 
-    func testResetsSessionIfRoomVisibilityChanges() {
+    func test_resetsSession_ifRoomVisibilityChanges() {
+        MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = true
 
         // The following tests that oubound session Id (and therefore the related inbound session Id)
         // is reset whenever the room's history visibility changes from shared to not shared.
@@ -122,4 +123,78 @@ class MXMegolmEncryptionTests: XCTestCase {
             }
         }
     }
+
+    func test_doesNotResetsSession_ifRoomVisibilityChanges_andFeatureDisabled() {
+        MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = false
+
+        // The following tests that if the feature is disabled, then outbound session Id
+        // is not reset when room visibility changes
+        e2eData.doE2ETestWithAlice(inARoom: self) { session, roomId, expectation in
+
+            let room = session?.room(withRoomId: roomId)
+
+            // 1st set of messages
+            room?.sendTextMessages(messages: ["Hi", "Hello"]) { _ in
+
+                // After first few messages we only expect one inbound and one outbound session
+                let sessionIds1 = self.storedSessionIds(in: session)
+                XCTAssertEqual(sessionIds1.outbound.count, 1)
+                XCTAssertEqual(sessionIds1.inbound.count, 1)
+                XCTAssertEqual(sessionIds1.inbound, sessionIds1.outbound)
+                XCTAssertFalse(self.isSharedHistoryInLastSession(for: session))
+
+                // 2nd set of messages
+                room?.sendTextMessages(messages: ["Hi", "Hello"]) { _ in
+
+                    // After second batch of messages nothing has changed that would require resetting
+                    // of sessions, therefore sessionIds are unchanged
+                    let sessionIds2 = self.storedSessionIds(in: session)
+                    XCTAssertEqual(sessionIds2, sessionIds1)
+                    XCTAssertFalse(self.isSharedHistoryInLastSession(for: session))
+
+                    // Changing room visibility from shared by default to more restrictive will not reset session keys
+                    room?.setHistoryVisibility(.joined) { _ in
+
+                        // 3rd set of messages
+                        room?.sendTextMessages(messages: ["Hi", "Hello"]) { _ in
+
+                            // Sessions are identical as before
+                            let sessionIds3 = self.storedSessionIds(in: session)
+                            XCTAssertEqual(sessionIds3.outbound.count, 1)
+                            XCTAssertEqual(sessionIds3.outbound, sessionIds2.outbound)
+                            XCTAssertEqual(sessionIds3.inbound.count, 1)
+                            XCTAssertEqual(sessionIds3.inbound, sessionIds1.outbound)
+                            XCTAssertFalse(self.isSharedHistoryInLastSession(for: session))
+
+                            // 4th set of messages
+                            room?.sendTextMessages(messages: ["Hi", "Hello"]) { _ in
+                                // After fourth batch of messages nothing has changed that would require resetting
+                                // of sessions, therefore sessionIds are unchanged
+                                let sessionIds4 = self.storedSessionIds(in: session)
+                                XCTAssertEqual(sessionIds4, sessionIds3)
+                                XCTAssertFalse(self.isSharedHistoryInLastSession(for: session))
+
+                                // Final visibility change back to shared will still not reset sessions
+                                room?.setHistoryVisibility(.worldReadable) { _ in
+                                    room?.sendTextMessages(messages: ["Hi", "Hello"]) { _ in
+
+                                        // Sessions are still identical as before
+                                        let sessionIds5 = self.storedSessionIds(in: session)
+                                        XCTAssertEqual(sessionIds5.outbound.count, 1)
+                                        XCTAssertEqual(sessionIds5.outbound, sessionIds4.outbound)
+                                        XCTAssertEqual(sessionIds5.inbound.count, 1)
+                                        XCTAssertEqual(sessionIds5.inbound, sessionIds1.outbound)
+                                        XCTAssertFalse(self.isSharedHistoryInLastSession(for: session))
+
+                                        session?.close()
+                                        expectation?.fulfill()
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/MatrixSDKTests/Crypto/Data/MXMegolmSessionDataUnitTests.swift b/MatrixSDKTests/Crypto/Data/MXMegolmSessionDataUnitTests.swift
@@ -19,6 +19,8 @@ import Foundation
 
 class MXMegolmSessionDataUnitTests: XCTestCase {
     func testCanInitWithJSONDictionary() {
+        MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = true
+
         let jsonDictionary: [String: Any] = [
             "sender_key": "A",
             "sender_claimed_keys": ["B": "C"],
@@ -42,6 +44,18 @@ class MXMegolmSessionDataUnitTests: XCTestCase {
         XCTAssertEqual(data?.forwardingCurve25519KeyChain, ["H", "I"])
     }
 
+    func testIgnoreSharedHistoryIfFlagDisabled() {
+        MXSDKOptions.sharedInstance().enableRoomSharedHistoryOnInvite = false
+        let jsonDictionary: [String: Any] = [
+            "org.matrix.msc3061.shared_history": true,
+        ]
+
+        let data = MXMegolmSessionData(fromJSON: jsonDictionary)
+
+        XCTAssertNotNil(data)
+        XCTAssertEqual(data?.sharedHistory, false)
+    }
+
     func testJsonDictionary() {
         let data = MXMegolmSessionData()
         data.senderKey = "A"

diff --git a/MatrixSDKTests/MXCryptoTests.m b/MatrixSDKTests/MXCryptoTests.m
@@ -3235,7 +3235,11 @@ - (void)testIsRoomSharingHistory
             @[kMXRoomHistoryVisibilityWorldReadable, @(YES)]
         ];
 
-        // Visibility is set to shared by default
+        // Visibility is set to not shared by default
+        XCTAssertFalse([session.crypto isRoomSharingHistory:roomId]);
+
+        // But can be enabled with a build flag
+        MXSDKOptions.sharedInstance.enableRoomSharedHistoryOnInvite = YES;
         XCTAssertTrue([session.crypto isRoomSharingHistory:roomId]);
 
         MXRoom *room = [session roomWithRoomId:roomId];