AaronFiore/electrum
1
0
Fork 0
Code Activity

util.is_hex_str: forbid whitespaces

Browse Source
This commit is contained in:
SomberNight
2021-01-27 20:04:08 +01:00
parent 176a1162b4
commit 7294613447
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/tests/test_util.py
View File

@@ -125,13 +125,23 @@ class TestUtil(ElectrumTestCase):
def test_is_hex_str(self):
self.assertTrue(is_hex_str('09a4'))
self.assertTrue(is_hex_str('abCD'))
self.assertTrue(is_hex_str('2A5C3F4062E4F2FCCE7A1C7B4310CB647B327409F580F4ED72CB8FC0B1804DFA'))
self.assertTrue(is_hex_str('00' * 33))
self.assertFalse(is_hex_str('0x09a4'))
self.assertFalse(is_hex_str('2A 5C3F'))
self.assertFalse(is_hex_str(' 2A5C3F'))
self.assertFalse(is_hex_str('2A5C3F '))
self.assertFalse(is_hex_str('000'))
self.assertFalse(is_hex_str('123'))
self.assertFalse(is_hex_str('0x123'))
self.assertFalse(is_hex_str('qweqwe'))
self.assertFalse(is_hex_str(b'09a4'))
self.assertFalse(is_hex_str(b'\x09\xa4'))
self.assertFalse(is_hex_str(None))
self.assertFalse(is_hex_str(7))
self.assertFalse(is_hex_str(7.2))
def test_is_integer(self):
self.assertTrue(is_integer(7))

5
electrum/util.py
View File

@@ -584,9 +584,12 @@ def is_hash256_str(text: Any) -> bool:
def is_hex_str(text: Any) -> bool:
if not isinstance(text, str): return False
try:
bytes.fromhex(text)
b = bytes.fromhex(text)
except:
return False
# forbid whitespaces in text:
if len(text) != 2 * len(b):
return False
return True