Skip to content

Commit

Permalink
BE-719 Fix parameter tampering
Browse files Browse the repository at this point in the history
* added tests, removed console.debug statements

Signed-off-by: nfrunza <nfrunza@gmail.com>
  • Loading branch information
nfrunza committed Dec 10, 2019
1 parent 17a9460 commit 37e3c99
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/rest/requestutils.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ function reqPayload(req) {
}

const orgsArrayToString = function(reqQuery) {
console.log('reqQuery: ', reqQuery);
let temp = '';
if (reqQuery) {
// eslint-disable-next-line spellcheck/spell-checker
Expand All @@ -100,7 +101,6 @@ const orgsArrayToString = function(reqQuery) {
const parsedReq = queryString.parse(orgsStr);
if (parsedReq && parsedReq.orgs) {
const orgsArray = parsedReq.orgs.toString().split(',');
console.log('requestutils.orgsArrayToString.orgsArray ', orgsArray);
// format DB value for IN clause, ex: in ('a', 'b', 'c')
if (orgsArray) {
orgsArray.forEach((element, i) => {
Expand All @@ -113,7 +113,7 @@ const orgsArrayToString = function(reqQuery) {
}
}
}
console.log('comma separated organizations: ', temp);

return temp;
};

Expand Down
5 changes: 5 additions & 0 deletions app/test/fixtures/reqMultiOrgs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"from": "Sun Dec 08 2019 22:22:00 GMT-0500 (Eastern Standard Time)",
"to": "Mon Dec 09 2019 22:22:00 GMT-0500 (Eastern Standard Time)",
"orgs": ["OrdererMSP", "Org2MSP"]
}
4 changes: 4 additions & 0 deletions app/test/fixtures/reqNoOrgs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"from": "Sun Dec 08 2019 22:22:00 GMT-0500 (Eastern Standard Time)",
"to": "Mon Dec 09 2019 22:22:00 GMT-0500 (Eastern Standard Time)"
}
5 changes: 5 additions & 0 deletions app/test/fixtures/reqOneOrg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"from": "Sun Dec 08 2019 22:22:00 GMT-0500 (Eastern Standard Time)",
"to": "Mon Dec 09 2019 22:22:00 GMT-0500 (Eastern Standard Time)",
"orgs": "OrgOne"
}
38 changes: 38 additions & 0 deletions app/test/requestutils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
SPDX-License-Identifier: Apache-2.0
*/

const expect = require('chai').expect;
const assert = require('assert');
const chai = require('chai');
const chaiHttp = require('chai-http');
const helper = require('../common/helper');
const reqMultiOrgs = require('./fixtures/reqMultiOrgs.json');
const reqOneOrg = require('./fixtures/reqOneOrg.json');
const reqNoOrgs = require('./fixtures/reqNoOrgs.json');

const should = chai.should();
chai.use(chaiHttp);
const requestutils = require('../rest/requestutils.js');

describe('requestutils().orgsArrayToString should return empty string', () => {
const emptyString = requestutils.orgsArrayToString(reqNoOrgs);
it('requestutils().orgsArrayToString should return empty string', () => {
assert.equal('', emptyString);
});
});

describe('requestutils().orgsArrayToString should return single quotes value', () => {
const oneOrgString = requestutils.orgsArrayToString(reqOneOrg);
it('requestutils().orgsArrayToString should return single quotes value', () => {
assert.equal("'OrgOne'", oneOrgString);
});
});

describe('requestutils().orgsArrayToString should return comma separated single quotes values ', () => {
const multiOrgsString = requestutils.orgsArrayToString(reqMultiOrgs);
const multiOrgs = "'OrdererMSP','Org2MSP'";
it('requestutils().orgsArrayToString should return comma separated single quotes values ', () => {
assert.equal(multiOrgs, multiOrgsString);
});
});

0 comments on commit 37e3c99

Please # to comment.