- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] git-update: Remove regex matching of URL
by Johannes Löthberg 20 Jun '15

20 Jun '15

The regex check that a URL is either http or ftp doesn't really have any use, and it forces you to leave proper URLs for eg projects hosted on gopher empty. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-update.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index ebed491..6610019 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -258,9 +258,6 @@ for commit in walker: die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) - if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): - die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) - for field in ('pkgname', 'pkgdesc', 'url'): if len(pkginfo[field]) > 255: die_commit('%s field too long: %s' % (field, pkginfo[field]), -- 2.4.4

1 1

[aur-dev] [PATCH 1/4] Add functions for getting arrays of maintainer and co-maintainer UIDs
by Johannes Löthberg 20 Jun '15

20 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/pkgbasefuncs.inc.php | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index c8c99eb..d12a228 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -318,6 +318,19 @@ function pkgbase_maintainer_uid($base_id) { return $result->fetch(PDO::FETCH_COLUMN, 0); } +/** + * Retrieve the maintainers of an array of package bases given by their ID + * + * @param int $base_ids The array of IDs of the package bases to query + * + * @return int The user ID of the current package maintainer + */ +function pkgbase_maintainer_uids($base_ids) { + $dbh = DB::connect(); + $q = "SELECT MaintainerUID FROM PackageBases WHERE ID IN (" . implode(",", $base_ids) . ")"; + $result = $dbh->query($q); + return $result->fetchAll(PDO::FETCH_COLUMN, 0); +} /** * Flag package(s) as out-of-date @@ -993,6 +1006,28 @@ function pkgbase_get_comaintainers($base_id) { } /** + * Get a list of package base co-maintainer IDs + * + * @param int $base_id The package base ID to retrieve the co-maintainers for + * + * @return array An array of co-maintainer user UDs + */ +function pkgbase_get_comaintainer_uids($base_ids) { + $dbh = DB::connect(); + $q = "SELECT UsersID FROM PackageComaintainers "; + $q .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; + $q .= "WHERE PackageComaintainers.PackageBaseID IN (" . implode(",", $base_ids) . ") "; + $q .= "ORDER BY Priority ASC"; + $result = $dbh->query($q); + + if ($result) { + return $result->fetchAll(PDO::FETCH_COLUMN, 0); + } else { + return array(); + } +} + +/** * Update the list of co-maintainers of a package base * * @param int $base_id The package base ID to update the co-maintainers of -- 2.4.4

1 3

[aur-dev] [PATCH v2 1/2] git-update: Remove regex matching of URL
by Johannes Löthberg 19 Jun '15

19 Jun '15

The regex check that a URL is either http or ftp doesn't really have any use, and it forces you leave proper URLs like projects hosted on gopher still empty. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-update.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index ebed491..6610019 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -258,9 +258,6 @@ for commit in walker: die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) - if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): - die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) - for field in ('pkgname', 'pkgdesc', 'url'): if len(pkginfo[field]) > 255: die_commit('%s field too long: %s' % (field, pkginfo[field]), -- 2.4.3

1 2

[aur-dev] [PATCH] git-update: Remove regex matching of URL
by Johannes Löthberg 19 Jun '15

19 Jun '15

The regex check that a URL is either http or ftp doesn't really have any use, and it forces you leave proper URLs like projects hosted on gopher still empty. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/git-update.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 34fabcf..f40511e 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -261,9 +261,6 @@ for commit in walker: die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) - if 'url' in pkginfo and not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): - die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) - for field in ('pkgname', 'pkgdesc', 'url'): if field in pkginfo and len(pkginfo[field]) > 255: die_commit('%s field too long: %s' % (field, pkginfo[field]), -- 2.4.3

1 0

[aur-dev] [PATCH] git-update: Make url field optional
by Johannes Löthberg 19 Jun '15

19 Jun '15

The url PKGBUILD variable is optional, so should be in the AUR as well. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- pkgdesc should be optional as well though, but I was unsure what Lukas would think, so sending this first. Comments? git-interface/git-update.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index ebed491..34fabcf 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -247,10 +247,13 @@ for commit in walker: for pkgname in srcinfo.GetPackageNames(): pkginfo = srcinfo.GetMergedPackage(pkgname) - for field in ('pkgver', 'pkgrel', 'pkgname', 'pkgdesc', 'url'): + for field in ('pkgver', 'pkgrel', 'pkgname', 'pkgdesc'): if not field in pkginfo: die_commit('missing mandatory field: %s' % (field), commit.id) + if not 'url' in pkginfo: + pkginfo['url'] = 'None' + if 'epoch' in pkginfo and not pkginfo['epoch'].isdigit(): die_commit('invalid epoch: %s' % (pkginfo['epoch']), commit.id) @@ -258,11 +261,11 @@ for commit in walker: die_commit('invalid package name: %s' % (pkginfo['pkgname']), commit.id) - if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): + if 'url' in pkginfo and not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']): die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) for field in ('pkgname', 'pkgdesc', 'url'): - if len(pkginfo[field]) > 255: + if field in pkginfo and len(pkginfo[field]) > 255: die_commit('%s field too long: %s' % (field, pkginfo[field]), commit.id) -- 2.4.3

1 0

[aur-dev] [PATCH v8] pkgbase_details.php/pkg_details.php: Show keywords
by Marcel Korpel 19 Jun '15

19 Jun '15

Keywords are hyperlinked so a user can search for other packages with the same name and/or keyword. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- Making the colours of the keyword tags a bit darker and applying all the changes also to pkgbase_details.php. web/html/css/aurweb.css | 18 ++++++++++++++++++ web/template/pkg_details.php | 14 +++++++++++++- web/template/pkgbase_details.php | 14 +++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..ca53fa1 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,24 @@ text-align:right; } +.keyword:link, .keyword:visited { + float: left; + margin: 1px .5ex 1px 0; + padding: 0 1em; + color: white; + background-color: #36a; + border: 1px solid transparent; + border-radius: 2px; +} + +.keyword:hover { + cursor: pointer; +} + +.keyword:focus { + border: 1px dotted #000; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..d2d3fe6 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> <td> +<?php +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,15 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php +else: + foreach ($keywords as $kw) { + echo '<a class="keyword" href="'; + echo get_uri('/packages/') . '?K=' . urlencode($kw) . '&SB=p'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } +endif; +?> </td> </tr> <?php endif; ?> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index fa24e12..61e167b 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -129,11 +129,14 @@ $pkgs = pkgbase_get_pkgnames($base_id); </td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> <td> +<?php +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['Name']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -144,6 +147,15 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php +else: + foreach ($keywords as $kw) { + echo '<a class="keyword" href="'; + echo get_uri('/packages/') . '?K=' . urlencode($kw) . '&SB=p'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } +endif; +?> </td> </tr> <?php endif; ?> -- 2.4.4

2 1

[aur-dev] [PATCH v2] Remove hostname from URLPath in JSON RPC
by Mikkel Oscar Lyderik 19 Jun '15

19 Jun '15

Prior to aur4, URLPath in the JSON RPC didn't include the hostname, only the path. This removes the hostname and make aur4 compatible with programs expecting the old semantics (e.i. cower) Closes FS#45333 --- conf/config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.proto b/conf/config.proto index 25c8830..2fbc27a 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -27,7 +27,7 @@ auto_orphan_age = 15552000 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 +snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 -- 2.4.4

2 1

[aur-dev] [PATCH] Remove hostname from URLPath in JSON RPC
by Mikkel Oscar Lyderik 19 Jun '15

19 Jun '15

Prior to aur4 URLPath in the JSON RPC didn't include the hostname, only the path. This removes the hostname and make aur4 compatible with programs expecting the old (and documented) semantics (e.i. cower) Fixes FS#45333 --- conf/config.proto | 2 +- web/template/pkg_details.php | 2 +- web/template/pkgbase_details.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 25c8830..2fbc27a 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -27,7 +27,7 @@ auto_orphan_age = 15552000 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 +snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 90e5729..eafccbe 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -2,7 +2,7 @@ $pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['BaseName'])); $log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['BaseName'])); -$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['BaseName'])); +$snapshot_uri = config_get('options', 'aur_location') . sprintf(config_get('options', 'snapshot_uri'), urlencode($row['BaseName'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['BaseName'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['BaseName'])); diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 9989369..b008677 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -2,7 +2,7 @@ $pkgbuild_uri = sprintf(config_get('options', 'pkgbuild_uri'), urlencode($row['Name'])); $log_uri = sprintf(config_get('options', 'log_uri'), urlencode($row['Name'])); -$snapshot_uri = sprintf(config_get('options', 'snapshot_uri'), urlencode($row['Name'])); +$snapshot_uri = config_get('options', 'aur_location') . sprintf(config_get('options', 'snapshot_uri'), urlencode($row['Name'])); $git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); $git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); -- 2.4.4

2 3

Re: [aur-dev] [PATCH] Redirect at previous page after a successful login
by Gordian Edenhofer 18 Jun '15

18 Jun '15

On Thu, 2015-06-18 at 21:28 +0200, Gordian Edenhofer wrote: > After the user was authenticated a redirect to the site which > linked the user to the login page is done. This fixes FS#32481. > --- > web/html/login.php | 1 + > web/lib/acctfuncs.inc.php | 15 ++++++++++++++- > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/web/html/login.php b/web/html/login.php > index f898a57..1b3a589 100644 > --- a/web/html/login.php > +++ b/web/html/login.php > @@ -42,6 +42,7 @@ html_header('AUR ' . __("Login")); > <p> > <input type="submit" class="button" > value="<?php print __("Login"); ?>" /> > <a href="<?= get_uri('/passreset/') > ?>">[<?= __('Forgot Password') ?>]</a> > + <input id="id_referer" type="hidden" > name="referer" value="<?= !empty($_SERVER['HTTP_REFERER']) ? > $_SERVER['HTTP_REFERER'] : '/'; ?>" /> > </p> > </fieldset> > </form> > diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php > index 20ac081..127a991 100644 > --- a/web/lib/acctfuncs.inc.php > +++ b/web/lib/acctfuncs.inc.php > @@ -544,7 +544,20 @@ function try_login() { > } > > setcookie("AURSID", $new_sid, $cookie_time, "/", null, > !empty($_SERVER['HTTPS']), true); > - header("Location: " . get_uri('/')); > + > + /** > + * Check whether the site itself refered here and if so > refer back to its origin > + * > + * One major drawback is that POST request are not handled > properly, the only possible > + * solution I could think of is to use JavaScript to auto > submit a hidden form, though > + * it would slow down the page load time and would require > js for a successful redirect. > + * This hard dependcy is not somehtings I want to implement > since this problem is too > + * minor for such an agressive approach IMHO. > + */ > + $referer = !empty($_REQUEST['referer']) ? > $_REQUEST['referer'] : '/'; > + $aur_location = aur_location(); > + $referer = strpos($referer, $aur_location) === 0 ? $referer > : '/'; > + header("Location: " . get_uri( $referer )); > $login_error = ""; > } > Sorry for sending this message twice. Please just ignore this E-Mail.

1 0

[aur-dev] [PATCH v6] pkg_details.php: Show keywords
by Marcel Korpel 18 Jun '15

18 Jun '15

Keywords are hyperlinked so a user can search for other packages with the same name and/or keyword. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- Small improvement to make the focus border stick out of the focused element. web/html/css/aurweb.css | 23 +++++++++++++++++++++++ web/template/pkg_details.php | 19 +++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index a3f43bd..7f63abb 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -53,6 +53,29 @@ text-align:right; } +td#keywords { + white-space: normal; +} + +.keyword:link, .keyword:visited { + float: left; + margin: 1px 2px 1px 0; + border: 1px solid transparent; + padding: 2px .5em; + background: #1794D1; + color: #FFF; + border-radius: 2px; +} + +.keyword:hover { + color: #FFF; + cursor: pointer; +} + +.keyword:focus { + border: 1px dotted #000; +} + .text-button { background: transparent; border: none !important; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae49e24..8cae135 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -190,11 +190,14 @@ $sources = pkg_sources($row["ID"]); <td><a href="<?= htmlspecialchars($row['URL'], ENT_QUOTES) ?>" title="<?= __('Visit the website for') . ' ' . htmlspecialchars( $row['Name'])?>"><?= htmlspecialchars($row['URL'], ENT_QUOTES) ?></a></td> </tr> <?php -if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"])) || count($keywords) > 0): ?> <tr> <th><?= __('Keywords') . ': ' ?></th> - <td> + <td id="keywords"> +<?php + if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): +?> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($row['BaseName']), ENT_QUOTES); ?>"> <div> <input type="hidden" name="action" value="do_SetKeywords" /> @@ -205,6 +208,18 @@ if (has_credential(CRED_PKGBASE_SET_KEYWORDS, array($row["MaintainerUID"]))): <input type="submit" value="<?= __('Update') ?>"/> </div> </form> +<?php + else: + foreach ($keywords as $kw) { + echo ' <a class="keyword" href="'; + /* Several default search parameters are hard-coded, + perhaps this should be changed/configured somewhere */ + echo get_uri('/packages/') . '?O=0&SeB=nd&K=' . urlencode($kw); + echo '&outdated=&SB=p&SO=a&PP=50&do_Search=Go'; + echo '">' . htmlspecialchars($kw) . "</a>\n"; + } + endif; +?> </td> </tr> <?php endif; ?> -- 2.4.4

2 2