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

Moved Diaspora specific metadata to own plugin

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-06-06 13:49:27 +02:00
parent a39f51c044
commit e212f2ae77
4 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/OStatus/EVENTS.txt Normal file
View File

@@ -0,0 +1,7 @@
StartAttachPubkeyToUserXRD: Runs only for XRD generation where a Magicsig exists for a Profile which is a "person".
@param Magicsig $magicsig crypto stuff related to the profile we're representing
@param XRD $xrd the XRD object which holds all data for the profile we're representing
EndAttachPubkeyToUserXRD: Runs only for XRD generation where a Magicsig exists for a Profile which is a "person". And only if StartAttachPubkeyToUserXRD didn't abort.
@param Magicsig $magicsig crypto stuff related to the profile we're representing
@param XRD $xrd the XRD object which holds all data for the profile we're representing

9
plugins/OStatus/OStatusPlugin.php
View File

@@ -1315,11 +1315,14 @@ class OStatusPlugin extends Plugin
$magicsig = Magicsig::generate($target->getUser());
}
if ($magicsig instanceof Magicsig) {
if (!$magicsig instanceof Magicsig) {
return false; // value doesn't mean anything, just figured I'd indicate this function didn't do anything
}
if (Event::handle('StartAttachPubkeyToUserXRD', array($magicsig, $xrd, $target))) {
$xrd->links[] = new XML_XRD_Element_Link(Magicsig::PUBLICKEYREL,
'data:application/magic-public-key,'. $magicsig->toString());
$xrd->links[] = new XML_XRD_Element_Link(Magicsig::DIASPORA_PUBLICKEYREL,
base64_encode($magicsig->exportPublicKey()));
// The following event handles plugins like Diaspora which add their own version of the Magicsig pubkey
Event::handle('EndAttachPubkeyToUserXRD', array($magicsig, $xrd, $target));
}
}

1
plugins/OStatus/classes/Magicsig.php
View File

@@ -36,7 +36,6 @@ require_once 'Crypt/RSA.php';
class Magicsig extends Managed_DataObject
{
const PUBLICKEYREL = 'magic-public-key';
const DIASPORA_PUBLICKEYREL = 'diaspora-public-key';
const DEFAULT_KEYLEN = 1024;
const DEFAULT_SIGALG = 'RSA-SHA256';