Skip to content

Commit 03e68f9

Browse files
committed
Fix locked or private permission should block any operation if owner is null
1 parent a119833 commit 03e68f9

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

lib/realtime.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ function ifMayEdit(socket, callback) {
540540
break;
541541
case "locked": case "private":
542542
//only owner can change
543-
if (note.owner != socket.request.user.id)
543+
if (!note.owner || note.owner != socket.request.user.id)
544544
mayEdit = false;
545545
break;
546546
}
@@ -641,7 +641,7 @@ function connection(socket) {
641641
if (!noteId || !notes[noteId]) return;
642642
var note = notes[noteId];
643643
//Only owner can change permission
644-
if (note.owner == socket.request.user.id) {
644+
if (note.owner && note.owner == socket.request.user.id) {
645645
note.permission = permission;
646646
models.Note.update({
647647
permission: permission

public/js/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,7 +1907,7 @@ function updatePermission(newPermission) {
19071907
title = "Only owner can view & edit";
19081908
break;
19091909
}
1910-
if (personalInfo.userid && personalInfo.userid == owner) {
1910+
if (personalInfo.userid && owner && personalInfo.userid == owner) {
19111911
label += ' <i class="fa fa-caret-down"></i>';
19121912
ui.infobar.permission.label.removeClass('disabled');
19131913
} else {
@@ -1931,7 +1931,7 @@ function havePermission() {
19311931
break;
19321932
case "locked":
19331933
case "private":
1934-
if (personalInfo.userid != owner) {
1934+
if (!owner || personalInfo.userid != owner) {
19351935
bool = false;
19361936
} else {
19371937
bool = true;

0 commit comments

Comments
 (0)