June 2015 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] git-serve: Support cloning with simplified paths
by Johannes Löthberg 12 Jun '15

12 Jun '15

This commit adds support for cloning repositories over SSH without a leading slash or with a trailing .git Fixes FS#45260 Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-serve.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index a6dee13..26aa02d 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -123,8 +123,10 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': die_with_help("%s: missing path" % (action)) path = cmdargv[1].rstrip('/') - if not path.startswith('/') or not path.endswith('.git'): - die('%s: invalid path: %s' % (action, path)) + if not path.startswith('/'): + path = '/' + path + if not path.endswith('.git'): + path = path + '.git' pkgbase = path[1:-4] if not re.match(repo_regex, pkgbase): die('%s: invalid repository name: %s' % (action, pkgbase)) -- 2.4.2

1 0

[aur-dev] [PATCH] Improve the regular expression to match HTTP clones
by Lukas Fleischer 12 Jun '15

12 Jun '15

Specifically check for URIs git-http-backend(1) can handle. This also allows us to make the ".git" suffix optional. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index a2a6153..9040c17 100644 --- a/INSTALL +++ b/INSTALL @@ -48,7 +48,7 @@ Setup on Arch Linux 9) If you want to enable smart HTTP support with nginx and uWSGI, you can use the following directives: - location ~ ^/([a-z0-9][a-z0-9.+_-]*)\.git/(.*)$ { + location ~ "^/([a-z0-9][a-z0-9.+_-]*?)(\.git)?/(git-(receive|upload)-pack|HEAD|info/refs|objects/(info/(http-)?alternates|packs)|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(pack|idx))$" { include uwsgi_params; uwsgi_modifier1 9; uwsgi_param PATH_INFO /aur.git/$2; -- 2.4.3

1 0

[aur-dev] [PATCH] git-serve: Fix cloning with paths not starting with /
by Johannes Löthberg 12 Jun '15

12 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-serve.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index a6dee13..85f077b 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -123,7 +123,9 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': die_with_help("%s: missing path" % (action)) path = cmdargv[1].rstrip('/') - if not path.startswith('/') or not path.endswith('.git'): + if not path.startswith('/'): + path = '/' + path + if not path.endswith('.git'): die('%s: invalid path: %s' % (action, path)) pkgbase = path[1:-4] if not re.match(repo_regex, pkgbase): -- 2.4.2

1 0

[aur-dev] [PATCH] Autofocus input fields at login and package-search
by Gordian Edenhofer 12 Jun '15

12 Jun '15

At the login and the package search page, the user is promted to provide some input. Until now it was neccessary to first click the field in which the input should be placed. This can be simplified with HTML5 using the autofocus attribute of the input element, though not included in XHTML 1.0, the attribute was at least given a value to comply with the standard. Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- web/html/login.php | 2 +- web/template/pkg_search_form.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/html/login.php b/web/html/login.php index 94da559..f898a57 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -29,7 +29,7 @@ html_header('AUR ' . __("Login")); <?php endif; ?> <p> <label for="id_username"><?= __('Username') . ':'; ?></label> - <input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" /> + <input id="id_username" type="text" name="user" size="30" maxlength="<?= config_get_int('options', 'username_max_len'); ?>" value="<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>" autofocus="autofocus" /> </p> <p> <label for="id_password"><?= __('Password') . ':'; ?></label> diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 7428250..b731674 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -70,7 +70,7 @@ $per_page = array(50, 100, 250); </div> <div> <label for="id_q"><?= __("Keywords"); ?></label> - <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' /> + <input type='text' name='K' size='30' value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength='35' autofocus="autofocus" /> </div> <div> <label for="id_out_of_date"><?= __('Out of Date'); ?></label> -- 2.4.1

3 5

[aur-dev] [PATCH] stats.inc.php: Show the 15 most recent updates
by Lukas Fleischer 12 Jun '15

12 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/stats.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 6ca5011..52637be 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -15,7 +15,7 @@ function updates_table() { $q.= 'FROM Packages INNER JOIN PackageBases ON '; $q.= 'Packages.PackageBaseID = PackageBases.ID '; $q.= 'WHERE PackageBases.PackagerUID IS NOT NULL '; - $q.= 'ORDER BY ModifiedTS DESC LIMIT 10'; + $q.= 'ORDER BY ModifiedTS DESC LIMIT 15'; $result = $dbh->query($q); $newest_packages = new ArrayObject(); -- 2.4.2

1 0

[aur-dev] [PATCH] Redesign the home page
by Lukas Fleischer 12 Jun '15

12 Jun '15

* Make the home page look even more like the archweb home page. * Add information on package requests. * Improve texts on discussion and bug reporting. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/aurweb.css | 4 ++++ web/html/home.php | 51 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 12 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index c86c1da..a3f43bd 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -81,3 +81,7 @@ legend { padding: 1em 0; } + +p.important { + font-weight: bold; +} diff --git a/web/html/home.php b/web/html/home.php index 031ad2b..569f322 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -26,8 +26,6 @@ html_header( __("Home") ); '</a>' ); ?> - </p> - <p> <?php echo __( 'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!', @@ -36,30 +34,63 @@ html_header( __("Home") ); '</a>' ); ?> - </p> - <p> <?= __('Remember to vote for your favourite packages!'); ?> <?= __('Some packages may be provided as binaries in [community].'); ?> </p> + <p class="important"> + <?= __('DISCLAIMER') ?>: + <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> + </p> + <p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR">Learn more...</a></p> + </div> + <div id="news"> + <h3><a><?= __('Support') ?></a><span class="arrow"></span></h3> + <h4><?= __('Package Requests') ?></h4> + <div class="article-content"> + <p> + <?php + echo __( + 'There are three types of requests that can be filed in the %sPackage Actions%s box on the package details page:', + '<var>', + '</var>' + ); + ?> + </p> + <ul> + <li><em><?= __('Orphan Request') ?></em>: <?= __('Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.') ?></li> + <li><em><?= __('Deletion Request') ?></em>: <?= __('Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.') ?></li> + <li><em><?= __('Merge Request') ?></em>: <?= __('Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.') ?></li> + </ul> + <p> + <?php + echo __( + 'If you want to discuss a request, you can use the %saur-requests%s mailing list. However, please do not use that list to file requests.', + '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-requests">', + '</a>' + ); + ?> + </p> + </div> <h4><?= __('Discussion') ?></h4> + <div class="article-content"> <p> <?php echo __( - 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. Package orphan requests, merge requests, and deletion requests should be filed in the %sPackage Actions%s box. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.', + 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>', - '<var>', - '</var>', '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">', '</a>' ); ?> </p> + </div> <h4><?= __('Bug Reporting') ?></h4> + <div class="article-content"> <p> <?php echo __( - 'If you find a bug in the AUR, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.', + 'If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.', '<a href="https://bugs.archlinux.org/index.php?project=2">', '</a>', '<strong>', @@ -67,10 +98,6 @@ html_header( __("Home") ); ); ?> </p> - - <h4><?= __('DISCLAIMER') ?></h4> - <div class="important"> - <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> </div> </div> </div> -- 2.4.2

1 0

[aur-dev] [PATCH 1/4] Add popupdate script
by Lukas Fleischer 12 Jun '15

12 Jun '15

This adds a simple script that can be used to recalculate the number of votes per package. It can be used in a cronjob. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/popupdate.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 scripts/popupdate.py diff --git a/scripts/popupdate.py b/scripts/popupdate.py new file mode 100755 index 0000000..489cd41 --- /dev/null +++ b/scripts/popupdate.py @@ -0,0 +1,27 @@ +#!/usr/bin/python3 + +import configparser +import mysql.connector +import os + +docroot = os.path.dirname(os.path.realpath(__file__)) + "/../web/html/" + +config = configparser.RawConfigParser() +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config") + +aur_db_host = config.get('database', 'host') +aur_db_name = config.get('database', 'name') +aur_db_user = config.get('database', 'user') +aur_db_pass = config.get('database', 'password') +aur_db_socket = config.get('database', 'socket') + +db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, + passwd=aur_db_pass, db=aur_db_name, + unix_socket=aur_db_socket, buffered=True) +cur = db.cursor() + +cur.execute("UPDATE PackageBases SET NumVotes = (SELECT COUNT(*) FROM " + + "PackageVotes WHERE PackageVotes.PackageBaseID = PackageBases.ID)") + +db.commit() +db.close() -- 2.4.2

1 3

[aur-dev] [PATCH 1/2] git-update: Deny non-fast-forwards
by Lukas Fleischer 11 Jun '15

11 Jun '15

To make sure we never lose any history, non-fast-forwards are forbidden. Instead of relying on receive.denyNonFastForwards, add a simple check to the update hook. This has the added benefit of more flexibility. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 1 - git-interface/git-update.py | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 50405df..a2a6153 100644 --- a/INSTALL +++ b/INSTALL @@ -29,7 +29,6 @@ Setup on Arch Linux # cd /srv/http/aurweb/aur.git/ # git init --bare # ln -s ../../git-interface/git-update.py hooks/update - # git config --local receive.denyNonFastForwards true # chown -R aur . 7) Install the git-auth wrapper script: diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 7898f39..3f6cfc1 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -178,6 +178,15 @@ if refname != "refs/heads/master": die("pushing to a branch other than master is restricted") repo = pygit2.Repository(repo_path) + +# Detect and deny non-fast-forwards. +if sha1_old != "0000000000000000000000000000000000000000": + walker = repo.walk(sha1_old, pygit2.GIT_SORT_TOPOLOGICAL) + walker.hide(sha1_new) + if next(walker, None) != None: + die("denying non-fast-forward (you should pull first)") + +# Prepare the walker that validates new commits. walker = repo.walk(sha1_new, pygit2.GIT_SORT_TOPOLOGICAL) if sha1_old != "0000000000000000000000000000000000000000": walker.hide(sha1_old) -- 2.4.2

1 1

[aur-dev] [PATCH] Support exceptions in the maintenance mode
by Lukas Fleischer 11 Jun '15

11 Jun '15

Allow for excluding certain IP addresses from the maintenance mode. This allows administrators to view the web page while the site is still under maintenance for the rest of the world. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 1 + git-interface/git-serve.py | 5 ++++- web/html/index.php | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index e5da57a..628dac3 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -29,6 +29,7 @@ pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 +maintenance-exceptions = 127.0.0.1 [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 21b130c..a6dee13 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -22,6 +22,7 @@ git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') enable_maintenance = config.getboolean('options', 'enable-maintenance') +maintenance_exc = config.get('options', 'maintenance-exceptions').split() def pkgbase_exists(pkgbase): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, @@ -113,7 +114,9 @@ cmdargv = shlex.split(cmd) action = cmdargv[0] if enable_maintenance: - die("The AUR is down due to maintenance. We will be back soon.") + remote_addr = os.environ["SSH_CLIENT"].split(" ")[0] + if not remote_addr in maintenance_exc: + die("The AUR is down due to maintenance. We will be back soon.") if action == 'git-upload-pack' or action == 'git-receive-pack': if len(cmdargv) < 2: diff --git a/web/html/index.php b/web/html/index.php index 27f81c8..27d897c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -8,9 +8,11 @@ $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) { - header("HTTP/1.0 503 Service Unavailable"); - include "./503.php"; - return; + if (!in_array($_SERVER['REMOTE_ADDR'], explode(" ", config_get('options', 'maintenance-exceptions')))) { + header("HTTP/1.0 503 Service Unavailable"); + include "./503.php"; + return; + } } if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { -- 2.4.2

1 0

[aur-dev] [PATCH] Implement a maintenance mode
by Lukas Fleischer 11 Jun '15

11 Jun '15

Add support for a maintenance mode that disables both the website and the SSH interface and can be enabled easily using a configuration option. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 1 + git-interface/git-serve.py | 5 +++++ web/html/503.php | 15 +++++++++++++++ web/html/index.php | 6 ++++++ 4 files changed, 27 insertions(+) create mode 100644 web/html/503.php diff --git a/conf/config.proto b/conf/config.proto index 1d3e329..e5da57a 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -28,6 +28,7 @@ auto_delete_age = 86400 pkgbuild_uri = https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=%s log_uri = https://aur.archlinux.org/cgit/aur.git/log/?h=%s snapshot_uri = https://aur.archlinux.org/cgit/aur.git/snapshot/%s.tar.gz +enable-maintenance = 1 [auth] valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519 diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 9812acb..21b130c 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -21,6 +21,8 @@ repo_regex = config.get('serve', 'repo-regex') git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') +enable_maintenance = config.getboolean('options', 'enable-maintenance') + def pkgbase_exists(pkgbase): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, passwd=aur_db_pass, db=aur_db_name, @@ -110,6 +112,9 @@ if not cmd: cmdargv = shlex.split(cmd) action = cmdargv[0] +if enable_maintenance: + die("The AUR is down due to maintenance. We will be back soon.") + if action == 'git-upload-pack' or action == 'git-receive-pack': if len(cmdargv) < 2: die_with_help("%s: missing path" % (action)) diff --git a/web/html/503.php b/web/html/503.php new file mode 100644 index 0000000..80eb436 --- /dev/null +++ b/web/html/503.php @@ -0,0 +1,15 @@ +<?php + +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); + +html_header( __("Service Unavailable") ); +?> + +<div id="error-page" class="box 503"> + <h2>503 - <?= __("Service Unavailable") ?></h2> + <p><?= __("Don't panic! This site is down due to maintenance. We will be back soon.") ?></p> +</div> + +<?php +html_footer(AURWEB_VERSION); + diff --git a/web/html/index.php b/web/html/index.php index 0275d0a..27f81c8 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -7,6 +7,12 @@ include_once("pkgfuncs.inc.php"); $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); +if (config_get_bool('options', 'enable-maintenance') && (empty($tokens[1]) || ($tokens[1] != "css" && $tokens[1] != "images"))) { + header("HTTP/1.0 503 Service Unavailable"); + include "./503.php"; + return; +} + if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { if (!empty($tokens[2])) { /* TODO: Create a proper data structure to pass variables from -- 2.4.2

1 0