From c16f314ec348205f4741e0171335168720e652d2 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Mon, 25 Oct 2010 21:52:30 -0700 Subject: [PATCH] two-way subscriptions working with federated social accounts --- boot.php | 23 +++- include/Scrape.php | 48 +++++++-- include/auth.php | 3 +- include/salmon.php | 13 ++- mod/contacts.php | 10 ++ mod/dfrn_request.php | 8 +- mod/follow.php | 200 +++++++++++++++++++++++++++++++++++ mod/xrd.php | 13 ++- view/atom_feed.tpl | 3 +- view/auto_request.tpl | 4 +- view/dfrn_request.tpl | 6 +- view/follow.tpl | 10 ++ view/follow_slap.tpl | 24 +++++ view/magicsig.tpl | 8 +- view/theme/default/style.css | 17 ++- 15 files changed, 356 insertions(+), 34 deletions(-) create mode 100644 mod/follow.php create mode 100644 view/follow.tpl create mode 100644 view/follow_slap.tpl diff --git a/boot.php b/boot.php index 8c9248703..1c00598b3 100644 --- a/boot.php +++ b/boot.php @@ -409,7 +409,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) { // post request to $url. $params is an array of post variables. if(! function_exists('post_url')) { -function post_url($url,$params, &$redirects = 0) { +function post_url($url,$params, $headers = null, &$redirects = 0) { $ch = curl_init($url); if(($redirects > 8) || (! $ch)) return false; @@ -419,6 +419,9 @@ function post_url($url,$params, &$redirects = 0) { curl_setopt($ch, CURLOPT_POST,1); curl_setopt($ch, CURLOPT_POSTFIELDS,$params); + if(is_array($headers)) + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + $check_cert = get_config('system','verifyssl'); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); $prx = get_config('system','proxy'); @@ -446,7 +449,7 @@ function post_url($url,$params, &$redirects = 0) { $url_parsed = parse_url($url); if (isset($url_parsed)) { $redirects++; - return post_url($url,$binary,$redirects); + return post_url($url,$binary,$headers,$redirects); } } $a = get_app(); @@ -1256,4 +1259,20 @@ function load_view_file($s) { return file_get_contents($s); }} +// for html,xml parsing - let's say you've got +// an attribute foobar="class1 class2 class3" +// and you want to find out if it contains 'class3'. +// you can't use a normal sub string search because you +// might match 'notclass3' and a regex to do the job is +// possible but a bit complicated. +// pass the attribute string as $attr and the attribute you +// are looking for as $s - returns true if found, otherwise false + +if(! function_exists('attribute_contains')) { +function attribute_contains($attr,$s) { + $a = explode(' ', $attr); + if(count($a) && in_array($s,$a)) + return true; + return false; +}} diff --git a/include/Scrape.php b/include/Scrape.php index 0272dde12..10ec54d13 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -2,15 +2,6 @@ require_once('library/HTML5/Parser.php'); -if(! function_exists('attribute_contains')) { -function attribute_contains($attr,$s) { - $a = explode(' ', $attr); - if(count($a) && in_array($s,$a)) - return true; - return false; -}} - - if(! function_exists('scrape_dfrn')) { function scrape_dfrn($url) { @@ -53,7 +44,7 @@ function scrape_dfrn($url) { $ret['photo'] = $x->getAttribute('src'); if(attribute_contains($x->getAttribute('class'),'key')) $ret['key'] = $x->textContent; - } + } } } @@ -107,3 +98,40 @@ function scrape_meta($url) { return $ret; }} + + +if(! function_exists('scrape_vcard')) { +function scrape_vcard($url) { + + $ret = array(); + $s = fetch_url($url); + + if(! $s) + return $ret; + + $dom = HTML5_Parser::parse($s); + + if(! $dom) + return $ret; + + // Pull out hCard profile elements + + $items = $dom->getElementsByTagName('*'); + foreach($items as $item) { + if(attribute_contains($item->getAttribute('class'), 'vcard')) { + $level2 = $item->getElementsByTagName('*'); + foreach($level2 as $x) { + if(attribute_contains($x->getAttribute('class'),'fn')) + $ret['fn'] = $x->textContent; + if((attribute_contains($x->getAttribute('class'),'photo')) + || (attribute_contains($x->getAttribute('class'),'avatar'))) + $ret['photo'] = $x->getAttribute('src'); + if((attribute_contains($x->getAttribute('class'),'nickname')) + || (attribute_contains($x->getAttribute('class'),'uid'))) + $ret['nick'] = $x->textContent; + } + } + } + + return $ret; +}} diff --git a/include/auth.php b/include/auth.php index 7e04cb2e7..a54b24f08 100644 --- a/include/auth.php +++ b/include/auth.php @@ -41,7 +41,7 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] === 'login'))) { $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname']; - $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); if(count($r)) { $a->contact = $r[0]; @@ -91,6 +91,7 @@ else { $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); if(count($r)) { + $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; } diff --git a/include/salmon.php b/include/salmon.php index c5ad3e825..7f4c32265 100644 --- a/include/salmon.php +++ b/include/salmon.php @@ -105,7 +105,8 @@ $namespaces = <<< EOT xmlns:media="http://purl.org/syndication/atommedia" xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" xmlns:as="http://activitystrea.ms/spec/1.0/" - xmlns:georss="http://www.georss.org/georss" > + xmlns:georss="http://www.georss.org/georss" + xmlns:poco="http://portablecontacts.net/spec/1.0" > EOT; $slap = str_replace('',$namespaces,$slap); @@ -129,7 +130,7 @@ EOT; $rsa->setHash('sha256'); $rsa->loadKey($owner['sprvkey']); - $signature = $rsa->sign($data); + $signature = base64url_encode($rsa->sign($data)); $salmon_tpl = load_view_file('view/magicsig.tpl'); $salmon = replace_macros($salmon_tpl,array( @@ -141,7 +142,13 @@ EOT; )); // slap them - post_url($contact['notify'],$salmon); + post_url($contact['notify'],$salmon, array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($salmon) + )); + $a = get_app(); + echo "CURL returned: " . $a->get_curl_code() . "\n"; + return; } \ No newline at end of file diff --git a/mod/contacts.php b/mod/contacts.php index bd5bf8ea8..936063715 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -8,6 +8,14 @@ function contacts_init(&$a) { if($a->config['register_policy'] != REGISTER_CLOSED) $a->page['aside'] .= ''; + + $tpl = load_view_file('view/follow.tpl'); + $a->page['aside'] .= replace_macros($tpl,array( + '$label' => t('Connect/Follow [profile address]'), + '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + '$follow' => t('Follow') + )); + } function contacts_post(&$a) { @@ -150,6 +158,8 @@ function contacts_content(&$a) { return; } + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + require_once('view/contact_selectors.php'); $tpl = load_view_file("view/contact_edit.tpl"); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index ddf495986..a7296fec0 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -472,13 +472,17 @@ function dfrn_request_content(&$a) { return; // NOTREACHED } else { - + $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : ''); // Normal web request. Display our user's introduction form. if($a->profile['page-flags'] == PAGE_NORMAL) $tpl = load_view_file('view/dfrn_request.tpl'); else $tpl = load_view_file('view/auto_request.tpl'); - $o .= replace_macros($tpl,array('$nickname' => $a->argv[1])); + $o .= replace_macros($tpl,array( + '$nickname' => $a->argv[1], + '$name' => $a->profile['name'], + '$myaddr' => $myaddr + )); return $o; } diff --git a/mod/follow.php b/mod/follow.php new file mode 100644 index 000000000..7ac9a50c3 --- /dev/null +++ b/mod/follow.php @@ -0,0 +1,200 @@ +path)) + $myaddr = urlencode($a->get_baseurl() . '/profile/' . $a->user['nickname']); + else + $myaddr = urlencode($a->user['nickname'] . '@' . $a->get_hostname()); + + goaway($ret['dfrn-request'] . "&address=$myaddr"); + + // NOTREACHED + } + } + + if($hcard) { + $vcard = scrape_vcard($hcard); + } + + if(! $profile) + $profile = $url; + + // do we have enough information? + + if(! x($vcard,'fn')) + if(x($vcard,'nick')) + $vcard['fn'] = $vcard['nick']; + + if(! ((x($vcard['fn'])) && ($poll) && ($notify) && ($profile))) { + notice( t('The profile address specified does not provide adequate information.') . EOL); + goaway($_SESSION['return_url']); + } + + if(! x($vcard,'photo')) + $vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; + + // check if we already have a contact + + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1", + intval(local_user()), + dbesc($poll) + ); + if($r) { + // update contact + if($r[0]['rel'] == REL_VIP) { + q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval(REL_BUD), + intval($r[0]['id']), + intval(local_user()) + ); + } + } + else { + // create contact record + $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, + `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 0 ) ", + intval(local_user()), + dbesc(datetime_convert()), + dbesc($profile), + dbesc($notify), + dbesc($poll), + dbesc($vcard['fn']), + dbesc($vcard['nick']), + dbesc($vcard['photo']), + dbesc('stat'), + intval(REL_FAN) + ); + } + $r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", + dbesc($profile), + intval(local_user()) + ); + if(! count($r)) { + notice( t('Unable to retrieve contact information.') . EOL); + goaway($_SESSION['return_url']); + // NOTREACHED + } + + $contact = $r[0]; + $contact_id = $r[0]['id']; + + require_once("Photo.php"); + + $photo_failure = false; + + $filename = basename($vcard['photo']); + $img_str = fetch_url($vcard['photo'],true); + $img = new Photo($img_str); + if($img->is_valid()) { + + $img->scaleImageSquare(175); + + $hash = photo_new_resource(); + + $r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 4 ); + + if($r === false) + $photo_failure = true; + + $img->scaleImage(80); + + $r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 5 ); + + if($r === false) + $photo_failure = true; + + $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; + $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; + } + else + $photo_failure = true; + + if($photo_failure) { + $photo = $a->get_baseurl() . '/images/default-profile.jpg'; + $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; + } + + $r = q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s' + WHERE `id` = %d LIMIT 1 + ", + dbesc($photo), + dbesc($thumb), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($contact_id) + ); + + + // pull feed and consume it, which should subscribe to the hub. + + + // create a follow slap + + $tpl = load_view_file('view/follow_slap.tpl'); + $slap = replace_macros($tpl, array( + '$name' => $a->user['username'], + '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'], + '$photo' => $a->contact['photo'], + '$thumb' => $a->contact['thumb'], + '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME), + '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(), + '$title' => '', + '$type' => 'text', + '$content' => t('following'), + '$nick' => $a->user['nickname'], + '$verb' => ACTIVITY_FOLLOW + )); + + $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` + WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", + intval(local_user()) + ); + + require_once('include/salmon.php'); + slapper($r[0],$contact,$slap); + + goaway($_SESSION['return_url']); + // NOTREACHED +} diff --git a/mod/xrd.php b/mod/xrd.php index 47516e8dd..0b4bd0d1e 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -5,11 +5,16 @@ require_once('salmon.php'); function xrd_content(&$a) { $uri = urldecode(notags(trim($_GET['uri']))); - $local = str_replace('acct:', '', $uri); - if(substr($local,0,2) == '//') - $local = substr($local,2); - $name = substr($local,0,strpos($local,'@')); + if(substr($uri,0,4) === 'http') + $name = basename($uri); + else { + $local = str_replace('acct:', '', $uri); + if(substr($local,0,2) == '//') + $local = substr($local,2); + + $name = substr($local,0,strpos($local,'@')); + } $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($name) diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl index 142119f49..60522eb50 100644 --- a/view/atom_feed.tpl +++ b/view/atom_feed.tpl @@ -5,7 +5,8 @@ xmlns:media="http://purl.org/syndication/atommedia" xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" xmlns:as="http://activitystrea.ms/spec/1.0/" - xmlns:georss="http://www.georss.org/georss" > + xmlns:georss="http://www.georss.org/georss" + xmlns:poco="http://portablecontacts.net/spec/1.0" > $feed_id $feed_title diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 57c4995d9..fe6e70a46 100644 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -5,7 +5,7 @@ Please enter your profile address from one of the following supported social networks:

@@ -13,7 +13,7 @@ Please enter your profile address from one of the following supported social net
- +
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index df7e3830c..6cc965597 100644 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -6,7 +6,7 @@ You may request a connection with this member if you have a valid profile addres on one of the following social networks:

@@ -14,7 +14,7 @@ on one of the following social networks:
- +
@@ -25,7 +25,7 @@ Please answer the following:

-Do I know you? +Does $name know you?

diff --git a/view/follow.tpl b/view/follow.tpl new file mode 100644 index 000000000..49bebee8b --- /dev/null +++ b/view/follow.tpl @@ -0,0 +1,10 @@ +
+
+ + +
+ +
+
+
+ diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl new file mode 100644 index 000000000..1c4a5f7ce --- /dev/null +++ b/view/follow_slap.tpl @@ -0,0 +1,24 @@ + + + $name + $profile_page + + + + + $item_id + $title + $published + $content + + + http://activitystrea.ms/schema/1.0/person + $profile_page + + + + $nick + $name + + $verb + diff --git a/view/magicsig.tpl b/view/magicsig.tpl index 46b4d4ea4..6707493ca 100644 --- a/view/magicsig.tpl +++ b/view/magicsig.tpl @@ -1,9 +1,9 @@ - - - + + + $data $encoding -$algorithm +$algorithm $signature diff --git a/view/theme/default/style.css b/view/theme/default/style.css index ca4891a76..191f2d50f 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -32,9 +32,12 @@ input, select { border: 1px solid #858585; } input:hover { + background-color: #29BBF2; - color: #F5F6FB; - border: 1px solid #F5F6FB; +/* background-color: #49dbFa; */ + color: black; +/* color: #F5F6FB; */ +/* border: 1px solid #F5F6FB; */ cursor: pointer; } option { @@ -1550,6 +1553,16 @@ a.mail-list-link:hover { margin-top: 10px; } +#side-follow-wrapper { + margin-top: 20px; +} +#side-follow-url { + margin-top: 5px; +} +#side-follow-submit { + margin-top: 15px; +} + .photo-album-image-wrapper { float: left; margin-top: 15px;