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

adding some exception handling for magicenv parsing

Browse Source
This commit is contained in:
James Walker 2010-02-25 09:39:16 -05:00
parent bac959ad46
commit e62e49ed3b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/OStatus/lib/magicenvelope.php
View File

@ -59,7 +59,7 @@ class MagicEnvelope
$signer_uri = $this->normalizeUser($signer_uri); $signer_uri = $this->normalizeUser($signer_uri);
if (!$this->checkAuthor($text, $signer_uri)) { if (!$this->checkAuthor($text, $signer_uri)) {
return false; throw new Exception("Unable to determine entry author.");
} }
$signature_alg = Magicsig::fromString($this->getKeyPair($signer_uri)); $signature_alg = Magicsig::fromString($this->getKeyPair($signer_uri));

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

@ -72,8 +72,12 @@ class Salmon
// TODO: Should probably be getting the signer uri as an argument? // TODO: Should probably be getting the signer uri as an argument?
$signer_uri = $magic_env->getAuthor($text); $signer_uri = $magic_env->getAuthor($text);
try {
$env = $magic_env->signMessage($text, 'application/atom+xml', $signer_uri); $env = $magic_env->signMessage($text, 'application/atom+xml', $signer_uri);
} catch (Exception $e) {
common_log(LOG_ERR, "Salmon signing failed: ". $e->getMessage());
return $text;
}
return $magic_env->unfold($env); return $magic_env->unfold($env);
} }