Skip to content

#5301 sensitive fields acl #5334

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
merged 11 commits into from
Feb 23, 2019
Merged

#5301 sensitive fields acl #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bbec2be
Add tests to prove a user with valid read ACLs still can't read PII d…
awgeorge Jan 18, 2019
6ed3165
Added negative scenarios for #5301.
awgeorge Jan 18, 2019
1cf28f6
Fix tests to catch errors
awgeorge Jan 19, 2019
506ee13
Add new definition and update tests to reflect
awgeorge Jan 28, 2019
5481e54
Set default protectedFields and remove previous filter logic
awgeorge Jan 28, 2019
02bde64
Add filter sensitive fields logic that apply CLPs\nAdd protectedField…
awgeorge Jan 29, 2019
1f773c0
Fix linter errors
awgeorge Jan 30, 2019
4d24e3f
Update based on @milesrichardson comment https://github.com/parse-com…
awgeorge Jan 31, 2019
7fdbf03
Use ES6 code
awgeorge Feb 1, 2019
68b9f2b
Updates based on review
awgeorge Feb 22, 2019
7c57ffa
Reverse update.
awgeorge Feb 22, 2019
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
2 changes: 2 additions & 0 deletions spec/MongoSchemaCollectionAdapter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('MongoSchemaCollection', () => {
create: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
indexes: {
name1: { deviceToken: 1 },
Expand Down Expand Up @@ -72,6 +73,7 @@ describe('MongoSchemaCollection', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
indexes: {
name1: { deviceToken: 1 },
Expand Down
4 changes: 4 additions & 0 deletions spec/ParseLiveQueryServer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ describe('ParseLiveQueryServer', function() {
find: {},
update: {},
delete: { '*': true },
protectedFields: {},
});

expect(deleteSpy).toHaveBeenCalled();
Expand All @@ -270,6 +271,7 @@ describe('ParseLiveQueryServer', function() {
find: {},
update: {},
delete: { '*': true },
protectedFields: {},
});
done();
})
Expand Down Expand Up @@ -1920,6 +1922,7 @@ describe('LiveQueryController', () => {
find: {},
update: {},
delete: { '*': true },
protectedFields: {},
});

expect(deleteSpy).toHaveBeenCalled();
Expand All @@ -1933,6 +1936,7 @@ describe('LiveQueryController', () => {
find: {},
update: {},
delete: { '*': true },
protectedFields: {},
});
done();
})
Expand Down
70 changes: 70 additions & 0 deletions spec/Schema.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand All @@ -338,6 +339,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
};
config.database.loadSchema().then(schema => {
schema
Expand Down Expand Up @@ -461,6 +463,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand Down Expand Up @@ -653,6 +656,68 @@ describe('SchemaController', () => {
});
});

it('refuses to add CLP with incorrect find', done => {
const levelPermissions = {
find: { '*': false },
get: { '*': true },
create: { '*': true },
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': ['email'] },
};
config.database.loadSchema().then(schema => {
schema
.validateObject('NewClass', {})
.then(() => schema.reloadData())
.then(() =>
schema.updateClass(
'NewClass',
{},
levelPermissions,
{},
config.database
)
)
.then(done.fail)
.catch(error => {
expect(error.code).toEqual(Parse.Error.INVALID_JSON);
done();
});
});
});

it('refuses to add CLP when incorrectly sending a string to protectedFields object value instead of an array', done => {
const levelPermissions = {
find: { '*': true },
get: { '*': true },
create: { '*': true },
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': 'email' },
};
config.database.loadSchema().then(schema => {
schema
.validateObject('NewClass', {})
.then(() => schema.reloadData())
.then(() =>
schema.updateClass(
'NewClass',
{},
levelPermissions,
{},
config.database
)
)
.then(done.fail)
.catch(error => {
expect(error.code).toEqual(Parse.Error.INVALID_JSON);
done();
});
});
});

it('will create classes', done => {
config.database
.loadSchema()
Expand Down Expand Up @@ -706,6 +771,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand Down Expand Up @@ -751,6 +817,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand Down Expand Up @@ -782,6 +849,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand Down Expand Up @@ -815,6 +883,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand Down Expand Up @@ -1002,6 +1071,7 @@ describe('SchemaController', () => {
update: { '*': true },
delete: { '*': true },
addField: { '*': true },
protectedFields: { '*': [] },
},
};
expect(dd(actualSchema, expectedSchema)).toEqual(undefined);
Expand Down
Loading