From 8ad7a5a08591a7306973660743e481f93cd80145 Mon Sep 17 00:00:00 2001 From: Michael Wozniak Date: Mon, 30 Jun 2014 10:41:12 -0400 Subject: [PATCH] Update tests and fix URI parsing Update URI parsing for BIP0072 compatability Update tests for parse_URI --- lib/tests/test_util.py | 48 +++++++++++++++++++++++++++++++++++++++++- lib/util.py | 10 +++++++-- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/lib/tests/test_util.py b/lib/tests/test_util.py index f0da88be7..13f2abfa7 100644 --- a/lib/tests/test_util.py +++ b/lib/tests/test_util.py @@ -1,5 +1,5 @@ import unittest -from lib.util import format_satoshis +from lib.util import format_satoshis, parse_URI class TestUtil(unittest.TestCase): @@ -17,3 +17,49 @@ class TestUtil(unittest.TestCase): result = format_satoshis(-1234, is_diff=True) expected = "-0.00001234" self.assertEqual(expected, result) + + def _do_test_parse_URI(self, uri, expected_address, expected_amount, expected_label, expected_message, expected_request_url): + address, amount, label, message, request_url = parse_URI(uri) + self.assertEqual(expected_address, address) + self.assertEqual(expected_amount, amount) + self.assertEqual(expected_label, label) + self.assertEqual(expected_message, message) + self.assertEqual(expected_request_url, request_url) + + def test_parse_URI_address(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '', '', '', '') + + def test_parse_URI_only_address(self): + self._do_test_parse_URI('15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', None, None, None, None) + + + def test_parse_URI_address_label(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?label=electrum%20test', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '', 'electrum test', '', '') + + def test_parse_URI_address_message(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?message=electrum%20test', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '', '', 'electrum test', '') + + def test_parse_URI_address_amount(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?amount=0.0003', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', 30000, '', '', '') + + def test_parse_URI_address_request_url(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?r=http://domain.tld/page?h%3D2a8628fc2fbe', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '', '', '', 'http://domain.tld/page?h%3D2a8628fc2fbe') + + def test_parse_URI_ignore_args(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?test=test', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', '', '', '', '') + + def test_parse_URI_multiple_args(self): + self._do_test_parse_URI('bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?amount=0.00004&label=electrum-test&message=electrum%20test&test=none&r=http://domain.tld/page', '15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma', 4000, 'electrum-test', 'electrum test', 'http://domain.tld/page') + + def test_parse_URI_no_address_request_url(self): + self._do_test_parse_URI('bitcoin:?r=http://domain.tld/page?h%3D2a8628fc2fbe', '', '', '', '', 'http://domain.tld/page?h%3D2a8628fc2fbe') + + def test_parse_URI_invalid_address(self): + self.assertRaises(AssertionError, parse_URI, 'bitcoin:invalidaddress') + + def test_parse_URI_invalid(self): + self.assertRaises(AssertionError, parse_URI, 'notbitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma') + + def test_parse_URI_parameter_polution(self): + self.assertRaises(Exception, parse_URI, 'bitcoin:15mKKb2eos1hWa6tisdPwwDC1a5J1y9nma?amount=0.0003&label=test&amount=30.0') + diff --git a/lib/util.py b/lib/util.py index 97906eb2b..e73434138 100644 --- a/lib/util.py +++ b/lib/util.py @@ -159,6 +159,7 @@ def age(from_date, since_date = None, target_tz=None, include_seconds=False): def parse_URI(uri): import urlparse + import urllib import bitcoin from decimal import Decimal @@ -170,7 +171,7 @@ def parse_URI(uri): assert u.scheme == 'bitcoin' address = u.path - assert bitcoin.is_address(address) + valid_address = bitcoin.is_address(address) pq = urlparse.parse_qs(u.query) @@ -192,8 +193,13 @@ def parse_URI(uri): if 'label' in pq: label = pq['label'][0] if 'r' in pq: - request_url = pq['r'][0] + request_url = urllib.quote(pq['r'][0], '/:?') + if request_url != '': + return address, amount, label, message, request_url + + assert valid_address + return address, amount, label, message, request_url