Skip to content

Commit de93140

Browse files
committed
better escaping for non-quoted values
1 parent 153ac89 commit de93140

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

o365Utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ var o365CommandRegistry = {
184184
'Type': {'quoted':false, 'default':'Security'},
185185
'ManagedBy': {},
186186
'Members': {}, // specifying members on create does not seem to work
187-
'ModerationEnabled': { 'default':'$false', 'quoted':false},
187+
'ModerationEnabled': { 'default':'0', 'quoted':false},
188188
'MemberDepartRestriction': { 'default':'Closed'},
189189
'MemberJoinRestriction': { 'default':'Closed'},
190190
'SendModerationNotifications': { 'default':'Never', 'quoted':false},
@@ -206,7 +206,7 @@ var o365CommandRegistry = {
206206
'ManagedBy': {},
207207
'Members': {},
208208
'MailTip': {},
209-
'ModerationEnabled': { 'default':'$false', 'quoted':false},
209+
'ModerationEnabled': { 'default':'0', 'quoted':false},
210210
'MemberDepartRestriction': { 'default':'Closed'},
211211
'MemberJoinRestriction': { 'default':'Closed'},
212212
'SendModerationNotifications': { 'default':'Never', 'quoted':false},

psCommandService.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,13 @@ PSCommandService.prototype._sanitize = function(toSanitize,isQuoted) {
360360
// escape stuff that could screw up variables
361361
toSanitize = toSanitize.replace(/([`#])/g, "`$1");
362362

363-
// fix quote breaking
363+
// if quoted, escape all quotes
364364
if (isQuoted) {
365365
toSanitize = toSanitize.replace(/(['])/g, "'$1");
366+
367+
// if not quoted, stop $ and |
368+
} else {
369+
toSanitize = toSanitize.replace(/([\$\|])/g, "`$1");
366370
}
367371

368372
return toSanitize;

0 commit comments

Comments
 (0)