We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 437ac120 authored by Brion Vibber's avatar Brion Vibber

Outgoing Salmon slaps now use the corrected signature format; if the first hit...

Outgoing Salmon slaps now use the corrected signature format; if the first hit is rejected with an HTTP error, we try again with the old format.

(This is not 100% ideal; possibly should try to distinguish between server errors and rejections, etc.)
parent f5650806
...@@ -52,29 +52,35 @@ class Salmon ...@@ -52,29 +52,35 @@ class Salmon
return false; return false;
} }
try { $classes = array('MagicEnvelope', 'MagicEnvelopeCompat');
$xml = $this->createMagicEnv($xml, $actor); foreach ($classes as $class) {
} catch (Exception $e) { try {
common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage()); $envelope = $this->createMagicEnv($xml, $actor, $class);
return false; } catch (Exception $e) {
} common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
return false;
$headers = array('Content-Type: application/magic-envelope+xml'); }
$headers = array('Content-Type: application/magic-envelope+xml');
try {
$client = new HTTPClient();
$client->setBody($envelope);
$response = $client->post($endpoint_uri, $headers);
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_ERR, "Salmon ($class) post to $endpoint_uri failed: " . $e->getMessage());
continue;
}
if ($response->getStatus() != 200) {
common_log(LOG_ERR, "Salmon ($class) at $endpoint_uri returned status " .
$response->getStatus() . ': ' . $response->getBody());
continue;
}
try { // Success!
$client = new HTTPClient(); return true;
$client->setBody($xml);
$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) { return false;
common_log(LOG_ERR, "Salmon at $endpoint_uri returned status " .
$response->getStatus() . ': ' . $response->getBody());
return false;
}
return true;
} }
/** /**
...@@ -87,14 +93,16 @@ class Salmon ...@@ -87,14 +93,16 @@ class Salmon
* *
* @param string $text XML fragment to sign, assumed to be Atom * @param string $text XML fragment to sign, assumed to be Atom
* @param Profile $actor Profile of a local user to use as signer * @param Profile $actor Profile of a local user to use as signer
* @param string $class to override the magic envelope signature version, pass a MagicEnvelope subclass here
*
* @return string XML string representation of magic envelope * @return string XML string representation of magic envelope
* *
* @throws Exception on bad profile input or key generation problems * @throws Exception on bad profile input or key generation problems
* @fixme if signing fails, this seems to return the original text without warning. Is there a reason for this? * @fixme if signing fails, this seems to return the original text without warning. Is there a reason for this?
*/ */
public function createMagicEnv($text, $actor) public function createMagicEnv($text, $actor, $class='MagicEnvelope')
{ {
$magic_env = new MagicEnvelope(); $magic_env = new $class();
$user = User::staticGet('id', $actor->id); $user = User::staticGet('id', $actor->id);
if ($user->id) { if ($user->id) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment