Skip to content

descriptor: reject trailing characters after the closing parenthesis #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fametrano wants to merge 1 commit into
base: master
Choose a base branch
from
Open

descriptor: reject trailing characters after the closing parenthesis #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hwilib/descriptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,11 @@ def _get_func_expr(s: str) -> Tuple[str, str]:
try:
start = s.index("(")
end = s.rindex(")")
return s[0:start], s[start + 1:end]
except ValueError:
raise ValueError("A matching pair of parentheses cannot be found")
if end != len(s) - 1:
raise ValueError("Trailing characters '{}' after descriptor".format(s[end + 1:]))
return s[0:start], s[start + 1:end]


def _get_const(s: str, const: str) -> str:
Expand Down
7 changes: 7 additions & 0 deletions test/test_descriptor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,13 @@ def test_parse_descriptor_with_key_at_end_without_origin(self):
def test_parse_empty_descriptor(self):
self.assertRaises(ValueError, parse_descriptor, "")

def test_parse_descriptor_trailing_characters(self):
key = "02c97dc3f4420402e01a113984311bf4a1b8de376cac0bdcfaf1b3ac81f13433c7"
with self.assertRaisesRegex(ValueError, "Trailing characters"):
parse_descriptor("pkh({})abc".format(key))
with self.assertRaisesRegex(ValueError, "Trailing characters"):
parse_descriptor("sh(wpkh({}))x".format(key))

def test_parse_descriptor_replace_h(self):
d = "wpkh([00000001/84h/1h/0h]tpubD6NzVbkrYhZ4WaWSyoBvQwbpLkojyoTZPRsgXELWz3Popb3qkjcJyJUGLnL4qHHoQvao8ESaAstxYSnhyswJ76uZPStJRJCTKvosUCJZL5B/0/0)"
desc = parse_descriptor(d)
Expand Down
Loading