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

Bugfix checksum validation in rem.utils #99

Merged
merged 1 commit into from
Nov 4, 2019
Merged

Bugfix checksum validation in rem.utils #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions contracts/contracts/rem.utils/include/rem.utils/rem.utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ namespace eosio {
void validate_eth_address_checksum(string checksum_address);
string bytetohex(unsigned char *data, int len);
std::array<unsigned char, 32> sha3_256(const string& address);
bool is_lower(const string &address);
};
/** @}*/ // end of @defgroup eosioutils rem.utils
} /// namespace eosio
14 changes: 12 additions & 2 deletions contracts/contracts/rem.utils/src/validate_address.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ namespace eosio {
for (const auto& ch: address) {
check(std::isxdigit(ch), "invalid hex symbol in ethereum address");
}
validate_eth_address_checksum(address);

if (!is_lower(address)) {
validate_eth_address_checksum(address);
}
}

void utils::validate_eth_address_checksum(string checksum_address) {
Expand All @@ -26,7 +29,7 @@ namespace eosio {
for (int i = 0; i < address.size(); ++i) {
int v = (toupper(address_hash_str[i]) >= 'A') ? (toupper(address_hash_str[i]) - 'A' + 10) :
(toupper(address_hash_str[i]) - '0');
pivot = v > 8 ? toupper(address[i]) : tolower(address[i]);
pivot = v >= 8 ? toupper(address[i]) : tolower(address[i]);
check(pivot == checksum_address[i], "invalid ethereum address checksum");
}
}
Expand All @@ -52,4 +55,11 @@ namespace eosio {
}
return s;
}

bool utils::is_lower(const string &address) {
string lower_address = address;
std::transform(lower_address.begin(), lower_address.end(), lower_address.begin(), ::tolower);

return lower_address == address;
}
} /// namespace eosio
56 changes: 45 additions & 11 deletions unittests/rem_utils_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,19 +256,42 @@ utils_tester::utils_tester() {
BOOST_AUTO_TEST_SUITE(utils_tests)

BOOST_FIXTURE_TEST_CASE( validate_eth_address_test, utils_tester ) {
name ethchainid = N(ethropsten);
string ethaddress = "0x9fB8A18fF402680b47387AE0F4e38229EC64f098";
try {
validate_address(N(proda), ethchainid, ethaddress);
name ethchainid = N(ethropsten);
vector<string> valid_addresses = {
"0xd18a02cafC6715c2e096636aB3349E4B79FAeCE7", "0xeB5F897477362945af744EbB244be03FbA0248F6",
"0x81b7E08F65Bdf5648606c89998A9CC8164397647", "0xCeAdcdA44010fe724Ff92Efc2cbCE9B5cf01842C",
"0xed092A687C65D12abd98420c57dE86694D7B682C", "0xc18De3aC4E50f9090435112866564dcFFEa7E2Fb",
"0x2a67090E67BcD5c1cc580f43a54DF5030797f1Bf", "0x61664145ae31775A634B237e527EB1472028B6B2",
"0xc9BCeB47b9795f6bbd190C30959Cd5E73792f2D3", "0x6B770956515f615A21E395cb97010100bAB5d1E6",
"0x48827A804e170A855cdf6Fa902728B517b982cDd", "0x5e904e42A2E5ff3Bae010c32b02CdcD988920c71",
"0xc18De3aC4E50f9090435112866564dcFFEa7E2Fb", "0xed092A687C65D12abd98420c57dE86694D7B682C",
"0x81b7E08F65Bdf5648606c89998A9CC8164397647", "0x48827A804e170A855cdf6Fa902728B517b982cDd",
"0x759dC16D1a8ab2D95F90cCd456774b3dF0c97CB8", "0x45cb76afdb1e30b7f1eca0c3faf0ea2619c0ea33",
};
for (const auto &address: valid_addresses) {
validate_address(N(proda), ethchainid, address);
}
} FC_LOG_AND_RETHROW()
}

BOOST_FIXTURE_TEST_CASE( validate_eth_address_test_without_hexpre, utils_tester ) {
try {
name ethchainid = N(ethropsten);
string address = "9fB8A18fF402680b47387AE0F4e38229EC64f098";

validate_address(N(proda), ethchainid, address);
vector<string> valid_addresses = {
"d18a02cafC6715c2e096636aB3349E4B79FAeCE7", "eB5F897477362945af744EbB244be03FbA0248F6",
"81b7E08F65Bdf5648606c89998A9CC8164397647", "CeAdcdA44010fe724Ff92Efc2cbCE9B5cf01842C",
"ed092A687C65D12abd98420c57dE86694D7B682C", "c18De3aC4E50f9090435112866564dcFFEa7E2Fb",
"2a67090E67BcD5c1cc580f43a54DF5030797f1Bf", "61664145ae31775A634B237e527EB1472028B6B2",
"c9BCeB47b9795f6bbd190C30959Cd5E73792f2D3", "6B770956515f615A21E395cb97010100bAB5d1E6",
"48827A804e170A855cdf6Fa902728B517b982cDd", "5e904e42A2E5ff3Bae010c32b02CdcD988920c71",
"c18De3aC4E50f9090435112866564dcFFEa7E2Fb", "ed092A687C65D12abd98420c57dE86694D7B682C",
"81b7E08F65Bdf5648606c89998A9CC8164397647", "48827A804e170A855cdf6Fa902728B517b982cDd",
"759dC16D1a8ab2D95F90cCd456774b3dF0c97CB8", "45cb76afdb1e30b7f1eca0c3faf0ea2619c0ea33",
};
for (const auto &address: valid_addresses) {
validate_address(N(proda), ethchainid, address);
}
} FC_LOG_AND_RETHROW()
}

Expand Down Expand Up @@ -310,7 +333,7 @@ BOOST_FIXTURE_TEST_CASE( validate_eth_address_test_with_address_invalid_symbol,
} FC_LOG_AND_RETHROW()
}

BOOST_FIXTURE_TEST_CASE( validate_eth_address_invalid_checksum, utils_tester ) {
BOOST_FIXTURE_TEST_CASE( validate_eth_address_all_lower, utils_tester ) {
try {
name ethchainid = N(ethropsten);
// valid address all upper
Expand All @@ -321,10 +344,21 @@ BOOST_FIXTURE_TEST_CASE( validate_eth_address_invalid_checksum, utils_tester ) {
// invalid ethereum address checksum
BOOST_REQUIRE_THROW(validate_address(N(proda), ethchainid, address), eosio_assert_message_exception);

// valid address all lower
address = "0xd423ae43105a0185c18f968cd8be0fa276689c04";
// invalid ethereum address checksum
BOOST_REQUIRE_THROW(validate_address(N(proda), ethchainid, address), eosio_assert_message_exception);
// valid addresses all lower
vector<string> valid_addresses = {
"0xd18a02cafc6715c2e096636ab3349e4b79faece7", "0xeb5f897477362945af744ebb244be03fba0248f6",
"0x81b7e08f65bdf5648606c89998a9cc8164397647", "0xceadcda44010fe724ff92efc2cbce9b5cf01842c",
"0xed092a687c65d12abd98420c57de86694d7b682c", "0xc18de3ac4e50f9090435112866564dcffea7e2fb",
"0x2a67090e67bcd5c1cc580f43a54df5030797f1bf", "0x61664145ae31775a634b237e527eb1472028b6b2",
"0xc9bceb47b9795f6bbd190c30959cd5e73792f2d3", "0x6b770956515f615a21e395cb97010100bab5d1e6",
"0x48827a804e170a855cdf6fa902728b517b982cdd", "0x5e904e42a2e5ff3bae010c32b02cdcd988920c71",
"0xc18de3ac4e50f9090435112866564dcffea7e2fb", "0xed092a687c65d12abd98420c57de86694d7b682c",
"0x81b7e08f65bdf5648606c89998a9cc8164397647", "0x48827a804e170a855cdf6fa902728b517b982cdd",
"0x759dc16d1a8ab2d95f90ccd456774b3df0c97cb8", "0x45cb76afdb1e30b7f1eca0c3faf0ea2619c0ea33",
};
for (const auto &address: valid_addresses) {
validate_address(N(proda), ethchainid, address);
}
} FC_LOG_AND_RETHROW()
}

Expand Down