August 2011 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] aurblup: Update config.h.proto
by Dan McGee 19 Aug '11

19 Aug '11

* Switch to x86_64 architecture by default * Add more repositories (including multilib) * Update default configuration path to include .php file extension Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/aurblup/config.h.proto | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/aurblup/config.h.proto b/scripts/aurblup/config.h.proto index daf1744..1a19ef4 100644 --- a/scripts/aurblup/config.h.proto +++ b/scripts/aurblup/config.h.proto @@ -1,5 +1,5 @@ /* AUR configuration file */ -#define AUR_CONFIG "/srv/aur/web/lib/config.inc" +#define AUR_CONFIG "/srv/aur/web/lib/config.inc.php" #define CONFIG_KEY_HOST "AUR_db_host" #define CONFIG_KEY_USER "AUR_db_user" @@ -8,6 +8,13 @@ /* libalpm options */ #define ALPM_DBPATH "/var/lib/aurblup/" -#define ALPM_MIRROR "ftp://mirrors.kernel.org/archlinux/%s/os/i686" +#define ALPM_MIRROR "ftp://mirrors.kernel.org/archlinux/%s/os/x86_64" -static const char *alpm_repos[] = { "core", "community", "extra" }; +static const char *alpm_repos[] = { + "core", + "community", + "community-testing", + "extra", + "multilib", + "testing" +}; -- 1.7.6

2 1

[aur-dev] [PATCH 0/2] Format string cleanup
by Lukas Fleischer 15 Aug '11

15 Aug '11

From: Lukas Fleischer <info(a)cryptocrack.de> I've wanted to get rid of the "%h" format specifiers for a long time and somehow lost track of it. Thanks to our translation team for poking me on this. First patch was generated by a simple sed(1) invocation. Not so sure if we should also rewrite some of the crazy stuff like "%s%s%s" and just use "%s" where suitable. It might make sense here. Note that this patch set is in my working branch ("wip") and I won't merge this into master before releasing 1.9.0 (doesn't seem worse a string freeze break). Lukas Fleischer (2): Use "%s" instead of "%h" in format strings web/lib/translator.inc.php: Use vsprintf() in __() web/html/index.php | 4 ++-- web/html/passreset.php | 2 +- web/html/pkgsubmit.php | 2 +- web/lib/acctfuncs.inc.php | 12 ++++++------ web/lib/translator.inc.php | 19 +++++-------------- 5 files changed, 15 insertions(+), 24 deletions(-) -- 1.7.6

2 4

[aur-dev] About the Greek transifex translation team
by Panos Filip 14 Aug '11

14 Aug '11

Hello to everyone! I've created a request to be added on the greek translation team, but it hasn't been approved yet. I've, previously, managed to create the el_GR translation for AUR, along with the help of other users, and I'd like to continue helping on that. PS.: I'm not sure if aur-dev is the appropriate place to ask if a TU could tell me if the transifex request is enough.

3 8

[aur-dev] ganlu Is Inviting You to Check Out Vizualize.Me
by ganlu via vizualize.me 13 Aug '11

13 Aug '11

1 0

[aur-dev] 1.9.0 string freeze
by Lukas Fleischer 13 Aug '11

13 Aug '11

Hi, folks! Just pushed two patches that implement the last release blocker for 1.9.0. I'd like to do the release next week (Sat, 20 Aug 2011). There were a few string additions - please have a look at your translations on Transifex :)

1 0

[aur-dev] [PATCH 1/2] Add a configuration setting to disallow HTTP login
by Lukas Fleischer 11 Aug '11

11 Aug '11

If this is enabled, do not show the login form and display a note suggesting to switch to a secure connection if a user accesses the site via HTTP. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aur.inc.php | 7 +++++-- web/lib/config.inc.php.proto | 3 +++ web/template/login_form.php | 10 +++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 0927604..474ebee 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -326,9 +326,12 @@ function html_header($title="") { global $_POST; global $LANG; global $SUPPORTED_LANGS; + global $DISABLE_HTTP_LOGIN; - $login = try_login(); - $login_error = $login['error']; + if (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) { + $login = try_login(); + $login_error = $login['error']; + } $title = htmlspecialchars($title, ENT_QUOTES); diff --git a/web/lib/config.inc.php.proto b/web/lib/config.inc.php.proto index f710844..0f672ab 100644 --- a/web/lib/config.inc.php.proto +++ b/web/lib/config.inc.php.proto @@ -71,3 +71,6 @@ $PERSISTENT_COOKIE_TIMEOUT = 60 * 60 * 24 * 30; # please ensure "upload_max_filesize" is additionally set to no more than 3M, # otherwise this check might be easy to bypass (FS#22991 for details) $MAX_FILESIZE_UNCOMPRESSED = 1024 * 1024 * 8; + +# Allow HTTPs logins only +$DISABLE_HTTP_LOGIN = true; diff --git a/web/template/login_form.php b/web/template/login_form.php index ca81e0e..b351a27 100644 --- a/web/template/login_form.php +++ b/web/template/login_form.php @@ -6,7 +6,7 @@ if (isset($_COOKIE["AURSID"])) { <a href="logout.php">[<?php print __("Logout"); ?>]</a> <?php } -else { +elseif (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) { if ($login_error) { print "<span class='error'>" . $login_error . "</span><br />\n"; } @@ -26,5 +26,13 @@ else { <a href="passreset.php">[<?php echo __('Forgot Password') ?>]</a> </div> </form> +<?php +} +else { +?> +<span class='error'> + <?php echo __("HTTP login is disabled. Please switch to HTTPs if you want to login: "); ?> + <a href="https://aur.archlinux.org/">https://aur.archlinux.org/</a> +</span> <?php } ?> </div> -- 1.7.6

2 3

[aur-dev] [PATCH 1/2] UPGRADING: Mention the upload directory transform script
by Lukas Fleischer 11 Aug '11

11 Aug '11

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/UPGRADING b/UPGRADING index b0185a1..331870e 100644 --- a/UPGRADING +++ b/UPGRADING @@ -19,6 +19,9 @@ ALTER TABLE PackageDepends ADD INDEX (DepName); 5. Merge "web/lib/config.inc.php.proto" with "web/lib/config.inc.php". +6. Run the upload directory transform script ("scripts/uploadbuckets.sh") and +rotate the converted directory structure into place. + From 1.8.1 to 1.8.2 ------------------- -- 1.7.6

3 17

[aur-dev] [PATCH 1/3] aur.inc.php: allow all functions using DB to take handle as arg
by Dan McGee 11 Aug '11

11 Aug '11

This prevents needless calls to db_connect() if we already have a reference to a handle we can pass into a function. Although the current underlying implementation using mysql_connect() will return the same connection if all parameters are the same, this might not be true if we switch to a more modern (e.g. PDO) interface. In the face of safe transactions, it is extremely important all actions are being taken over the same connection to the database. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- web/lib/aur.inc.php | 74 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 49 insertions(+), 25 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 55cc8a9..0927604 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -17,7 +17,7 @@ include_once("cachefuncs.inc.php"); # see if the visitor is already logged in # -function check_sid() { +function check_sid($dbh=NULL) { global $_COOKIE; global $LOGIN_TIMEOUT; @@ -25,7 +25,9 @@ function check_sid() { $failed = 0; # the visitor is logged in, try and update the session # - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT LastUpdateTS, UNIX_TIMESTAMP() FROM Sessions "; $q.= "WHERE SessionID = '" . mysql_real_escape_string($_COOKIE["AURSID"]) . "'"; $result = db_query($q, $dbh); @@ -97,11 +99,13 @@ function new_sid() { # obtain the username if given their Users.ID # -function username_from_id($id="") { +function username_from_id($id="", $dbh=NULL) { if (!$id) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Username FROM Users WHERE ID = " . mysql_real_escape_string($id); $result = db_query($q, $dbh); if (!$result) { @@ -115,11 +119,13 @@ function username_from_id($id="") { # obtain the username if given their current SID # -function username_from_sid($sid="") { +function username_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Username "; $q.= "FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -135,11 +141,13 @@ function username_from_sid($sid="") { # obtain the email address if given their current SID # -function email_from_sid($sid="") { +function email_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Email "; $q.= "FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -156,11 +164,13 @@ function email_from_sid($sid="") { # obtain the account type if given their current SID # Return either "", "User", "Trusted User", "Developer" # -function account_from_sid($sid="") { +function account_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT AccountType "; $q.= "FROM Users, AccountTypes, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -177,11 +187,13 @@ function account_from_sid($sid="") { # obtain the Users.ID if given their current SID # -function uid_from_sid($sid="") { +function uid_from_sid($sid="", $dbh=NULL) { if (!$sid) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT Users.ID "; $q.= "FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; @@ -251,7 +263,7 @@ function db_query($query="", $db_handle="") { # set up the visitor's language # -function set_lang() { +function set_lang($dbh=NULL) { global $LANG; global $SUPPORTED_LANGS; global $PERSISTENT_COOKIE_TIMEOUT; @@ -272,7 +284,9 @@ function set_lang() { } elseif (isset($_COOKIE["AURSID"])) { # No language but a session; use default lang preference # - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT LangPreference FROM Users, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; $q.= "AND Sessions.SessionID = '"; @@ -332,15 +346,17 @@ function html_footer($ver="") { # check to see if the user can submit a package # -function can_submit_pkg($name="", $sid="") { +function can_submit_pkg($name="", $sid="", $dbh=NULL) { if (!$name || !$sid) {return 0;} - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT MaintainerUID "; $q.= "FROM Packages WHERE Name = '".mysql_real_escape_string($name)."'"; $result = db_query($q, $dbh); if (mysql_num_rows($result) == 0) {return 1;} $row = mysql_fetch_row($result); - $my_uid = uid_from_sid($sid); + $my_uid = uid_from_sid($sid, $dbh); if ($row[0] === NULL || $row[0] == $my_uid) { return 1; @@ -401,12 +417,14 @@ function chmod_group($path) { # obtain the uid given a Users.Username # -function uid_from_username($username="") +function uid_from_username($username="", $dbh=NULL) { if (!$username) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT ID FROM Users WHERE Username = '".mysql_real_escape_string($username) ."'"; $result = db_query($q, $dbh); @@ -420,12 +438,14 @@ function uid_from_username($username="") # obtain the uid given a Users.Email # -function uid_from_email($email="") +function uid_from_email($email="", $dbh=NULL) { if (!$email) { return ""; } - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $q = "SELECT ID FROM Users WHERE Email = '".mysql_real_escape_string($email) ."'"; $result = db_query($q, $dbh); @@ -479,9 +499,11 @@ function mkurl($append) { return substr($out, 5); } -function get_salt($user_id) +function get_salt($user_id, $dbh=NULL) { - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $salt_q = "SELECT Salt FROM Users WHERE ID = " . $user_id; $result = db_query($salt_q, $dbh); if ($result) { @@ -491,9 +513,11 @@ function get_salt($user_id) return; } -function save_salt($user_id, $passwd) +function save_salt($user_id, $passwd, $dbh=NULL) { - $dbh = db_connect(); + if(!$dbh) { + $dbh = db_connect(); + } $salt = generate_salt(); $hash = salted_hash($passwd, $salt); $salting_q = "UPDATE Users SET Salt = '" . $salt . "', " . -- 1.7.6

3 13

[aur-dev] [PATCH 1/3] Rename package_exists() to pkgid_from_name()
by Lukas Fleischer 11 Aug '11

11 Aug '11

Describe what this function actually does: Return the ID of a package with a given name and return NULL if such a package doesn't exist. The function name is chosen in a fashion similar to other functions from "pkgfuncs.inc.php" (pkgname_from_id(), pkgnotify_from_sid(), ...). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/cleanup | 2 +- web/html/pkgsubmit.php | 4 ++-- web/lib/pkgfuncs.inc.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/cleanup b/scripts/cleanup index 4fc9ea2..b920c8e 100755 --- a/scripts/cleanup +++ b/scripts/cleanup @@ -25,7 +25,7 @@ exec('ls ' . INCOMING_DIR, $files); $count = 0; foreach ($files as $pkgname) { - if (!package_exists($pkgname)) { + if (!pkgid_from_name($pkgname)) { echo 'Removing ' . INCOMING_DIR . "$pkgname\n"; system('rm -r ' . INCOMING_DIR . $pkgname); $count++; diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 793f8ca..2e95a56 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -261,7 +261,7 @@ if ($uid): if (!$error) { # First, see if this package already exists, and if it can be overwritten - $pkg_exists = package_exists($pkg_name); + $pkg_id = pkgid_from_name($pkg_name); if (can_submit_pkg($pkg_name, $_COOKIE["AURSID"])) { if (file_exists($incoming_pkgdir)) { # Blow away the existing file/dir and contents @@ -277,7 +277,7 @@ if ($uid): if (!$error) { # Check if package name is blacklisted. - if (!$pkg_exists && pkgname_is_blacklisted($pkg_name)) { + if (!$pkg_id && pkgname_is_blacklisted($pkg_name)) { if (!canSubmitBlacklisted(account_from_sid($_COOKIE["AURSID"]))) { $error = __( "%s is on the package blacklist, please check if it's available in the official repos.", $pkg_name); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 8cd1c61..bb5a592 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -90,7 +90,7 @@ function pkgCategories() { # check to see if the package name exists # -function package_exists($name="") { +function pkgid_from_name($name="") { if (!$name) {return NULL;} $dbh = db_connect(); $q = "SELECT ID FROM Packages "; -- 1.7.6

2 14

[aur-dev] [PATCH] Add a upload directory tranform script
by Dan McGee 10 Aug '11

10 Aug '11

This goes with the previous patch that moves uploads into segmented subdirectories. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/uploadbuckets.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) create mode 100755 scripts/uploadbuckets.sh diff --git a/scripts/uploadbuckets.sh b/scripts/uploadbuckets.sh new file mode 100755 index 0000000..1bb1a90 --- /dev/null +++ b/scripts/uploadbuckets.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +DRYRUN=1 + +source="$1" +dest="$2" + +if [[ -z $source || -z $dest ]]; then + echo 'usage: uploadbuckets.sh <source> <dest>' + exit 1 +fi + +if [[ ! -d $source ]]; then + echo 'error: source is not a directory' + exit 1 +fi + +if [[ -e $dest && ! -d $dest ]]; then + echo 'error: dest is not a directory' + exit 1 +fi + +if [[ ! -d $dest ]]; then + mkdir $dest +fi + +for package in "$source"/*; do + pkgname="${package##*/}" + newfolder="$dest/${pkgname:0:2}" + if [[ ! -d "$newfolder" ]]; then + if [[ DRYRUN -gt 0 ]]; then + echo mkdir -p "$newfolder" + else + mkdir -p "$newfolder" + fi + fi + if [[ DRYRUN -gt 0 ]]; then + echo mv "$source/$pkgname" "$newfolder/$pkgname" + else + mv "$source/$pkgname" "$newfolder/$pkgname" + fi +done -- 1.7.6

5 8