Commit 920acf8d authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

parents ad608ab9 a954fd65
......@@ -123,7 +123,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction
return;
}
$fave = Fave::addNew($this->user, $this->notice);
$fave = Fave::addNew($this->user->getProfile(), $this->notice);
if (empty($fave)) {
$this->clientError(
......
......@@ -162,40 +162,29 @@ class FoafAction extends Action
if ($sub->find()) {
while ($sub->fetch()) {
if ($sub->token) {
$other = Remote_profile::staticGet('id', $sub->subscriber);
$profile = Profile::staticGet('id', $sub->subscriber);
} else {
$other = User::staticGet('id', $sub->subscriber);
$profile = Profile::staticGet('id', $sub->subscriber);
}
if (!$other) {
$profile = Profile::staticGet('id', $sub->subscriber);
if (empty($profile)) {
common_debug('Got a bad subscription: '.print_r($sub,true));
continue;
}
if (array_key_exists($other->uri, $person)) {
$person[$other->uri][0] = BOTH;
$user = $profile->getUser();
$other_uri = $profile->getUri();
if (array_key_exists($other_uri, $person)) {
$person[$other_uri][0] = BOTH;
} else {
$person[$other->uri] = array(LISTENER,
$other->id,
$profile->nickname,
(empty($sub->token)) ? 'User' : 'Remote_profile');
$person[$other_uri] = array(LISTENER,
$profile->id,
$profile->nickname,
$user ? 'local' : 'remote');
}
$other->free();
$other = null;
unset($other);
$profile->free();
$profile = null;
unset($profile);
}
}
$sub->free();
$sub = null;
unset($sub);
foreach ($person as $uri => $p) {
list($type, $id, $nickname, $cls) = $p;
list($type, $id, $nickname, $local) = $p;
if ($type == BOTH) {
$this->element('knows', array('rdf:resource' => $uri));
}
......@@ -206,8 +195,8 @@ class FoafAction extends Action
foreach ($person as $uri => $p) {
$foaf_url = null;
list($type, $id, $nickname, $cls) = $p;
if ($cls == 'User') {
list($type, $id, $nickname, $local) = $p;
if ($local == 'local') {
$foaf_url = common_local_url('foaf', array('nickname' => $nickname));
}
$profile = Profile::staticGet($id);
......@@ -216,7 +205,7 @@ class FoafAction extends Action
$this->element('knows', array('rdf:resource' => $this->user->uri));
}
$this->showMicrobloggingAccount($profile,
($cls == 'User') ? common_root_url() : null,
($local == 'local') ? common_root_url() : null,
$uri,
true);
if ($foaf_url) {
......@@ -275,33 +264,22 @@ class FoafAction extends Action
if ($sub->find()) {
while ($sub->fetch()) {
if (!empty($sub->token)) {
$other = Remote_profile::staticGet('id', $sub->subscribed);
$profile = Profile::staticGet('id', $sub->subscribed);
} else {
$other = User::staticGet('id', $sub->subscribed);
$profile = Profile::staticGet('id', $sub->subscribed);
}
if (empty($other)) {
$profile = Profile::staticGet('id', $sub->subscribed);
if (empty($profile)) {
common_debug('Got a bad subscription: '.print_r($sub,true));
continue;
}
$this->element('sioc:follows', array('rdf:resource' => $other->uri.'#acct'));
$person[$other->uri] = array(LISTENEE,
$other->id,
$profile->nickname,
(empty($sub->token)) ? 'User' : 'Remote_profile');
$other->free();
$other = null;
unset($other);
$profile->free();
$profile = null;
$user = $profile->getUser();
$other_uri = $profile->getUri();
$this->element('sioc:follows', array('rdf:resource' => $other_uri.'#acct'));
$person[$other_uri] = array(LISTENEE,
$profile->id,
$profile->nickname,
$user ? 'local' : 'remote');
unset($profile);
}
}
$sub->free();
$sub = null;
unset($sub);
}
......
......@@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject
}
$orig = clone($conv);
$orig->uri = common_local_url('conversation', array('id' => $id));
$orig->uri = common_local_url('conversation', array('id' => $id),
null, null, false);
$result = $orig->update($conv);
if (empty($result)) {
......
......@@ -21,7 +21,15 @@ class Fave extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
static function addNew($profile, $notice) {
/**
* Save a favorite record.
* @fixme post-author notification should be moved here
*
* @param Profile $profile the local or remote user who likes
* @param Notice $notice the notice that is liked
* @return mixed false on failure, or Fave record on success
*/
static function addNew(Profile $profile, Notice $notice) {
$fave = null;
......
......@@ -421,7 +421,9 @@ class Notice extends Memcached_DataObject
}
$profile = Profile::staticGet($this->profile_id);
$profile->blowNoticeCount();
if (!empty($profile)) {
$profile->blowNoticeCount();
}
}
/**
......
......@@ -1273,7 +1273,7 @@ class ApiAction extends Action
if (empty($local)) {
return null;
} else {
return User_group::staticGet('id', $local->id);
return User_group::staticGet('id', $local->group_id);
}
}
......
......@@ -273,7 +273,7 @@ class FavCommand extends Command
function handle($channel)
{
$notice = $this->getNotice($this->other);
$fave = Fave::addNew($this->user, $notice);
$fave = Fave::addNew($this->user->getProfile(), $notice);
if (!$fave) {
$channel->error($this->user, _('Could not create favorite.'));
......
......@@ -1529,7 +1529,8 @@ function common_user_uri(&$user)
function common_notice_uri(&$notice)
{
return common_local_url('shownotice',
array('notice' => $notice->id));
array('notice' => $notice->id),
null, null, false);
}
// 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
......
......@@ -92,7 +92,7 @@ class UsersalmonAction extends SalmonAction
throw new ClientException("Not to anyone in reply to anything!");
}
$existing = Notice::staticGet('uri', $this->act->object->id);
$existing = Notice::staticGet('uri', $this->act->objects[0]->id);
if (!empty($existing)) {
common_log(LOG_ERR, "Not saving notice '{$existing->uri}'; already exists.");
......@@ -143,7 +143,7 @@ class UsersalmonAction extends SalmonAction
function handleFavorite()
{
$notice = $this->getNotice($this->act->object);
$notice = $this->getNotice($this->act->objects[0]);
$profile = $this->ensureProfile()->localProfile();
$old = Fave::pkeyGet(array('user_id' => $profile->id,
......@@ -164,7 +164,7 @@ class UsersalmonAction extends SalmonAction
*/
function handleUnfavorite()
{
$notice = $this->getNotice($this->act->object);
$notice = $this->getNotice($this->act->objects[0]);
$profile = $this->ensureProfile()->localProfile();
$fave = Fave::pkeyGet(array('user_id' => $profile->id,
......
......@@ -27,6 +27,8 @@
* @link http://status.net/
*/
require_once 'Crypt/RSA.php';
class Magicsig extends Memcached_DataObject
{
......@@ -50,7 +52,15 @@ class Magicsig extends Memcached_DataObject
{
$obj = parent::staticGet(__CLASS__, $k, $v);
if (!empty($obj)) {
return Magicsig::fromString($obj->keypair);
$obj = Magicsig::fromString($obj->keypair);
// Double check keys: Crypt_RSA did not
// consistently generate good keypairs.
// We've also moved to 1024 bit keys.
if (strlen($obj->publicKey->modulus->toBits()) != 1024) {
$obj->delete();
return false;
}
}
return $obj;
......@@ -100,16 +110,16 @@ class Magicsig extends Memcached_DataObject
public function generate($user_id)
{
$rsa = new SafeCrypt_RSA();
$rsa = new Crypt_RSA();
$keypair = $rsa->createKey();
$rsa->loadKey($keypair['privatekey']);
$this->privateKey = new SafeCrypt_RSA();
$this->privateKey = new Crypt_RSA();
$this->privateKey->loadKey($keypair['privatekey']);
$this->publicKey = new SafeCrypt_RSA();
$this->publicKey = new Crypt_RSA();
$this->publicKey->loadKey($keypair['publickey']);
$this->user_id = $user_id;
......@@ -161,7 +171,7 @@ class Magicsig extends Memcached_DataObject
{
common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")");
$rsa = new SafeCrypt_RSA();
$rsa = new Crypt_RSA();
$rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
$rsa->setHash('sha256');
$rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256);
......
......@@ -67,7 +67,7 @@
* @author Jim Wigginton <terrafrost@php.net>
* @copyright MMVI Jim Wigginton
* @license http://www.gnu.org/licenses/lgpl.txt
* @version $Id: BigInteger.php,v 1.31 2010/03/01 17:28:19 terrafrost Exp $
* @version $Id: BigInteger.php,v 1.33 2010/03/22 22:32:03 terrafrost Exp $
* @link http://pear.php.net/package/Math_BigInteger
*/
......@@ -294,7 +294,7 @@ class Math_BigInteger {
$this->value = array();
}
if ($x === 0) {
if (empty($x)) {
return;
}
......@@ -718,7 +718,7 @@ class Math_BigInteger {
*
* Will be called, automatically, when serialize() is called on a Math_BigInteger object.
*
* @see __wakeup
* @see __wakeup()
* @access public
*/
function __sleep()
......@@ -740,7 +740,7 @@ class Math_BigInteger {
*
* Will be called, automatically, when unserialize() is called on a Math_BigInteger object.
*
* @see __sleep
* @see __sleep()
* @access public
*/
function __wakeup()
......
......@@ -59,12 +59,21 @@ class MagicEnvelope
}
if ($xrd->links) {
if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
list($type, $keypair) = explode(',', $link['href']);
if (empty($keypair)) {
$keypair = false;
$parts = explode(',', $link['href']);
if (count($parts) == 2) {
$keypair = $parts[1];
} else {
// Backwards compatibility check for separator bug in 0.9.0
list($type, $keypair) = explode(';', $link['href']);
$parts = explode(';', $link['href']);
if (count($parts) == 2) {
$keypair = $parts[1];
}
}
if ($keypair) {
return $keypair;
}
return $keypair;
}
}
throw new Exception('Unable to locate signer public key');
......
<?php
require_once 'Crypt/RSA.php';
/**
* Crypt_RSA stores a Math_BigInteger with value 0, which triggers a bug
* in Math_BigInteger's wakeup function which spews notices to log or output.
* This wrapper replaces it with a version that survives serialization.
*/
class SafeCrypt_RSA extends Crypt_RSA
{
function __construct()
{
parent::__construct();
$this->zero = new SafeMath_BigInteger();
}
}
<?php
require_once 'Math/BigInteger.php';
/**
* Crypt_RSA stores a Math_BigInteger with value 0, which triggers a bug
* in Math_BigInteger's wakeup function which spews notices to log or output.
* This wrapper replaces it with a version that survives serialization.
*/
class SafeMath_BigInteger extends Math_BigInteger
{
function __wakeup()
{
if ($this->hex == '') {
$this->hex = '0';
}
parent::__wakeup();
}
}
......@@ -53,7 +53,14 @@ class XRD
$xrd = new XRD();
$dom = new DOMDocument();
if (!$dom->loadXML($xml)) {
// Don't spew XML warnings to output
$old = error_reporting();
error_reporting($old & ~E_WARNING);
$ok = $dom->loadXML($xml);
error_reporting($old);
if (!$ok) {
throw new Exception("Invalid XML");
}
$xrd_element = $dom->getElementsByTagName('XRD')->item(0);
......
This diff is collapsed.
#!/usr/bin/env php
<?php
/*
* StatusNet - a distributed open-source microblogging tool
* Copyright (C) 2010 StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$longoptions = array('dry-run', 'start=', 'end=');
$helptext = <<<END_OF_USERROLE_HELP
fixup_deletions.php [options]
Finds notices posted by deleted users and cleans them up.
Stray incompletely deleted items cause various fun problems!
--dry-run look but don't touch
--start=N start looking at profile_id N instead of 1
--end=N end looking at profile_id N instead of the max
END_OF_USERROLE_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
/**
* Find the highest profile_id currently listed in the notice table;
* this field is indexed and should return very quickly.
*
* We check notice.profile_id rather than profile.id because we're
* looking for notices left behind after deletion; if the most recent
* accounts were deleted, we wouldn't have them from profile.
*
* @return int
* @access private
*/
function get_max_profile_id()
{
$query = 'SELECT MAX(profile_id) AS id FROM notice';
$profile = new Profile();
$profile->query($query);
if ($profile->fetch()) {
return intval($profile->id);
} else {
die("Something went awry; could not look up max used profile_id.");
}
}
/**
* Check for profiles in the given id range that are missing, presumed deleted.
*
* @param int $start beginning profile.id, inclusive
* @param int $end final profile.id, inclusive
* @return array of integer profile.ids
* @access private
*/
function get_missing_profiles($start, $end)
{
$query = sprintf("SELECT id FROM profile WHERE id BETWEEN %d AND %d",
$start, $end);
$profile = new Profile();
$profile->query($query);
$all = range($start, $end);
$known = array();
while ($row = $profile->fetch()) {
$known[] = intval($profile->id);
}
unset($profile);
$missing = array_diff($all, $known);
return $missing;
}
/**
* Look for stray notices from this profile and, if present, kill them.
*
* @param int $profile_id
* @param bool $dry if true, we won't delete anything
*/
function cleanup_missing_profile($profile_id, $dry)
{
$notice = new Notice();
$notice->profile_id = $profile_id;
$notice->find();
if ($notice->N == 0) {
return;
}
$s = ($notice->N == 1) ? '' : 's';
print "Deleted profile $profile_id has $notice->N stray notice$s:\n";
while ($notice->fetch()) {
print " notice $notice->id";
if ($dry) {
print " (skipped; dry run)\n";
} else {
$victim = clone($notice);
try {
$victim->delete();
print " (deleted)\n";
} catch (Exception $e) {
print " FAILED: ";
print $e->getMessage();
print "\n";
}
}
}
}
$dry = have_option('dry-run');
$max_profile_id = get_max_profile_id();
$chunk = 1000;
if (have_option('start')) {
$begin = intval(get_option_value('start'));
} else {
$begin = 1;
}
if (have_option('end')) {
$final = min($max_profile_id, intval(get_option_value('end')));
} else {
$final = $max_profile_id;
}
if ($begin < 1) {
die("Silly human, you can't begin before profile number 1!\n");
}
if ($final < $begin) {
die("Silly human, you can't end at $final if it's before $begin!\n");
}
// Identify missing profiles...
for ($start = $begin; $start <= $final; $start += $chunk) {
$end = min($start + $chunk - 1, $final);
print "Checking for missing profiles between id $start and $end";
if ($dry) {
print " (dry run)";
}
print "...\n";
$missing = get_missing_profiles($start, $end);
foreach ($missing as $profile_id) {
cleanup_missing_profile($profile_id, $dry);
}
}
echo "done.\n";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment