* @param boolean $discovery Network discovery if no local cache?
*/
public function getKeyPair(Profile $profile, $discovery=false) {
- $magicsig = Magicsig::getKV('user_id', $profile->id);
+ if (!$profile->isLocal()) common_debug('Getting magic-public-key for non-local profile id=='.$profile->getID());
+ $magicsig = Magicsig::getKV('user_id', $profile->getID());
if ($discovery && !$magicsig instanceof Magicsig) {
+ if (!$profile->isLocal()) common_debug('magic-public-key not found, will do discovery for profile id=='.$profile->getID());
// Throws exception on failure, but does not try to _load_ the keypair string.
$keypair = $this->discoverKeyPair($profile);
$magicsig = new Magicsig();
- $magicsig->user_id = $profile->id;
+ $magicsig->user_id = $profile->getID();
$magicsig->importKeys($keypair);
// save the public key for this profile in our database.
// TODO: If the profile generates a new key remotely, we must be able to replace
throw new ServerException(sprintf('No public key found for profile (id==%d)', $profile->id));
}
- assert($magicsig->publicKey instanceof Crypt_RSA);
+ assert($magicsig->publicKey instanceof \phpseclib\Crypt\RSA);
return $magicsig;
}
* you'll only get the public key ;)
*
* The string will (hopefully) be formatted as described in Magicsig specification:
- * https://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html#anchor13
+ * https://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html
*
* @return string formatted as Magicsig keypair
*/
{
$signer_uri = $profile->getUri();
if (empty($signer_uri)) {
- throw new ServerException(sprintf('Profile missing URI (id==%d)', $profile->id));
+ throw new ServerException(sprintf('Profile missing URI (id==%d)', $profile->getID()));
}
$disco = new Discovery();
// Throws exception on lookup problems
- $xrd = $disco->lookup($signer_uri);
+ try {
+ $xrd = $disco->lookup($signer_uri);
+ } catch (Exception $e) {
+ // Diaspora seems to require us to request the acct: uri
+ $xrd = $disco->lookup($profile->getAcctUri());
+ }
- $link = $xrd->get(Magicsig::PUBLICKEYREL);
- if (is_null($link)) {
- // TRANS: Exception.
- throw new Exception(_m('Unable to locate signer public key.'));
+ common_debug('Will try to find magic-public-key from XRD of profile id=='.$profile->getID());
+ $pubkey = null;
+ if (Event::handle('MagicsigPublicKeyFromXRD', array($xrd, &$pubkey))) {
+ $link = $xrd->get(Magicsig::PUBLICKEYREL);
+ if (is_null($link)) {
+ // TRANS: Exception.
+ throw new Exception(_m('Unable to locate signer public key.'));
+ }
+ $pubkey = $link->href;
+ }
+ if (empty($pubkey)) {
+ throw new ServerException('Empty Magicsig public key. A bug?');
}
// We have a public key element, let's hope it has proper key data.
$keypair = false;
- $parts = explode(',', $link->href);
+ $parts = explode(',', $pubkey);
if (count($parts) == 2) {
$keypair = $parts[1];
} else {
// Backwards compatibility check for separator bug in 0.9.0
- $parts = explode(';', $link->href);
+ $parts = explode(';', $pubkey);
if (count($parts) == 2) {
$keypair = $parts[1];
}
}
if ($keypair === false) {
- // For debugging clarity. Keypair did not pass count()-check above.
+ // For debugging clarity. Keypair did not pass count()-check above.
// TRANS: Exception when public key was not properly formatted.
throw new Exception(_m('Incorrectly formatted public key element.'));
}
$magicsig = Magicsig::generate($this->actor->getUser());
}
assert($magicsig instanceof Magicsig);
- assert($magicsig->privateKey instanceof Crypt_RSA);
+ assert($magicsig->privateKey instanceof \phpseclib\Crypt\RSA);
// Prepare text and metadata for signing
$this->data = Magicsig::base64_url_encode($text);
*
* @return string representation of XML document
*/
- public function toXML($flavour=null) {
+ public function toXML(Profile $target=null, $flavour=null) {
$xs = new XMLStringer();
$xs->startXML(); // header, to point out it's not HTML or anything...
- if (Event::handle('StartMagicEnvelopeToXML', array($this, $xs, $flavour))) {
+ if (Event::handle('StartMagicEnvelopeToXML', array($this, $xs, $flavour, $target))) {
// fall back to our default, normal Magic Envelope XML.
// the $xs element _may_ have had elements added, or could get in the end event
$xs->elementStart('me:env', array('xmlns:me' => self::NS));
$xs->element('me:sig', null, $this->getSignature());
$xs->elementEnd('me:env');
- Event::handle('EndMagicEnvelopeToXML', array($this, $xs, $flavour));
+ Event::handle('EndMagicEnvelopeToXML', array($this, $xs, $flavour, $target));
}
return $xs->getString();
}
{
$dom = new DOMDocument();
if (!$dom->loadXML(Magicsig::base64_url_decode($this->data))) {
- throw new ServerException('Malformed XML in Salmon payload');
+ throw new ClientException('Malformed XML in Salmon payload');
}
switch ($this->data_type) {
$prov->appendChild($alg);
$sig = $dom->createElementNS(self::NS, 'me:sig', $this->getSignature());
$prov->appendChild($sig);
-
+
$dom->documentElement->appendChild($prov);
break;
default:
- throw new ServerException('Unknown Salmon payload data type');
+ throw new ClientException('Unknown Salmon payload data type');
}
return $dom;
}
public function getSignature()
{
+ if (empty($this->sig)) {
+ throw new ServerException('You must first call signMessage before getSignature');
+ }
return $this->sig;
}
return $this->alg;
}
+ public function getData()
+ {
+ return $this->data;
+ }
+
public function getDataType()
{
return $this->data_type;
public function verify(Profile $profile)
{
if ($this->alg != 'RSA-SHA256') {
- common_log(LOG_DEBUG, "Salmon error: bad algorithm");
+ common_log(LOG_DEBUG, 'Salmon error: bad algorithm: '._ve($this->alg));
return false;
}
if ($this->encoding != self::ENCODING) {
- common_log(LOG_DEBUG, "Salmon error: bad encoding");
+ common_log(LOG_DEBUG, 'Salmon error: bad encoding: '._ve($this->encoding));
return false;
}
try {
$magicsig = $this->getKeyPair($profile, true); // Do discovery too if necessary
} catch (Exception $e) {
- common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage());
+ common_log(LOG_DEBUG, "Salmon error: getKeyPair for profile id=={$profile->getID()}: "._ve($e->getMessage()));
return false;
}
if (!$magicsig->verify($this->signingText(), $this->getSignature())) {
+ common_log(LOG_INFO, 'Salmon signature verification failed for profile id=='.$profile->getID());
// TRANS: Client error when incoming salmon slap signature does not verify cryptographically.
throw new ClientException(_m('Salmon signature verification failed.'));
}
+ common_debug('Salmon signature verification successful for profile id=='.$profile->getID());
$this->setActor($profile);
return true;
}