PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Elliott said that chmod 000 debris was confusing host rm -rf, and macos

Browse Source 
couldn't handle chmod +s in /tmp. Try to make test_chmod clear out debris
and teach make clean to chmod -R generated before deleting it.
This commit is contained in:
Rob Landley 2020-12-18 05:16:33 -06:00
parent fbc2252f4f
commit e474cf80c3
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -63,6 +63,7 @@ root_clean:
@echo root cleaned @echo root cleaned
clean:: clean::
@chmod -fR 700 generated || true
@rm -rf toybox generated change .singleconfig* @rm -rf toybox generated change .singleconfig*
@echo cleaned @echo cleaned

40
tests/chmod.test
View File

@ -24,28 +24,16 @@ mkdir dir
touch file touch file
# We don't need to test all 512 permissions # We don't need to test all 512 permissions
for u in 0 1 2 3 4 5 6 7 file=- dir=d DOfile=touch DOdir=mkdir
do unset touch mkdir d
for g in 0 3 6 for U in {0..7}; do for G in 0 3 6; do for O in 0 7; do for T in dir file; do
do chmod 777 $T 2>/dev/null
for o in 0 7 X=DO$T
do rm -rf $T && ${!X} $T
if [ "$type" == file ] testing "$U$G$O $T" "chmod $U$G$O $T && ls -ld $T | cut -d' ' -f 1" \
then "${!T}$(num2perm $U$G$O)\n" "" ""
type=dir done; done; done; done
rm -rf "./$type" && mkdir $type unset U G O T X
DASH=d
else
type=file
rm -f "./$type" && touch $type
DASH=-
fi
DASHES=$(num2perm $u$g$o)
testing "$u$g$o $type" "chmod $u$g$o $type &&
ls -ld $type | cut -d' ' -f 1 | cut -d. -f 1" "$DASH$DASHES\n" "" ""
done
done
done
rm -rf dir file && mkdir dir && touch file 640 rm -rf dir file && mkdir dir && touch file 640
testing "750 dir 640 file" "chmod 750 dir 640 file && testing "750 dir 640 file" "chmod 750 dir 640 file &&
@ -54,6 +42,7 @@ testing "750 dir 640 file" "chmod 750 dir 640 file &&
chtest() chtest()
{ {
chmod -fR 700 dir file 2>/dev/null
rm -rf dir file && mkdir dir && touch file rm -rf dir file && mkdir dir && touch file
testing "$1 dir file" \ testing "$1 dir file" \
"chmod $1 dir file && ls -ld dir file | cut -d' ' -f 1 | cut -d. -f 1" \ "chmod $1 dir file && ls -ld dir file | cut -d' ' -f 1 | cut -d. -f 1" \
@ -107,10 +96,17 @@ chtest +x "drwxr-xr-x\n-rwxr-xr-x\n"
chtest -r "d-wx--x--x\n--w-------\n" chtest -r "d-wx--x--x\n--w-------\n"
chtest -w "dr-xr-xr-x\n-r--r--r--\n" chtest -w "dr-xr-xr-x\n-r--r--r--\n"
chtest -x "drw-r--r--\n-rw-r--r--\n" chtest -x "drw-r--r--\n-rw-r--r--\n"
# macOS doesn't allow +s in /tmp
touch s-supported
chmod +s s-supported 2>/dev/null || SKIP=1
rm s-supported
chtest g+s "drwxr-sr-x\n-rw-r-Sr--\n" chtest g+s "drwxr-sr-x\n-rw-r-Sr--\n"
chtest u+s "drwsr-xr-x\n-rwSr--r--\n" chtest u+s "drwsr-xr-x\n-rwSr--r--\n"
chtest +s "drwsr-sr-x\n-rwSr-Sr--\n" chtest +s "drwsr-sr-x\n-rwSr-Sr--\n"
chtest o+s "drwxr-xr-x\n-rw-r--r--\n" chtest o+s "drwxr-xr-x\n-rw-r--r--\n"
unset SKIP
chtest +t "drwxr-xr-t\n-rw-r--r-T\n" chtest +t "drwxr-xr-t\n-rw-r--r-T\n"
chtest a=r+w+x "drwxrwxrwx\n-rwxrwxrwx\n" chtest a=r+w+x "drwxrwxrwx\n-rwxrwxrwx\n"