October 2016 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Add clone hints to 404 error pages
by Lukas Fleischer 08 Oct '16

08 Oct '16

When clicking on the linked Git clone URL of a package base, users are faced with a 404 error page since the URL is not supposed to be opened in a web browser. Add some notes to 404 error pages corresponding to Git clone URLs that explain how to use them instead. Fixes FS#51266. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/404.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/web/html/404.php b/web/html/404.php index a47ae1e..757c485 100644 --- a/web/html/404.php +++ b/web/html/404.php @@ -2,12 +2,45 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); +$path = $_SERVER['PATH_INFO']; +$tokens = explode('/', $path); + +if (preg_match('/^([a-z0-9][a-z0-9.+_-]*?)(\.git)?$/', $tokens[1], $matches)) { + $gitpkg = $matches[1]; + if (pkg_from_name($gitpkg)) { + $gitcmd = 'git clone ' . sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($gitpkg)); + $gitlink = get_pkgbase_uri($gitpkg); + } else { + unset($gitpkg); + } +} else { + unset($gitpkg); +} + html_header( __("Page Not Found") ); ?> <div id="error-page" class="box 404"> <h2>404 - <?= __("Page Not Found") ?></h2> <p><?= __("Sorry, the page you've requested does not exist.") ?></p> + <?php if (isset($gitpkg)): ?> + <ul> + <li> + <strong><?= __("Note") ?>:</strong> + <?= __("Git clone URLs are not meant to be opened in a browser.") ?> + </li> + <li> + <?= __("To clone the Git repository of %s, run %s.", + '<strong>' . htmlspecialchars($gitpkg) . '</strong>', + '<code>' . htmlspecialchars($gitcmd) . '</code>') ?> + </li> + <li> + <?= __("Click %shere%s to return to the %s details page.", + '<a href="' . htmlspecialchars($gitlink, ENT_QUOTES) . '">', '</a>', + '<strong>' . htmlspecialchars($gitpkg) . '</strong>') ?> + </li> + </ul> + <?php endif; ?> </div> <?php -- 2.10.0

1 0

[aur-dev] [PATCH] git-serve: Support `git {receive,upload}-pack`
by Lukas Fleischer 01 Oct '16

01 Oct '16

Add support for the `git receive-pack` and `git upload-pack` commands which are aliases for git-receive-pack and git-upload-pack, respectively. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 5f3b26d..ebfef94 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -305,6 +305,10 @@ def main(): if remote_addr not in maintenance_exc: die("The AUR is down due to maintenance. We will be back soon.") + if action == 'git' and cmdargv[1] in ('upload-pack', 'receive-pack'): + action = action + '-' + cmdargv[1] + del cmdargv[1] + if action == 'git-upload-pack' or action == 'git-receive-pack': if len(cmdargv) < 2: die_with_help("{:s}: missing path".format(action)) -- 2.10.0

1 0

[aur-dev] Absence of terminating newline in RPC requests
by Alad Wenter 01 Oct '16

01 Oct '16

JSON from the RPC interface seems to not contain a terminating newline, regardless of version or type specified. I am curious if there is a particular reason for this, as the POSIX standard defines text files to contain lines with terminating newlines. [1] [2] This is more noticeable when merging the resulting files to a valid JSON structure, e.g. to display the union of various search results. As a comparison, journalctl - json does terminate lines with a newline. Regards, Alad [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag… [2] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag…

2 3