forked from matrix-org/matrix-react-sdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix viewing source of redacted events
Clicking 'View Source' in the context menu of a redacted event causes an error, and the user gets no visible result. This fixes <ViewSource /> to indicate that the source is unavailable when a message has been redacted. The original source remains available. <SyntaxHighlight /> requires a non-null string for its `content` prop, and, in the case of redacted events, <ViewSource /> was passing `undefined`. This is ultimately because redacting an event causes `MatrixEvent.clearEvent` to be `undefined`, which <ViewSource /> wasn't checking. Fixes element-hq/element-web#24165 Signed-off-by: Clark Fischer <[email protected]>
- Loading branch information
Showing
3 changed files
with
68 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
/* | ||
Copyright 2015, 2016 OpenMarket Ltd | ||
Copyright 2019 Michael Telatynski <[email protected]> | ||
Copyright 2019 The Matrix.org Foundation C.I.C. | ||
Copyright 2015, 2019, 2023 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
|
@@ -77,9 +76,13 @@ export default class ViewSource extends React.Component<IProps, IState> { | |
<summary> | ||
<span className="mx_ViewSource_heading">{_t("Decrypted event source")}</span> | ||
</summary> | ||
<CopyableText getTextToCopy={copyDecryptedFunc}> | ||
<SyntaxHighlight language="json">{stringify(decryptedEventSource)}</SyntaxHighlight> | ||
</CopyableText> | ||
{decryptedEventSource ? ( | ||
<CopyableText getTextToCopy={copyDecryptedFunc}> | ||
<SyntaxHighlight language="json">{stringify(decryptedEventSource)}</SyntaxHighlight> | ||
</CopyableText> | ||
) : ( | ||
<div>{_t("Source unavailable")}</div> | ||
)} | ||
</details> | ||
<details className="mx_ViewSource_details"> | ||
<summary> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
Copyright 2023 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import { render } from "@testing-library/react"; | ||
import { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix"; | ||
import React from "react"; | ||
|
||
import ViewSource from "../../../src/components/structures/ViewSource"; | ||
import { mkEvent, stubClient } from "../../test-utils/test-utils"; | ||
|
||
describe("ThreadView", () => { | ||
const ROOM_ID = "!roomId:example.org"; | ||
const SENDER = "@alice:example.org"; | ||
|
||
let messageEvent: MatrixEvent; | ||
|
||
const redactionEvent = mkEvent({ | ||
user: SENDER, | ||
event: true, | ||
type: EventType.RoomRedaction, | ||
content: {}, | ||
}); | ||
|
||
beforeEach(() => { | ||
messageEvent = new MatrixEvent({ | ||
type: EventType.RoomMessageEncrypted, | ||
room_id: ROOM_ID, | ||
sender: SENDER, | ||
content: {}, | ||
state_key: undefined, | ||
}); | ||
messageEvent.makeRedacted(redactionEvent); | ||
}); | ||
|
||
beforeEach(stubClient); | ||
|
||
// See https://github.com/vector-im/element-web/issues/24165 | ||
it("doesn't error when viewing redacted encrypted messages", () => { | ||
// Sanity checks | ||
expect(messageEvent.isEncrypted()).toBeTruthy(); | ||
// @ts-ignore clearEvent is private, but it's being used directly <ViewSource /> | ||
expect(messageEvent.clearEvent).toBe(undefined); | ||
|
||
expect(() => render(<ViewSource mxEvent={messageEvent} onFinished={() => {}} />)).not.toThrow(); | ||
}); | ||
}); |