external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

SQL: treat all UID/ID values as numbers, not strings

Browse source 
Ensure we are not quoting these values in any of our SQL queries.

Thanks-to: elij <elij.mx@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-04-25 23:23:01 -05:00 • committed by Lukas Fleischer
parent fcda6671f3
commit 3609cf140e
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/html/passreset.php
View file

@ -58,8 +58,8 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir
$resetkey = new_sid(); $resetkey = new_sid();
$dbh = db_connect(); $dbh = db_connect();
$q = "UPDATE Users $q = "UPDATE Users
SET ResetKey = '$resetkey' SET ResetKey = '" . $resetkey . "'
WHERE ID = '$uid'"; WHERE ID = " . $uid;
db_query($q, $dbh); db_query($q, $dbh);
# Send email with confirmation link # Send email with confirmation link
$body = __('A password reset request was submitted for the account '. $body = __('A password reset request was submitted for the account '.

2
web/html/pkgsubmit.php
View file

@ -325,7 +325,7 @@ if ($uid):
} }
# Update package data # Update package data
$q = sprintf("UPDATE Packages SET ModifiedTS = UNIX_TIMESTAMP(), Name = '%s', Version = '%s-%s', License = '%s', Description = '%s', URL = '%s', OutOfDateTS = NULL, MaintainerUID = '%d' WHERE ID = %d", $q = sprintf("UPDATE Packages SET ModifiedTS = UNIX_TIMESTAMP(), Name = '%s', Version = '%s-%s', License = '%s', Description = '%s', URL = '%s', OutOfDateTS = NULL, MaintainerUID = %d WHERE ID = %d",
mysql_real_escape_string($new_pkgbuild['pkgname']), mysql_real_escape_string($new_pkgbuild['pkgname']),
mysql_real_escape_string($new_pkgbuild['pkgver']), mysql_real_escape_string($new_pkgbuild['pkgver']),
mysql_real_escape_string($new_pkgbuild['pkgrel']), mysql_real_escape_string($new_pkgbuild['pkgrel']),

18
web/lib/acctfuncs.inc
View file

@ -619,18 +619,18 @@ function try_login() {
# last ($MAX_SESSIONS_PER_USER - 1). # last ($MAX_SESSIONS_PER_USER - 1).
$q = "DELETE s.* FROM Sessions s "; $q = "DELETE s.* FROM Sessions s ";
$q.= "LEFT JOIN (SELECT SessionID FROM Sessions "; $q.= "LEFT JOIN (SELECT SessionID FROM Sessions ";
$q.= "WHERE UsersId = '" . $userID . "' "; $q.= "WHERE UsersId = " . $userID . " ";
$q.= "ORDER BY LastUpdateTS DESC "; $q.= "ORDER BY LastUpdateTS DESC ";
$q.= "LIMIT " . ($MAX_SESSIONS_PER_USER - 1) . ") q "; $q.= "LIMIT " . ($MAX_SESSIONS_PER_USER - 1) . ") q ";
$q.= "ON s.SessionID = q.SessionID "; $q.= "ON s.SessionID = q.SessionID ";
$q.= "WHERE s.UsersId = '" . $userID . "' "; $q.= "WHERE s.UsersId = " . $userID . " ";
$q.= "AND q.SessionID IS NULL;"; $q.= "AND q.SessionID IS NULL;";
db_query($q, $dbh); db_query($q, $dbh);
} }
$new_sid = new_sid(); $new_sid = new_sid();
$q = "INSERT INTO Sessions (UsersID, SessionID, LastUpdateTS)" $q = "INSERT INTO Sessions (UsersID, SessionID, LastUpdateTS)"
." VALUES ( $userID, '" . $new_sid . "', UNIX_TIMESTAMP())"; ." VALUES (" . $userID . ", '" . $new_sid . "', UNIX_TIMESTAMP())";
$result = db_query($q, $dbh); $result = db_query($q, $dbh);
# Query will fail if $new_sid is not unique # Query will fail if $new_sid is not unique
@ -749,7 +749,7 @@ function valid_passwd( $userID, $passwd )
if ($salt) { if ($salt) {
# use salt # use salt
$passwd_q = "SELECT ID FROM Users" . $passwd_q = "SELECT ID FROM Users" .
" WHERE ID = '$userID' AND Passwd = '" . " WHERE ID = " . $userID . " AND Passwd = '" .
salted_hash($passwd, $salt) . "'"; salted_hash($passwd, $salt) . "'";
$passwd_result = mysql_fetch_row(db_query($passwd_q, $dbh)); $passwd_result = mysql_fetch_row(db_query($passwd_q, $dbh));
if ($passwd_result[0]) { if ($passwd_result[0]) {
@ -758,14 +758,14 @@ function valid_passwd( $userID, $passwd )
} else { } else {
# check without salt # check without salt
$nosalt_q = "SELECT ID FROM Users". $nosalt_q = "SELECT ID FROM Users".
" WHERE ID = '$userID'" . " WHERE ID = " . $userID .
" AND Passwd = '" . md5($passwd) . "'"; " AND Passwd = '" . md5($passwd) . "'";
$nosalt_result = mysql_fetch_row(db_query($nosalt_q, $dbh)); $nosalt_result = mysql_fetch_row(db_query($nosalt_q, $dbh));
if ($nosalt_result[0]) { if ($nosalt_result[0]) {
# password correct, but salt it first # password correct, but salt it first
if (!save_salt($userID, $passwd)) { if (!save_salt($userID, $passwd)) {
trigger_error("Unable to salt user's password;" . trigger_error("Unable to salt user's password;" .
" ID $userID", E_USER_WARNING); " ID " . $userID, E_USER_WARNING);
return false; return false;
} }
@ -782,7 +782,7 @@ function valid_passwd( $userID, $passwd )
function user_suspended( $id ) function user_suspended( $id )
{ {
$dbh = db_connect(); $dbh = db_connect();
$q = "SELECT Suspended FROM Users WHERE ID = '$id'"; $q = "SELECT Suspended FROM Users WHERE ID = " . $id;
$result = mysql_fetch_row(db_query($q, $dbh)); $result = mysql_fetch_row(db_query($q, $dbh));
if ($result[0] == 1 ) { if ($result[0] == 1 ) {
return true; return true;
@ -796,7 +796,7 @@ function user_suspended( $id )
function user_delete( $id ) function user_delete( $id )
{ {
$dbh = db_connect(); $dbh = db_connect();
$q = "DELETE FROM Users WHERE ID = '$id'"; $q = "DELETE FROM Users WHERE ID = " . $id;
$result = mysql_fetch_row(db_query($q, $dbh)); $result = mysql_fetch_row(db_query($q, $dbh));
return; return;
} }
@ -808,7 +808,7 @@ function user_delete( $id )
function user_is_privileged( $id ) function user_is_privileged( $id )
{ {
$dbh = db_connect(); $dbh = db_connect();
$q = "SELECT AccountTypeID FROM Users WHERE ID = '$id'"; $q = "SELECT AccountTypeID FROM Users WHERE ID = " . $id;
$result = mysql_fetch_row(db_query($q, $dbh)); $result = mysql_fetch_row(db_query($q, $dbh));
if( $result[0] > 1) { if( $result[0] > 1) {
return $result[0]; return $result[0];

6
web/lib/aur.inc
View file

@ -478,7 +478,7 @@ function mkurl($append) {
function get_salt($user_id) function get_salt($user_id)
{ {
$dbh = db_connect(); $dbh = db_connect();
$salt_q = "SELECT Salt FROM Users WHERE ID = '$user_id'"; $salt_q = "SELECT Salt FROM Users WHERE ID = " . $user_id;
$salt_result = mysql_fetch_row(db_query($salt_q, $dbh)); $salt_result = mysql_fetch_row(db_query($salt_q, $dbh));
return $salt_result[0]; return $salt_result[0];
} }
@ -488,8 +488,8 @@ function save_salt($user_id, $passwd)
$dbh = db_connect(); $dbh = db_connect();
$salt = generate_salt(); $salt = generate_salt();
$hash = salted_hash($passwd, $salt); $hash = salted_hash($passwd, $salt);
$salting_q = "UPDATE Users SET Salt = '$salt'" . $salting_q = "UPDATE Users SET Salt = '" . $salt . "', " .
", Passwd = '$hash' WHERE ID = '$user_id'"; "Passwd = '" . $hash . "' WHERE ID = " . $user_id;
return db_query($salting_q, $dbh); return db_query($salting_q, $dbh);
} }