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

move salmon posting to send application/magic-envelope+xml per http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF

Browse Source
This commit is contained in:
James Walker
2010-02-26 15:39:30 -05:00
parent f23a877cd8
commit e4c462570f
3 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/OStatus/lib/salmon.php
View File

@@ -48,12 +48,17 @@ class Salmon
return false;
}
if (!common_config('ostatus', 'skip_signatures')) {
try {
$xml = $this->createMagicEnv($xml, $actor);
} catch (Exception $e) {
common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
return false;
}
$headers = array('Content-Type: application/atom+xml');
$headers = array('Content-Type: application/magic-envelope+xml');
common_log(LOG_DEBUG, "Salmon: going to post " . $xml);
try {
$client = new HTTPClient();
$client->setBody($xml);
@@ -72,7 +77,6 @@ class Salmon
public function createMagicEnv($text, $actor)
{
common_log(LOG_DEBUG, "Got actor as : ". print_r($actor, true));
$magic_env = new MagicEnvelope();
$user = User::staticGet('id', $actor->id);
@@ -84,7 +88,6 @@ class Salmon
$magickey = new Magicsig();
$magickey->generate($user->id);
}
common_log(LOG_DEBUG, "Salmon: Loaded key for ". $user->id);
} else {
throw new Exception("Salmon invalid actor for signing");
}
@@ -95,15 +98,16 @@ class Salmon
common_log(LOG_ERR, "Salmon signing failed: ". $e->getMessage());
return $text;
}
return $magic_env->unfold($env);
return $magic_env->toXML($env);
}
public function verifyMagicEnv($dom)
public function verifyMagicEnv($text)
{
common_log(LOG_DEBUG, "Going to verify ". $text);
$magic_env = new MagicEnvelope();
$env = $magic_env->fromDom($dom);
$env = $magic_env->parse($text);
return $magic_env->verify($env);
}