[16.0-stable] pillar: fix decimal literals used as file modes - #6282
Conversation
os.MkdirAll(dir, 755) and os.WriteFile(file, data, 644) pass decimal, not octal, values. Go reads 755 as 0o1363, leaving permission bits 0o363 (-wxrw--wx), and 644 as 0o1204, leaving 0o204 (-w----r--). The vault directories were therefore created world-writable, and the attestation integrity token was written world-readable while not being readable by its owner. Use octal literals, keeping the permissions each site already intended. In vault/key.go that is not sufficient on its own: stageKey() mounts a tmpfs onto the key staging directory right after creating it, and a tmpfs root defaults to 01777, which masks the mode underneath for as long as the unsealed vault key is staged there. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Christoph Ostarek <christoph@zededa.com> (cherry picked from commit 1204936)
os.Mkdir(RunWlanDir, 600) passes a decimal literal. Go reads 600 as 0o1130, leaving permission bits 0o130 (--x-wx---), so /run/wlan is created group-writable and not readable by its owner. The directory holds the generated wpa_supplicant configuration, i.e. the WiFi credentials. Use 0700 rather than 0600: the intent was clearly owner-only, but a directory also needs the execute bit to be traversable. This code is not present on master, where b92d1ff moved wpa_supplicant into pillar and removed it, so the fix applies to the stable branches only and cannot be a cherry-pick. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Christoph Ostarek <christoph@zededa.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 16.0-stable #6282 +/- ##
===============================================
+ Coverage 19.52% 23.55% +4.02%
===============================================
Files 19 19
Lines 3021 2509 -512
===============================================
+ Hits 590 591 +1
+ Misses 2310 1787 -523
- Partials 121 131 +10 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Verification — PASS, with three follow-upsVerified this backport independently (system test). The change does what it says; every What was verifiedBackport fidelity — the fix commit is content-identical to The mode arithmetic, measured on linux/arm64 with
Matches the description exactly. (Go ignores mode bits Completeness, using the two mode rules from All 7
Also confirming the 1. The
|
Description
Backport of #6264
Six file-mode arguments in pillar are written as decimal literals, so the
permission bits they produce are not the ones they read as:
7550o13630o363—-wxrw--wx6440o12040o204—-w----r--Measured, not inferred:
So the vault directories were created world-writable, and the attestation
integrity token file (
/run/eve.integrity_token) was written world-readablewhile not being readable by its owner. Affected call sites:
pkg/pillar/vault/key.go— key staging directorypkg/pillar/vault/handler_ext4.go(x2) — default vault and vault pathpkg/pillar/vault/handler_unsupported.go— default vaultpkg/pillar/vault/handler_zfs.go— sealed dataset mount pointpkg/pillar/cmd/zedagent/attesttask.go— integrity token fileEach site is switched to an octal literal keeping the permissions it already
intended, so there is no change of intent anywhere — only the notation bug.
Cherry-picked with
git cherry-pick -x, applies cleanly with no conflicts.Only the fix commit of #6264 is backported. That PR's second commit,
semgrep: run the rules from make and in CI, is developer tooling (a maketarget and a CI workflow) rather than a fix, and it modifies
tests/semgrep-rules/os-openfile-non-perm-mode.yaml, which is absent from16.0-stable, 14.5-stable and 13.4-stable.
In addition, this PR carries one fix that is not part of #6264, because the
affected code does not exist on master and so cannot be cherry-picked:
pkg/pillar/dpcreconciler/linuxitems/wlan.gocreates/run/wlanwithos.Mkdir(RunWlanDir, 600). 600 decimal is0o1130, permission bits0o130(
--x-wx---), so the directory is group-writable and not readable by itsowner — and it holds the generated wpa_supplicant configuration, i.e. the WiFi
credentials. It is changed to
0700rather than0600, since a directory alsoneeds the execute bit to be traversable. On master this code was removed by
b92d1ff, which moved wpa_supplicant into pillar.
How to test and validate this PR
The mistake is checkable statically. This reports nothing after this PR, and
the six call sites above before it:
Also run:
make -C pkg/pillar fmt-check make -C pkg/pillar vet make -C pkg/pillar testOn a device, the permission change can be confirmed directly. Since
MkdirAllonly applies its mode when creating the directory, the vault checks need a
device whose vault does not exist yet (fresh install, or an installation
without TPM where the vault is a plain folder):
drwxr-xr-xrather thand-wxrw--wx:stat -c '%a %A %n' /persist/vaultvolumes start. All the affected directories are used by root-owned
processes only, so no functional change is expected.
drwxr-xr-x:stat -c '%a %A %n' /persist/vault-rw-r--r--rather than--w----r--:stat -c '%a %A %n' /run/eve.integrity_tokendrwx------rather thand--x-wx---on a device with a WiFi port configured:
stat -c '%a %A %n' /run/wlanSuggested QA regression focus: vault creation and unlock on a fresh install,
both with and without TPM, on ext4 and zfs; plus one attestation cycle.
Changelog notes
Fixed file permissions on the vault directories, the vault key staging
directory and the attestation integrity token file, which were created with
different permission bits than intended.
PR Backports
Original: #6264
Checklist
For backport PRs (remove it if it's not a backport):
And the last but not least:
check them
Reasons for the unchecked boxes:
nothing to document.
changes are architecture-independent, but the vault paths are device
management code, so the on-device steps above still need to be run before
this leaves draft.