Provide the ability to subscribe to our user from other federated sites.

This is a read-only relationship until the rest of the salmon
magic-envelope stuff lands
This commit is contained in:
Mike Macgirvin 2010-10-12 19:32:15 -07:00
parent f1977d420e
commit 3c440f70c6
3 changed files with 161 additions and 120 deletions

View File

@ -2,10 +2,11 @@
set_time_limit(0); set_time_limit(0);
define ( 'BUILD_ID' , 1007 ); define ( 'BUILD_ID', 1007 );
define ( 'DFRN_PROTOCOL_VERSION', '2.0');
define ( 'EOL', "<br />\r\n"); define ( 'EOL', "<br />\r\n");
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'REGISTER_CLOSED', 0); define ( 'REGISTER_CLOSED', 0);
define ( 'REGISTER_APPROVE', 1); define ( 'REGISTER_APPROVE', 1);
@ -34,6 +35,7 @@ define ( 'NAMESPACE_TOMB' , 'http://purl.org/atompub/tombstones/1.0' )
define ( 'NAMESPACE_ACTIVITY', 'http://activitystrea.ms/spec/1.0/' ); define ( 'NAMESPACE_ACTIVITY', 'http://activitystrea.ms/spec/1.0/' );
define ( 'NAMESPACE_ACTIVITY_SCHEMA', 'http://activitystrea.ms/schema/1.0/'); define ( 'NAMESPACE_ACTIVITY_SCHEMA', 'http://activitystrea.ms/schema/1.0/');
define ( 'NAMESPACE_SALMON_ME', 'http://salmon-protocol.org/ns/magic-env'); define ( 'NAMESPACE_SALMON_ME', 'http://salmon-protocol.org/ns/magic-env');
define ( 'NAMESPACE_OSTATUSSUB', 'http://ostatus.org/schema/1.0/subscribe');
define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' ); define ( 'ACTIVITY_LIKE', NAMESPACE_ACTIVITY_SCHEMA . 'like' );
define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' ); define ( 'ACTIVITY_DISLIKE', NAMESPACE_DFRN . '/dislike' );
@ -848,6 +850,10 @@ function webfinger_dfrn($s) {
foreach($links as $link) foreach($links as $link)
if($link['@attributes']['rel'] === NAMESPACE_DFRN) if($link['@attributes']['rel'] === NAMESPACE_DFRN)
return $link['@attributes']['href']; return $link['@attributes']['href'];
foreach($links as $link)
if($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB)
return 'stat:' . $link['@attributes']['template'];
} }
return ''; return '';
}} }}

View File

@ -183,143 +183,175 @@ function dfrn_request_post(&$a) {
$url = webfinger_dfrn($url); $url = webfinger_dfrn($url);
if(substr($url,0,5) === 'stat:') {
$network = 'stat';
$url = substr($url,5);
}
else {
$network = 'dfrn';
}
if(! strlen($url)) { if(! strlen($url)) {
notice( t("Unable to resolve your name at the provided location.") . EOL); notice( t("Unable to resolve your name at the provided location.") . EOL);
return; return;
} }
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
intval($uid),
dbesc($url)
);
if(count($ret)) { if($network == 'dfrn') {
if(strlen($ret[0]['issued-id'])) { $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
notice( t('You have already introduced yourself here.') . EOL ); intval($uid),
return; dbesc($url)
}
else {
$contact_record = $ret[0];
$parms = array('dfrn-request' => $ret[0]['request']);
}
}
$issued_id = random_string();
if(is_array($contact_record)) {
// There is a contact record but no issued-id, so this
// is a reciprocal introduction from a known contact
$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
dbesc($issued_id),
intval($contact_record['id'])
); );
}
else {
if(! validate_url($url)) {
notice( t('Invalid profile URL.') . EOL);
goaway($a->get_baseurl() . '/' . $a->cmd);
return; // NOTREACHED
}
if(! allowed_url($url)) {
notice( t('Disallowed profile URL.') . EOL);
goaway($a->get_baseurl() . '/' . $a->cmd);
return; // NOTREACHED
}
require_once('Scrape.php');
$parms = scrape_dfrn($url);
if(! count($parms)) {
notice( t('Profile location is not valid or does not contain profile information.') . EOL );
goaway($a->get_baseurl() . '/' . $a->cmd);
}
else {
if(! x($parms,'fn'))
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
if(! x($parms,'photo'))
notice( t('Warning: profile location has no profile photo.') . EOL );
$invalid = validate_dfrn($parms);
if($invalid) {
notice( $invalid . t(' required parameter')
. (($invalid == 1) ? t(" was ") : t("s were ") )
. t("not found at the given location.") . EOL ) ;
if(count($ret)) {
if(strlen($ret[0]['issued-id'])) {
notice( t('You have already introduced yourself here.') . EOL );
return; return;
} }
else {
$contact_record = $ret[0];
$parms = array('dfrn-request' => $ret[0]['request']);
}
} }
$issued_id = random_string();
if(is_array($contact_record)) {
$parms['url'] = $url; // There is a contact record but no issued-id, so this
$parms['issued-id'] = $issued_id; // is a reciprocal introduction from a known contact
$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
dbesc($issued_id),
dbesc_array($parms); intval($contact_record['id'])
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `issued-id`, `photo`, `site-pubkey`, );
`request`, `confirm`, `notify`, `poll` ) }
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", else {
intval($uid), if(! validate_url($url)) {
datetime_convert(), notice( t('Invalid profile URL.') . EOL);
$parms['url'], goaway($a->get_baseurl() . '/' . $a->cmd);
$parms['fn'], return; // NOTREACHED
$parms['issued-id'], }
$parms['photo'],
$parms['key'], if(! allowed_url($url)) {
$parms['dfrn-request'], notice( t('Disallowed profile URL.') . EOL);
$parms['dfrn-confirm'], goaway($a->get_baseurl() . '/' . $a->cmd);
$parms['dfrn-notify'], return; // NOTREACHED
$parms['dfrn-poll'] }
);
// find the contact record we just created require_once('Scrape.php');
if($r) {
$r = q("SELECT `id` FROM `contact` $parms = scrape_dfrn($url);
WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
intval($uid), if(! count($parms)) {
$parms['url'], notice( t('Profile location is not valid or does not contain profile information.') . EOL );
$parms['issued-id'] goaway($a->get_baseurl() . '/' . $a->cmd);
}
else {
if(! x($parms,'fn'))
notice( t('Warning: profile location has no identifiable owner name.') . EOL );
if(! x($parms,'photo'))
notice( t('Warning: profile location has no profile photo.') . EOL );
$invalid = validate_dfrn($parms);
if($invalid) {
notice( $invalid . t(' required parameter')
. (($invalid == 1) ? t(" was ") : t("s were ") )
. t("not found at the given location.") . EOL ) ;
return;
}
}
$parms['url'] = $url;
$parms['issued-id'] = $issued_id;
dbesc_array($parms);
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `issued-id`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll` )
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($uid),
datetime_convert(),
$parms['url'],
$parms['fn'],
$parms['issued-id'],
$parms['photo'],
$parms['key'],
$parms['dfrn-request'],
$parms['dfrn-confirm'],
$parms['dfrn-notify'],
$parms['dfrn-poll']
);
// find the contact record we just created
if($r) {
$r = q("SELECT `id` FROM `contact`
WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
intval($uid),
$parms['url'],
$parms['issued-id']
);
if(count($r))
$contact_record = $r[0];
}
}
if($r === false) {
notice( t('Failed to update contact record.') . EOL );
return;
}
$hash = random_string() . (string) time(); // Generate a confirm_key
if(is_array($contact_record)) {
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
intval($uid),
intval($contact_record['id']),
((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
dbesc(notags(trim($_POST['dfrn-request-message']))),
dbesc($hash),
dbesc(datetime_convert())
); );
if(count($r))
$contact_record = $r[0];
} }
}
if($r === false) {
notice( t('Failed to update contact record.') . EOL );
return;
}
$hash = random_string() . (string) time(); // Generate a confirm_key // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
if(is_array($contact_record)) { if(! $failed)
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`) notice( t('Your introduction has been sent.') . EOL );
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
intval($uid), // "Homecoming" - send the requestor back to their site to record the introduction.
intval($contact_record['id']),
((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0), $dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
dbesc(notags(trim($_POST['dfrn-request-message']))), $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
dbesc($hash),
dbesc(datetime_convert()) goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&confirm_key=' . $hash
. (($aes_allow) ? "&aes_allow=1" : "")
); );
// NOTREACHED
// END $network === 'dfrn'
} }
elseif($network === 'stat') {
/**
*
* OStatus network
* Check contact existence
* Try and scrape together enough information to create a contact record, with us as REL_VIP
* Substitute our user's feed URL into $url template
* Send the subscriber home to subscribe
*
**/
// This notice will only be seen by the requestor if the requestor and requestee are on the same server. $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url);
goaway($url);
// NOTREACHED
// END $network === 'stat'
}
if(! $failed) } return;
notice( t('Your introduction has been sent.') . EOL );
// "Homecoming" - send the requestor back to their site to record the introduction.
$dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" . '&confirm_key=' . $hash . (($aes_allow) ? "&aes_allow=1" : ""));
return; // NOTREACHED
}
return;
}} }}

View File

@ -4,7 +4,10 @@
<p id="dfrn-request-intro"> <p id="dfrn-request-intro">
You may request a connection with this member if you have a valid profile address<br /> You may request a connection with this member if you have a valid profile address<br />
on one of the following social networks:<br /> on one of the following social networks:<br />
<ul id="dfrn-request-networks"><li><a href="http://dfrn.org">mistpark/DFRN</a></li></ul> <ul id="dfrn-request-networks">
<li><a href="http://dfrn.org">Mistpark/DFRN</a> (fully supported)</li>
<li><a href="http://ostatus.org">Federation/OStatus/Diaspora/GNU-social</a> (limited - experimental)</li>
</ul>
</p> </p>
<form action="dfrn_request/$nickname" method="post" /> <form action="dfrn_request/$nickname" method="post" />