August 2017 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/3] Do not hardcode path to the Python interpreter
by Lukas Fleischer 25 Aug '17

25 Aug '17

Use `/usr/bin/env python3` instead of `/usr/bin/python3` in the shebang of Python scripts. This adds support for non-standard Python interpreter paths such as the paths used in virtualenv environments. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/git/auth.py | 2 +- aurweb/git/serve.py | 2 +- aurweb/git/update.py | 2 +- aurweb/scripts/aurblup.py | 2 +- aurweb/scripts/mkpkglists.py | 2 +- aurweb/scripts/notify.py | 2 +- aurweb/scripts/pkgmaint.py | 2 +- aurweb/scripts/popupdate.py | 2 +- aurweb/scripts/rendercomment.py | 2 +- aurweb/scripts/tuvotereminder.py | 2 +- schema/gendummydata.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aurweb/git/auth.py b/aurweb/git/auth.py index d02390d..b7819a9 100755 --- a/aurweb/git/auth.py +++ b/aurweb/git/auth.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import os import shlex diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py index dfaddd1..93ff34c 100755 --- a/aurweb/git/serve.py +++ b/aurweb/git/serve.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import os import re diff --git a/aurweb/git/update.py b/aurweb/git/update.py index 16fa2b0..f681ddb 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import os import pygit2 diff --git a/aurweb/scripts/aurblup.py b/aurweb/scripts/aurblup.py index 1b6de2f..1433173 100755 --- a/aurweb/scripts/aurblup.py +++ b/aurweb/scripts/aurblup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import pyalpm import re diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py index 686ee7d..6724141 100755 --- a/aurweb/scripts/mkpkglists.py +++ b/aurweb/scripts/mkpkglists.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import datetime import gzip diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 69164fb..2d0f757 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import email.mime.text import subprocess diff --git a/aurweb/scripts/pkgmaint.py b/aurweb/scripts/pkgmaint.py index 3ad9ed8..36da126 100755 --- a/aurweb/scripts/pkgmaint.py +++ b/aurweb/scripts/pkgmaint.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import time diff --git a/aurweb/scripts/popupdate.py b/aurweb/scripts/popupdate.py index 58cd018..b64deed 100755 --- a/aurweb/scripts/popupdate.py +++ b/aurweb/scripts/popupdate.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import time diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index 9c0aa6a..22aa856 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import re import pygit2 diff --git a/aurweb/scripts/tuvotereminder.py b/aurweb/scripts/tuvotereminder.py index 97b1d12..eb3874e 100755 --- a/aurweb/scripts/tuvotereminder.py +++ b/aurweb/scripts/tuvotereminder.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import subprocess import time diff --git a/schema/gendummydata.py b/schema/gendummydata.py index 5ed6332..1f3d047 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 """ usage: gendummydata.py outputfilename.sql """ -- 2.14.1

1 2

[aur-dev] [PATCH] t1100: Test AUR_OVERWRITE
by Lukas Fleischer 10 Aug '17

10 Aug '17

Since c5302d3 (Require TUs to explicitly request to overwrite a pkgbase, 2017-07-24), non-fast-forward pushes require setting the AUR_OVERWRITE environment variable. Make sure that git-auth passes this variable to git-serve when it should (and does not pass it if it shouldn't). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/t1100-git-auth.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/t1100-git-auth.sh b/test/t1100-git-auth.sh index 71d526f..dd20bea 100755 --- a/test/t1100-git-auth.sh +++ b/test/t1100-git-auth.sh @@ -25,4 +25,21 @@ test_expect_success 'Test authentication with a wrong key.' ' 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 -- 2.14.0

1 0

[aur-dev] [PATCH] git-serve: Fix broken SQL statement
by Lukas Fleischer 08 Aug '17

08 Aug '17

Add a missing space to the SQL statement performing the disown operation. Fixes FS#55068. Note that the broken query was not discovered by the test suite since SQLite parses "?AND" inside prepared statements gracefully while MySQL does not. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/git/serve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py index eea0c9c..dfaddd1 100755 --- a/aurweb/git/serve.py +++ b/aurweb/git/serve.py @@ -192,7 +192,7 @@ def pkgreq_by_pkgbase(pkgbase_id, reqtype): "INNER JOIN RequestTypes ON " + "RequestTypes.ID = PackageRequests.ReqTypeID " + "WHERE PackageRequests.Status = 0 " + - "AND PackageRequests.PackageBaseID = ?" + + "AND PackageRequests.PackageBaseID = ? " + "AND RequestTypes.Name = ?", [pkgbase_id, reqtype]) return [row[0] for row in cur.fetchall()] -- 2.14.0

1 0

[aur-dev] [PATCH] t1300: Fix test cases for non-fast-forward pushes
by Lukas Fleischer 08 Aug '17

08 Aug '17

Since commit c5302d3 (Require TUs to explicitly request to overwrite a pkgbase, 2017-07-24), non-fast-forward pushes are denied even for Trusted Users, unless the AUR_OVERWRITE environment variable is set. Mark the test case performing a non-fast-forward push from a TU account as test_must_fail and add another test case performing the same operation with AUR_OVERWRITE=1. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/t1300-git-update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/t1300-git-update.sh b/test/t1300-git-update.sh index f16e2ad..109351a 100755 --- a/test/t1300-git-update.sh +++ b/test/t1300-git-update.sh @@ -125,7 +125,18 @@ test_expect_success 'Performing a non-fast-forward ref update.' ' test_expect_success 'Performing a non-fast-forward ref update as Trusted User.' ' 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 AUR_USER=tu AUR_PKGBASE=foobar AUR_PRIVILEGED=1 \ + test_must_fail "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 && + test_cmp expected actual +' + +test_expect_success 'Performing a non-fast-forward ref update with AUR_OVERWRITE=1.' ' + old=$(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 \ "$GIT_UPDATE" refs/heads/master "$old" "$new" 2>&1 ' -- 2.14.0

1 0

[aur-dev] Fixed translation
by Daniel Milde 03 Aug '17

03 Aug '17

Hi all, I fixed one annoying wrong translation in submenu for czech language. Patch in attachement. Thanks Daniel

2 2

[aur-dev] [PATCH] INSTALL: Add new dependencies
by Lukas Fleischer 01 Aug '17

01 Aug '17

Add installation instructions for python-bleach and python-markdown which are required for the rendercomment script. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL b/INSTALL index 369e1e3..ba24a45 100644 --- a/INSTALL +++ b/INSTALL @@ -48,6 +48,7 @@ read the instructions below. 5) Install Python modules and dependencies: # pacman -S python-mysql-connector python-pygit2 python-srcinfo + # pacman -S python-bleach python-markdown # python3 setup.py install 6) Create a new user: -- 2.13.3

1 0

[aur-dev] [PATCH] mkpkglists: Generate a list of user names
by Lukas Fleischer 01 Aug '17

01 Aug '17

In addition to the packages list and the package base list, also create a list of registered user names. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/mkpkglists.py | 7 +++++++ conf/config.proto | 1 + test/setup.sh | 1 + test/t2100-mkpkglists.sh | 18 ++++++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py index 8a0f2e9..686ee7d 100755 --- a/aurweb/scripts/mkpkglists.py +++ b/aurweb/scripts/mkpkglists.py @@ -8,6 +8,7 @@ import aurweb.db packagesfile = aurweb.config.get('mkpkglists', 'packagesfile') pkgbasefile = aurweb.config.get('mkpkglists', 'pkgbasefile') +userfile = aurweb.config.get('mkpkglists', 'userfile') def main(): @@ -16,6 +17,7 @@ def main(): datestr = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT") pkglist_header = "# AUR package list, generated on " + datestr pkgbaselist_header = "# AUR package base list, generated on " + datestr + userlist_header = "# AUR user name list, generated on " + datestr with gzip.open(packagesfile, "w") as f: f.write(bytes(pkglist_header + "\n", "UTF-8")) @@ -31,6 +33,11 @@ def main(): "WHERE PackagerUID IS NOT NULL") f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()]) + with gzip.open(userfile, "w") as f: + f.write(bytes(userlist_header + "\n", "UTF-8")) + cur = conn.execute("SELECT UserName FROM Users") + f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()]) + conn.close() diff --git a/conf/config.proto b/conf/config.proto index 6c637b0..1750929 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -71,3 +71,4 @@ server = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64 [mkpkglists] packagesfile = /srv/http/aurweb/web/html/packages.gz pkgbasefile = /srv/http/aurweb/web/html/pkgbase.gz +userfile = /srv/http/aurweb/web/html/users.gz diff --git a/test/setup.sh b/test/setup.sh index efa1ab8..d98c49c 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -61,6 +61,7 @@ server = file://$(pwd)/remote/ [mkpkglists] packagesfile = packages.gz pkgbasefile = pkgbase.gz +userfile = users.gz EOF cat >sendmail.sh <<-\EOF diff --git a/test/t2100-mkpkglists.sh b/test/t2100-mkpkglists.sh index 1e2edc3..fc11d07 100755 --- a/test/t2100-mkpkglists.sh +++ b/test/t2100-mkpkglists.sh @@ -44,4 +44,22 @@ test_expect_success 'Test package list generation.' ' test_cmp actual expected ' +test_expect_success 'Test user list generation.' ' + "$MKPKGLISTS" && + cat <<-EOD >expected && + dev + tu + tu2 + tu3 + tu4 + user + user2 + user3 + user4 + EOD + gunzip users.gz && + sed "/^#/d" users >actual && + test_cmp actual expected +' + test_done -- 2.13.3

1 0

[aur-dev] [PATCH] Unset PackagerUID before deleting an account
by Lukas Fleischer 01 Aug '17

01 Aug '17

When removing an account, remove the user from all last packager fields before deletion to make sure that no package bases are deleted, even if propagation constraints are missing. Fixes FS#53956. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index e45d735..bdcaaa8 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -924,7 +924,7 @@ function user_delete($id) { $fields_set_null = array( array("PackageBases", "SubmitterUID"), array("PackageBases", "MaintainerUID"), - array("PackageBases", "SubmitterUID"), + array("PackageBases", "PackagerUID"), array("PackageComments", "UsersID"), array("PackageComments", "DelUsersID"), array("PackageRequests", "UsersID"), -- 2.13.3

1 0