Merge branch 'develop' into alunturner/style-mentions-as-pills

Author: artcodespace

CHANGELOG.md

@@ -1,3 +1,16 @@
+Changes in [3.69.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.69.1) (2023-03-31)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix detection of encryption for all users in a room ([\#10487](https://github.com/matrix-org/matrix-react-sdk/pull/10487)). Fixes vector-im/element-web#24995.
+
+Changes in [3.69.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.69.0) (2023-03-28)
+=====================================================================================================
+
+## 🔒 Security
+ * Fixes for [CVE-2023-28427](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-28427) / GHSA-mwq8-fjpf-c2gr
+ * Fixes for [CVE-2023-28103](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-28103) / GHSA-6g43-88cp-w5gv
+
 Changes in [3.68.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.68.0) (2023-03-15)
 =====================================================================================================
 

cypress/e2e/create-room/create-room.spec.ts

@@ -20,8 +20,8 @@ import { HomeserverInstance } from "../../plugins/utils/homeserver";
 import Chainable = Cypress.Chainable;
 
 function openCreateRoomDialog(): Chainable<JQuery<HTMLElement>> {
-    cy.get('[aria-label="Add room"]').click();
-    cy.get('.mx_ContextualMenu [aria-label="New room"]').click();
+    cy.findButton("Add room").click();
+    cy.findMenuitem("New room").click();
     return cy.get(".mx_CreateRoomDialog");
 }
 
@@ -46,20 +46,23 @@ describe("Create Room", () => {
 
         openCreateRoomDialog().within(() => {
             // Fill name & topic
-            cy.get('[label="Name"]').type(name);
-            cy.get('[label="Topic (optional)"]').type(topic);
+            cy.findTextbox("Name").type(name);
+            cy.findTextbox("Topic (optional)").type(topic);
             // Change room to public
-            cy.get('[aria-label="Room visibility"]').click();
-            cy.get("#mx_JoinRuleDropdown__public").click();
+            cy.findButton("Room visibility").click();
+            cy.findOption("Public room").click();
             // Fill room address
-            cy.get('[label="Room address"]').type("test-room-1");
+            cy.findTextbox("Room address").type("test-room-1");
             // Submit
-            cy.get(".mx_Dialog_primary").click();
+            cy.findButton("Create room").click();
         });
 
         cy.url().should("contain", "/#/room/#test-room-1:localhost");
-        cy.contains(".mx_RoomHeader_nametext", name);
-        cy.contains(".mx_RoomHeader_topic", topic);
+
+        cy.get(".mx_RoomHeader").within(() => {
+            cy.findByText(name);
+            cy.findByText(topic);
+        });
     });
 
     it("should create a room with a long room name, which is displayed with ellipsis", () => {

cypress/e2e/crypto/decryption-failure.spec.ts

@@ -57,6 +57,28 @@ const handleVerificationRequest = (request: VerificationRequest): Chainable<Emoj
     );
 };
 
+const checkTimelineNarrow = (button = true) => {
+    cy.viewport(800, 600); // SVGA
+    cy.get(".mx_LeftPanel_minimized").should("exist"); // Wait until the left panel is minimized
+    cy.get(".mx_RightPanel_roomSummaryButton").click(); // Open the right panel to make the timeline narrow
+    cy.get(".mx_BaseCard").should("exist");
+
+    // Ensure the failure bar does not cover the timeline
+    cy.get(".mx_RoomView_body .mx_EventTile.mx_EventTile_last").should("be.visible");
+
+    // Ensure the indicator does not overflow the timeline
+    cy.get("[data-testid='decryption-failure-bar-indicator']").should("be.visible");
+
+    if (button) {
+        // Ensure the button does not overflow the timeline
+        cy.get("[data-testid='decryption-failure-bar-button']:last-of-type").should("be.visible");
+    }
+
+    cy.get(".mx_RightPanel_roomSummaryButton").click(); // Close the right panel
+    cy.get(".mx_BaseCard").should("not.exist");
+    cy.viewport(1000, 660); // Reset to the default size
+};
+
 describe("Decryption Failure Bar", () => {
     let homeserver: HomeserverInstance | undefined;
     let testUser: UserCredentials | undefined;
@@ -113,10 +135,13 @@ describe("Decryption Failure Bar", () => {
                 })
                 .then(() => {
                     cy.botSendMessage(bot, roomId, "test");
+                    cy.contains(".mx_DecryptionFailureBar_start_headline", "Decrypting messages…").should("be.visible");
                     cy.contains(
-                        ".mx_DecryptionFailureBar .mx_DecryptionFailureBar_message_headline",
+                        ".mx_DecryptionFailureBar_start_headline",
                         "Verify this device to access all messages",
-                    );
+                    ).should("be.visible");
+
+                    checkTimelineNarrow();
 
                     cy.get(".mx_DecryptionFailureBar").percySnapshotElement(
                         "DecryptionFailureBar prompts user to verify",
@@ -125,12 +150,14 @@ describe("Decryption Failure Bar", () => {
                         },
                     );
 
-                    cy.contains(".mx_DecryptionFailureBar_button", "Resend key requests").should("not.exist");
-                    cy.contains(".mx_DecryptionFailureBar_button", "Verify").click();
+                    cy.contains(".mx_DecryptionFailureBar_end", "Resend key requests").should("not.exist");
+                    cy.contains(".mx_DecryptionFailureBar_end", "Verify").should("be.visible").click();
 
                     const verificationRequestPromise = waitForVerificationRequest(otherDevice);
                     cy.get(".mx_CompleteSecurity_actionRow .mx_AccessibleButton").click();
-                    cy.contains("To proceed, please accept the verification request on your other device.");
+                    cy.contains("To proceed, please accept the verification request on your other device.").should(
+                        "be.visible",
+                    );
                     cy.wrap(verificationRequestPromise).then((verificationRequest: VerificationRequest) => {
                         cy.wrap(verificationRequest.accept());
                         handleVerificationRequest(verificationRequest).then((emojis) => {
@@ -146,10 +173,12 @@ describe("Decryption Failure Bar", () => {
             cy.get(".mx_VerificationPanel_verified_section .mx_E2EIcon_verified").should("exist");
             cy.contains(".mx_AccessibleButton", "Got it").click();
 
-            cy.get(".mx_DecryptionFailureBar .mx_DecryptionFailureBar_message_headline").should(
-                "have.text",
+            cy.contains(
+                ".mx_DecryptionFailureBar_start_headline",
                 "Open another device to load encrypted messages",
-            );
+            ).should("be.visible");
+
+            checkTimelineNarrow();
 
             cy.get(".mx_DecryptionFailureBar").percySnapshotElement(
                 "DecryptionFailureBar prompts user to open another device, with Resend Key Requests button",
@@ -159,9 +188,12 @@ describe("Decryption Failure Bar", () => {
             );
 
             cy.intercept("/_matrix/client/r0/sendToDevice/m.room_key_request/*").as("keyRequest");
-            cy.contains(".mx_DecryptionFailureBar_button", "Resend key requests").click();
+            cy.contains(".mx_DecryptionFailureBar_end_button", "Resend key requests").should("be.visible").click();
             cy.wait("@keyRequest");
-            cy.contains(".mx_DecryptionFailureBar_button", "Resend key requests").should("not.exist");
+            cy.contains(".mx_DecryptionFailureBar_end_button", "Resend key requests").should("not.exist");
+            cy.contains(".mx_DecryptionFailureBar_end_button", "View your device list").should("be.visible");
+
+            checkTimelineNarrow();
 
             cy.get(".mx_DecryptionFailureBar").percySnapshotElement(
                 "DecryptionFailureBar prompts user to open another device, without Resend Key Requests button",
@@ -184,15 +216,17 @@ describe("Decryption Failure Bar", () => {
 
             cy.botSendMessage(bot, roomId, "test");
             cy.contains(
-                ".mx_DecryptionFailureBar .mx_DecryptionFailureBar_message_headline",
+                ".mx_DecryptionFailureBar_start_headline",
                 "Reset your keys to prevent future decryption errors",
-            );
+            ).should("be.visible");
+
+            checkTimelineNarrow();
 
             cy.get(".mx_DecryptionFailureBar").percySnapshotElement("DecryptionFailureBar prompts user to reset keys", {
                 widths: [320, 640],
             });
 
-            cy.contains(".mx_DecryptionFailureBar_button", "Reset").click();
+            cy.contains(".mx_DecryptionFailureBar_end_button", "Reset").should("be.visible").click();
 
             // Set up key backup
             cy.get(".mx_Dialog").within(() => {
@@ -204,11 +238,12 @@ describe("Decryption Failure Bar", () => {
                 cy.contains("Done").click();
             });
 
-            cy.get(".mx_DecryptionFailureBar .mx_DecryptionFailureBar_message_headline").should(
-                "have.text",
-                "Some messages could not be decrypted",
+            cy.contains(".mx_DecryptionFailureBar_start_headline", "Some messages could not be decrypted").should(
+                "be.visible",
             );
 
+            checkTimelineNarrow(false); // button should not be rendered here
+
             cy.get(".mx_DecryptionFailureBar").percySnapshotElement(
                 "DecryptionFailureBar displays general message with no call to action",
                 {
@@ -233,9 +268,11 @@ describe("Decryption Failure Bar", () => {
             widths: [320, 640],
         });
 
+        checkTimelineNarrow();
+
         cy.wait(5000);
         cy.get(".mx_DecryptionFailureBar .mx_Spinner").should("not.exist");
-        cy.get(".mx_DecryptionFailureBar .mx_DecryptionFailureBar_icon").should("exist");
+        cy.get("[data-testid='decryption-failure-bar-icon']").should("be.visible");
 
         cy.get(".mx_RoomView_messagePanel").scrollTo("top");
         cy.get(".mx_DecryptionFailureBar").should("not.exist");
@@ -245,5 +282,7 @@ describe("Decryption Failure Bar", () => {
 
         cy.get(".mx_RoomView_messagePanel").scrollTo("bottom");
         cy.get(".mx_DecryptionFailureBar").should("exist");
+
+        checkTimelineNarrow();
     });
 });