external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move AUR_OVERWRITE privilege check from git/auth to git/update

Browse source 
git/auth is run as an AutherizedKeysCommand which does not get the
environment variables passed to it, so AUR_OVERWRITE always got
hard-set to '0' by it.  Instead we need to perform the actual privilege
check in git/update instead.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Johannes Löthberg 2018-01-21 17:51:02 +01:00 • committed by Lukas Fleischer
parent ac29097ce8
commit e5b43760c2
4 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aurweb/git/auth.py
View file

@ -53,7 +53,6 @@ def main():
env_vars = { env_vars = {
'AUR_USER': user, 'AUR_USER': user,
'AUR_PRIVILEGED': '1' if account_type > 1 else '0', 'AUR_PRIVILEGED': '1' if account_type > 1 else '0',
'AUR_OVERWRITE' : os.environ.get('AUR_OVERWRITE', '0') if account_type > 1 else '0',
} }
key = keytype + ' ' + keytext key = keytype + ' ' + keytext

2
aurweb/git/update.py
View file

@ -238,7 +238,7 @@ def main():
user = os.environ.get("AUR_USER") user = os.environ.get("AUR_USER")
pkgbase = os.environ.get("AUR_PKGBASE") pkgbase = os.environ.get("AUR_PKGBASE")
privileged = (os.environ.get("AUR_PRIVILEGED", '0') == '1') privileged = (os.environ.get("AUR_PRIVILEGED", '0') == '1')
allow_overwrite = (os.environ.get("AUR_OVERWRITE", '0') == '1') allow_overwrite = (os.environ.get("AUR_OVERWRITE", '0') == '1') and privileged
warn_or_die = warn if privileged else die warn_or_die = warn if privileged else die
if len(sys.argv) == 2 and sys.argv[1] == "restore": if len(sys.argv) == 2 and sys.argv[1] == "restore":

17
test/t1100-git-auth.sh
View file

@ -25,21 +25,4 @@ test_expect_success 'Test authentication with a wrong key.' '
test_must_be_empty out test_must_be_empty out
' '
test_expect_success 'Test AUR_OVERWRITE passthrough.' '
AUR_OVERWRITE=1 \
"$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out &&
grep -q AUR_OVERWRITE=1 out
'
test_expect_success 'Make sure that AUR_OVERWRITE is unset by default.' '
"$GIT_AUTH" "$AUTH_KEYTYPE_TU" "$AUTH_KEYTEXT_TU" >out &&
grep -q AUR_OVERWRITE=0 out
'
test_expect_success 'Make sure regular users cannot set AUR_OVERWRITE.' '
AUR_OVERWRITE=1 \
"$GIT_AUTH" "$AUTH_KEYTYPE_USER" "$AUTH_KEYTEXT_USER" >out &&
grep -q AUR_OVERWRITE=0 out
'
test_done test_done

14
test/t1300-git-update.sh
View file

@ -137,7 +137,19 @@ test_expect_success 'Performing a non-fast-forward ref update as Trusted User.'
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'Performing a non-fast-forward ref update with AUR_OVERWRITE=1.' ' test_expect_success 'Performing a non-fast-forward ref update as normal user with AUR_OVERWRITE=1.' '
old=$(git -C aur.git rev-parse HEAD) &&
new=$(git -C aur.git rev-parse HEAD^) &&
cat >expected <<-EOD &&
error: denying non-fast-forward (you should pull first)
EOD
test_must_fail \
env AUR_USER=user AUR_PKGBASE=foobar AUR_PRIVILEGED=0 AUR_OVERWRITE=1 \
"$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 &&
test_cmp expected actual
'
test_expect_success 'Performing a non-fast-forward ref update as Trusted User with AUR_OVERWRITE=1.' '
old=$(git -C aur.git rev-parse HEAD) && old=$(git -C aur.git rev-parse HEAD) &&
new=$(git -C aur.git rev-parse HEAD^) && new=$(git -C aur.git rev-parse HEAD^) &&
AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 AUR_OVERWRITE=1 \ AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 AUR_OVERWRITE=1 \