Skip to content

Annex: accept new line in pointer detection logic #44

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
rezib wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Annex: accept new line in pointer detection logic #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e33951a
Annex: accept new line in pointer detection logic
rezib Jan 20, 2026
3137f79
Annex: simplify pointer size test logic
rezib Jan 27, 2026
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
14 changes: 8 additions & 6 deletions lib/rift/Annex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,14 @@ def is_pointer(cls, filepath):
Return true if content of file at filepath looks like a valid digest
identifier.
"""
meta = os.stat(filepath)

# MD5 or SHA3 256
if meta.st_size in (32, 64):
with open(filepath, encoding='utf-8') as fh:
identifier = fh.read(meta.st_size)
with open(filepath, encoding='utf-8') as fh:
identifier = fh.read()
# Remove possible trailing whitespace, newline and carriage return
# characters.
identifier = identifier.rstrip()

# Check size corresponds to MD5 (32) or SHA3 256 (64).
if len(identifier) in (32, 64):
return all(byte in string.hexdigits for byte in identifier)

return False
Expand Down
25 changes: 25 additions & 0 deletions tests/Annex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,31 @@ def test_is_pointer_valid_identifier(self):
temp_file = make_temp_file(correct_identifier)
self.assertTrue(Annex.is_pointer(temp_file.name))

def test_is_pointer_valid_identifier_with_line_feed(self):
""" Test if is_pointer correctly detect a valid identifier with a line feed """

correct_identifier = '7CF2DB5EC261A0FA27A502D3196A6F60\n'
temp_file = make_temp_file(correct_identifier)
self.assertTrue(Annex.is_pointer(temp_file.name))

def test_is_pointer_valid_identifier_with_carriage_return(self):
Copy link
Contributor

@valeriyoann valeriyoann Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest: add the same test for spaces

Copy link
Collaborator Author

@rezib rezib Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 3137f79.

"""
Test if is_pointer correctly detect a valid identifier with a carriage return.
"""

correct_identifier = '7CF2DB5EC261A0FA27A502D3196A6F60\r\n'
temp_file = make_temp_file(correct_identifier)
self.assertTrue(Annex.is_pointer(temp_file.name))

def test_is_pointer_valid_identifier_with_whitespace(self):
"""
Test if is_pointer correctly detect a valid identifier with a whitespace.
"""

correct_identifier = '7CF2DB5EC261A0FA27A502D3196A6F60 '
temp_file = make_temp_file(correct_identifier)
self.assertTrue(Annex.is_pointer(temp_file.name))

def test_is_pointer_invalid_identifier(self):
""" Test if is_pointer correctly detect a invalid identifier """

Expand Down