*/
class Salmon
{
+ const REL_SALMON = 'salmon';
+ const REL_MENTIONED = 'mentioned';
+ // XXX: these are deprecated
const NS_REPLIES = "http://salmon-protocol.org/ns/salmon-replies";
-
const NS_MENTIONS = "http://salmon-protocol.org/ns/salmon-mention";
-
+
/**
* Sign and post the given Atom entry as a Salmon message.
*
- * @fixme pass through the actor for signing?
+ * Side effects: may generate a keypair on-demand for the given user,
+ * which can be very slow on some systems.
*
* @param string $endpoint_uri
- * @param string $xml
+ * @param string $xml string representation of payload
+ * @param User $user local user profile whose keys we sign with
* @return boolean success
*/
- public function post($endpoint_uri, $xml, $actor)
+ public static function post($endpoint_uri, $xml, User $user)
{
if (empty($endpoint_uri)) {
+ common_debug('No endpoint URI for Salmon post to '.$user->getUri());
return false;
}
try {
- $xml = $this->createMagicEnv($xml, $actor);
+ $magic_env = MagicEnvelope::signAsUser($xml, $user);
+ $envxml = $magic_env->toXML();
} catch (Exception $e) {
common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
return false;
try {
$client = new HTTPClient();
- $client->setBody($xml);
+ $client->setBody($envxml);
$response = $client->post($endpoint_uri, $headers);
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
return false;
}
if ($response->getStatus() != 200) {
- common_log(LOG_ERR, "Salmon at $endpoint_uri returned status " .
- $response->getStatus() . ': ' . $response->getBody());
+ common_log(LOG_ERR, sprintf('Salmon (from profile %d) endpoint %s returned status %s: %s',
+ $user->id, $endpoint_uri, $response->getStatus(), $response->getBody()));
return false;
}
- return true;
- }
- public function createMagicEnv($text, $actor)
- {
- $magic_env = new MagicEnvelope();
-
- $user = User::staticGet('id', $actor->id);
- if ($user->id) {
- // Use local key
- $magickey = Magicsig::staticGet('user_id', $user->id);
- if (!$magickey) {
- // No keypair yet, let's generate one.
- $magickey = new Magicsig();
- $magickey->generate($user->id);
- }
- } else {
- throw new Exception("Salmon invalid actor for signing");
- }
-
- try {
- $env = $magic_env->signMessage($text, 'application/atom+xml', $magickey->toString());
- } catch (Exception $e) {
- return $text;
- }
- return $magic_env->toXML($env);
- }
-
-
- public function verifyMagicEnv($text)
- {
- $magic_env = new MagicEnvelope();
-
- $env = $magic_env->parse($text);
-
- return $magic_env->verify($env);
+ // Success!
+ return true;
}
}