Merge pull request from GHSA-xqp8-w826-hh6x
* Backport the advisory fix * Added a 4.10.3 section to CHANGELOG
This commit is contained in:
committed by
GitHub
parent
0bfa6b7cc1
commit
6ae5835b19
@@ -108,6 +108,23 @@ const mongoSchemaFromFieldsAndClassNameAndCLP = (
|
||||
return mongoObject;
|
||||
};
|
||||
|
||||
function validateExplainValue(explain) {
|
||||
if (explain) {
|
||||
// The list of allowed explain values is from node-mongodb-native/lib/explain.js
|
||||
const explainAllowedValues = [
|
||||
'queryPlanner',
|
||||
'queryPlannerExtended',
|
||||
'executionStats',
|
||||
'allPlansExecution',
|
||||
false,
|
||||
true,
|
||||
];
|
||||
if (!explainAllowedValues.includes(explain)) {
|
||||
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Invalid value for explain');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export class MongoStorageAdapter implements StorageAdapter {
|
||||
// Private
|
||||
_uri: string;
|
||||
@@ -562,6 +579,7 @@ export class MongoStorageAdapter implements StorageAdapter {
|
||||
query: QueryType,
|
||||
{ skip, limit, sort, keys, readPreference, hint, caseInsensitive, explain }: QueryOptions
|
||||
): Promise<any> {
|
||||
validateExplainValue(explain);
|
||||
schema = convertParseSchemaToMongoSchema(schema);
|
||||
const mongoWhere = transformWhere(className, query, schema);
|
||||
const mongoSort = _.mapKeys(sort, (value, fieldName) =>
|
||||
@@ -740,6 +758,7 @@ export class MongoStorageAdapter implements StorageAdapter {
|
||||
hint: ?mixed,
|
||||
explain?: boolean
|
||||
) {
|
||||
validateExplainValue(explain);
|
||||
let isPointerField = false;
|
||||
pipeline = pipeline.map(stage => {
|
||||
if (stage.$group) {
|
||||
|
||||
@@ -633,7 +633,7 @@ RestQuery.prototype.runFind = function (options = {}) {
|
||||
return this.config.database
|
||||
.find(this.className, this.restWhere, findOptions, this.auth)
|
||||
.then(results => {
|
||||
if (this.className === '_User' && findOptions.explain !== true) {
|
||||
if (this.className === '_User' && !findOptions.explain) {
|
||||
for (var result of results) {
|
||||
cleanResultAuthData(result);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user