From 12bd55fd2c7a17a9ff8bee46845d7bf2384402a3 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Mon, 22 Apr 2019 00:46:56 +0100
Subject: [PATCH] util.py: tighten protocol validation

---
 electrumx/lib/util.py  | 5 -----
 tests/lib/test_util.py | 1 -
 2 files changed, 6 deletions(-)

diff --git a/electrumx/lib/util.py b/electrumx/lib/util.py
index 4e3287b..60fc54e 100644
--- a/electrumx/lib/util.py
+++ b/electrumx/lib/util.py
@@ -256,16 +256,11 @@ def address_string(address):
     return fmt.format(host, port)
 
 
-VERSION_CLEANUP_REGEX = re.compile(r'([0-9.]*)')
-
-
 def protocol_tuple(s):
     '''Converts a protocol version number, such as "1.0" to a tuple (1, 0).
 
     If the version number is bad, (0, ) indicating version 0 is returned.'''
     try:
-        # clean up extra text at end of version e.g. '3.3.4CS' -> '3.3.4'
-        s = VERSION_CLEANUP_REGEX.match(s).group(1)
         return tuple(int(part) for part in s.split('.'))
     except (TypeError, ValueError, AttributeError):
         return (0, )
diff --git a/tests/lib/test_util.py b/tests/lib/test_util.py
index 4ef5d16..ebdfdc5 100644
--- a/tests/lib/test_util.py
+++ b/tests/lib/test_util.py
@@ -136,7 +136,6 @@ def test_protocol_tuple():
     assert util.protocol_tuple("0.1") == (0, 1)
     assert util.protocol_tuple("0.10") == (0, 10)
     assert util.protocol_tuple("2.5.3") == (2, 5, 3)
-    assert util.protocol_tuple("11.2.33ExtraXYZ") == (11, 2, 33)
 
 def test_version_string():
     assert util.version_string(()) == "0.0"