- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] Allow to search for both maintainer and co-maintainer
by Lukas Fleischer 07 Feb '17

07 Feb '17

As a follow-up to commit 6cb8c04 (Implement co-maintainer search, 2017-01-26), add an option to search for both maintainers and co-maintainers at the same time. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 8 ++++++++ web/template/pkg_search_form.php | 1 + 2 files changed, 9 insertions(+) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 063cc93..030ec9a 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -717,6 +717,14 @@ function pkg_search_page($params, $show_headers=true, $SID="") { $q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID "; $q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . ")"; } + elseif (isset($params["SeB"]) && $params["SeB"] == "M") { + /* Search by maintainer and co-maintainer. */ + $q_where .= "AND (Users.Username = " . $dbh->quote($params['K']) . " "; + $q_where .= "OR EXISTS (SELECT * FROM PackageComaintainers "; + $q_where .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; + $q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID "; + $q_where .= "AND Users.Username = " . $dbh->quote($params['K']) . "))"; + } elseif (isset($params["SeB"]) && $params["SeB"] == "s") { /* Search by submitter. */ $q_where .= "AND SubmitterUID = " . intval(uid_from_username($params['K'])) . " "; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 688cfcc..3d0cde6 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -10,6 +10,7 @@ $searchby = array( 'k' => __('Keywords'), 'm' => __('Maintainer'), 'c' => __('Co-maintainer'), + 'M' => __('Maintainer, Co-maintainer'), 's' => __('Submitter') ); -- 2.11.1

1 1

[aur-dev] [PATCH] confparser.inc.php: Support alternative config path
by Lukas Fleischer 04 Feb '17

04 Feb '17

Add a AUR_CONFIG environment variable that can be used to specify an alternative configuration file, similar to the feature introduced in ecbf32f (git-interface: Add AUR_CONFIG environment variable, 2016-08-03). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/confparser.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 789300e..e7128be 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -4,7 +4,11 @@ function config_load() { global $AUR_CONFIG; if (!isset($AUR_CONFIG)) { - $AUR_CONFIG = parse_ini_file("/etc/aurweb/config", true, INI_SCANNER_RAW); + $path = getenv('AUR_CONFIG'); + if (!$path) { + $path = "/etc/aurweb/config"; + } + $AUR_CONFIG = parse_ini_file($path, true, INI_SCANNER_RAW); } } -- 2.11.1

1 0

[aur-dev] [PATCH 1/3] Hide the table sorting links on the dashboard
by Lukas Fleischer 04 Feb '17

04 Feb '17

The tables on the dashboard always show the 50 most recent packages, ordered by last update. Do not make the table headers of these tables clickable. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_search_results.php | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index d596ec2..264d35b 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -1,4 +1,23 @@ <?php +if ($show_headers) { + $fmtth = function($title, $sb=false, $so=false, $hint=false) { + echo '<th>'; + if ($sb) { + echo '<a href="' . mkurl('SB=' . $sb . '&SO = ' . $so) . '">' . $title . '</a>'; + } else { + echo $title; + } + if ($hint) { + echo '<span title="' . $hint . '" class="hover-help"><sup>?</sup></span>'; + } + echo '</th>'; + }; +} else { + $fmtth = function($title, $sb=false, $so=false, $hint=false) { + echo '<th>' . $title . '</th>'; + }; +} + if (!$result): ?> <p><?= __("Error retrieving package list.") ?></p> <?php elseif ($total == 0): ?> @@ -33,16 +52,16 @@ if (!$result): ?> <?php if ($SID && $show_headers): ?> <th> </th> <?php endif; ?> - <th><a href="?<?= mkurl('SB=n&SO=' . $SO_next) ?>"><?= __("Name") ?></a></th> - <th><?= __("Version") ?></th> - <th><a href="?<?= mkurl('SB=v&SO=' . $SO_next) ?>"><?= __("Votes") ?></a></th> - <th><a href="?<?= mkurl('SB=p&SO=' . $SO_next) ?>"><?= __("Popularity") ?></a><span title="<?= __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98) ?>" class="hover-help"><sup>?</sup></span></th> + <?php $fmtth(__('Name'), 'n', $SO_next) ?> + <?php $fmtth(__('Version')) ?> + <?php $fmtth(__('Votes'), 'v', $SO_next) ?> + <?php $fmtth(__('Popularity'), 'p', $SO_next, __('Popularity is calculated as the sum of all votes with each vote being weighted with a factor of %.2f per day since its creation.', 0.98)) ?> <?php if ($SID): ?> - <th><a href="?<?= mkurl('SB=w&SO=' . $SO_next) ?>"><?= __("Voted") ?></a></th> - <th><a href="?<?= mkurl('SB=o&SO=' . $SO_next) ?>"><?= __("Notify") ?></a></th> + <?php $fmtth(__('Voted'), 'w', $SO_next) ?> + <?php $fmtth(__('Notify'), 'o', $SO_next) ?> <?php endif; ?> - <th><?= __("Description") ?></th> - <th><a href="?<?= mkurl('SB=m&SO=' . $SO_next) ?>"><?= __("Maintainer") ?></a></th> + <?php $fmtth(__('Description')) ?> + <?php $fmtth(__('Maintainer'), 'm', $SO_next) ?> </tr> </thead> <tbody> -- 2.11.1

1 2

[aur-dev] [PATCH 1/4] Split out the search form from pkg_search_page()
by Lukas Fleischer 04 Feb '17

04 Feb '17

This makes it easier to display search results without showing the search form. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/packages.php | 3 ++- web/lib/pkgfuncs.inc.php | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 1b89278..8fd3266 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -80,8 +80,9 @@ $(document).ready(function() { </script> <?php +include('pkg_search_form.php'); + if (isset($pkgid)) { - include('pkg_search_form.php'); if ($pkgid) { if (isset($_COOKIE["AURSID"])) { pkg_display_details($pkgid, $details, $_COOKIE["AURSID"]); diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8ca8835..8a5cf57 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -888,8 +888,6 @@ function pkg_search_page($SID="") { $templ_pages[__('Last') . ' »'] = ($pages - 1) * $per_page; } - include('pkg_search_form.php'); - $searchresults = array(); if ($result) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) { -- 2.11.1

1 4

[aur-dev] [PATCH] Implement co-maintainer search
by Lukas Fleischer 28 Jan '17

28 Jan '17

Add an option to filter package search results by co-maintainer. Partly fixes FS#45591. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 8 ++++++++ web/template/pkg_search_form.php | 1 + 2 files changed, 9 insertions(+) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 4b0fdba..8ca8835 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -670,6 +670,7 @@ function pkg_display_details($id=0, $row, $SID="") { * B - package base name (exact match) * k - package keyword(s) * m - package maintainer's username + * c - package co-maintainer's username * s - package submitter's username * do_Orphans - boolean. whether to search packages * without a maintainer @@ -746,6 +747,13 @@ function pkg_search_page($SID="") { /* Search by maintainer. */ $q_where .= "AND Users.Username = " . $dbh->quote($_GET['K']) . " "; } + elseif (isset($_GET["SeB"]) && $_GET["SeB"] == "c") { + /* Search by co-maintainer. */ + $q_where .= "AND EXISTS (SELECT * FROM PackageComaintainers "; + $q_where .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; + $q_where .= "WHERE PackageComaintainers.PackageBaseID = PackageBases.ID "; + $q_where .= "AND Users.Username = " . $dbh->quote($_GET['K']) . ")"; + } elseif (isset($_GET["SeB"]) && $_GET["SeB"] == "s") { /* Search by submitter. */ $q_where .= "AND SubmitterUID = " . intval(uid_from_username($_GET['K'])) . " "; diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 795a796..688cfcc 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -9,6 +9,7 @@ $searchby = array( 'B' => __('Exact Package Base'), 'k' => __('Keywords'), 'm' => __('Maintainer'), + 'c' => __('Co-maintainer'), 's' => __('Submitter') ); -- 2.11.0

1 0

[aur-dev] [PATCH 1/4] git-serve: Save last SSH login date and IP address
by Lukas Fleischer 25 Jan '17

25 Jan '17

In addition to logging the last login date and IP address on the web interface, store the time stamp and IP address of the last SSH login in the database. This simplifies user banning if one of the new SSH interface features, such as the voting mechanism implemented in 7ee2fdd (git-serve: Add support for (un-)voting, 2017-01-23), is abused. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/git/serve.py | 13 +++++++++++++ schema/aur-schema.sql | 2 ++ upgrading/4.5.0.txt | 10 +++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py index 4c03e3b..cfd4910 100755 --- a/aurweb/git/serve.py +++ b/aurweb/git/serve.py @@ -410,6 +410,18 @@ def pkgbase_has_full_access(pkgbase, user): return cur.fetchone()[0] > 0 +def log_ssh_login(user, remote_addr): + conn = aurweb.db.Connection() + + now = int(time.time()) + conn.execute("UPDATE Users SET LastSSHLogin = ?, " + + "LastSSHLoginIPAddress = ? WHERE Username = ?", + [now, remote_addr, user]) + + conn.commit() + conn.close() + + def die(msg): sys.stderr.write("{:s}\n".format(msg)) exit(1) @@ -451,6 +463,7 @@ def serve(action, cmdargv, user, privileged, remote_addr): if enable_maintenance: if remote_addr not in maintenance_exc: raise aurweb.exceptions.MaintenanceException + log_ssh_login(user, remote_addr) if action == 'git' and cmdargv[1] in ('upload-pack', 'receive-pack'): action = action + '-' + cmdargv[1] diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 13e3fd9..b0663eb 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -38,6 +38,8 @@ CREATE TABLE Users ( PGPKey VARCHAR(40) NULL DEFAULT NULL, LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0, LastLoginIPAddress VARCHAR(45) NULL DEFAULT NULL, + LastSSHLogin BIGINT UNSIGNED NOT NULL DEFAULT 0, + LastSSHLoginIPAddress VARCHAR(45) NULL DEFAULT NULL, InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0, RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, CommentNotify TINYINT(1) NOT NULL DEFAULT 1, diff --git a/upgrading/4.5.0.txt b/upgrading/4.5.0.txt index 6c4ce80..5cf0888 100644 --- a/upgrading/4.5.0.txt +++ b/upgrading/4.5.0.txt @@ -2,4 +2,12 @@ --- ALTER TABLE Users ADD COLUMN Timezone VARCHAR(32) NOT NULL DEFAULT 'UTC'; ---- \ No newline at end of file +--- + +2. Add LastSSHLogin and LastSSHLoginIPAddress columns to the Users table: + +--- +ALTER TABLE Users + ADD COLUMN LastSSHLogin BIGINT UNSIGNED NOT NULL DEFAULT 0, + ADD COLUMN LastSSHLoginIPAddress VARCHAR(45) NULL DEFAULT NULL; +--- -- 2.11.0

1 3

[aur-dev] [PATCH] config.proto: Update path to the notification script
by Lukas Fleischer 25 Jan '17

25 Jan '17

As of commit 3718860 (Make maintenance scripts installable, 2016-10-17), the notification script is installed as aurweb-notify. Update the sample configuration file accordingly. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.proto b/conf/config.proto index 431697e..c1be281 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -34,7 +34,7 @@ enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 [notifications] -notify-cmd = /srv/http/aurweb/scripts/notify.py +notify-cmd = /usr/local/bin/aurweb-notify sendmail = /usr/bin/sendmail sender = notify(a)aur.archlinux.org reply-to = noreply(a)aur.archlinux.org -- 2.11.0

1 0

[aur-dev] [PATCH] Show co-maintainers ssh clone url on pkgbase page
by Mark Weiman 23 Jan '17

23 Jan '17

On pkgbase pages, if a co-maintainer visits, only the read-only url is displayed which is inconsistent with how the individual packages of a pkgbase's pages displays them. This adds the ssh clone url to the pkgbase's page for co-maintainers to see. Implements: FS#52675 Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- web/template/pkgbase_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 1012c4e..ecfc42f 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -50,7 +50,7 @@ $base_uri = get_pkgbase_uri($row['Name']); <th><?= __('Git Clone URL') . ': ' ?></th> <td> <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> (<?= __('read-only') ?>) - <?php if ($uid == $row["MaintainerUID"]): ?> + <?php if (in_array($uid, $maintainers)): ?> <br /> <a href="<?= $git_clone_uri_priv ?>"><?= $git_clone_uri_priv ?></a> <?php endif; ?> </td> -- 2.11.0

2 1

[aur-dev] [PATCH 1/2] git-serve: Add support for (un-)voting
by Lukas Fleischer 23 Jan '17

23 Jan '17

Add support for voting for packages and removing votes from the SSH interface. The syntax is `vote <pkgbase>` resp. `unvote <pkgbase>`. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/exceptions.py | 12 ++++++++++ aurweb/git/serve.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/aurweb/exceptions.py b/aurweb/exceptions.py index 5922b2d..639f9e0 100644 --- a/aurweb/exceptions.py +++ b/aurweb/exceptions.py @@ -48,6 +48,18 @@ class InvalidCommentException(AurwebException): super(InvalidCommentException, self).__init__(msg) +class AlreadyVotedException(AurwebException): + def __init__(self, comment): + msg = 'already voted for package base: {:s}'.format(comment) + super(AlreadyVotedException, self).__init__(msg) + + +class NotVotedException(AurwebException): + def __init__(self, comment): + msg = 'missing vote for package base: {:s}'.format(comment) + super(NotVotedException, self).__init__(msg) + + class InvalidArgumentsException(AurwebException): def __init__(self, msg): super(InvalidArgumentsException, self).__init__(msg) diff --git a/aurweb/git/serve.py b/aurweb/git/serve.py index e33fbeb..4c03e3b 100755 --- a/aurweb/git/serve.py +++ b/aurweb/git/serve.py @@ -318,6 +318,57 @@ def pkgbase_unflag(pkgbase, user): conn.commit() +def pkgbase_vote(pkgbase, user): + pkgbase_id = pkgbase_from_name(pkgbase) + if not pkgbase_id: + raise aurweb.exceptions.InvalidPackageBaseException(pkgbase) + + conn = aurweb.db.Connection() + + cur = conn.execute("SELECT ID FROM Users WHERE Username = ?", [user]) + userid = cur.fetchone()[0] + if userid == 0: + raise aurweb.exceptions.InvalidUserException(user) + + cur = conn.execute("SELECT COUNT(*) FROM PackageVotes " + + "WHERE UsersID = ? AND PackageBaseID = ?", + [userid, pkgbase_id]) + if cur.fetchone()[0] > 0: + raise aurweb.exceptions.AlreadyVotedException(pkgbase) + + now = int(time.time()) + conn.execute("INSERT INTO PackageVotes (UsersID, PackageBaseID, VoteTS) " + + "VALUES (?, ?, ?)", [userid, pkgbase_id, now]) + conn.execute("UPDATE PackageBases SET NumVotes = NumVotes + 1 " + + "WHERE ID = ?", [pkgbase_id]) + conn.commit() + + +def pkgbase_unvote(pkgbase, user): + pkgbase_id = pkgbase_from_name(pkgbase) + if not pkgbase_id: + raise aurweb.exceptions.InvalidPackageBaseException(pkgbase) + + conn = aurweb.db.Connection() + + cur = conn.execute("SELECT ID FROM Users WHERE Username = ?", [user]) + userid = cur.fetchone()[0] + if userid == 0: + raise aurweb.exceptions.InvalidUserException(user) + + cur = conn.execute("SELECT COUNT(*) FROM PackageVotes " + + "WHERE UsersID = ? AND PackageBaseID = ?", + [userid, pkgbase_id]) + if cur.fetchone()[0] == 0: + raise aurweb.exceptions.NotVotedException(pkgbase) + + conn.execute("DELETE FROM PackageVotes WHERE UsersID = ? AND " + + "PackageBaseID = ?", [userid, pkgbase_id]) + conn.execute("UPDATE PackageBases SET NumVotes = NumVotes - 1 " + + "WHERE ID = ?", [pkgbase_id]) + conn.commit() + + def pkgbase_set_keywords(pkgbase, keywords): pkgbase_id = pkgbase_from_name(pkgbase) if not pkgbase_id: @@ -467,6 +518,16 @@ def serve(action, cmdargv, user, privileged, remote_addr): pkgbase = cmdargv[1] pkgbase_unflag(pkgbase, user) + elif action == 'vote': + checkarg(cmdargv, 'repository name') + + pkgbase = cmdargv[1] + pkgbase_vote(pkgbase, user) + elif action == 'unvote': + checkarg(cmdargv, 'repository name') + + pkgbase = cmdargv[1] + pkgbase_unvote(pkgbase, user) elif action == 'set-comaintainers': checkarg_atleast(cmdargv, 'repository name') @@ -485,6 +546,8 @@ def serve(action, cmdargv, user, privileged, remote_addr): "set-keywords <name> [...]": "Change package base keywords.", "setup-repo <name>": "Create a repository (deprecated).", "unflag <name>": "Remove out-of-date flag from a package base.", + "unvote <name>": "Remove vote from a package base.", + "vote <name>": "Vote for a package base.", "git-receive-pack": "Internal command used with Git.", "git-upload-pack": "Internal command used with Git.", } -- 2.11.0

1 1

[aur-dev] [Bug Report] Fwd: AUR Ownership Notification for rcm
by Thiago Barroso Perrotta 22 Jan '17

22 Jan '17

I just disowned a package in the AUR, and then I received the following automatic email: > Begin forwarded message: > > From: notify(a)aur.archlinux.org <mailto:notify@aur.archlinux.org> > Subject: AUR Ownership Notification for rcm > Date: 21 January 2017 22:07:54 GMT-2 > To: < <mailto:tbperrotta@gmail.com>my email address> > Reply-To: noreply(a)aur.archlinux.org <mailto:noreply@aur.archlinux.org> > > The package rcm [1] was disowned by serialoverflow [2]. > > [1] https://aur.archlinux.org/pkgbase/rcm/ <https://aur.archlinux.org/pkgbase/rcm/> > [2] https://aur.archlinux.org/account/serialoverflow/ <https://aur.archlinux.org/account/serialoverflow/> I want to stress this part out: The package rcm [1] was disowned by serialoverflow [2]. User `serialoverflow` was the only co-maintainer of the `rcm` package; and now, he is the current maintainer, since I have disowned the package. The aforementioned message is wrong, because I was the one who disowned the package, not its former co-maintainer. In other words: * Package X has Y as its maintainer and Z as its co-maintainer. * Y, the maintainer, disowns the package. * AUR sends an email stating that Z, not Y, disowned the package. This is a bug. - Thiago

3 2