GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

OStatus fixup-shadow.php: add check for user_group entries with 'uri' entry shadowing an actual local_group -- this can cause trouble now that we sometimes actually use the uri field for lookups, and leaving the entries around would break updating the table to fill out formerly missing uris, since the unique index entry would already be taken by the bad entry.

Browse Source
This commit is contained in:
Brion Vibber 2010-10-07 11:26:07 -07:00
parent a9654beb5d
commit 458f93bddd
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/OStatus/scripts/fixup-shadow.php
View File

@ -84,6 +84,50 @@ while ($group->fetch()) {
}
echo "\n";
// And there may be user_group entries remaining where we've already killed
// the ostatus_profile. These were "harmless" until our lookup started actually
// using the uri field, at which point we can clearly see it breaks stuff.
echo "Checking for leftover bogus user_group.uri entries obscuring local_group entries...\n";
$group = new User_group();
$group->joinAdd(array('id', 'local_group:group_id'), 'LEFT');
$group->whereAdd('group_id IS NULL');
$marker = mt_rand(31337, 31337000);
$groupTemplate = common_local_url('groupbyid', array('id' => $marker));
$encGroup = $group->escape($groupTemplate, true);
$encGroup = str_replace($marker, '%', $encGroup);
echo " LIKE '$encGroup'\n";
$group->whereAdd("uri LIKE '$encGroup'");
$group->find();
$count = $group->N;
echo "Found $count...\n";
while ($group->fetch()) {
$uri = $group->uri;
if (preg_match('!/group/(\d+)/id!', $uri, $matches)) {
$id = intval($matches[1]);
$local = Local_group::staticGet('group_id', $id);
if ($local) {
$nick = $local->nickname;
} else {
$nick = '<deleted>';
}
echo "local group $id ($local->nickname) hidden by $uri (bogus group id $group->id)";
if ($dry) {
echo " - skipping\n";
} else {
echo " - removing bogus user_group entry...";
$evil = User_group::staticGet('id', $group->id);
$evil->delete();
echo " ok\n";
}
}
}
echo "\n";
// Fallback?
echo "Checking for bogus profiles blocking local users/groups by URI pattern match...\n";