Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions spec/schemas.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1847,6 +1847,7 @@ describe('schemas', () => {
expect(err.message).toEqual('Permission denied');
expect(err.code).toEqual(Parse.Error.OPERATION_FORBIDDEN);
expect(loggerErrorSpy).toHaveBeenCalledWith('Sanitized error:', jasmine.stringContaining('Permission denied for action addField on class AClass'));
expect(loggerErrorSpy).toHaveBeenCalledWith('Sanitized error:', jasmine.stringContaining('field hello'));
done();
}
);
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/DatabaseController.js
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ class DatabaseController {
runOptions.addsField = true;

const action = runOptions.action;
return schema.validatePermission(className, aclGroup, 'addField', action);
return schema.validatePermission(className, aclGroup, 'addField', action, newKeys);
}
return Promise.resolve();
}
Expand Down
18 changes: 14 additions & 4 deletions src/Controllers/SchemaController.js
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,8 @@ export default class SchemaController {
className: string,
aclGroup: string[],
operation: string,
action?: string
action?: string,
fields?: string[]
) {
if (SchemaController.testPermissions(classPermissions, aclGroup, operation)) {
return Promise.resolve();
Expand Down Expand Up @@ -1451,21 +1452,30 @@ export default class SchemaController {
}
}

const fieldInfo =
fields && fields.length ? ` for ${fields.length > 1 ? 'fields' : 'field'} ${fields.join(', ')}` : '';
throw createSanitizedError(
Parse.Error.OPERATION_FORBIDDEN,
`Permission denied for action ${operation} on class ${className}.`,
`Permission denied for action ${operation} on class ${className}${fieldInfo}.`,
config
);
}

// Validates an operation passes class-level-permissions set in the schema
validatePermission(className: string, aclGroup: string[], operation: string, action?: string) {
validatePermission(
className: string,
aclGroup: string[],
operation: string,
action?: string,
fields?: string[]
) {
return SchemaController.validatePermission(
this.getClassLevelPermissions(className),
className,
aclGroup,
operation,
action
action,
fields
);
}

Expand Down
Loading