d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

portsnap: only move expected snapshot contents from snap/ to files/

Browse Source 
Previously it was possible to smuggle in addional files that would
be used by later portsnap runs. Now we only move those files expected
to be in the snapshot into files/ and require that there are no
unexpected files.

This was used by portsnap attacks 2, 3, and 4 in the "non-cryptanalytic
attacks against FreeBSD update components" anonymous gist.

Reported by:	anonymous gist
Reviewed by:	allanjude, delphij
MFC after:	ASAP
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D8052
This commit is contained in:
emaste 2016-09-28 21:22:51 +00:00
parent 25eedae59e
commit 27891556e1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/portsnap/portsnap/portsnap.sh
View File

@ -691,6 +691,13 @@ fetch_snapshot() {
fetch_index_sanity || return 1
# Verify the snapshot contents
cut -f 2 -d '|' INDEX.new | fetch_snapshot_verify || return 1
cut -f 2 -d '|' tINDEX.new INDEX.new | sort -u > files.expected
find snap -mindepth 1 | sed -E 's^snap/(.*)\.gz^\1^' | sort > files.snap
if ! cmp -s files.expected files.snap; then
echo "unexpected files in snapshot."
return 1
fi
rm files.expected files.snap
echo "done."
# Move files into their proper locations