Skip to content

Add isValidSignatureAndData to Bouncer to verify method calls #973

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

Merged
shrugs merged 18 commits into from
Jun 9, 2018
Merged

Add isValidSignatureAndData to Bouncer to verify method calls #973

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
98538ea
Core functionality is now working. Needs cleanup and more unit tests
aflesher Jun 1, 2018
273c846
More cleanup, added missing unit tests
aflesher Jun 1, 2018
2622a66
Fixing lint errors
aflesher Jun 1, 2018
be50c84
Added modifiers and tests
aflesher Jun 1, 2018
da1a4f1
Merge branch 'master' into feature/validate-data-and-sig-#891
aflesher Jun 1, 2018
6afc6b3
Merge branch 'master' into feature/validate-data-and-sig-#891
aflesher Jun 4, 2018
29036cc
Added a more detailed description of the new modifiers with a notice …
aflesher Jun 4, 2018
a02b258
Refactored signature bouncer test to de-dup variables
aflesher Jun 5, 2018
d2f6fc7
Merge branch 'master' into feature/validate-data-and-sig-#891
aflesher Jun 5, 2018
91ec2c1
Fixed the signature length issue and added a test with multiple bytes…
aflesher Jun 5, 2018
006db16
Cleanup and refactor
aflesher Jun 5, 2018
b30361d
Fixing lint errors
aflesher Jun 5, 2018
2a8e1d5
Merge branch 'master' into feature/validate-data-and-sig-#891
aflesher Jun 5, 2018
68d9b74
Merge branch 'master' into feature/validate-data-and-sig-#891
aflesher Jun 6, 2018
b528c26
Added more details in the Contract description
aflesher Jun 7, 2018
aab0822
Rename SIG_SIZE to SIGNATURE_SIZE and cleaning up comments
aflesher Jun 8, 2018
7e050b6
Merge branch 'master' into feature/validate-data-and-sig-#891
aflesher Jun 8, 2018
3f3495c
Merge branch 'master' into feature/validate-data-and-sig-#891
shrugs Jun 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing lint errors
  • Loading branch information
@aflesher
aflesher committed Jun 1, 2018
commit 2622a66ae0a57446b2769373a0cc83663caf781b
21 changes: 10 additions & 11 deletions test/access/SignatureBouncer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

import assertRevert from '../helpers/assertRevert';
import { signHex } from '../helpers/sign';
import { ENGINE_METHOD_DIGESTS } from 'constants';

const Bouncer = artifacts.require('SignatureBouncerMock');

Expand All @@ -19,12 +18,12 @@ export const getSigner = (contract, signer, data = '') => (addr) => {
export const getMethodId = (methodName, ...paramTypes) => {
// methodId is a sha3 of the first 4 bytes after 0x of 'method(paramType1,...)'
return web3.sha3(`${methodName}(${paramTypes.join(',')})`).substr(2, 8);
}
};

export const stripAndPadHexValue = (hexVal, sizeInBytes) => {
// strip 0x from the font and pad with 0's for
return hexVal.substr(2).padStart(sizeInBytes * 2, 0);
}
};

contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBouncer]) => {
before(async function () {
Expand Down Expand Up @@ -135,8 +134,8 @@ contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBounc
it('should accept valid method with valid params for valid user', async function () {
const methodId = getMethodId('checkValidSignatureAndData', 'address', 'uint256', 'bytes');
const val = 23;
Copy link
Contributor

@shrugs shrugs Jun 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's de-duplicate these variables by bringing them either into a context variable using a beforeEach within a context or just making them constants above these methods

const addressData = stripAndPadHexValue(authorizedUser,32);
const valData = stripAndPadHexValue(web3.toHex(val),32);
const addressData = stripAndPadHexValue(authorizedUser, 32);
const valData = stripAndPadHexValue(web3.toHex(val), 32);
const sig = getSigner(
this.bouncer,
bouncerAddress,
Expand All @@ -152,8 +151,8 @@ contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBounc
it('should not accept an invalid method with valid params for valid user', async function () {
const methodId = getMethodId('invalidMethod', 'address', 'uint256', 'bytes');
const val = 23;
const addressData = stripAndPadHexValue(authorizedUser,32);
const valData = stripAndPadHexValue(web3.toHex(val),32);
const addressData = stripAndPadHexValue(authorizedUser, 32);
const valData = stripAndPadHexValue(web3.toHex(val), 32);
const sig = getSigner(
this.bouncer,
bouncerAddress,
Expand All @@ -169,8 +168,8 @@ contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBounc
it('should not accept valid method with invalid params for valid user', async function () {
const methodId = getMethodId('checkValidSignatureAndData', 'address', 'uint256', 'bytes');
const val = 23;
const addressData = stripAndPadHexValue(authorizedUser,32);
const valData = stripAndPadHexValue(web3.toHex(val),32);
const addressData = stripAndPadHexValue(authorizedUser, 32);
const valData = stripAndPadHexValue(web3.toHex(val), 32);
const sig = getSigner(
this.bouncer,
bouncerAddress,
Expand All @@ -186,8 +185,8 @@ contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBounc
it('should not accept valid method with valid params for invalid user', async function () {
const methodId = getMethodId('checkValidSignatureAndData', 'address', 'uint256', 'bytes');
const val = 23;
const addressData = stripAndPadHexValue(authorizedUser,32);
const valData = stripAndPadHexValue(web3.toHex(val),32);
const addressData = stripAndPadHexValue(authorizedUser, 32);
const valData = stripAndPadHexValue(web3.toHex(val), 32);
const sig = getSigner(
this.bouncer,
bouncerAddress,
Expand Down