coolaj86
/
walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

enable large urlencoded forms and multipart forms

This commit is contained in:
AJ ONeal 2017-07-06 01:40:59 +00:00
parent 12737b74e3
commit 566b947376
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/apis.js
View File

@ -494,12 +494,19 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) {
// Twilio Parameters are often 26 long // Twilio Parameters are often 26 long
var bodyParserTwilio = require('body-parser').urlencoded({ limit: '4kb', parameterLimit: 100, extended: false }); var bodyParserTwilio = require('body-parser').urlencoded({ limit: '4kb', parameterLimit: 100, extended: false });
//var bodyParserMailgun = require('body-parser').urlencoded({ limit: '4kb', parameterLimit: 100, extended: false }); var bodyParserMailgun = require('body-parser').urlencoded({ limit: '100kb', parameterLimit: 500, extended: false });
function bodyParserMailgun (req, res, next) { function bodyMultiParserMailgun (req, res, next) {
var multiparty = require('multiparty'); var multiparty = require('multiparty');
var form = new multiparty.Form(); var form = new multiparty.Form();
form.parse(req, function (err, fields/*, files*/) { form.parse(req, function (err, fields/*, files*/) {
if (err) {
console.error('Error');
console.error(err);
res.end("Couldn't parse form");
return;
}
var body; var body;
req.body = req.body || {}; req.body = req.body || {};
Object.keys(fields).forEach(function (key) { Object.keys(fields).forEach(function (key) {
@ -526,13 +533,15 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) {
// //
// Webhook Parsers // Webhook Parsers
// //
, 'mailgun.urlencoded@daplie.com': function (req, res, next) { //, 'mailgun.urlencoded@daplie.com': function (req, res, next) { ... }
return bodyParserMailgun(req, res, function () { , 'mailgun.parsers@daplie.com': function (req, res, next) {
console.log('mailgun parser req.headers');
console.log(req.headers);
function verify() {
var body = req.body; var body = req.body;
var mailconf = siteConfig['mailgun.org']; var mailconf = siteConfig['mailgun.org'];
console.log('mailgun req.headers');
console.log(req.headers);
if (!validateMailgun(mailconf.apiKey, body.timestamp, body.token, body.signature)) { if (!validateMailgun(mailconf.apiKey, body.timestamp, body.token, body.signature)) {
console.error('Request came, but not from Mailgun'); console.error('Request came, but not from Mailgun');
res.send({ error: { message: 'Invalid signature. Are you even Mailgun?' } }); res.send({ error: { message: 'Invalid signature. Are you even Mailgun?' } });
@ -540,7 +549,17 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) {
} }
next(); next();
}); }
if (/urlencoded/.test(req.headers['content-type'])) {
bodyParserMailgun(req, res, verify);
}
else if (/multipart/.test(req.headers['content-type'])) {
bodyMultiParserMailgun(req, res, verify);
}
else {
next();
}
} }
, 'twilio.urlencoded@daplie.com': function (req, res, next) { , 'twilio.urlencoded@daplie.com': function (req, res, next) {
// TODO null for res and Promise instead of next? // TODO null for res and Promise instead of next?