wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General code safety: validate input and escape SQL strings in common_relative_profile()

Browse Source
This commit is contained in:
Brion Vibber 2010-11-29 16:44:01 -08:00
parent e03d2584aa
commit 3f0557aa8e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/util.php
View File

@ -1118,17 +1118,20 @@ function common_group_link($sender_id, $nickname)
* *
* @param <type> $sender the user or profile in whose context we're looking * @param <type> $sender the user or profile in whose context we're looking
* @param string $nickname validated nickname of * @param string $nickname validated nickname of
* @param <type> $dt unused mystery parameter. * @param <type> $dt unused mystery parameter; in Notice reply-to handling a timestamp is passed.
* *
* @return Profile or null * @return Profile or null
*/ */
function common_relative_profile($sender, $nickname, $dt=null) function common_relative_profile($sender, $nickname, $dt=null)
{ {
// Will throw exception on invalid input.
$nickname = Nickname::normalize($nickname);
// Try to find profiles this profile is subscribed to that have this nickname // Try to find profiles this profile is subscribed to that have this nickname
$recipient = new Profile(); $recipient = new Profile();
// XXX: use a join instead of a subquery // XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$sender->id.' and subscribed = id)', 'AND'); $recipient->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.intval($sender->id).' and subscribed = id)', 'AND');
$recipient->whereAdd("nickname = '" . trim($nickname) . "'", 'AND'); $recipient->whereAdd("nickname = '" . $recipient->escape($nickname) . "'", 'AND');
if ($recipient->find(true)) { if ($recipient->find(true)) {
// XXX: should probably differentiate between profiles with // XXX: should probably differentiate between profiles with
// the same name by date of most recent update // the same name by date of most recent update
@ -1137,8 +1140,8 @@ function common_relative_profile($sender, $nickname, $dt=null)
// Try to find profiles that listen to this profile and that have this nickname // Try to find profiles that listen to this profile and that have this nickname
$recipient = new Profile(); $recipient = new Profile();
// XXX: use a join instead of a subquery // XXX: use a join instead of a subquery
$recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$sender->id.' and subscriber = id)', 'AND'); $recipient->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.intval($sender->id).' and subscriber = id)', 'AND');
$recipient->whereAdd("nickname = '" . trim($nickname) . "'", 'AND'); $recipient->whereAdd("nickname = '" . $recipient->escape($nickname) . "'", 'AND');
if ($recipient->find(true)) { if ($recipient->find(true)) {
// XXX: should probably differentiate between profiles with // XXX: should probably differentiate between profiles with
// the same name by date of most recent update // the same name by date of most recent update