Skip to content

fix: Don't allow OTR message editing #35600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 15 commits into from
May 13, 2025
Merged

fix: Don't allow OTR message editing #35600

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ac5915f
don't allow edit message action on otr message
yash-rajpal Mar 24, 2025
e04f363
skip OTR message when using keyboard events for editing
yash-rajpal Mar 24, 2025
f151642
add cs
yash-rajpal Mar 24, 2025
28e9334
Merge branch 'develop' into fix/otr-message-editing
yash-rajpal Apr 15, 2025
f02193c
chore: remove unused functions
yash-rajpal Apr 15, 2025
f6336ae
Merge branch 'develop' into fix/otr-message-editing
gabriellsh Apr 17, 2025
755fa46
Merge branch 'develop' into fix/otr-message-editing
yash-rajpal May 8, 2025
fce3763
add e2e test
yash-rajpal May 8, 2025
51e2720
test spec
yash-rajpal May 8, 2025
559dc88
fix: Editing non OTR messages when OTR session is active
yash-rajpal May 9, 2025
b36bec5
improve test
yash-rajpal May 9, 2025
78fd406
fix other OTR test
yash-rajpal May 9, 2025
e1648bb
remove comment
yash-rajpal May 9, 2025
2a8b740
fix: review
dougfabris May 12, 2025
cfec8a1
Merge branch 'develop' into fix/otr-message-editing
kodiakhq[bot] May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hungry-games-smoke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Blocks edit message action for Off-The-Record (OTR) messages.
2 changes: 1 addition & 1 deletion apps/meteor/app/ui/client/lib/ChatMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class ChatMessages implements ChatAPI {
}

if (!this.currentEditing) {
let lastMessage = await this.data.findLastOwnMessage();
let lastMessage = await this.data.findPreviousOwnMessage();

// Videoconf messages should not be edited
if (lastMessage && isVideoConfMessage(lastMessage)) {
Expand Down
6 changes: 5 additions & 1 deletion apps/meteor/client/components/message/toolbar/useEditMessageAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isRoomFederated } from '@rocket.chat/core-typings';
import { isOTRAckMessage, isOTRMessage, isRoomFederated } from '@rocket.chat/core-typings';
import type { IRoom, IMessage, ISubscription } from '@rocket.chat/core-typings';
import { usePermission, useSetting, useUser } from '@rocket.chat/ui-contexts';
import moment from 'moment';
Expand Down Expand Up @@ -26,6 +26,10 @@ export const useEditMessageAction = (
return message.u._id === user?._id;
}

if (isOTRMessage(message) || isOTRAckMessage(message)) {
return false;
}

const editOwn = message.u && message.u._id === user?._id;
if (!canEditMessage && (!isEditAllowed || !editOwn)) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/lib/chats/ChatAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export type DataAPI = {
getLastMessage(): Promise<IMessage>;
findLastOwnMessage(): Promise<IMessage | undefined>;
getLastOwnMessage(): Promise<IMessage>;
findPreviousOwnMessage(message: IMessage): Promise<IMessage | undefined>;
findPreviousOwnMessage(message?: IMessage): Promise<IMessage | undefined>;
getPreviousOwnMessage(message: IMessage): Promise<IMessage>;
findNextOwnMessage(message: IMessage): Promise<IMessage | undefined>;
getNextOwnMessage(message: IMessage): Promise<IMessage>;
Expand Down
17 changes: 14 additions & 3 deletions apps/meteor/client/lib/chats/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import type { IEditedMessage, IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
import {
isOTRAckMessage,
isOTRMessage,
type IEditedMessage,
type IMessage,
type IRoom,
type ISubscription,
} from '@rocket.chat/core-typings';
import { Random } from '@rocket.chat/random';
import moment from 'moment';

Expand Down Expand Up @@ -85,6 +92,10 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
return false;
}

if (isOTRMessage(message) || isOTRAckMessage(message)) {
return false;
}

const canEditMessage = hasAtLeastOnePermission('edit-message', message.rid);
const editAllowed = (settings.get('Message_AllowEditing') as boolean | undefined) ?? false;
const editOwn = message?.u && message.u._id === Meteor.userId();
Expand All @@ -104,15 +115,15 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
return true;
};

const findPreviousOwnMessage = async (message: IMessage): Promise<IMessage | undefined> => {
const findPreviousOwnMessage = async (message?: IMessage): Promise<IMessage | undefined> => {
const uid = Meteor.userId();

if (!uid) {
return undefined;
}

const msg = Messages.findOne(
{ rid, 'tmid': tmid ?? { $exists: false }, 'u._id': uid, '_hidden': { $ne: true }, 'ts': { $lt: message.ts } },
{ rid, 'tmid': tmid ?? { $exists: false }, 'u._id': uid, '_hidden': { $ne: true }, 'ts': { ...(message && { $lt: message.ts }) } },
Comment thread
yash-rajpal marked this conversation as resolved.
{ sort: { ts: -1 }, reactive: false },
);

Expand Down