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

[aur-dev] [PATCH] config.proto: Fix default value of ssh-cmdline
by Lukas Fleischer 23 May '15

23 May '15

We no longer use port 2222 for SSH. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.proto b/conf/config.proto index 623d044..88f046d 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -39,7 +39,7 @@ repo-regex = [a-z0-9][a-z0-9.+_-]*$ template-path = /srv/http/aurweb/scripts/git-integration/templates/ git-update-hook = /srv/http/aurweb/scripts/git-integration/git-update.py git-shell-cmd = /usr/bin/git-shell -ssh-cmdline = ssh -p 2222 aur(a)aur.archlinux.org +ssh-cmdline = ssh aur(a)aur.archlinux.org [aurblup] db-path = /srv/http/aurweb/scripts/aurblup/ -- 2.4.1

1 0

[aur-dev] [PATCH] Use keyword search by default
by Lukas Fleischer 23 May '15

23 May '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgfuncs.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c71358a..8fd629f 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -601,9 +601,11 @@ function pkg_search_page($SID="") { } else { /* Search by name and description (default). */ - $K = "%" . addcslashes($_GET['K'], '%_') . "%"; - $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($K) . " OR "; - $q_where .= "Description LIKE " . $dbh->quote($K) . ") "; + foreach (str_getcsv($_GET['K'], ' ') as $term) { + $term = "%" . addcslashes($term, '%_') . "%"; + $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($term) . " OR "; + $q_where .= "Description LIKE " . $dbh->quote($term) . ") "; + } } } -- 2.4.1

2 5

[aur-dev] [PATCH] Include user name in password reset emails
by Lukas Fleischer 22 May '15

22 May '15

Fixes FS#44320. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/passreset.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/html/passreset.php b/web/html/passreset.php index fca3d10..29f2c64 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -41,15 +41,17 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir } } elseif (isset($_POST['email'])) { $email = $_POST['email']; + $username = username_from_id(uid_from_email($email)); if (empty($email)) { $error = __('Missing a required field.'); } else { $subject = 'AUR Password Reset'; - $body = __('A password reset request was submitted for the account '. - 'associated with your e-mail address. If you wish to reset '. - 'your password follow the link below, otherwise ignore '. - 'this message and nothing will happen.'); + $body = __('A password reset request was submitted for the ' . + 'account %s associated with your e-mail address. ' . + 'If you wish to reset your password follow the ' . + 'link below, otherwise ignore this message and ' . + 'nothing will happen.', $username); send_resetkey($email, $subject, $body); header('Location: ' . get_uri('/passreset/') . '?step=confirm'); -- 2.4.1

1 0

[aur-dev] [PATCH 1/3] Fix the permission check in pkgbase_adopt()
by Lukas Fleischer 22 May '15

22 May '15

Filter the affected package bases before closing any package requests. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 50cb47e..d10b5ad 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -579,7 +579,25 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } } + /* Verify package ownership. */ $base_ids = sanitize_ids($base_ids); + + $q = "SELECT ID FROM PackageBases "; + $q.= "WHERE ID IN (" . implode(",", $base_ids) . ") "; + + if ($action && !has_credential(CRED_PKGBASE_ADOPT)) { + /* Regular users may only adopt orphan packages. */ + $q.= "AND MaintainerUID IS NULL"; + } + if (!$action && !has_credential(CRED_PKGBASE_DISOWN)) { + /* Regular users may only disown their own packages. */ + $q.= "AND MaintainerUID = " . $uid; + } + + $result = $dbh->query($q); + $base_ids = $result->fetchAll(PDO::FETCH_COLUMN, 0); + + /* Error out if the list of remaining packages is empty. */ if (empty($base_ids)) { if ($action) { return array(false, __("You did not select any packages to adopt.")); @@ -618,16 +636,6 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { $q.= "SET MaintainerUID = NULL "; } $q.= "WHERE ID IN (" . implode(",", $base_ids) . ") "; - - if ($action && !has_credential(CRED_PKGBASE_ADOPT)) { - /* Regular users may only adopt orphan packages. */ - $q.= "AND MaintainerUID IS NULL"; - } - if (!$action && !has_credential(CRED_PKGBASE_DISOWN)) { - /* Regular users may only disown their own packages. */ - $q.= "AND MaintainerUID = " . $uid; - } - $dbh->exec($q); if ($action) { -- 2.4.1

1 4

[aur-dev] [PATCH 1/2] Fix processing of pkgbase_get_comaintainers()
by Lukas Fleischer 22 May '15

22 May '15

pkgbase_get_comaintainers() returns an array of user names, not an array of user IDs. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgdisown.php | 6 +++--- web/lib/pkgbasefuncs.inc.php | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index 071a76c..fa182dc 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -11,7 +11,7 @@ check_sid(); html_header(__("Disown Package")); $maintainer_uids = array(pkgbase_maintainer_uid($base_id)); -$comaintainer_uids = pkgbase_get_comaintainers($base_id); +$comaintainers = pkgbase_get_comaintainers($base_id); if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <div class="box"> @@ -26,9 +26,9 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?php endforeach; ?> </ul> - <?php if (count($comaintainer_uids) > 0): ?> + <?php if (count($comaintainers) > 0): ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package and transfer ownership to %s%s%s.', - '', $comaintainer_uids[0], ''); ?> + '', $comaintainers[0], ''); ?> <?php else: ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package.') ?> <?php endif; ?> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index b8da23c..5b8b52f 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -646,12 +646,15 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } } else { foreach ($base_ids as $base_id) { - $uids = pkgbase_get_comaintainers($base_id); - - $q = "UPDATE PackageBases "; - $q.= "SET MaintainerUID = " . $uids[0] . " "; - $q.= "WHERE ID = " . $base_id; - $dbh->exec($q); + $comaintainers = pkgbase_get_comaintainers($base_id); + + if (count($comaintainers) > 0) { + $uid = uid_from_username($comaintainers[0]); + $q = "UPDATE PackageBases "; + $q.= "SET MaintainerUID = " . $uid . " "; + $q.= "WHERE ID = " . $base_id; + $dbh->exec($q); + } } } } -- 2.4.1

1 1

[aur-dev] [PATCH] Store co-maintainer priorities
by Lukas Fleischer 22 May '15

22 May '15

In addition to saving the list of package co-maintainers, also save their order. This makes it possible to define a "primary" co-maintainer. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 1 + upgrading/4.0.0.txt | 1 + web/lib/pkgbasefuncs.inc.php | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 9c647d8..5641d0d 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -281,6 +281,7 @@ CREATE TABLE PackageComments ( CREATE TABLE PackageComaintainers ( UsersID INTEGER UNSIGNED NOT NULL, PackageBaseID INTEGER UNSIGNED NOT NULL, + Priority INTEGER UNSIGNED NOT NULL, INDEX (UsersID), INDEX (PackageBaseID), FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, diff --git a/upgrading/4.0.0.txt b/upgrading/4.0.0.txt index 023dec0..9a4a807 100644 --- a/upgrading/4.0.0.txt +++ b/upgrading/4.0.0.txt @@ -26,6 +26,7 @@ UPDATE PackageBases SET PackagerUID = NULL; CREATE TABLE PackageComaintainers ( UsersID INTEGER UNSIGNED NOT NULL, PackageBaseID INTEGER UNSIGNED NOT NULL, + Priority INTEGER UNSIGNED NOT NULL, INDEX (UsersID), INDEX (PackageBaseID), FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE CASCADE, diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 3e4b572..50cb47e 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -967,7 +967,8 @@ function pkgbase_get_comaintainers($base_id) { $dbh = DB::connect(); $q = "SELECT UserName FROM PackageComaintainers "; $q .= "INNER JOIN Users ON Users.ID = PackageComaintainers.UsersID "; - $q .= "WHERE PackageComaintainers.PackageBaseID = " . intval($base_id); + $q .= "WHERE PackageComaintainers.PackageBaseID = " . intval($base_id) . " "; + $q .= "ORDER BY Priority ASC"; $result = $dbh->query($q); if ($result) { @@ -1012,9 +1013,11 @@ function pkgbase_set_comaintainers($base_id, $users) { $q = sprintf("DELETE FROM PackageComaintainers WHERE PackageBaseID = %d", $base_id); $dbh->exec($q); + $i = 1; foreach ($uids as $uid) { - $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID) VALUES (%d, %d)", $base_id, $uid); + $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (%d, %d, %d)", $base_id, $uid, $i); $dbh->exec($q); + $i++; } return array(true, __("The package base co-maintainers have been updated.")); -- 2.4.1

1 0

[aur-dev] [PATCH] Update upgrade instructions for 4.0.0
by Lukas Fleischer 22 May '15

22 May '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- upgrading/4.0.0.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/upgrading/4.0.0.txt b/upgrading/4.0.0.txt index b1582f2..023dec0 100644 --- a/upgrading/4.0.0.txt +++ b/upgrading/4.0.0.txt @@ -1,14 +1,18 @@ +WARNING! Following these upgrade instructions will reset all packages! If you +want to keep the package contents, please create a backup before starting the +upgrade process and import the source tarballs into the Git repositories +afterwards. + 1. Add a field for the SSH public key to the Users table: ---- ALTER TABLE Users ADD COLUMN SSHPubKey VARCHAR(4096) NULL DEFAULT NULL; ---- -2. Create a new user and set up a patched version of the sshd as -described in INSTALL. +2. Create a new user and configure the sshd as described in INSTALL. -3. Create a directory for the package base Git repositories and run -init-repos.py to initialize them. +3. Run gen-templates.py to initialize the Git repository template. Create a +directory for the Git repositories and run init-repos.py to initialize them. 4. Reset the packager field of all package bases: -- 2.4.1

1 0

[aur-dev] [PATCH] Make the type parameter of pkgreq_by_pkgbase() optional
by Lukas Fleischer 21 May '15

21 May '15

This simplifies the code a bit, improves maintainability and reduces the number of SQL queries when deleting a package. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 5 +---- web/lib/pkgreqfuncs.inc.php | 9 ++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 3f02bc7..3e4b572 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -513,10 +513,7 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) { if (!$action) { $username = username_from_sid($_COOKIE['AURSID']); foreach ($base_ids as $base_id) { - $pkgreq_ids = array_merge( - pkgreq_by_pkgbase($base_id, 'deletion'), - pkgreq_by_pkgbase($base_id, 'merge'), - pkgreq_by_pkgbase($base_id, 'orphan')); + $pkgreq_ids = array_merge(pkgreq_by_pkgbase($base_id)); foreach ($pkgreq_ids as $pkgreq_id) { pkgreq_close(intval($pkgreq_id), 'accepted', 'The user ' . $username . diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index e4c63b5..c056d68 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -49,15 +49,18 @@ function pkgreq_list($offset, $limit) { * * @return array List of package request IDs */ -function pkgreq_by_pkgbase($baseid, $type) { +function pkgreq_by_pkgbase($baseid, $type=false) { $dbh = DB::connect(); $q = "SELECT PackageRequests.ID "; $q.= "FROM PackageRequests INNER JOIN RequestTypes ON "; $q.= "RequestTypes.ID = PackageRequests.ReqTypeID "; $q.= "WHERE PackageRequests.Status = 0 "; - $q.= "AND PackageRequests.PackageBaseID = " . intval($baseid) . " "; - $q.= "AND RequestTypes.Name = " . $dbh->quote($type); + $q.= "AND PackageRequests.PackageBaseID = " . intval($baseid); + + if ($type) { + $q .= " AND RequestTypes.Name = " . $dbh->quote($type); + } return $dbh->query($q)->fetchAll(PDO::FETCH_COLUMN, 0); } -- 2.4.1

1 0

[aur-dev] aur-dev no longer uses port 2222 for SSH
by Lukas Fleischer 21 May '15

21 May '15

Hi, If you are using the AUR 4.0.0 testing environment on aur-dev.archlinux.org, please note that we now use the default SSH port 22 instead of 2222. This means that you can drop the ":2222" part from your Git remote URIs or remove the "Port 2222" line from your local SSH configuration. We are currently preparing the migration to AUR 4.0.0 and we are going to inform all AUR users about the transition in a couple of days. Regards, Lukas

2 1

[aur-dev] [PATCH] Change default configuration to use SSH port 22
by Lukas Fleischer 21 May '15

21 May '15

We no longer run a separate SSH daemon on port 2222. Change the default configuration accordingly. Also remove some configuration files that are no longer needed. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- conf/aur-sshd.socket | 6 ------ conf/aur-sshd@.service | 8 -------- conf/cgitrc.proto | 2 +- conf/config.proto | 2 +- scripts/git-integration/sshd_config | 6 ------ 5 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 conf/aur-sshd.socket delete mode 100644 conf/aur-sshd@.service delete mode 100644 scripts/git-integration/sshd_config diff --git a/conf/aur-sshd.socket b/conf/aur-sshd.socket deleted file mode 100644 index 5b0c3df..0000000 --- a/conf/aur-sshd.socket +++ /dev/null @@ -1,6 +0,0 @@ -[Socket] -ListenStream=2222 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/conf/aur-sshd@.service b/conf/aur-sshd@.service deleted file mode 100644 index 5ec410a..0000000 --- a/conf/aur-sshd@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=AUR OpenSSH Per-Connection Daemon - -[Service] -ExecStart=-/srv/http/aurweb/openssh/sshd -i -f /srv/http/aurweb/.ssh/sshd_config -User=aur -StandardInput=socket -StandardError=syslog diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto index 86b410b..d9bde83 100644 --- a/conf/cgitrc.proto +++ b/conf/cgitrc.proto @@ -1,5 +1,5 @@ virtual-root=/cgit/ -clone-prefix=git+ssh://aur@aur.archlinux.org:2222 +clone-prefix=git+ssh://aur@aur.archlinux.org noheader=0 logo= css=/css/cgit.css diff --git a/conf/config.proto b/conf/config.proto index 99ab602..623d044 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -20,7 +20,7 @@ disable_http_login = 1 aur_location = https://aur.archlinux.org cgit_uri = https://aur.archlinux.org/cgit/ git_clone_uri_anon = https://aur.archlinux.org/cgit/%s.git/ -git_clone_uri_priv = ssh+git://aur@aur.archlinux.org:2222/%s.git/ +git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/ max_rpc_results = 5000 aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 diff --git a/scripts/git-integration/sshd_config b/scripts/git-integration/sshd_config deleted file mode 100644 index d3d2f5a..0000000 --- a/scripts/git-integration/sshd_config +++ /dev/null @@ -1,6 +0,0 @@ -Port 2222 -HostKey ~/.ssh/ssh_host_rsa_key -PasswordAuthentication no -UsePrivilegeSeparation no -AuthorizedKeysCommand /srv/http/aurweb/scripts/git-integration/git-auth.py "%t" "%k" -AuthorizedKeysCommandUser aur -- 2.4.1

1 0