Skip to content
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.

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

Support st_blksize and st_blocks on JFFS2 #912

Merged
merged 4 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions dissect/target/filesystems/jffs.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,9 @@ def lstat(self) -> fsutil.stat_result:
]
)

# JFFS2 block size is a function of the "erase size" of the underlying flash device.
# Linux stat reports the default block size, which is defined as 4k in libc.
st_info.st_blksize = 4096
st_info.st_blocks = (node.isize + 511) // 512 if self.is_file() else 0

return st_info
74 changes: 74 additions & 0 deletions tests/filesystems/test_jffs2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
from datetime import datetime
from typing import Iterator
from unittest.mock import Mock, patch

import pytest

from dissect.target.filesystems.jffs import JFFSFilesystem, JFFSFilesystemEntry


@pytest.fixture
def jffs_fs() -> Iterator[JFFSFilesystem]:
with patch("dissect.jffs.jffs2.JFFS2"):
jffs_fs = JFFSFilesystem(Mock())
yield jffs_fs


@pytest.fixture
def jffs_fs_file_entry(jffs_fs: JFFSFilesystem) -> Iterator[JFFSFilesystemEntry]:
raw_inode = Mock(uid=1000, guid=999, isize=165002)
inode = Mock(
mode=0o100664,
inum=4,
inode=raw_inode,
atime=datetime(2024, 10, 1, 12, 0, 0),
mtime=datetime(2024, 10, 2, 12, 0, 0),
ctime=datetime(2024, 10, 3, 12, 0, 0),
is_file=lambda: True,
is_dir=lambda: False,
is_symlink=lambda: False,
)

entry = JFFSFilesystemEntry(jffs_fs, "/some_file", inode)
yield entry


@pytest.fixture
def jffs_fs_directory_entry(jffs_fs: JFFSFilesystem) -> Iterator[JFFSFilesystemEntry]:
raw_inode = Mock(uid=1000, guid=999, isize=0)
inode = Mock(
mode=0o40775,
inum=2,
inode=raw_inode,
atime=datetime(2024, 10, 1, 12, 0, 0),
mtime=datetime(2024, 10, 2, 12, 0, 0),
ctime=datetime(2024, 10, 3, 12, 0, 0),
is_file=lambda: False,
is_dir=lambda: True,
is_symlink=lambda: False,
)

entry = JFFSFilesystemEntry(jffs_fs, "/some_directory", inode)
yield entry


@pytest.mark.parametrize(
"entry_fixture, expected_blocks", [("jffs_fs_file_entry", 323), ("jffs_fs_directory_entry", 0)]
)
def test_jffs2_stat(entry_fixture: str, expected_blocks: int, request: pytest.FixtureRequest) -> None:
jffs_entry: JFFSFilesystemEntry = request.getfixturevalue(entry_fixture)
stat = jffs_entry.stat()

entry = jffs_entry.entry
assert stat.st_mode == entry.mode
assert stat.st_ino == entry.inum
assert stat.st_dev == id(jffs_entry.fs)
assert stat.st_nlink == 1
assert stat.st_uid == entry.inode.uid
assert stat.st_gid == entry.inode.gid
assert stat.st_size == entry.inode.isize
assert stat.st_atime == entry.atime.timestamp()
assert stat.st_mtime == entry.mtime.timestamp()
assert stat.st_ctime == entry.ctime.timestamp()
assert stat.st_blksize == 4096
assert stat.st_blocks == expected_blocks
2 changes: 1 addition & 1 deletion tests/filesystems/test_xfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def xfs_fs_entry(xfs_fs: XfsFilesystem) -> Iterator[XfsFilesystemEntry]:
ctime = datetime(2024, 10, 3, 12, 0, 0)
crtime = datetime(2024, 10, 4, 12, 0, 0)

dinode = Mock(di_mode=33272, di_nlink=1, di_uid=1000, di_gid=999)
dinode = Mock(di_mode=0o100750, di_nlink=1, di_uid=1000, di_gid=999)
inode = Mock(
nblocks=10,
inode=dinode,
Expand Down
Loading