diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2018-01-21 17:51:02 +0100 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2018-01-21 18:09:10 +0100 |
| commit | e5b43760c275130623ff4fda5a96f628cf17156e (patch) | |
| tree | d0416f24e591d39315366311775467ff1c9ab875 /aurweb/git | |
| parent | ac29097ce8585b99ebe7c5d9570b0567236d45f3 (diff) | |
| download | aur-e5b43760c275130623ff4fda5a96f628cf17156e.tar.gz aur-e5b43760c275130623ff4fda5a96f628cf17156e.tar.xz | |
Move AUR_OVERWRITE privilege check from git/auth to git/update
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>
Diffstat (limited to 'aurweb/git')
| -rwxr-xr-x | aurweb/git/auth.py | 1 | ||||
| -rwxr-xr-x | aurweb/git/update.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/aurweb/git/auth.py b/aurweb/git/auth.py index b7819a95..828ed4e2 100755 --- a/aurweb/git/auth.py +++ b/aurweb/git/auth.py @@ -53,7 +53,6 @@ def main(): env_vars = { 'AUR_USER': user, '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 diff --git a/aurweb/git/update.py b/aurweb/git/update.py index f681ddb9..da48eb31 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -238,7 +238,7 @@ def main(): user = os.environ.get("AUR_USER") pkgbase = os.environ.get("AUR_PKGBASE") 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 if len(sys.argv) == 2 and sys.argv[1] == "restore": |