- Aur-dev - lists.archlinux.org

[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

Populate DB from aur-schema.sql
by Nodiv Byzero 01 May '18

01 May '18

Hello, When I try to populate DB from aur-schema.sql using mysql command line I see following error: ERROR 1071 (42000) at line 20: Specified key was too long; max key length is 767 bytes Have you seen this one when installed aur-web? Is it because I use Maria DB version 10.1.30? Thanks, Nodiv

2 3

[PATCH] Hash IP for API rate limit
by Florian Pritz 22 Apr '18

22 Apr '18

The hash uses the start of a fixed window as an HMAC key. Therefore the windows stored in the DB also use this so that there can only be one active window for each IP. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- schema/aur-schema.sql | 2 +- upgrading/4.7.0.txt | 2 +- web/lib/aurjson.class.php | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 79de3f2..45f8993 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -403,7 +403,7 @@ CREATE TABLE AcceptedTerms ( -- Rate limits for API -- CREATE TABLE `ApiRateLimit` ( - IP VARCHAR(45) NOT NULL, + IP VARCHAR(255) NOT NULL, Requests INT(11) NOT NULL, WindowStart BIGINT(20) NOT NULL, PRIMARY KEY (`ip`) diff --git a/upgrading/4.7.0.txt b/upgrading/4.7.0.txt index 820e454..fcdbb4d 100644 --- a/upgrading/4.7.0.txt +++ b/upgrading/4.7.0.txt @@ -2,7 +2,7 @@ --- CREATE TABLE `ApiRateLimit` ( - IP VARCHAR(45) NOT NULL, + IP VARCHAR(255) NOT NULL, Requests INT(11) NOT NULL, WindowStart BIGINT(20) NOT NULL, PRIMARY KEY (`ip`) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index c51e9c2..168c6b7 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -153,6 +153,9 @@ private function check_ratelimit($ip) { } $window_length = config_get("ratelimit", "window_length"); + $hmac_key = floor(time() / ($window_length)); + $ip = hash_hmac("sha256", $ip, $hmac_key); + $this->update_ratelimit($ip); $stmt = $this->dbh->prepare(" SELECT Requests FROM ApiRateLimit @@ -181,14 +184,13 @@ private function check_ratelimit($ip) { private function update_ratelimit($ip) { $window_length = config_get("ratelimit", "window_length"); $db_backend = config_get("database", "backend"); - $time = time(); + $window_start = floor(time() / ($window_length)); // Clean up old windows - $deletion_time = $time - $window_length; $stmt = $this->dbh->prepare(" DELETE FROM ApiRateLimit WHERE WindowStart < :time"); - $stmt->bindParam(":time", $deletion_time); + $stmt->bindParam(":time", $window_start); $stmt->execute(); if ($db_backend == "mysql") { @@ -198,7 +200,7 @@ private function update_ratelimit($ip) { VALUES (:ip, 1, :window_start) ON DUPLICATE KEY UPDATE Requests=Requests+1"); $stmt->bindParam(":ip", $ip); - $stmt->bindParam(":window_start", $time); + $stmt->bindParam(":window_start", $window_start); $stmt->execute(); } elseif ($db_backend == "sqlite") { $stmt = $this->dbh->prepare(" @@ -206,7 +208,7 @@ private function update_ratelimit($ip) { (IP, Requests, WindowStart) VALUES (:ip, 0, :window_start);"); $stmt->bindParam(":ip", $ip); - $stmt->bindParam(":window_start", $time); + $stmt->bindParam(":window_start", $window_start); $stmt->execute(); $stmt = $this->dbh->prepare(" -- 2.17.0

1 0

[aur-dev][PATCH] config: allow reading both the proto file and the modified config
by Eli Schwartz 22 Apr '18

22 Apr '18

This change allows aurweb configuration to be done via either: - copying config.proto to config and modifying values - creating a new config only containing modified values, next to a config.proto containing unmodified values The motivation for this change is to enable ansible configuration by storing only changed values, and deferring to config.proto otherwise. If a config.proto file does not exist next to /etc/aurweb/config or $AUR_CONFIG, it is ignored and *all* values are expected to live in the modified config file. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- aurweb/config.py | 4 ++++ web/lib/confparser.inc.php | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/aurweb/config.py b/aurweb/config.py index a52d942..c333c43 100644 --- a/aurweb/config.py +++ b/aurweb/config.py @@ -13,6 +13,10 @@ def _get_parser(): path = os.environ.get('AUR_CONFIG') else: path = "/etc/aurweb/config" + + if os.path.isfile(path + '.proto'): + with open(path + '.proto') as f: + _parser.read_file(f) _parser.read(path) return _parser diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index 499481d..2ed0108 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -8,11 +8,17 @@ function config_load() { if (!$path) { $path = "/etc/aurweb/config"; } + if (file_exists($path . ".proto")) { + $defaults = parse_ini_file($path . ".proto", true, INI_SCANNER_RAW); + } else { + $defaults = []; + } if (file_exists($path)) { - $AUR_CONFIG = parse_ini_file($path, true, INI_SCANNER_RAW); + $config = parse_ini_file($path, true, INI_SCANNER_RAW); } else { die("aurweb config file not found"); } + $AUR_CONFIG = array_replace_recursive($defaults, $config) } } -- 2.17.0

3 10

[PATCH] Allow manual breaks and horizontal lines in comments
by Lukas Fleischer 08 Apr '18

08 Apr '18

When sanitizing rendered comments, keep <hr> tags and <br> tags. The former are generated when using "---" in Markdown comments, the latter are used when putting two spaces at the end of a line. Fixes FS#56649. --- aurweb/scripts/rendercomment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py index 4b64227..5e18fd5 100755 --- a/aurweb/scripts/rendercomment.py +++ b/aurweb/scripts/rendercomment.py @@ -119,8 +119,8 @@ def main(): FlysprayLinksExtension(), GitCommitsExtension(pkgbase), HeadingExtension()]) - allowed_tags = bleach.sanitizer.ALLOWED_TAGS + \ - ['p', 'pre', 'h4', 'h5', 'h6'] + allowed_tags = (bleach.sanitizer.ALLOWED_TAGS + + ['p', 'pre', 'h4', 'h5', 'h6', 'br', 'hr']) html = bleach.clean(html, tags=allowed_tags) save_rendered_comment(conn, commentid, html) -- 2.17.0

1 0