protected $oprofile = null; // Ostatus_profile of the actor
protected $actor = null; // Profile object of the actor
+ var $format = 'text'; // error messages will be printed in plaintext
+
var $xml = null;
var $activity = null;
var $target = null;
if (!isset($_SERVER['CONTENT_TYPE'])) {
// TRANS: Client error. Do not translate "Content-type"
- $this->clientError(_m('Salmon requires a Content-type header.'));
+ throw new ClientException(_m('Salmon requires a Content-type header.'));
}
$envxml = null;
switch ($_SERVER['CONTENT_TYPE']) {
break;
default:
// TRANS: Client error. Do not translate the quoted "application/[type]" strings.
- $this->clientError(_m('Salmon requires "application/magic-envelope+xml". For Diaspora we also accept "application/x-www-form-urlencoded" with an "xml" parameter.', 415));
+ throw new ClientException(_m('Salmon requires "application/magic-envelope+xml". For Diaspora we also accept "application/x-www-form-urlencoded" with an "xml" parameter.', 415));
}
+ if (empty($envxml)) {
+ throw new ClientException('No magic envelope supplied in POST.');
+ }
try {
- if (empty($envxml)) {
- throw new ClientException('No magic envelope supplied in POST.');
- }
$magic_env = new MagicEnvelope($envxml); // parse incoming XML as a MagicEnvelope
$entry = $magic_env->getPayload(); // Not cryptographically verified yet!
common_log(LOG_ERR, "broken actor: " . var_export($this->activity->actor->id, true));
common_log(LOG_ERR, "activity with no actor: " . var_export($this->activity, true));
// TRANS: Exception.
- throw new Exception(_m('Received a salmon slap from unidentified actor.'));
+ throw new ClientException(_m('Activity in salmon slap has no actor id.'));
}
// ensureProfiles sets $this->actor and $this->oprofile
$this->ensureProfiles();
} catch (Exception $e) {
common_debug('Salmon envelope parsing failed with: '.$e->getMessage());
- $this->clientError($e->getMessage());
+ // convert exception to ClientException
+ throw new ClientException($e->getMessage());
}
- // Cryptographic verification test
- if (!$magic_env->verify($this->actor)) {
- common_log(LOG_DEBUG, "Salmon signature verification failed.");
- // TRANS: Client error.
- $this->clientError(_m('Salmon signature verification failed.'));
- }
+ // Cryptographic verification test, throws exception on failure
+ $magic_env->verify($this->actor);
+
+ common_debug('Salmon slap is carrying activity URI=='._ve($this->activity->id));
return true;
}
{
parent::handle();
+ assert($this->activity instanceof Activity);
+ assert($this->target instanceof Profile);
+
common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
+
+ try {
+ $options = [ 'source' => 'ostatus' ];
+ common_debug('Save salmon slap directly with Notice::saveActivity for actor=='.$this->actor->getID());
+ $stored = Notice::saveActivity($this->activity, $this->actor, $options);
+ common_debug('Save salmon slap finished, notice id=='.$stored->getID());
+ return true;
+ } catch (AlreadyFulfilledException $e) {
+ // The action's results are already fulfilled. Maybe it was a
+ // duplicate? Maybe someone's database is out of sync?
+ // Let's just accept it and move on.
+ common_log(LOG_INFO, 'Salmon slap carried an event which had already been fulfilled.');
+ return true;
+ } catch (NoticeSaveException $e) {
+ common_debug('Notice::saveActivity did not save our '._ve($this->activity->verb).' activity, trying old-fashioned salmon saving.');
+ }
+
try {
if (Event::handle('StartHandleSalmonTarget', array($this->activity, $this->target)) &&
Event::handle('StartHandleSalmon', array($this->activity))) {
function saveNotice()
{
if (!$this->oprofile instanceof Ostatus_profile) {
- common_debug('Ostatus_profile missing in ' . get_class(). ' profile: '.var_export($this->profile));
+ common_debug('Ostatus_profile missing in ' . get_class(). ' profile: '.var_export($this->profile, true));
}
return $this->oprofile->processPost($this->activity, 'salmon');
}