Skip to content

Commit f2dd8e7

Browse files
authored
Merge pull request #633 from onekey-sec/extract-result
Report extraction problems from handlers/extractors
2 parents 5c594e2 + 37c00fd commit f2dd8e7

File tree

89 files changed

+730
-247
lines changed
  • docs
  • tests
    • handlers/filesystem
    • integration/filesystem/yaffs/__output__
      • malformed.2048.16.ecc.be.yaffs2_extract
      • malformed.2048.16.ecc.le.yaffs2_extract
      • sample.16384.128.ecc.be.yaffs2_extract
      • sample.16384.128.ecc.le.yaffs2_extract
      • sample.16384.128.le.yaffs2_extract
      • sample.16384.16.ecc.be.yaffs2_extract
      • sample.16384.16.ecc.le.yaffs2_extract
      • sample.16384.16.le.yaffs2_extract
      • sample.16384.256.ecc.be.yaffs2_extract
      • sample.16384.256.ecc.le.yaffs2_extract
      • sample.16384.256.le.yaffs2_extract
      • sample.16384.32.ecc.be.yaffs2_extract
      • sample.16384.32.ecc.le.yaffs2_extract
      • sample.16384.32.le.yaffs2_extract
      • sample.16384.512.ecc.be.yaffs2_extract
      • sample.16384.512.ecc.le.yaffs2_extract
      • sample.16384.512.le.yaffs2_extract
      • sample.16384.64.ecc.be.yaffs2_extract
      • sample.16384.64.ecc.le.yaffs2_extract
      • sample.16384.64.le.yaffs2_extract
      • sample.2048.128.ecc.be.yaffs2_extract
      • sample.2048.128.ecc.le.yaffs2_extract
      • sample.2048.128.le.yaffs2_extract
      • sample.2048.16.ecc.be.yaffs2_extract
      • sample.2048.16.ecc.le.yaffs2_extract
      • sample.2048.16.le.yaffs2_extract
      • sample.2048.256.ecc.be.yaffs2_extract
      • sample.2048.256.ecc.le.yaffs2_extract
      • sample.2048.256.le.yaffs2_extract
      • sample.2048.32.ecc.be.yaffs2_extract
      • sample.2048.32.ecc.le.yaffs2_extract
      • sample.2048.32.le.yaffs2_extract
      • sample.2048.512.ecc.be.yaffs2_extract
      • sample.2048.512.ecc.le.yaffs2_extract
      • sample.2048.512.le.yaffs2_extract
      • sample.2048.64.ecc.be.yaffs2_extract
      • sample.2048.64.ecc.le.yaffs2_extract
      • sample.2048.64.le.yaffs2_extract
      • sample.4096.128.ecc.be.yaffs2_extract
      • sample.4096.128.ecc.le.yaffs2_extract
      • sample.4096.128.le.yaffs2_extract
      • sample.4096.16.ecc.be.yaffs2_extract
      • sample.4096.16.ecc.le.yaffs2_extract
      • sample.4096.16.le.yaffs2_extract
      • sample.4096.256.ecc.be.yaffs2_extract
      • sample.4096.256.ecc.le.yaffs2_extract
      • sample.4096.256.le.yaffs2_extract
      • sample.4096.32.ecc.be.yaffs2_extract
      • sample.4096.32.ecc.le.yaffs2_extract
      • sample.4096.32.le.yaffs2_extract
      • sample.4096.512.ecc.be.yaffs2_extract
      • sample.4096.512.ecc.le.yaffs2_extract
      • sample.4096.512.le.yaffs2_extract
      • sample.4096.64.ecc.be.yaffs2_extract
      • sample.4096.64.ecc.le.yaffs2_extract
      • sample.4096.64.le.yaffs2_extract
      • sample.8192.128.ecc.be.yaffs2_extract
      • sample.8192.128.ecc.le.yaffs2_extract
      • sample.8192.128.le.yaffs2_extract
      • sample.8192.16.ecc.be.yaffs2_extract
      • sample.8192.16.ecc.le.yaffs2_extract
      • sample.8192.16.le.yaffs2_extract
      • sample.8192.256.ecc.be.yaffs2_extract
      • sample.8192.256.ecc.le.yaffs2_extract
      • sample.8192.256.le.yaffs2_extract
      • sample.8192.32.ecc.be.yaffs2_extract
      • sample.8192.32.ecc.le.yaffs2_extract
      • sample.8192.32.le.yaffs2_extract
      • sample.8192.512.ecc.be.yaffs2_extract
      • sample.8192.512.ecc.le.yaffs2_extract
      • sample.8192.512.le.yaffs2_extract
      • sample.8192.64.ecc.be.yaffs2_extract
      • sample.8192.64.ecc.le.yaffs2_extract
      • sample.8192.64.le.yaffs2_extract
  • unblob

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+730
-247
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ build/
77
*.so
88
.idea
99
.coverage*
10+
/.venv/

docs/development.md

Lines changed: 16 additions & 2 deletions

tests/handlers/filesystem/test_romfs.py

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
from pathlib import Path
2-
31
import pytest
42

53
from unblob.file_utils import File
6-
from unblob.handlers.filesystem.romfs import get_string, is_safe_path, valid_checksum
4+
from unblob.handlers.filesystem.romfs import get_string, valid_checksum
75

86

97
@pytest.mark.parametrize(
@@ -44,23 +42,3 @@ def test_get_string(content, expected):
4442
)
4543
def test_valid_checksum(content, valid):
4644
assert valid_checksum(content) == valid
47-
48-
49-
@pytest.mark.parametrize(
50-
"basedir, path, expected",
51-
[
52-
("/lib/out", "/lib/out/file", True),
53-
("/lib/out", "file", True),
54-
("/lib/out", "dir/file", True),
55-
("/lib/out", "some/dir/file", True),
56-
("/lib/out", "some/dir/../file", True),
57-
("/lib/out", "some/dir/../../file", True),
58-
("/lib/out", "some/dir/../../../file", False),
59-
("/lib/out", "some/dir/../../../", False),
60-
("/lib/out", "some/dir/../../..", False),
61-
("/lib/out", "../file", False),
62-
("/lib/out", "/lib/out/../file", False),
63-
],
64-
)
65-
def test_is_safe_path(basedir, path, expected):
66-
assert is_safe_path(Path(basedir), Path(path)) is expected
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
etc/passwd

0 commit comments

Comments
 (0)