eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

OStatus: initial hookup of remote group membership (notice delivery not yet working quite right)

Browse Source 
- added a temp config var to disable salmon magic signatures until they're working consistently
This commit is contained in:
Brion Vibber
2010-02-22 09:43:27 -08:00
parent 7e8c3ea418
commit 06f155c02d
7 changed files with 336 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/OStatus/lib/salmonaction.php
View File

@@ -41,7 +41,7 @@ class SalmonAction extends Action
$this->clientError(_('This method requires a POST.'));
}
if ($_SERVER['CONTENT_TYPE'] != 'application/atom+xml') {
if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/atom+xml') {
$this->clientError(_('Salmon requires application/atom+xml'));
}
@@ -57,11 +57,13 @@ class SalmonAction extends Action
// Check the signature
$salmon = new Salmon;
if (!$salmon->verifyMagicEnv($dom)) {
common_log(LOG_DEBUG, "Salmon signature verification failed.");
$this->clientError(_m('Salmon signature verification failed.'));
if (!common_config('ostatus', 'skip_signatures')) {
if (!$salmon->verifyMagicEnv($dom)) {
common_log(LOG_DEBUG, "Salmon signature verification failed.");
$this->clientError(_m('Salmon signature verification failed.'));
}
}
$this->act = new Activity($dom->documentElement);
return true;
}
@@ -101,6 +103,9 @@ class SalmonAction extends Action
case ActivityVerb::JOIN:
$this->handleJoin();
break;
case ActivityVerb::LEAVE:
$this->handleLeave();
break;
default:
throw new ClientException(_("Unimplemented."));
}
@@ -154,6 +159,14 @@ class SalmonAction extends Action
throw new ClientException(_("Unimplemented!"));
}
/**
* Hmmmm
*/
function handleLeave()
{
throw new ClientException(_("Unimplemented!"));
}
/**
* @return Ostatus_profile
*/