Commit 88dd90c
committed
refactor: consolidate extraction safety, share yapdb tail, split megafiles
Safe extraction (security-sensitive consolidation):
- new pkg/safepath: Join / JoinStrict / SymlinkTarget /
EntrySymlinkTarget — ONE filepath.Rel-based containment implementation
with an adversarial test suite (traversal, prefix-aliasing, "/" root
clamping, symlink escapes)
- the five hand-rolled copies (archive/tar.go, aptinstall/extract.go,
dnfinstall/safepath.go, apkindex/install.go, container/rootless) are
now thin delegators keeping their local names and tests
- HARDENING: a member literally named "../etc/passwd" is now rejected
even when root is "/" — filepath.Clean clamps ".." at the root, and
the apt/dnf copies silently accepted the clamped form (apk already
rejected it; rpm >= 4.18 and dpkg reject such names too)
- HARDENING: container rootfs layer extraction (rootless pull) now
validates symlink targets; previously a malicious layer could plant a
symlink escaping the rootfs and write through it with a later entry
- archive keeps its stricter any-".."-segment rejection for source
archives on top of the shared containment
Dedup:
- yapdb.RecordInstalled: shared open/insert/close tail; the
format-specific writeYapdb functions in aptinstall and dnfinstall now
only assemble metadata
- cmd/yap/command.ResolveFlexibleDistro: parse-args + auto-detect +
userProvided tracking shared by build and zap
File splits (mechanical, no behavior change):
- pkg/aptcache: aptcache.go (1957 lines) → aptcache.go (cache+resolver,
576) + sources.go (449) + parse.go (605) + download.go (356)
- pkg/pkgbuild: filterInstalled* family (253 lines) → filter_installed.go1 parent 18cffdf commit 88dd90c
31 files changed
Lines changed: 2120 additions & 1887 deletions
File tree
- .github/workflows
- cmd/yap/command
- pkg
- apkindex
- aptcache
- aptinstall
- archive
- container/rootless
- dnfinstall
- pkgbuild
- safepath
- yapdb
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
| 11 | + | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| |||
259 | 260 | | |
260 | 261 | | |
261 | 262 | | |
| 263 | + | |
262 | 264 | | |
263 | 265 | | |
264 | 266 | | |
| |||
0 commit comments