Skip to content
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

Jump to bottom

Remove request body validation #589 #604 #733

Merged
merged 3 commits into from Jul 7, 2019
Merged

Remove request body validation #589 #604 #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
061e3a6
Remove request body validation #589
dnalborczyk Jul 6, 2019
9d90731
Remove disableModelValidation flag
dnalborczyk Jul 6, 2019
146acf5
Merge branch 'master' into remove-body-validation
dnalborczyk Jul 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 30 additions & 16 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -144,7 +144,6 @@
"hapi-plugin-websocket": "^2.1.2",
"js-string-escape": "^1.0.1",
"jsonpath-plus": "^0.20.1",
"jsonschema": "^1.2.4",
"jsonwebtoken": "^8.5.1",
"luxon": "^1.16.1",
"object.fromentries": "^2.0.0",
Expand Down
51 changes: 3 additions & 48 deletions src/ApiGateway.js
View file
Open in desktop
Expand Up @@ -17,7 +17,6 @@ const Endpoint = require('./Endpoint');
const parseResources = require('./parseResources');
const { detectEncoding, createUniqueId } = require('./utils');
const authFunctionNameExtractor = require('./authFunctionNameExtractor');
const requestBodyValidator = require('./requestBodyValidator');

module.exports = class ApiGateway {
constructor(serverless, options, velocityContextOptions) {
Expand Down Expand Up @@ -242,15 +241,6 @@ module.exports = class ApiGateway {
const endpoint = new Endpoint(event.http, funOptions).generate();

const integration = endpoint.integration || 'lambda-proxy';
const requestBodyValidationModel = ['lambda', 'lambda-proxy'].includes(
integration,
)
? requestBodyValidator.getModel(
this.service.custom,
event.http,
this.serverlessLog,
)
: null;
const epath = endpoint.path;
const method = endpoint.method.toUpperCase();
const { requestTemplates } = endpoint;
Expand All @@ -266,13 +256,7 @@ module.exports = class ApiGateway {
protectedRoutes.push(`${method}#${fullPath}`);
}

this.serverlessLog(
`${method} ${fullPath}${
requestBodyValidationModel && !this.options.disableModelValidation
? ` - request body will be validated against ${requestBodyValidationModel.name}`
: ''
}`,
);
this.serverlessLog(`${method} ${fullPath}`);

// If the endpoint has an authorization function, create an authStrategy for the route
const authStrategyName = this.options.noAuth
Expand Down Expand Up @@ -921,30 +905,6 @@ module.exports = class ApiGateway {
funOptions.funTimeout,
);

// If request body validation is enabled, validate body against the request model.
if (
requestBodyValidationModel &&
!this.options.disableModelValidation
) {
try {
requestBodyValidator.validate(
requestBodyValidationModel,
event.body,
);
} catch (error) {
// When request body validation fails, APIG will return back 400 as detailed in:
// https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-method-request-validation.html
return resolve(
this._replyError(
400,
response,
`Invalid request body for '${funName}' handler`,
error,
),
);
}
}

// Finally we call the handler
debugLog('_____ CALLING HANDLER _____');

Expand Down Expand Up @@ -1014,15 +974,15 @@ module.exports = class ApiGateway {
}

// Bad news
_replyError(responseCode, response, message, error) {
_reply500(response, message, error) {
this.serverlessLog(message);

console.error(error);

response.header('Content-Type', 'application/json');

/* eslint-disable no-param-reassign */
response.statusCode = responseCode;
response.statusCode = 200; // APIG replies 200 by default on failures;
response.source = {
errorMessage: message,
errorType: error.constructor.name,
Expand All @@ -1035,11 +995,6 @@ module.exports = class ApiGateway {
return response;
}

_reply500(response, message, err) {
// APIG replies 200 by default on failures
return this._replyError(200, response, message, err);
}

_replyTimeout(response, resolve, funName, funTimeout, requestId) {
if (this.currentRequestId !== requestId) return;

Expand Down
4 changes: 0 additions & 4 deletions src/ServerlessOffline.js
View file
Open in desktop
Expand Up @@ -60,9 +60,6 @@ module.exports = class ServerlessOffline {
disableCookieValidation: {
usage: 'Used to disable cookie-validation on hapi.js-server',
},
disableModelValidation: {
usage: 'Disables the Model Validator',
},
enforceSecureCookies: {
usage: 'Enforce secure cookies',
},
Expand Down Expand Up @@ -284,7 +281,6 @@ module.exports = class ServerlessOffline {
corsAllowHeaders: 'accept,content-type,x-api-key,authorization',
corsExposedHeaders: 'WWW-Authenticate,Server-Authorization',
disableCookieValidation: false,
disableModelValidation: false,
enforceSecureCookies: false,
exec: '',
hideStackTraces: false,
Expand Down