AaronFiore/electrum
1
0
Fork 0
Code Activity

util: implement is_subpath

Browse Source
This commit is contained in:
SomberNight
2022-08-09 18:48:21 +02:00
parent 3c964c9ea0
commit 233d2373df
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
electrum/tests/test_util.py
View File

@@ -1,10 +1,11 @@
from decimal import Decimal from decimal import Decimal
from electrum import util
from electrum.util import (format_satoshis, format_fee_satoshis, parse_URI, from electrum.util import (format_satoshis, format_fee_satoshis, parse_URI,
is_hash256_str, chunks, is_ip_address, list_enabled_bits, is_hash256_str, chunks, is_ip_address, list_enabled_bits,
format_satoshis_plain, is_private_netaddress, is_hex_str, format_satoshis_plain, is_private_netaddress, is_hex_str,
is_integer, is_non_negative_integer, is_int_or_float, is_integer, is_non_negative_integer, is_int_or_float,
is_non_negative_int_or_float) is_non_negative_int_or_float, is_subpath)
from . import ElectrumTestCase from . import ElectrumTestCase
@@ -292,3 +293,25 @@ class TestUtil(ElectrumTestCase):
self.assertFalse(is_private_netaddress("[2a00:1450:400e:80d::200e]")) self.assertFalse(is_private_netaddress("[2a00:1450:400e:80d::200e]"))
self.assertFalse(is_private_netaddress("8.8.8.8")) self.assertFalse(is_private_netaddress("8.8.8.8"))
self.assertFalse(is_private_netaddress("example.com")) self.assertFalse(is_private_netaddress("example.com"))
def test_is_subpath(self):
self.assertTrue(util.is_subpath("/a/b/c/d/e", "/"))
self.assertTrue(util.is_subpath("/a/b/c/d/e", "/a"))
self.assertTrue(util.is_subpath("/a/b/c/d/e", "/a/"))
self.assertTrue(util.is_subpath("/a/b/c/d/e", "/a/b/c/"))
self.assertTrue(util.is_subpath("/a/b/c/d/e/", "/a/b/c/"))
self.assertTrue(util.is_subpath("/a/b/c/d/e/", "/a/b/c"))
self.assertTrue(util.is_subpath("/a/b/c/d/e/", "/a/b/c/d/e/"))
self.assertTrue(util.is_subpath("/", "/"))
self.assertTrue(util.is_subpath("a/b/c", "a"))
self.assertTrue(util.is_subpath("a/b/c", "a/"))
self.assertTrue(util.is_subpath("a/b/c", "a/b"))
self.assertTrue(util.is_subpath("a/b/c", "a/b/c"))
self.assertFalse(util.is_subpath("/a/b/c/d/e/", "/b"))
self.assertFalse(util.is_subpath("/a/b/c/d/e/", "/b/c/"))
self.assertFalse(util.is_subpath("/a/b/c", "/a/b/c/d/e/"))
self.assertFalse(util.is_subpath("/a/b/c", "a"))
self.assertFalse(util.is_subpath("/a/b/c", "c"))
self.assertFalse(util.is_subpath("a", "/a/b/c"))
self.assertFalse(util.is_subpath("c", "/a/b/c"))

11
electrum/util.py
View File

@@ -1201,6 +1201,17 @@ def make_dir(path, allow_symlink=True):
os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR) os.chmod(path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
def is_subpath(long_path: str, short_path: str) -> bool:
"""Returns whether long_path is a sub-path of short_path."""
try:
common = os.path.commonpath([long_path, short_path])
except ValueError:
return False
short_path = standardize_path(short_path)
common = standardize_path(common)
return short_path == common
def log_exceptions(func): def log_exceptions(func):
"""Decorator to log AND re-raise exceptions.""" """Decorator to log AND re-raise exceptions."""
assert asyncio.iscoroutinefunction(func), 'func needs to be a coroutine' assert asyncio.iscoroutinefunction(func), 'func needs to be a coroutine'