- Aur-dev - lists.archlinux.org

[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

[aur-dev] [PATCH] AUTHORS: Add Johannes to maintainers
by Lukas Fleischer 27 Jun '15

27 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 6be7759..a21fef7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ Current Maintainers ------------------- * Lukas Fleischer <lfleischer(a)archlinux.org> +* Johannes Löthberg <johannes(a)kyriasis.com> Past Maintainers ---------------- -- 2.4.4

1 0

[aur-dev] [PATCH] popupdate: Drop unused variable
by Lukas Fleischer 27 Jun '15

27 Jun '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/popupdate.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/popupdate.py b/scripts/popupdate.py index f4c99ca..2aa8a54 100755 --- a/scripts/popupdate.py +++ b/scripts/popupdate.py @@ -4,8 +4,6 @@ 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") -- 2.4.4

1 0

[aur-dev] [PATCH] Drop the message when no changes were made to an account
by Johannes Löthberg 27 Jun '15

27 Jun '15

When no changes has been made to the account there's no need for a message, and it is no longer applicable since the setting of SSH keys is done in a separate function now. Reported-by: Alexis Chotard <alexis.horgix.chotard(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- web/lib/acctfuncs.inc.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 417ee6d..be5d0e2 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -350,10 +350,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="", account_set_ssh_keys($UID, $ssh_keys, $ssh_fingerprints); - if (!$result) { - print __("No changes were made to the account, %s%s%s.", - "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>"); - } else { + if ($result) { print __("The account, %s%s%s, has been successfully modified.", "<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>"); } -- 2.4.4

2 4

[aur-dev] [PATCH] Exclude hidden packages from mkpkglists.py
by Johannes Löthberg 27 Jun '15

27 Jun '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- scripts/mkpkglists.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mkpkglists.py b/scripts/mkpkglists.py index 0f2eb84..f2f48da 100755 --- a/scripts/mkpkglists.py +++ b/scripts/mkpkglists.py @@ -28,12 +28,12 @@ pkgbaselist_header = "# AUR package base list, generated on " + datestr with gzip.open(docroot + "packages.gz", "w") as f: f.write(bytes(pkglist_header + "\n", "UTF-8")) - cur.execute("SELECT Name FROM Packages") + cur.execute("SELECT Name FROM Packages WHERE PackagerUID IS NOT NULL") f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()]) with gzip.open(docroot + "pkgbase.gz", "w") as f: f.write(bytes(pkgbaselist_header + "\n", "UTF-8")) - cur.execute("SELECT Name FROM PackageBases") + cur.execute("SELECT Name FROM PackageBases WHERE PackagerUID IS NOT NULL") f.writelines([bytes(x[0] + "\n", "UTF-8") for x in cur.fetchall()]) db.close() -- 2.4.4

2 1