scripts: protect against unintended glob matching in [[ ]] RHS

The right-hand side of the [[ ... = ... ]] keyword is an exception to
the general rule that quoting is unnecessary with [[

This is usually not a problem, e.g. in libmakepkg, lint_one_pkgname will
already fail if pkgname has an asterisk, but it certainly doesn't hurt
to be "more proper" and go with the spec; it is more dangerous in
repo-add, which can get caught in an infinite loop instead of safely
asserting there is no package named 'foo*'.

Reported-by: Rafael Ascensão <rafa.almas@gmail.com>
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2019-04-27 22:54:17 -04:00 committed by Allan McRae
parent a0f4429e95
commit b93dfa935f
10 changed files with 11 additions and 11 deletions

View file

@ -44,7 +44,7 @@ lint_checkdepends() {
for checkdepend in "${checkdepends_list[@]}"; do
name=${checkdepend%%@(<|>|=|>=|<=)*}
lint_one_pkgname checkdepends "$name" || ret=1
if [[ $name != $checkdepend ]]; then
if [[ $name != "$checkdepend" ]]; then
ver=${checkdepend##$name@(<|>|=|>=|<=)}
check_fullpkgver "$ver" checkdepends || ret=1
fi

View file

@ -44,7 +44,7 @@ lint_conflicts() {
for conflict in "${conflicts_list[@]}"; do
name=${conflict%%@(<|>|=|>=|<=)*}
lint_one_pkgname conflicts "$name" || ret=1
if [[ $name != $conflict ]]; then
if [[ $name != "$conflict" ]]; then
ver=${conflict##$name@(<|>|=|>=|<=)}
check_fullpkgver "$ver" conflicts || ret=1
fi

View file

@ -44,7 +44,7 @@ lint_depends() {
for depend in "${depends_list[@]}"; do
name=${depend%%@(<|>|=|>=|<=)*}
lint_one_pkgname depends "$name" || ret=1
if [[ $name != $depend ]]; then
if [[ $name != "$depend" ]]; then
ver=${depend##$name@(<|>|=|>=|<=)}
# Don't validate empty version because of https://bugs.archlinux.org/task/58776
if [[ -n $ver ]]; then

View file

@ -44,7 +44,7 @@ lint_makedepends() {
for makedepend in "${makedepends_list[@]}"; do
name=${makedepend%%@(<|>|=|>=|<=)*}
lint_one_pkgname makedepends "$name" || ret=1
if [[ $name != $makedepend ]]; then
if [[ $name != "$makedepend" ]]; then
ver=${makedepend##$name@(<|>|=|>=|<=)}
check_fullpkgver "$ver" makedepends || ret=1
fi

View file

@ -44,7 +44,7 @@ lint_optdepends() {
for optdepend in "${optdepends_list[@]%%:[[:space:]]*}"; do
name=${optdepend%%@(<|>|=|>=|<=)*}
lint_one_pkgname optdepends "$name" || ret=1
if [[ $name != $optdepend ]]; then
if [[ $name != "$optdepend" ]]; then
ver=${optdepend##$name@(<|>|=|>=|<=)}
check_fullpkgver "$ver" optdepends || ret=1
fi

View file

@ -49,7 +49,7 @@ lint_provides() {
fi
name=${provide%=*}
lint_one_pkgname provides "$name" || ret=1
if [[ $name != $provide ]]; then
if [[ $name != "$provide" ]]; then
ver=${provide##$name=}
check_fullpkgver "$ver" provides || ret=1
fi

View file

@ -117,7 +117,7 @@ extract_git() {
if [[ ${fragment%%=*} = tag ]]; then
tagname="$(git tag -l --format='%(tag)' "$ref")"
if [[ -n $tagname && $tagname != $ref ]]; then
if [[ -n $tagname && $tagname != "$ref" ]]; then
error "$(gettext "Failure while checking out version %s, the git tag has been forged")" "$ref"
plain "$(gettext "Aborting...")"
exit 1

View file

@ -40,7 +40,7 @@ tidy_zipman() {
while read -r link ; do
if [[ "${file}" -ef "${link}" ]] ; then
rm -f "$link" "${link}.gz"
if [[ ${file%/*} = ${link%/*} ]]; then
if [[ ${file%/*} = "${link%/*}" ]]; then
ln -s -- "${file##*/}.gz" "${link}.gz"
else
ln -s -- "/${file}.gz" "${link}.gz"

View file

@ -182,7 +182,7 @@ if [[ -z "$db_version" ]]; then
realdir="$(resolve_dir "$dir")"
# verify realdir is inside root
if [[ ${realdir:0:${#pacroot}} != $pacroot ]]; then
if [[ ${realdir:0:${#pacroot}} != "$pacroot" ]]; then
warning "$(gettext "symlink '%s' points outside pacman root, manual repair required")" "$dir"
continue
fi

View file

@ -121,7 +121,7 @@ find_pkgentry() {
for pkgentry in "$tmpdir/db/$pkgname"*; do
name=${pkgentry##*/}
if [[ ${name%-*-*} = $pkgname ]]; then
if [[ ${name%-*-*} = "$pkgname" ]]; then
echo $pkgentry
return 0
fi
@ -464,7 +464,7 @@ remove() {
error "$(gettext "Package matching '%s' not found.")" "$pkgname"
return 1
fi
return 0
}