Skip to content
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

Added checks to updateMessage and deleteMessage #621

Merged
merged 3 commits into from
Aug 29, 2015
Merged

Added checks to updateMessage and deleteMessage #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a46275
added checks to updateMessage and deleteMessage
geekgonecrazy Aug 28, 2015
804b2e0
Fixed typo
geekgonecrazy Aug 28, 2015
3538f9e
fixed. Forgot this is an action that's only triggered from admin panel.
geekgonecrazy Aug 29, 2015
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
8 changes: 6 additions & 2 deletions server/methods/deleteMessage.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Meteor.methods
if not RocketChat.settings.get 'Message_AllowDeleting'
throw new Meteor.Error 'message-deleting-not-allowed', "[methods] updateMessage -> Message deleting not allowed"

user = Meteor.users.findOne Meteor.userId()

unless user?.admin is true or message.u._id is Meteor.userId()
throw new Meteor.Error 'not-authorized', '[methods] deleteMessage -> Not authorized'

console.log '[methods] deleteMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments

Expand All @@ -25,7 +29,7 @@ Meteor.methods
_id: message._id
'u._id': Meteor.userId()
,
$set:
$set:
_hidden: true

else
Expand All @@ -39,7 +43,7 @@ Meteor.methods
_id: message._id
'u._id': Meteor.userId()
,
$set:
$set:
msg: ''
t: 'rm'
ets: new Date()
Expand Down
7 changes: 6 additions & 1 deletion server/methods/updateMessage.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Meteor.methods
if not RocketChat.settings.get 'Message_AllowEditing'
throw new Meteor.Error 'message-editing-not-allowed', "[methods] updateMessage -> Message editing not allowed"

user = Meteor.users.findOne Meteor.userId()

unless user?.admin is true or message.u._id is Meteor.userId()
throw new Meteor.Error 'not-authorized', '[methods] updateMessage -> Not authorized'

console.log '[methods] updateMessage -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments

# If we keep history of edits, insert a new message to store history information
Expand All @@ -31,4 +36,4 @@ Meteor.methods
$set: message

# Meteor.defer ->
# RocketChat.callbacks.run 'afterSaveMessage', ChatMessage.findOne(message.id)
# RocketChat.callbacks.run 'afterSaveMessage', ChatMessage.findOne(message.id)