May 2018 - Aur-dev - lists.archlinux.org

[PATCH] feat(rpc): return "providers" packages when querying by `name` or `name-desc`
by morganamilo 18 Feb '19

18 Feb '19

From: actionless <actionless.loveless(a)gmail.com> --- doc/rpc.txt | 4 ++-- web/lib/aurjson.class.php | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/rpc.txt b/doc/rpc.txt index f353ff0..83cdae3 100644 --- a/doc/rpc.txt +++ b/doc/rpc.txt @@ -8,8 +8,8 @@ Package searches can be performed by issuing HTTP GET requests of the form +/rpc/?v=5&type=search&by=_field_&arg=_keywords_+ where _keywords_ is the search argument and _field_ is one of the following values: -* `name` (search by package name only) -* `name-desc` (search by package name and description) +* `name` (search by package name or packages which provide that name) +* `name-desc` (the same as `name` and search by description) * `maintainer` (search by package maintainer) The _by_ parameter can be skipped and defaults to `name-desc`. diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 9eeaafd..6e580a9 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -392,12 +392,26 @@ class AurJSON { if (strlen($keyword_string) < 2) { return $this->json_error('Query arg too small.'); } + + //packages which provide the package we are looking for: + $providers = pkg_providers(addcslashes($keyword_string, '%_')); + $provided_names = array(); + foreach ($providers as $provider) { + if ($provider[0] != 0) { // if package is not from repo + $name = $this->dbh->quote($provider[1]); + array_push($provided_names, $name); + } + } + $provided_query = "(" . join(", ", $provided_names) . ")"; + $keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%"); if ($search_by === 'name') { - $where_condition = "(Packages.Name LIKE $keyword_string)"; + $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Packages.Name IN $provided_query )"; } else if ($search_by === 'name-desc') { $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Packages.Name IN $provided_query OR "; $where_condition .= "Description LIKE $keyword_string)"; } } else if ($search_by === 'maintainer') { -- 2.16.2

6 25

[PATCH] Add package base name in request close notifications
by Lukas Fleischer 20 May '18

20 May '18

Mention both the package base name and the request type in the subject of request closure notification. Implements FS#41607. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 16 ++++++++++++---- test/t1200-git-serve.sh | 2 +- test/t2500-notify.sh | 6 +++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index beca8b4..44eec84 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -443,9 +443,14 @@ class RequestCloseNotification(Notification): 'WHERE PackageRequests.ID = ?', [reqid]) self._to = aurweb.config.get('options', 'aur_request_ml') self._cc = [row[0] for row in cur.fetchall()] - cur = conn.execute('SELECT ClosureComment FROM PackageRequests ' + - 'WHERE ID = ?', [reqid]) - self._text = cur.fetchone()[0] + cur = conn.execute('SELECT PackageRequests.ClosureComment, ' + + 'RequestTypes.Name, ' + + 'PackageRequests.PackageBaseName ' + + 'FROM PackageRequests ' + + 'INNER JOIN RequestTypes ' + + 'ON RequestTypes.ID = PackageRequests.ReqTypeID ' + + 'WHERE PackageRequests.ID = ?', [reqid]) + self._text, self._reqtype, self._pkgbase = cur.fetchone() self._reqid = int(reqid) self._reason = reason @@ -453,7 +458,10 @@ class RequestCloseNotification(Notification): return [(self._to, 'en')] def get_subject(self, lang): - return '[PRQ#%d] Request %s' % (self._reqid, self._reason.title()) + return '[PRQ#%d] %s Request for %s %s' % (self._reqid, + self._reqtype.title(), + self._pkgbase, + self._reason.title()) def get_body(self, lang): if self._user: diff --git a/test/t1200-git-serve.sh b/test/t1200-git-serve.sh index 94a5ff6..473065f 100755 --- a/test/t1200-git-serve.sh +++ b/test/t1200-git-serve.sh @@ -376,7 +376,7 @@ test_expect_success "Check whether package requests are closed when disowning." SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \ "$GIT_SERVE" 2>&1 && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Orphan Request for foobar Accepted EOD grep "^Subject.*PRQ" sendmail.out >sendmail.parts && test_cmp sendmail.parts expected && diff --git a/test/t2500-notify.sh b/test/t2500-notify.sh index 46c2753..b2bad1c 100755 --- a/test/t2500-notify.sh +++ b/test/t2500-notify.sh @@ -304,7 +304,7 @@ test_expect_success 'Test subject and body of request close notifications.' ' "$NOTIFY" request-close 1 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -322,7 +322,7 @@ test_expect_success 'Test subject and body of request close notifications (auto- "$NOTIFY" request-close 0 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -342,7 +342,7 @@ test_expect_success 'Test subject and body of request close notifications with c "$NOTIFY" request-close 1 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && -- 2.17.0

1 0

[aur-dev][PATCH] git-update: accept any arch when discovering arch-dependent metadata
by Eli Schwartz 18 May '18

18 May '18

Currently we hardcode the architectures the official repos historically supported, which seems both inefficient because of hardcoding, and simply wrong, because many packages support various ARM platforms too. If we were to say "only officially supported arches will be supported in the AUR" we'd have to disable i686, which seems silly and arbitrarily restrictive. Also there's better places to implement such a blacklist (via die_commit in the main loop, via a config option to list supported arches, would make much more sense in terms of logic). As for the metadata extraction itself, there's no reason to hardcode the arches to check for at all. We can get this information too, from the .SRCINFO itself. Detecting this dynamically is not incompatible with a blacklist, should we ever decide to implement such a thing. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Just in case I wasn't obvious, I don't support adding a real blacklist any more than the currently existing accidental sort of kind of one... But currently we're really inconsistent in how we treat e.g. source_aarch64 which just quietly disappears and should really be shown in the web interface. This is extremely valid in -bin packages. It looks like we weren't hardcoding this anywhere but there anyway, the database/frontend don't seem to care what the value of arch is before displaying it. So, no database changes, and less bytes of code. This is a really long commit message and annotation for a two-word change... aurweb/git/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/git/update.py b/aurweb/git/update.py index da48eb3..0614e9e 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -39,7 +39,7 @@ def extract_arch_fields(pkginfo, field): for val in pkginfo[field]: values.append({"value": val, "arch": None}) - for arch in ['i686', 'x86_64']: + for arch in pkginfo['arch']: if field + '_' + arch in pkginfo: for val in pkginfo[field + '_' + arch]: values.append({"value": val, "arch": arch}) -- 2.17.0

2 1

[PATCH 0/6] Localize notification emails
by Lukas Fleischer 17 May '18

17 May '18

This patch series implements FS#31850. The preparatory work is quite invasive and includes a complete rewrite of the notification module. The last patch adds the new translatable strings to our message catalog. Comments welcome! Lukas Fleischer (6): notify.py: Do not add stray newlines t2500: Add test cases for all notifications Refactor the notification script Localize notification emails Use modern format strings in notification messages Update message catalog aurweb/l10n.py | 16 + aurweb/scripts/notify.py | 880 +++++++++++++++++++++------------------ po/Makefile | 21 +- po/aur.pot | 136 +++++- test/setup.sh | 18 +- test/t2500-notify.sh | 350 +++++++++++++++- 6 files changed, 1003 insertions(+), 418 deletions(-) create mode 100644 aurweb/l10n.py -- 2.17.0

1 6

[PATCH] Stop using each()
by Lukas Fleischer 12 May '18

12 May '18

The each() function has been deprecated as of PHP 7.2.0. Use foreach loops instead. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/rss.php | 2 +- web/html/voters.php | 4 ++-- web/template/account_edit_form.php | 4 ++-- web/template/account_search_results.php | 12 ++++++------ web/template/pkg_comments.php | 4 ++-- web/template/pkg_details.php | 12 ++++++------ web/template/pkg_search_results.php | 4 ++-- web/template/pkgbase_details.php | 4 ++-- web/template/pkgreq_results.php | 4 ++-- web/template/tu_last_votes_list.php | 4 ++-- web/template/tu_list.php | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/web/html/rss.php b/web/html/rss.php index 8585d81..d6e7825 100644 --- a/web/html/rss.php +++ b/web/html/rss.php @@ -40,7 +40,7 @@ $rss->image = $image; #Get the latest packages and add items for them $packages = latest_pkgs(20); -while (list($indx, $row) = each($packages)) { +foreach ($packages as $indx => $row) { $item = new FeedItem(); $item->title = $row["Name"]; $item->link = "{$protocol}://{$host}" . get_pkg_uri($row["Name"]); diff --git a/web/html/voters.php b/web/html/voters.php index 997186d..bacbcfc 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -16,14 +16,14 @@ if (has_credential(CRED_PKGBASE_LIST_VOTERS)): <h2>Votes for <a href="<?= get_pkgbase_uri($pkgbase_name); ?>"><?= $pkgbase_name ?></a></h2> <div class="boxbody"> <ul> - <?php while (list($indx, $row) = each($votes)): ?> + <?php foreach ($votes as $indx => $row): ?> <li> <a href="<?= get_user_uri($row['Username']); ?>"><?= htmlspecialchars($row['Username']) ?></a> <?php if ($row["VoteTS"] > 0): ?> (<?= date("Y-m-d H:i", intval($row["VoteTS"])) ?>) <?php endif; ?> </li> - <?php endwhile; ?> + <?php endforeach; ?> </ul> </div> </div> diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 833e74a..6eff81b 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -122,7 +122,7 @@ <select name="L" id="id_language"> <?php reset($SUPPORTED_LANGS); - while (list($code, $lang) = each($SUPPORTED_LANGS)) { + foreach ($SUPPORTED_LANGS as $code => $lang) { if ($L == $code) { print "<option value=\"".$code."\" selected=\"selected\"> ".$lang."</option>"."\n"; } else { @@ -137,7 +137,7 @@ <select name="TZ" id="id_timezone"> <?php $timezones = generate_timezone_list(); - while (list($key, $val) = each($timezones)) { + foreach ($timezones as $key => $val) { if ($TZ == $key) { print "<option value=\"".$key."\" selected=\"selected\"> ".$val."</option>\n"; } else { diff --git a/web/template/account_search_results.php b/web/template/account_search_results.php index 43f2d1d..81cd818 100644 --- a/web/template/account_search_results.php +++ b/web/template/account_search_results.php @@ -18,7 +18,7 @@ else: </thead> <?php $i = 0; - while (list($indx, $row) = each($userinfo)): + foreach ($userinfo as $indx => $row): if ($i % 2): $c = "even"; else: @@ -51,7 +51,7 @@ else: </tr> <?php $i++; - endwhile; + endforeach; ?> </table> @@ -64,10 +64,10 @@ else: <input type="hidden" name="O" value="<?= ($OFFSET-$HITS_PER_PAGE) ?>" /> <?php reset($search_vars); - while (list($k, $ind) = each($search_vars)): + foreach ($search_vars as $k => $ind): ?> <input type="hidden" name="<?= $ind ?>" value="<?= ${$ind} ?>" /> - <?php endwhile; ?> + <?php endforeach; ?> <input type="submit" class="button" value="<-- <?= __("Less") ?>" /> </fieldset> </form> @@ -79,10 +79,10 @@ else: <input type="hidden" name="O" value="<?= ($OFFSET+$HITS_PER_PAGE) ?>" /> <?php reset($search_vars); - while (list($k, $ind) = each($search_vars)): + foreach ($search_vars as $k => $ind): ?> <input type="hidden" name="<?= $ind ?>" value="<?= ${$ind} ?>" /> - <?php endwhile; ?> + <?php endforeach; ?> <input type="submit" class="button" value="<?= __("More") ?> -->" /> </fieldset> </form> diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 7d9bedc..3e5e5cc 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -15,7 +15,7 @@ if (!isset($count)) { <?php endif; ?> </h3> - <?php while (list($indx, $row) = each($comments)): ?> + <?php foreach ($comments as $indx => $row): ?> <?php $date_fmtd = date('Y-m-d H:i', $row['CommentTS']); if ($row['UserName']) { @@ -113,7 +113,7 @@ if (!isset($count)) { <?php endif; ?> </div> </div> - <?php endwhile; ?> + <?php endforeach; ?> <?php if ($count > 10 && !isset($_GET['comments']) && !isset($pinned)): ?> <h3> diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 8a93417..650c245 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -276,9 +276,9 @@ endif; <h3><?= __('Dependencies') . " (" . count($deps) . ")"?></h3> <?php if (count($deps) > 0): ?> <ul id="pkgdepslist"> -<?php while (list($k, $darr) = each($deps)): ?> +<?php foreach ($deps as $k => $darr): ?> <li><?= pkg_depend_link($darr[0], $darr[1], $darr[2], $darr[3], $darr[4], $darr[5]); ?></li> -<?php endwhile; ?> +<?php endforeach; ?> </ul> <?php endif; ?> </div> @@ -286,9 +286,9 @@ endif; <h3><?= __('Required by') . " (" . count($requiredby) . ")"?></h3> <?php if (count($requiredby) > 0): ?> <ul id="pkgreqslist"> - <?php while (list($k, $darr) = each($requiredby)): ?> + <?php foreach ($requiredby as $k => $darr): ?> <li><?= pkg_requiredby_link($darr[0], $darr[1], $darr[2], $darr[3], $row['Name']); ?></li> - <?php endwhile; ?> + <?php endforeach; ?> </ul> <?php endif; ?> </div> @@ -298,9 +298,9 @@ endif; <?php if (count($sources) > 0): ?> <div> <ul id="pkgsrcslist"> - <?php while (list($k, $src) = each($sources)): ?> + <?php foreach ($sources as $k => $src): ?> <li><?= pkg_source_link($src[0], $src[1], urlencode($row['BaseName'])) ?></li> - <?php endwhile; ?> + <?php endforeach; ?> </ul> </div> <?php endif; ?> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index d7512b1..7c5ad03 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -66,7 +66,7 @@ if (!$result): ?> </thead> <tbody> - <?php while (list($indx, $row) = each($searchresults)): ?> + <?php foreach ($searchresults as $indx => $row): ?> <tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>"> <?php if ($SID && $show_headers): ?> <td><input type="checkbox" name="IDs[<?= $row["PackageBaseID"] ?>]" value="1" /></td> @@ -100,7 +100,7 @@ if (!$result): ?> <?php endif; ?> </td> </tr> - <?php endwhile; ?> + <?php endforeach; ?> </tbody> </table> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index de55da0..8a6e2b4 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -126,10 +126,10 @@ endif; <?php if (count($pkgs) > 0): ?> <ul> <?php - while (list($k, $pkg) = each($pkgs)): + foreach ($pkgs as $k => $pkg): ?> <li><a href="<?= htmlspecialchars(get_pkg_uri($pkg), ENT_QUOTES); ?>" title="<?= __('View packages details for').' '. htmlspecialchars($pkg) ?>"><?= htmlspecialchars($pkg) ?></a></li> - <?php endwhile; ?> + <?php endforeach; ?> </ul> <?php endif; ?> </div> diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index e02cff3..1a565c3 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -36,7 +36,7 @@ </thead> <tbody> - <?php while (list($indx, $row) = each($results)): ?> + <?php foreach ($results as $indx => $row): ?> <?php $idle_time = config_get_int('options', 'request_idle_time'); $due = ($row['Open'] && time() - intval($row['RequestTS']) > $idle_time); @@ -100,7 +100,7 @@ <td><?= __("unknown") ?></td> <?php endif; ?> </tr> - <?php endwhile; ?> + <?php endforeach; ?> </tbody> </table> diff --git a/web/template/tu_last_votes_list.php b/web/template/tu_last_votes_list.php index 5cff248..6e85258 100644 --- a/web/template/tu_last_votes_list.php +++ b/web/template/tu_last_votes_list.php @@ -11,7 +11,7 @@ <tbody> <?php if (empty($result)): ?> <tr><td align="center" colspan="0"><?= __("No results found.") ?></td></tr> - <?php else: while (list($indx, $row) = each($result)): + <?php else: foreach ($result as $indx => $row): if ($indx % 2): $c = "even"; else: @@ -28,7 +28,7 @@ </td> </tr> <?php - endwhile; + endforeach; endif; ?> </tbody> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index b7253f9..204c89e 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -26,7 +26,7 @@ </thead> <tbody> - <?php while (list($indx, $row) = each($result)): ?> + <?php foreach ($result as $indx => $row): ?> <?php if ($indx % 2) { $c = "even"; @@ -60,7 +60,7 @@ <?php endif; ?> </td> </tr> - <?php endwhile; ?> + <?php endforeach; ?> </tbody> </table> -- 2.17.0

1 0

[PATCH] Add newline after accept link for orphan requests
by Lukas Fleischer 12 May '18

12 May '18

Fixes a regression introduced in 0ffa067 (Use a link to accept orphan requests, 2018-05-10). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgreq_results.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 3c824c0..6b9c6bd 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -85,8 +85,8 @@ <a href="<?= get_pkgbase_uri($row['Name']) ?>disown/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <?php elseif ($row['Type'] == 'orphan' && !$due): ?> <?= __('Locked') ?> (<?= $time_left_fmt ?>) - <br /> <?php endif; ?> + <br /> <?php endif; ?> <a href="<?= get_pkgreq_route() . '/' . intval($row['ID']) ?>/close/"><?= __('Close') ?></a> </td> -- 2.17.0

1 1

[PATCH 1/2] confparser.inc.php: Add missing semicolon
by Lukas Fleischer 12 May '18

12 May '18

Fixes a regression introduced in 97c5bce (config: allow reading both the defaults file and the modified config, 2018-04-15). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/confparser.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 29f17e8..cb51e02 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -22,7 +22,7 @@ function config_load() { } else { die("aurweb config file not found"); } - $AUR_CONFIG = array_replace_recursive($default_config, $config) + $AUR_CONFIG = array_replace_recursive($default_config, $config); } } -- 2.17.0

1 1

[aur-dev][PATCH] Requests: use a link instead of a form to accept orphan requests
by Eli Schwartz 11 May '18

11 May '18

This forwards to a confirmation page, and currently drops the "via" parameter in the process. As a result, accepted orphan requests usually show: Request #XXXXXX has been accepted automatically by the Arch User Repository package request system: The user YYYYYYY disowned the package. This is wrong, and should show (will show, if you manually add it or use the close button instead of the accept button): Request #XXXXXX has been rejected by YYYYYYY [1]: Fixes FS#56606 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- web/template/pkgreq_results.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index fb49dfa..3c824c0 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -82,11 +82,7 @@ <a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <br /> <?php elseif ($row['Type'] == 'orphan' && $due): ?> - <form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post"> - <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> - <input type="hidden" name="via" value="<?= intval($row['ID']) ?>" /> - <input type="submit" class="button text-button" name="do_Disown" value="<?= __('Accept') ?>" /> - </form> + <a href="<?= get_pkgbase_uri($row['Name']) ?>disown/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a> <?php elseif ($row['Type'] == 'orphan' && !$due): ?> <?= __('Locked') ?> (<?= $time_left_fmt ?>) <br /> -- 2.17.0

2 1

[PATCH] Erase login IP addresses after seven days
by Lukas Fleischer 10 May '18

10 May '18

Add a script to periodically remove old IP addresses from the users database. The login IP addresses are stored for spam protection and to prevent from abuse. It is quite unlikely that we ever need the IP address of a user whose last login is more than a week old. It makes sense to remove such IP addresses to protect our users' privacy. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/usermaint.py | 22 +++++++++++++++++ setup.py | 1 + test/setup.sh | 1 + test/t2700-usermaint.sh | 49 +++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100755 aurweb/scripts/usermaint.py create mode 100755 test/t2700-usermaint.sh diff --git a/aurweb/scripts/usermaint.py b/aurweb/scripts/usermaint.py new file mode 100755 index 0000000..1621d41 --- /dev/null +++ b/aurweb/scripts/usermaint.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 + +import time + +import aurweb.db + + +def main(): + conn = aurweb.db.Connection() + + limit_to = int(time.time()) - 86400 * 7 + conn.execute("UPDATE Users SET LastLoginIPAddress = NULL " + + "WHERE LastLogin < ?", [limit_to]) + conn.execute("UPDATE Users SET LastSSHLoginIPAddress = NULL " + + "WHERE LastSSHLogin < ?", [limit_to]) + + conn.commit() + conn.close() + + +if __name__ == '__main__': + main() diff --git a/setup.py b/setup.py index 9d10cc1..ca26f0d 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,7 @@ setup( 'aurweb-popupdate = aurweb.scripts.popupdate:main', 'aurweb-rendercomment = aurweb.scripts.rendercomment:main', 'aurweb-tuvotereminder = aurweb.scripts.tuvotereminder:main', + 'aurweb-usermaint = aurweb.scripts.usermaint:main', ], }, ) diff --git a/test/setup.sh b/test/setup.sh index d98c49c..5e10fec 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -14,6 +14,7 @@ GIT_UPDATE="$TOPLEVEL/aurweb/git/update.py" MKPKGLISTS="$TOPLEVEL/aurweb/scripts/mkpkglists.py" TUVOTEREMINDER="$TOPLEVEL/aurweb/scripts/tuvotereminder.py" PKGMAINT="$TOPLEVEL/aurweb/scripts/pkgmaint.py" +USERMAINT="$TOPLEVEL/aurweb/scripts/usermaint.py" AURBLUP="$TOPLEVEL/aurweb/scripts/aurblup.py" NOTIFY="$TOPLEVEL/aurweb/scripts/notify.py" RENDERCOMMENT="$TOPLEVEL/aurweb/scripts/rendercomment.py" diff --git a/test/t2700-usermaint.sh b/test/t2700-usermaint.sh new file mode 100755 index 0000000..4f62514 --- /dev/null +++ b/test/t2700-usermaint.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +test_description='usermaint tests' + +. ./setup.sh + +test_expect_success 'Test removal of login IP addresses.' ' + now=$(date -d now +%s) && + threedaysago=$(date -d "3 days ago" +%s) && + tendaysago=$(date -d "10 days ago" +%s) && + cat <<-EOD | sqlite3 aur.db && + UPDATE Users SET LastLogin = $threedaysago, LastLoginIPAddress = "1.2.3.4" WHERE ID = 1; + UPDATE Users SET LastLogin = $tendaysago, LastLoginIPAddress = "2.3.4.5" WHERE ID = 2; + UPDATE Users SET LastLogin = $now, LastLoginIPAddress = "3.4.5.6" WHERE ID = 3; + UPDATE Users SET LastLogin = 0, LastLoginIPAddress = "4.5.6.7" WHERE ID = 4; + UPDATE Users SET LastLogin = 0, LastLoginIPAddress = "5.6.7.8" WHERE ID = 5; + UPDATE Users SET LastLogin = $tendaysago, LastLoginIPAddress = "6.7.8.9" WHERE ID = 6; + EOD + "$USERMAINT" && + cat <<-EOD >expected && + 1.2.3.4 + 3.4.5.6 + EOD + echo "SELECT LastLoginIPAddress FROM Users WHERE LastLoginIPAddress IS NOT NULL;" | sqlite3 aur.db >actual && + test_cmp actual expected +' + +test_expect_success 'Test removal of SSH login IP addresses.' ' + now=$(date -d now +%s) && + threedaysago=$(date -d "3 days ago" +%s) && + tendaysago=$(date -d "10 days ago" +%s) && + cat <<-EOD | sqlite3 aur.db && + UPDATE Users SET LastSSHLogin = $now, LastSSHLoginIPAddress = "1.2.3.4" WHERE ID = 1; + UPDATE Users SET LastSSHLogin = $threedaysago, LastSSHLoginIPAddress = "2.3.4.5" WHERE ID = 2; + UPDATE Users SET LastSSHLogin = $tendaysago, LastSSHLoginIPAddress = "3.4.5.6" WHERE ID = 3; + UPDATE Users SET LastSSHLogin = 0, LastSSHLoginIPAddress = "4.5.6.7" WHERE ID = 4; + UPDATE Users SET LastSSHLogin = 0, LastSSHLoginIPAddress = "5.6.7.8" WHERE ID = 5; + UPDATE Users SET LastSSHLogin = $tendaysago, LastSSHLoginIPAddress = "6.7.8.9" WHERE ID = 6; + EOD + "$USERMAINT" && + cat <<-EOD >expected && + 1.2.3.4 + 2.3.4.5 + EOD + echo "SELECT LastSSHLoginIPAddress FROM Users WHERE LastSSHLoginIPAddress IS NOT NULL;" | sqlite3 aur.db >actual && + test_cmp actual expected +' + +test_done -- 2.17.0

1 0

[aur-dev][PATCH] Update copyright year. Four years just passed in the blink of an eye. :)
by Eli Schwartz 10 May '18

10 May '18

Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- web/template/cgit/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html index 36e0f1b..6ceec28 100644 --- a/web/template/cgit/footer.html +++ b/web/template/cgit/footer.html @@ -1,6 +1,6 @@ <div id="footer"> <p> - Copyright © 2004-2014 aurweb Development Team – + Copyright © 2004-2018 aurweb Development Team – <strong>AUR packages are user produced content. Any use of the provided files is at your own risk.</strong> </p> </div> -- 2.17.0

2 3