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

Use locally cached Salmon keys for profiles

Browse Source 
Please note that we're not yet actually caching them ourselves.
This commit is contained in:
Mikael Nordfeldth
2014-05-31 12:51:51 +02:00
parent 0c2134f9ad
commit 411f3b86a4
2 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/OStatus/lib/salmonaction.php
View File

@@ -28,6 +28,8 @@ class SalmonAction extends Action
{
protected $needPost = true;
protected $verified = false;
var $xml = null;
var $activity = null;
var $target = null;
@@ -45,15 +47,24 @@ class SalmonAction extends Action
$envxml = file_get_contents('php://input');
$magic_env = new MagicEnvelope($envxml); // parse incoming XML as a MagicEnvelope
if (!$magic_env->verify()) {
$entry = $magic_env->getPayload(); // Not cryptographically verified yet!
$this->activity = new Activity($entry->documentElement);
try {
$profile = Profile::fromUri($this->activity->actor->id);
$this->verified = $magic_env->verify($profile);
} catch (UnknownUriException $e) {
// If we don't know the profile, perform some discovery instead
$this->verified = $magic_env->verify();
}
if (!$this->verified) {
common_log(LOG_DEBUG, "Salmon signature verification failed.");
// TRANS: Client error.
$this->clientError(_m('Salmon signature verification failed.'));
}
$entry = $magic_env->getPayload();
$this->activity = new Activity($entry->documentElement);
return true;
}