- Aur-dev - lists.archlinux.org

[aur-dev] [RFC] Add comment edit icon and form
by Marcel Korpel 07 Jul '15

07 Jul '15

Partly implements FS#34690. --- web/html/commentedit.php | 21 +++++++++++++++++++++ web/html/css/aurweb.css | 4 ++++ web/html/images/pencil.png | Bin 0 -> 429 bytes web/html/index.php | 4 ++++ web/lib/credentials.inc.php | 2 ++ web/lib/pkgbasefuncs.inc.php | 19 +++++++++++++++++++ web/lib/pkgfuncs.inc.php | 14 ++++++++++++++ web/template/pkg_comment_editform.php | 15 +++++++++++++++ web/template/pkg_comments.php | 1 + 9 files changed, 80 insertions(+) create mode 100644 web/html/commentedit.php create mode 100644 web/html/images/pencil.png create mode 100644 web/template/pkg_comment_editform.php diff --git a/web/html/commentedit.php b/web/html/commentedit.php new file mode 100644 index 0000000..7a5829a --- /dev/null +++ b/web/html/commentedit.php @@ -0,0 +1,21 @@ +<?php + +set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); + +include_once("aur.inc.php"); +include_once("pkgbasefuncs.inc.php"); + +set_lang(); +check_sid(); + +$comment_id = intval($_REQUEST['comment']); +$comment = pkgbase_get_comment($comment_id); + +if (!isset($base_id) || !has_credential(CRED_COMMENT_EDIT, array(pkgbase_maintainer_uid($base_id))) || is_null($comment)) { + header('Location: /'); + exit(); +} + +html_header(__("Edit comment")); +include('pkg_comment_editform.php'); +html_footer(AURWEB_VERSION); diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index d67877a..47166d3 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -96,6 +96,10 @@ color: #999; } +.edit-comment { + float: left; +} + legend { padding: 1em 0; } diff --git a/web/html/images/pencil.png b/web/html/images/pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..4f0377684842064b2f990663d6de73313c8227e9 GIT binary patch literal 429 zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000vJ000sQ0{{R3j?xud0002JP)t-s<hn23 zq&1jhAi9e?!h$i<oiE#}Ps@{2$&gRVlTcVd6IntMUP2X<Z62IyC8}T+w011DeKfg= zCcls;!HY=3XBESlF~@^6$dFFRsb|TNPs)`-&zwroomteJUD%~+*^fKfs8HO*ZQZML z-L7om%dq6SFXpse=$Jt4s$uNUsq*2-^5(wt&u{e4rS#ON^wvc6&!+X+X!YD+_uIYq z;mP>n#rWc=_~Xm??Zf%w%lYHX`sdO5?vDKQvqhM@VE_OC0d!JMQvg8b*k%9#00Cl4 zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2$=023iC&9OfK003!8 zL_t&-(_>(u7GUF)U_}#BlsC1IW<e2B(>JrWHsL@KvNTuG(=%a55wbJVl~tBP6*4xk zRad|-B#bE}q=PA>Dv2({t8F7FrX(Yd>@Z#{O$||g0TlOh%Nc5kpb9Z?@$d;S69^pu XUcC;B&HZ$A00000NkvXXu0mjfYBaqK literal 0 HcmV?d00001 diff --git a/web/html/index.php b/web/html/index.php index 27d897c..58e425c 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -89,6 +89,9 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "comaintainers": include('comaintainers.php'); return; + case "edit-comment": + include('commentedit.php'); + return; default: header("HTTP/1.0 404 Not Found"); include "./404.php"; @@ -169,6 +172,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/images/favicon.ico": case "/images/feed-icon-14x14.png": case "/images/titlelogo.png": + case "/images/pencil.png": case "/images/x.png": header("Content-Type: image/png"); readfile("./$path"); diff --git a/web/lib/credentials.inc.php b/web/lib/credentials.inc.php index cf1fcca..648d78c 100644 --- a/web/lib/credentials.inc.php +++ b/web/lib/credentials.inc.php @@ -7,6 +7,7 @@ define("CRED_ACCOUNT_LAST_LOGIN", 4); define("CRED_ACCOUNT_SEARCH", 5); define("CRED_COMMENT_DELETE", 6); define("CRED_COMMENT_VIEW_DELETED", 22); +define("CRED_COMMENT_EDIT", 25); define("CRED_PKGBASE_ADOPT", 7); define("CRED_PKGBASE_SET_KEYWORDS", 8); define("CRED_PKGBASE_DELETE", 9); @@ -58,6 +59,7 @@ function has_credential($credential, $approved_users=array()) { case CRED_ACCOUNT_SEARCH: case CRED_COMMENT_DELETE: case CRED_COMMENT_VIEW_DELETED: + case CRED_COMMENT_EDIT: case CRED_PKGBASE_ADOPT: case CRED_PKGBASE_SET_KEYWORDS: case CRED_PKGBASE_DELETE: diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 5d191eb..cff25c4 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -67,6 +67,25 @@ function pkgbase_comments($base_id, $limit, $include_deleted) { } /** + * Get a package comment + * + * @param int $comment_id The ID of the comment + * + * @return string The comment + */ +function pkgbase_get_comment($comment_id) { + $dbh = DB::connect(); + $q = "SELECT Comments FROM PackageComments "; + $q.= "WHERE ID = " . $comment_id; + $result = $dbh->query($q); + if (!$result) { + return null; + } + + return $result->fetchColumn(0); +} + +/** * Add a comment to a package page and send out appropriate notifications * * @param string $base_id The package base ID to add the comment on diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 110290b..7cb2ffc 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -43,6 +43,20 @@ function can_delete_comment_array($comment) { } /** + * Determine if the user can edit a specific package comment using an array + * + * Only the comment submitter, Trusted Users, and Developers can edit + * comments. This function is used for the frontend side of comment editing. + * + * @param array $comment All database information relating a specific comment + * + * @return bool True if the user can edit the comment, otherwise false + */ +function can_edit_comment_array($comment) { + return has_credential(CRED_COMMENT_EDIT, array($comment['UsersID'])); +} + +/** * Check to see if the package name already exists in the database * * @param string $name The package name to check diff --git a/web/template/pkg_comment_editform.php b/web/template/pkg_comment_editform.php new file mode 100644 index 0000000..8815da0 --- /dev/null +++ b/web/template/pkg_comment_editform.php @@ -0,0 +1,15 @@ +<div class="box"> + <h2><?= __('Edit comment for: %s', htmlspecialchars($pkgbase_name)) ?></h2> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> + <fieldset> + <input type="hidden" name="ID" value="<?= $comment_id ?>" /> + <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> + <p> + <textarea id="id_comment" name="comment" cols="80" rows="10"><?= htmlspecialchars($comment) ?></textarea> + </p> + <p> + <input type="submit" class="button" name="do_EditComment" value="<?= __("Save") ?>" /> + </p> + </fieldset> + </form> +</div> diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 3e99d9b..d124676 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -21,6 +21,7 @@ $count = pkgbase_comments_count($base_id, $include_deleted); endif; ?> <h4<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>> <?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?> + <a href="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name) . 'edit-comment?comment=' . $row['ID'], ENT_QUOTES) ?>" class="edit-comment" title="<?= __('Edit comment') ?>"><img src="/images/pencil.png" alt="<?= __('Edit comment') ?>" width="19" height="18"></a> <form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> <fieldset style="display:inline;"> <input type="hidden" name="action" value="do_DeleteComment" /> -- 2.4.5

2 1

[aur-dev] AUR4: Missing Tags
by kachelaqa 05 Jul '15

05 Jul '15

Hello I just migrated a package to AUR4, and managed to push most of the history I had from an existing repo. However, all my annotated tags are missing. Is there a deliberate policy to reject tags? Or do I need to do something else to get them accepted? Here's the (abbreviated) output from the original push: $ git push origin master Counting objects: 191, done. Delta compression using up to 2 threads. Compressing objects: 100% (191/191), done. Writing objects: 100% (191/191), 20.97 KiB | 0 bytes/s, done. Total 191 (delta 74), reused 0 (delta 0) remote: error: pushing to a branch other than master is restricted remote: error: hook declined to update refs/tags/0.1-1 ... [snip] ... To ssh://aur@aur4.archlinux.org/pkgbrowser.git * [new branch] master -> master ! [remote rejected] 0.1-1 -> 0.1-1 (hook declined) ... [snip] ... error: failed to push some refs to 'ssh://aur@aur4.archlinux.org/pkgbrowser.git'

2 1

[aur-dev] [PATCH] Show number of selected packages on search page
by Johannes Löthberg 04 Jul '15

04 Jul '15

Fixes FS#45379. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- This is an initial version, so might not be perfect. Note that since we have to do it through JS we have to use strings like "1 package(s) selected" instead of properly gettext'ed ones. web/html/packages.php | 11 +++++++++++ web/template/pkg_search_results.php | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/web/html/packages.php b/web/html/packages.php index 75a574e..b4c5c39 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -67,10 +67,21 @@ function collapseDependsList(list) { }); } +function checkboxes() { + document.getElementById("pkglist-checked-count").innerHTML = document.querySelectorAll('input[type="checkbox"]:checked').length; +} + $(document).ready(function() { collapseDependsList("#pkgdepslist"); collapseDependsList("#pkgreqslist"); collapseDependsList("#pkgsrcslist"); + checkboxes(); // Set initial value + + var elements = document.getElementsByClassName('package-checkbox'); + + for (var i = 0, len = elements.length; i < len; i++) { + elements[i].onchange = checkboxes; + } }); </script> diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index cce533c..b40c87d 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -9,6 +9,8 @@ if (!$result): ?> <p> <?= _n('%d package found.', '%d packages found.', $total) ?> <?= __('Page %d of %d.', $current, $pages) ?> + <?= __('%s%s%s package(s) selected.', + '<span id="pkglist-checked-count">', '0', '</span>') ?> </p> <?php if (count($templ_pages) > 1): ?> <p class="pkglist-nav"> @@ -49,7 +51,7 @@ if (!$result): ?> <?php while (list($indx, $row) = each($searchresults)): ?> <tr class="<?= ($indx % 2 == 0) ? 'odd' : 'even' ?>"> <?php if ($SID): ?> - <td><input type="checkbox" name="IDs[<?= $row["PackageBaseID"] ?>]" value="1" /></td> + <td><input class="package-checkbox" type="checkbox" name="IDs[<?= $row["PackageBaseID"] ?>]" value="1" /></td> <?php endif; ?> <td><a href="<?= htmlspecialchars(get_pkg_uri($row["Name"]), ENT_QUOTES); ?>"><?= htmlspecialchars($row["Name"]) ?></a></td> <td<?php if ($row["OutOfDateTS"]): ?> class="flagged"<?php endif; ?>><?= htmlspecialchars($row["Version"]) ?></td> @@ -89,6 +91,8 @@ if (!$result): ?> <p> <?= _n('%d package found.', '%d packages found.', $total) ?> <?= __('Page %d of %d.', $current, $pages) ?> + <?= __('%s%s%s package(s) selected.', + '<span id="pkglist-checked-count">', '0', '</span>') ?> </p> <?php if (count($templ_pages) > 1): ?> <p class="pkglist-nav"> -- 2.4.4

4 11

[aur-dev] [PATCH] RPC: Add decimal_fields array for floating-point fields
by Johannes Löthberg 04 Jul '15

04 Jul '15

Fixes FS#45537. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Another take on fixing FS#45537, makes <1435960231-22737-1-git-send-email-johannes(a)kyriasis.com> obsolete web/lib/aurjson.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 7b77da4..f73d0c0 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -45,6 +45,9 @@ class AurJSON { 'ID', 'PackageBaseID', 'NumVotes', 'OutOfDate', 'FirstSubmitted', 'LastModified' ); + private static $decimal_fields = array( + 'Popularity' + ); /* * Handles post data, and routes the request. @@ -255,6 +258,10 @@ class AurJSON { $row[$field] = intval($row[$field]); } + foreach (self::$decimal_fields as $field) { + $row[$field] = floatval($row[$field]); + } + if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { $row = array_merge($row, $this->get_extended_fields($row['ID'])); } -- 2.4.5

1 0

[aur-dev] [PATCH] RPC: Use JSON_NUMERIC_CHECK when encoding json response
by Johannes Löthberg 04 Jul '15

04 Jul '15

JSON_NUMERIC_CHECK has been available since PHP 5.3.3 to encode numeric strings as numbers. Fixes FS#45537. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/aurjson.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 7b77da4..a619ee5 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -147,7 +147,7 @@ class AurJSON { $json_array['error'] = $error; } - return json_encode($json_array); + return json_encode($json_array, JSON_NUMERIC_CHECK); } private function get_extended_fields($pkgid) { -- 2.4.5

2 2

[aur-dev] [PATCH] Accept SSH keys with whitespace in comments
by Lukas Fleischer 29 Jun '15

29 Jun '15

`ssh-keygen -l` returns more than four tokens when there is whitespace in the key comment. Fixes FS#45488. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 861de0a..edd38ee 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -1250,7 +1250,7 @@ function ssh_key_fingerprint($ssh_key) { unlink($tmpfile); $tokens = explode(' ', $out[0]); - if (count($tokens) != 4) { + if (count($tokens) < 4) { return false; } -- 2.4.4

1 0

[aur-dev] [PATCH] Expose name-only search through the RPC interface
by Johannes Löthberg 28 Jun '15

28 Jun '15

Fixes FS#37317. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/aurjson.class.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 7b77da4..6c90ebd 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -16,6 +16,9 @@ class AurJSON { 'search', 'info', 'multiinfo', 'msearch', 'suggest', 'suggest-pkgbase' ); + private static $exposed_fields = array( + 'name', 'name_and_desc' + ); private static $fields_v1 = array( 'Packages.ID', 'Packages.Name', 'PackageBases.ID AS PackageBaseID', @@ -80,11 +83,14 @@ class AurJSON { if (!in_array($http_data['type'], self::$exposed_methods)) { return $this->json_error('Incorrect request type specified.'); } + if ($http_data['search_by'] !== null && !in_array($http_data['search_by'], self::$exposed_fields)) { + return $this->json_error('Incorrect search_by field specified.'); + } $this->dbh = DB::connect(); $type = str_replace('-', '_', $http_data['type']); - $json = call_user_func(array(&$this, $type), $http_data['arg']); + $json = call_user_func(array(&$this, $type), $http_data['arg'], $http_data['search_by']); $etag = md5($json); header("Etag: \"$etag\""); @@ -319,15 +325,19 @@ class AurJSON { * * @return mixed Returns an array of package matches. */ - private function search($keyword_string) { + private function search($keyword_string, $search_by) { if (strlen($keyword_string) < 2) { return $this->json_error('Query arg too small'); } $keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%"); - $where_condition = "(Packages.Name LIKE $keyword_string OR "; - $where_condition .= "Description LIKE $keyword_string)"; + if ($search_by === 'name') { + $where_condition = "(Packages.Name LIKE $keyword_string)"; + } else if ($search_by === 'name_and_desc' || $search_by === null) { + $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Description LIKE $keyword_string)"; + } return $this->process_query('search', $where_condition); } -- 2.4.4

1 3

[aur-dev] [PATCH] Update sample configuration for Smart HTTP
by Lukas Fleischer 28 Jun '15

28 Jun '15

Using uWSGI for the Smart HTTP protocol caused some issues, see e.g. FS#45428. Suggest using fcgiwrap instead which is more lightweight, has better documentation and is easier to debug. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- INSTALL | 27 ++++++++++----------------- conf/fcgiwrap.service.proto | 11 +++++++++++ conf/fcgiwrap.socket.proto | 11 +++++++++++ 3 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 conf/fcgiwrap.service.proto create mode 100644 conf/fcgiwrap.socket.proto diff --git a/INSTALL b/INSTALL index b090789..d68fa26 100644 --- a/INSTALL +++ b/INSTALL @@ -63,24 +63,17 @@ Setup on Arch Linux AuthorizedKeysCommand /usr/local/bin/aur-git-auth "%t" "%k" AuthorizedKeysCommandUser aur -9) If you want to enable smart HTTP support with nginx and uWSGI, you can use - the following directives: +9) If you want to enable smart HTTP support with nginx and fcgiwrap, you can + use the following directives: 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; - uwsgi_param GIT_NAMESPACE $1; - uwsgi_pass unix:/run/uwsgi/smarthttp/aurweb.sock; + fastcgi_pass unix:/run/fcgiwrap.sock; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend; + fastcgi_param PATH_INFO /aur.git/$3; + fastcgi_param GIT_HTTP_EXPORT_ALL ""; + fastcgi_param GIT_NAMESPACE $1; + fastcgi_param GIT_PROJECT_ROOT /srv/http/aurweb/; } - For the uWSGI configuration, the following template can be used: - - [uwsgi] - plugins = cgi - uid = aur - processes = 1 - threads = 8 - env = GIT_HTTP_EXPORT_ALL= - env = GIT_PROJECT_ROOT=/srv/http/aurweb - cgi = /usr/lib/git-core/git-http-backend + Sample systemd unit files for fcgiwrap can be found under conf/. diff --git a/conf/fcgiwrap.service.proto b/conf/fcgiwrap.service.proto new file mode 100644 index 0000000..c4e8544 --- /dev/null +++ b/conf/fcgiwrap.service.proto @@ -0,0 +1,11 @@ +[Unit] +Description=Simple CGI Server +After=nss-user-lookup.target + +[Service] +ExecStart=/usr/sbin/fcgiwrap +User=aur +Group=aur + +[Install] +Also=fcgiwrap.socket diff --git a/conf/fcgiwrap.socket.proto b/conf/fcgiwrap.socket.proto new file mode 100644 index 0000000..a1bc826 --- /dev/null +++ b/conf/fcgiwrap.socket.proto @@ -0,0 +1,11 @@ +[Unit] +Description=fcgiwrap Socket + +[Socket] +ListenStream=/run/fcgiwrap.sock +SocketUser=http +SocketGroup=http +SocketMode=0700 + +[Install] +WantedBy=sockets.target -- 2.4.4

1 0

[aur-dev] [PATCH] Delete unused variable
by Johannes Löthberg 28 Jun '15

28 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/aurjson.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 7b77da4..2ba92b7 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -201,7 +201,6 @@ class AurJSON { private function process_query($type, $where_condition) { $max_results = config_get_int('options', 'max_rpc_results'); - $package_url = config_get('options', 'package_url'); if ($this->version == 1) { $fields = implode(',', self::$fields_v1); -- 2.4.4

1 0

[aur-dev] [PATCH/RFC 0/2] Rewrite email notification routines in Python
by Lukas Fleischer 28 Jun '15

28 Jun '15

aurweb 4.0.0-rc6 will be released soon and I do not expect any further patches (apart from bug fixes). For 4.1.0, our plan is to improve comments and notifications [1]. This is an RFC that converts all notification code to a Python script that can be extended easily later. You can also find this on the post-4.0.0 branch. [1] https://bugs.archlinux.org/task/42343?project=2&due%5B0%5D=140 Lukas Fleischer (2): Port notification routines to Python notify: Reword notification emails conf/config.proto | 5 + scripts/notify.py | 257 +++++++++++++++++++++++++++++++++++++++++++ web/html/passreset.php | 9 +- web/lib/acctfuncs.inc.php | 72 +++++++----- web/lib/pkgbasefuncs.inc.php | 106 ++---------------- web/lib/pkgreqfuncs.inc.php | 114 ++----------------- 6 files changed, 322 insertions(+), 241 deletions(-) create mode 100755 scripts/notify.py -- 2.4.4

1 2