Skip to content

Commit 79bf5f5

Browse files
coratgerlcoratgerl
committed
fix: feedbacks
1 parent d78f994 commit 79bf5f5

16 files changed

+17
-83
lines changed

‎src/Controllers/SchemaController.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,10 +1406,10 @@ export default class SchemaController {
14061406
// If aclGroup has * (public)
14071407
if (!aclGroup || aclGroup.length == 0) {
14081408
const detailedError = 'Permission denied, user needs to be authenticated.';
1409-
throw createSanitizedError(Parse.Error.OBJECT_NOT_FOUND, detailedError, defaultLogger);
1409+
throw createSanitizedError(Parse.Error.OBJECT_NOT_FOUND, detailedError);
14101410
} else if (aclGroup.indexOf('*') > -1 && aclGroup.length == 1) {
14111411
const detailedError = 'Permission denied, user needs to be authenticated.';
1412-
throw createSanitizedError(Parse.Error.OBJECT_NOT_FOUND, detailedError, defaultLogger);
1412+
throw createSanitizedError(Parse.Error.OBJECT_NOT_FOUND, detailedError);
14131413
}
14141414
// requiresAuthentication passed, just move forward
14151415
// probably would be wise at some point to rename to 'authenticatedUser'
@@ -1424,7 +1424,7 @@ export default class SchemaController {
14241424
// Reject create when write lockdown
14251425
if (permissionField == 'writeUserFields' && operation == 'create') {
14261426
const detailedError = `Permission denied for action ${operation} on class ${className}.`;
1427-
throw createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError, defaultLogger);
1427+
throw createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError);
14281428
}
14291429
14301430
// Process the readUserFields later
@@ -1445,7 +1445,7 @@ export default class SchemaController {
14451445
}
14461446
14471447
const detailedError = `Permission denied for action ${operation} on class ${className}.`;
1448-
throw createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError, defaultLogger);
1448+
throw createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError);
14491449
}
14501450

14511451
// Validates an operation passes class-level-permissions set in the schema

‎src/GraphQL/loaders/schemaMutations.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { transformToParse, transformToGraphQL } from '../transformers/schemaFiel
77
import { enforceMasterKeyAccess } from '../parseGraphQLUtils';
88
import { getClass } from './schemaQueries';
99
import { createSanitizedError } from '../../SecurityError';
10-
import defaultLogger from '../../logger';
1110

1211
const load = parseGraphQLSchema => {
1312
const createClassMutation = mutationWithClientMutationId({
@@ -35,11 +34,9 @@ const load = parseGraphQLSchema => {
3534
enforceMasterKeyAccess(auth, config);
3635

3736
if (auth.isReadOnly) {
38-
const loggerOrConfig = config || defaultLogger;
3937
throw createSanitizedError(
4038
Parse.Error.OPERATION_FORBIDDEN,
4139
"read-only masterKey isn't allowed to create a schema.",
42-
loggerOrConfig
4340
);
4441
}
4542

@@ -137,11 +134,9 @@ const load = parseGraphQLSchema => {
137134
enforceMasterKeyAccess(auth, config);
138135

139136
if (auth.isReadOnly) {
140-
const loggerOrConfig = config || defaultLogger;
141137
throw createSanitizedError(
142138
Parse.Error.OPERATION_FORBIDDEN,
143139
"read-only masterKey isn't allowed to delete a schema.",
144-
loggerOrConfig
145140
);
146141
}
147142

‎src/GraphQL/parseGraphQLUtils.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import Parse from 'parse/node';
22
import { GraphQLError } from 'graphql';
33
import { createSanitizedError } from '../SecurityError';
4-
import defaultLogger from '../logger';
54

6-
export function enforceMasterKeyAccess(auth, config = null) {
5+
export function enforceMasterKeyAccess(auth) {
76
if (!auth.isMaster) {
8-
const loggerOrConfig = config || defaultLogger;
97
throw createSanitizedError(
108
Parse.Error.OPERATION_FORBIDDEN,
119
'unauthorized: master key is required',
12-
loggerOrConfig
1310
);
1411
}
1512
}

‎src/RestQuery.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,9 @@ function _UnsafeRestQuery(
123123
if (this.className == '_Session') {
124124
if (!this.auth.user) {
125125
const detailedError = 'Invalid session token';
126-
const log = (this.config && this.config.loggerController) || defaultLogger;
127126
throw createSanitizedError(
128127
Parse.Error.INVALID_SESSION_TOKEN,
129128
detailedError,
130-
log
131129
);
132130
}
133131
this.restWhere = {
@@ -809,11 +807,9 @@ _UnsafeRestQuery.prototype.denyProtectedFields = async function () {
809807
for (const key of protectedFields) {
810808
if (this.restWhere[key]) {
811809
const detailedError = `This user is not allowed to query ${key} on class ${this.className}`;
812-
const log = (this.config && this.config.loggerController) || defaultLogger;
813810
throw createSanitizedError(
814811
Parse.Error.OPERATION_FORBIDDEN,
815812
detailedError,
816-
log
817813
);
818814
}
819815
}

‎src/RestWrite.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,11 +1455,9 @@ RestWrite.prototype.runDatabaseOperation = function () {
14551455

14561456
if (this.className === '_User' && this.query && this.auth.isUnauthenticated()) {
14571457
const detailedError = `Cannot modify user ${this.query.objectId}.`;
1458-
const log = (this.config && this.config.loggerController) || defaultLogger;
14591458
throw createSanitizedError(
14601459
Parse.Error.SESSION_MISSING,
14611460
detailedError,
1462-
log
14631461
);
14641462
}
14651463

‎src/Routers/ClassesRouter.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@ export class ClassesRouter extends PromiseRouter {
114114
req.body.objectId.startsWith('role:')
115115
) {
116116
const detailedError = 'Invalid object ID.';
117-
const log = (req.config && req.config.loggerController) || defaultLogger;
118-
throw createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError, log);
117+
throw createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError);
119118
}
120119
return rest.create(
121120
req.config,

‎src/Routers/FilesRouter.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import logger from '../logger';
66
const triggers = require('../triggers');
77
const Utils = require('../Utils');
88
import { createSanitizedError } from '../SecurityError';
9-
import defaultLogger from '../logger';
109

1110
export class FilesRouter {
1211
expressRouter({ maxUploadSize = '20Mb' } = {}) {
@@ -46,9 +45,7 @@ export class FilesRouter {
4645
if (!config) {
4746
res.status(403);
4847
const detailedError = 'Invalid application ID.';
49-
const log = defaultLogger;
50-
log.error('Security error:', detailedError);
51-
const err = createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError, log);
48+
const err = createSanitizedError(Parse.Error.OPERATION_FORBIDDEN, detailedError);
5249
res.json({ code: err.code, error: err.message });
5350
return;
5451
}

‎src/Routers/GlobalConfigRouter.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import PromiseRouter from '../PromiseRouter';
44
import * as middleware from '../middlewares';
55
import * as triggers from '../triggers';
66
import { createSanitizedError } from '../SecurityError';
7-
import defaultLogger from '../logger';
87

98
const getConfigFromParams = params => {
109
const config = new Parse.Config();
@@ -43,11 +42,9 @@ export class GlobalConfigRouter extends PromiseRouter {
4342

4443
async updateGlobalConfig(req) {
4544
if (req.auth.isReadOnly) {
46-
const log = (req.config && req.config.loggerController) || defaultLogger;
4745
throw createSanitizedError(
4846
Parse.Error.OPERATION_FORBIDDEN,
4947
"read-only masterKey isn't allowed to update the config.",
50-
log
5148
);
5249
}
5350
const params = req.body.params || {};

‎src/Routers/GraphQLRouter.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Parse from 'parse/node';
22
import PromiseRouter from '../PromiseRouter';
33
import * as middleware from '../middlewares';
44
import { createSanitizedError } from '../SecurityError';
5-
import defaultLogger from '../logger';
65

76
const GraphQLConfigPath = '/graphql-config';
87

@@ -16,11 +15,9 @@ export class GraphQLRouter extends PromiseRouter {
1615

1716
async updateGraphQLConfig(req) {
1817
if (req.auth.isReadOnly) {
19-
const log = (req.config && req.config.loggerController) || defaultLogger;
2018
throw createSanitizedError(
2119
Parse.Error.OPERATION_FORBIDDEN,
2220
"read-only masterKey isn't allowed to update the GraphQL config.",
23-
log
2421
);
2522
}
2623
const data = await req.config.parseGraphQLController.updateGraphQLConfig(req.body?.params || {});

‎src/Routers/PurgeRouter.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@ import PromiseRouter from '../PromiseRouter';
22
import * as middleware from '../middlewares';
33
import Parse from 'parse/node';
44
import { createSanitizedError } from '../SecurityError';
5-
import defaultLogger from '../logger';
65

76
export class PurgeRouter extends PromiseRouter {
87
handlePurge(req) {
98
if (req.auth.isReadOnly) {
10-
const log = (req.config && req.config.loggerController) || defaultLogger;
119
throw createSanitizedError(
1210
Parse.Error.OPERATION_FORBIDDEN,
1311
"read-only masterKey isn't allowed to purge a schema.",
14-
log
1512
);
1613
}
1714
return req.config.database

0 commit comments

Comments
 (0)