diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-24 15:47:51 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-24 15:47:51 -0800 |
commit | 59be4b8cae992476628b23c2976d335e4f704c89 (patch) | |
tree | a1e94f2b11a5e640bf55f6977576fdca237f323f /plugins/OStatus/lib/salmon.php | |
parent | 2d9d444b05e29105082d3a443b8b71de6498b7e9 (diff) | |
parent | e04f55630473f5f8b17554d14cfd047b93af8609 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/lib/salmon.php')
-rw-r--r-- | plugins/OStatus/lib/salmon.php | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php index df17a7006..b5f178cc6 100644 --- a/plugins/OStatus/lib/salmon.php +++ b/plugins/OStatus/lib/salmon.php @@ -28,13 +28,26 @@ */ class Salmon { + /** + * Sign and post the given Atom entry as a Salmon message. + * + * @fixme pass through the actor for signing? + * + * @param string $endpoint_uri + * @param string $xml + * @return boolean success + */ public function post($endpoint_uri, $xml) { if (empty($endpoint_uri)) { - return FALSE; + return false; + } + + if (!common_config('ostatus', 'skip_signatures')) { + $xml = $this->createMagicEnv($xml); } - $headers = array('Content-type: application/atom+xml'); + $headers = array('Content-Type: application/atom+xml'); try { $client = new HTTPClient(); @@ -49,19 +62,28 @@ class Salmon $response->getStatus() . ': ' . $response->getBody()); return false; } - + return true; } - public function createMagicEnv($text, $userid) + public function createMagicEnv($text) { + $magic_env = new MagicEnvelope(); + + // TODO: Should probably be getting the signer uri as an argument? + $signer_uri = $magic_env->getAuthor($text); + $env = $magic_env->signMessage($text, 'application/atom+xml', $signer_uri); + return $magic_env->unfold($env); } - public function verifyMagicEnv($env) + public function verifyMagicEnv($dom) { + $magic_env = new MagicEnvelope(); + + $env = $magic_env->fromDom($dom); - + return $magic_env->verify($env); } } |