From a27a5e5a4551a2165e3c145f454f57a7e6143671 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Fri, 28 Jun 2019 00:00:38 -0500
Subject: [PATCH] added support for 0-truncated hashes in stringvalidators,
 added test for hash validation

---
 onionr/onionrutils/stringvalidators.py |  4 +++-
 onionr/tests/test_stringvalidations.py | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/onionr/onionrutils/stringvalidators.py b/onionr/onionrutils/stringvalidators.py
index 5b7fbf6f..951c25ed 100644
--- a/onionr/onionrutils/stringvalidators.py
+++ b/onionr/onionrutils/stringvalidators.py
@@ -23,12 +23,14 @@ from onionrutils import bytesconverter
 def validate_hash(data, length=64):
     '''
         Validate if a string is a valid hash hex digest (does not compare, just checks length and charset)
+
+        Length is only invalid if its *more* than the specified
     '''
     retVal = True
     if data == False or data == True:
         return False
     data = data.strip()
-    if len(data) != length:
+    if len(data) > length:
         retVal = False
     else:
         try:
diff --git a/onionr/tests/test_stringvalidations.py b/onionr/tests/test_stringvalidations.py
index 72d5fb20..eef418ba 100755
--- a/onionr/tests/test_stringvalidations.py
+++ b/onionr/tests/test_stringvalidations.py
@@ -27,6 +27,25 @@ class OnionrValidations(unittest.TestCase):
             print('testing', x)
             self.assertFalse(stringvalidators.validate_transport(x))
     
+    def test_hash_validator(self):
+        valid = ['00003b3813a166e706e490238e9515633cc3d083efe982a67753d50d87a00c96\n', '00003b3813a166e706e490238e9515633cc3d083efe982a67753d50d87a00c96', b'00003b3813a166e706e490238e9515633cc3d083efe982a67753d50d87a00c96',
+        '00003b3813a166e706e490238e9515633cc36', b'00003b3813a166e706e490238e9515633cc3d083']
+        invalid = [None, 0, 1, True, False, '%#W483242#', '00003b3813a166e706e490238e9515633cc3d083efe982a67753d50d87a00c9666', '', b'', 
+        b'00003b3813a166e706e490238e9515633cc3d083efe982a67753d50d87a00c9666666', b'    ', '\n', '00003b3813a166e706e490238e9515633cc3d083efe982a67753d50d87a00ccccc\n']
+        
+        for x in valid:
+            self.assertTrue(stringvalidators.validate_hash(x))
+        for x in invalid:
+            try:
+                result = stringvalidators.validate_hash(x)
+                print('testing', x, result)
+            except AttributeError:
+                result = False
+            try:
+                self.assertFalse(result)
+            except AssertionError:
+                raise AssertionError("%s returned true" % (x,))
+    
     def test_pubkey_validator(self):
         # Test ed25519 public key validity
         valids = ['JZ5VE72GUS3C7BOHDRIYZX4B5U5EJMCMLKHLYCVBQQF3UKHYIRRQ====', 'JZ5VE72GUS3C7BOHDRIYZX4B5U5EJMCMLKHLYCVBQQF3UKHYIRRQ']