X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=1cc258853b9b52e154cfc1b795d93bb089ebd2dc;hb=836058c47745f502890a209dfd6efcb3596ace84;hp=3df36182e18ad34cd065b56eea62752b47b0d168;hpb=033935c19406c8468ed75fdd15a3a532f4e25319;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 3df36182e1..1cc258853b 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -1,297 +1,560 @@ interactive = false; // notice() becomes a no-op since nobody is there to see it -function dfrn_confirm_post(&$a) { - - if($a->argc > 1) - $node = $a->argv[1]; + } + else { + if($a->argc > 1) + $node = $a->argv[1]; + } - // Main entry point. Our user received a friend request notification (perhaps - // from another site) and clicked 'Accept'. $POST['source_url'] is not set. - // They will perform the following: + /** + * + * Main entry point. Scenario 1. Our user received a friend request notification (perhaps + * from another site) and clicked 'Approve'. + * $POST['source_url'] is not set. If it is, it indicates Scenario 2. + * + * We may also have been called directly from dfrn_request ($handsfree != null) due to + * this being a page type which supports automatic friend acceptance. That is also Scenario 1 + * since we are operating on behalf of our registered user to approve a friendship. + * + */ if(! x($_POST,'source_url')) { - $uid = get_uid(); + $uid = ((is_array($handsfree)) ? $handsfree['uid'] : local_user()); if(! $uid) { notice( t('Permission denied.') . EOL ); return; - } + } + + $user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", + intval($uid) + ); + + if(! $user) { + notice( t('Profile not found.') . EOL ); + return; + } - // These come from the friend request notification form. - - $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ""); - $intro_id = intval($_POST['intro_id']); - $duplex = intval($_POST['duplex']); + // These data elements may come from either the friend request notification form or $handsfree array. - // The other person will have been issued an ID when they first requested friendship. - // Locate their record. At this time, their record will have both pending and blocked set to 1. + if(is_array($handsfree)) { + logger('Confirm in handsfree mode'); + $dfrn_id = $handsfree['dfrn_id']; + $intro_id = $handsfree['intro_id']; + $duplex = $handsfree['duplex']; + $hidden = ((array_key_exists('hidden',$handsfree)) ? intval($handsfree['hidden']) : 0 ); + $activity = ((array_key_exists('activity',$handsfree)) ? intval($handsfree['activity']) : 0 ); + } + else { + $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ""); + $intro_id = ((x($_POST,'intro_id')) ? intval($_POST['intro_id']) : 0 ); + $duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 ); + $cid = ((x($_POST,'contact_id')) ? intval($_POST['contact_id']) : 0 ); + $hidden = ((x($_POST,'hidden')) ? intval($_POST['hidden']) : 0 ); + $activity = ((x($_POST,'activity')) ? intval($_POST['activity']) : 0 ); + } - $r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' AND `uid` = %d LIMIT 1", - dbesc($dfrn_id), - intval($uid) + /** + * + * Ensure that dfrn_id has precedence when we go to find the contact record. + * We only want to search based on contact id if there is no dfrn_id, + * e.g. for OStatus network followers. + * + */ + + if(strlen($dfrn_id)) + $cid = 0; + + logger('Confirming request for dfrn_id (issued) ' . $dfrn_id); + if($cid) + logger('Confirming follower with contact_id: ' . $cid); + + + /** + * + * The other person will have been issued an ID when they first requested friendship. + * Locate their record. At this time, their record will have both pending and blocked set to 1. + * There won't be any dfrn_id if this is a network follower, so use the contact_id instead. + * + */ + + $r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d AND `duplex` = 0 LIMIT 1", + dbesc($dfrn_id), + intval($cid), + intval($uid) ); if(! count($r)) { + logger('Contact not found in DB.'); notice( t('Contact not found.') . EOL ); + notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL ); return; } - $contact_id = $r[0]['id']; - $relation = $r[0]['rel']; - $site_pubkey = $r[0]['site-pubkey']; - $dfrn_confirm = $r[0]['confirm']; - $aes_allow = $r[0]['aes_allow']; + $contact = $r[0]; + $contact_id = $contact['id']; + $relation = $contact['rel']; + $site_pubkey = $contact['site-pubkey']; + $dfrn_confirm = $contact['confirm']; + $aes_allow = $contact['aes_allow']; - // Generate a key pair for all further communications with this person. - // We have a keypair for every contact, and a site key for unknown people. - // This provides a means to carry on relationships with other people if - // any single key is compromised. It is a robust key. We're much more - // worried about key leakage than anybody cracking it. + $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); - $res = openssl_pkey_new(array( - 'digest_alg' => 'whirlpool', - 'private_key_bits' => 4096, - 'encrypt_key' => false ) - ); + if($contact['network']) + $network = $contact['network']; + if($network === NETWORK_DFRN) { - $private_key = ''; + /** + * + * Generate a key pair for all further communications with this person. + * We have a keypair for every contact, and a site key for unknown people. + * This provides a means to carry on relationships with other people if + * any single key is compromised. It is a robust key. We're much more + * worried about key leakage than anybody cracking it. + * + */ + require_once('include/crypto.php'); - openssl_pkey_export($res, $private_key); + $res = new_keypair(4096); - $pubkey = openssl_pkey_get_details($res); - $public_key = $pubkey["key"]; - // Save the private key. Send them the public key. + $private_key = $res['prvkey']; + $public_key = $res['pubkey']; - $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", - dbesc($private_key), - intval($contact_id), - intval($uid) - ); + // Save the private key. Send them the public key. + $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d", + dbesc($private_key), + intval($contact_id), + intval($uid) + ); - $params = array(); + $params = array(); - // Per the protocol document, we will verify both ends by encrypting the dfrn_id with our - // site private key (person on the other end can decrypt it with our site public key). - // Then encrypt our profile URL with the other person's site public key. They can decrypt - // it with their site private key. If the decryption on the other end fails for either - // item, it indicates tampering or key failure on at least one site and we will not be - // able to provide a secure communication pathway. + /** + * + * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our + * site private key (person on the other end can decrypt it with our site public key). + * Then encrypt our profile URL with the other person's site public key. They can decrypt + * it with their site private key. If the decryption on the other end fails for either + * item, it indicates tampering or key failure on at least one site and we will not be + * able to provide a secure communication pathway. + * + * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 + * or later) then we encrypt the personal public key we send them using AES-256-CBC and a + * random key which is encrypted with their site public key. + * + */ - // If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 - // or later) then we encrypt the personal public key we send them using AES-256-CBC and a - // random key which is encrypted with their site public key. + $src_aes_key = random_string(); - $src_aes_key = random_string(); + $result = ''; + openssl_private_encrypt($dfrn_id,$result,$user[0]['prvkey']); - $result = ''; - openssl_private_encrypt($dfrn_id,$result,$a->user['prvkey']); + $params['dfrn_id'] = bin2hex($result); + $params['public_key'] = $public_key; - $params['dfrn_id'] = bin2hex($result); - $params['public_key'] = $public_key; + $my_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; - $my_url = $a->get_baseurl() . '/profile/' . $a->user['nickname']; + openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); + $params['source_url'] = bin2hex($params['source_url']); - openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); - $params['source_url'] = bin2hex($params['source_url']); + if($aes_allow && function_exists('openssl_encrypt')) { + openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey); + $params['aes_key'] = bin2hex($params['aes_key']); + $params['public_key'] = bin2hex(openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key)); + } - if($aes_allow && function_exists('openssl_encrypt')) { - openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey); - $params['aes_key'] = bin2hex($params['aes_key']); - $params['public_key'] = bin2hex(openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key)); - } + $params['dfrn_version'] = DFRN_PROTOCOL_VERSION ; + if($duplex == 1) + $params['duplex'] = 1; - $params['dfrn_version'] = DFRN_PROTOCOL_VERSION ; - if($duplex == 1) - $params['duplex'] = 1; + if($user[0]['page-flags'] == PAGE_COMMUNITY) + $params['page'] = 1; + if($user[0]['page-flags'] == PAGE_PRVGROUP) + $params['page'] = 2; - // POST all this stuff to the other site. + logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); - $res = post_url($dfrn_confirm,$params); + /** + * + * POST all this stuff to the other site. + * Temporarily raise the network timeout to 120 seconds because the default 60 + * doesn't always give the other side quite enough time to decrypt everything. + * + */ - // Now figure out what they responded. Try to be robust if the remote site is - // having difficulty and throwing up errors of some kind. + $a->config['system']['curl_timeout'] = 120; - $leading_junk = substr($res,0,strpos($res,'status; - $message = unxmlify($xml->message); // human readable text of what may have gone wrong. - switch($status) { - case 0: - notice( t("Confirmation completed successfully.") . EOL); - if(strlen($message)) - notice( t('Remote site reported: ') . $message . EOL); - break; - case 1: - // birthday paradox - generate new dfrn-id and fall through. - $new_dfrn_id = random_string(); - $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", - dbesc($new_dfrn_id), - intval($contact_id), - intval($uid) + $xml = parse_xml_string($res); + $status = (int) $xml->status; + $message = unxmlify($xml->message); // human readable text of what may have gone wrong. + switch($status) { + case 0: + info( t("Confirmation completed successfully.") . EOL); + if(strlen($message)) + notice( t('Remote site reported: ') . $message . EOL); + break; + case 1: + // birthday paradox - generate new dfrn-id and fall through. + $new_dfrn_id = random_string(); + $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", + dbesc($new_dfrn_id), + intval($contact_id), + intval($uid) + ); + + case 2: + notice( t("Temporary failure. Please wait and try again.") . EOL); + if(strlen($message)) + notice( t('Remote site reported: ') . $message . EOL); + break; + + + case 3: + notice( t("Introduction failed or was revoked.") . EOL); + if(strlen($message)) + notice( t('Remote site reported: ') . $message . EOL); + break; + } + + if(($status == 0) && ($intro_id)) { + + // Success. Delete the notification. + + $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d", + intval($intro_id), + intval($uid) ); - case 2: - notice( t("Temporary failure. Please wait and try again.") . EOL); - if(strlen($message)) - notice( t('Remote site reported: ') . $message . EOL); - break; + } + + if($status != 0) + return; + } - case 3: - notice( t("Introduction failed or was revoked.") . EOL); - if(strlen($message)) - notice( t('Remote site reported: ') . $message . EOL); - break; + /* + * + * We have now established a relationship with the other site. + * Let's make our own personal copy of their profile photo so we don't have + * to always load it from their site. + * + * We will also update the contact record with the nature and scope of the relationship. + * + */ + + require_once('include/Photo.php'); + + $photos = import_profile_photo($contact['photo'],$uid,$contact_id); + + logger('dfrn_confirm: confirm - imported photos'); + + if($network === NETWORK_DFRN) { + + $new_relation = CONTACT_IS_FOLLOWER; + if(($relation == CONTACT_IS_SHARING) || ($duplex)) + $new_relation = CONTACT_IS_FRIEND; + + if(($relation == CONTACT_IS_SHARING) && ($duplex)) + $duplex = 0; + + $r = q("UPDATE `contact` SET + `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `rel` = %d, + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `blocked` = 0, + `pending` = 0, + `duplex` = %d, + `hidden` = %d, + `network` = '%s' WHERE `id` = %d + ", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + intval($new_relation), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($duplex), + intval($hidden), + dbesc(NETWORK_DFRN), + intval($contact_id) + ); + } + else { + + // $network !== NETWORK_DFRN + + $network = (($contact['network']) ? $contact['network'] : NETWORK_OSTATUS); + $notify = (($contact['notify']) ? $contact['notify'] : ''); + $poll = (($contact['poll']) ? $contact['poll'] : ''); + + if((! $contact['notify']) || (! $contact['poll'])) { + $arr = lrdd($contact['url']); + if(count($arr)) { + foreach($arr as $link) { + if($link['@attributes']['rel'] === 'salmon') + $notify = $link['@attributes']['href']; + if($link['@attributes']['rel'] === NAMESPACE_FEED) + $poll = $link['@attributes']['href']; + } + } } - if(($status == 0) && ($intro_id)) { + $new_relation = $contact['rel']; + $writable = $contact['writable']; + + if($network === NETWORK_DIASPORA) { + if($duplex) + $new_relation = CONTACT_IS_FRIEND; + else + $new_relation = CONTACT_IS_SHARING; - // Success. Delete the notification. + if($new_relation != CONTACT_IS_FOLLOWER) + $writable = 1; + } - $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d", intval($intro_id), intval($uid) ); - + + + $r = q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `notify` = '%s', + `poll` = '%s', + `blocked` = 0, + `pending` = 0, + `network` = '%s', + `writable` = %d, + `hidden` = %d, + `rel` = %d + WHERE `id` = %d + ", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($notify), + dbesc($poll), + dbesc($network), + intval($writable), + intval($hidden), + intval($new_relation), + intval($contact_id) + ); } - if($status != 0) - return; - - // We have now established a relationship with the other site. - // Let's make our own personal copy of their profile photo so we don't have - // to always load it from their site. + if($r === false) + notice( t('Unable to set contact photo.') . EOL); - require_once("Photo.php"); + // reload contact info - $photo_failure = false; + $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", + intval($contact_id) + ); + if(count($r)) + $contact = $r[0]; + else + $contact = null; - $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1", - intval($contact_id)); - if(count($r)) { - $filename = basename($r[0]['photo']); - $img_str = fetch_url($r[0]['photo'],true); - $img = new Photo($img_str); - if($img->is_valid()) { + if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) { - $img->scaleImageSquare(175); - - $hash = photo_new_resource(); + if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) { + require_once('include/diaspora.php'); + $ret = diaspora_share($user[0],$r[0]); + logger('mod_follow: diaspora_share returns: ' . $ret); + } - $r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 4 ); + // Send a new friend post if we are allowed to... - if($r === false) - $photo_failure = true; + $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", + intval($uid) + ); - $img->scaleImage(80); + if((count($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) { - $r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 5 ); + require_once('include/items.php'); - if($r === false) - $photo_failure = true; + $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($uid) + ); - $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; - $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; + if(count($self)) { + + $arr = array(); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); + $arr['uid'] = $uid; + $arr['contact-id'] = $self[0]['id']; + $arr['wall'] = 1; + $arr['type'] = 'wall'; + $arr['gravity'] = 0; + $arr['origin'] = 1; + $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; + $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; + $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; + + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + $APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]'; + + $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; + $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; + + $arr['verb'] = ACTIVITY_FRIEND; + $arr['object-type'] = ACTIVITY_OBJ_PERSON; + $arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto; + + $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $contact['name'] . '' + . '' . $contact['url'] . '/' . $contact['name'] . ''; + $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] .= xmlify('' . "\n"); + $arr['object'] .= '' . "\n"; + + $arr['last-child'] = 1; + + $arr['allow_cid'] = $user[0]['allow_cid']; + $arr['allow_gid'] = $user[0]['allow_gid']; + $arr['deny_cid'] = $user[0]['deny_cid']; + $arr['deny_gid'] = $user[0]['deny_gid']; + + $i = item_store($arr); + if($i) + proc_run('php',"include/notifier.php","activity","$i"); + } } - else - $photo_failure = true; } - else - $photo_failure = true; - if($photo_failure) { - $photo = $a->get_baseurl() . '/images/default-profile.jpg'; - $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; - } - $new_relation = REL_VIP; - if(($relation == REL_FAN) || ($duplex)) - $new_relation = REL_BUD; - - $r = q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `rel` = %d, - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', - `blocked` = 0, - `pending` = 0, - `duplex` = %d, - `network` = 'dfrn' WHERE `id` = %d LIMIT 1 - ", - dbesc($photo), - dbesc($thumb), - intval($new_relation), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($duplex), - intval($contact_id) + $g = q("select def_gid from user where uid = %d limit 1", + intval($uid) ); - if($r === false) - notice( t('Unable to set contact photo.') . EOL); - + if($contact && $g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($uid,'',$contact['id'],$g[0]['def_gid']); + } // Let's send our user to the contact editor in case they want to // do anything special with this new friend. - - goaway($a->get_baseurl() . '/contacts/' . intval($contact_id)); - return; //NOTREACHED - } - - - - // End of first scenario. [Local confirmation of remote friend request]. - + if($handsfree === null) + goaway($a->get_baseurl() . '/contacts/' . intval($contact_id)); + else + return; + //NOTREACHED + } - // Begin scenario two. This is the remote response to the above scenario. - // This will take place on the site that originally initiated the friend request. - // In the section above where the confirming party makes a POST and - // retrieves xml status information, they are communicating with the following code. + /** + * + * + * End of Scenario 1. [Local confirmation of remote friend request]. + * + * Begin Scenario 2. This is the remote response to the above scenario. + * This will take place on the site that originally initiated the friend request. + * In the section above where the confirming party makes a POST and + * retrieves xml status information, they are communicating with the following code. + * + */ if(x($_POST,'source_url')) { // We are processing an external confirmation to an introduction created by our user. - $public_key = $_POST['public_key']; - $dfrn_id = hex2bin($_POST['dfrn_id']); - $source_url = hex2bin($_POST['source_url']); - $aes_key = $_POST['aes_key']; - $duplex = $_POST['duplex']; - $version_id = (float) $_POST['dfrn_version']; + $public_key = ((x($_POST,'public_key')) ? $_POST['public_key'] : ''); + $dfrn_id = ((x($_POST,'dfrn_id')) ? hex2bin($_POST['dfrn_id']) : ''); + $source_url = ((x($_POST,'source_url')) ? hex2bin($_POST['source_url']) : ''); + $aes_key = ((x($_POST,'aes_key')) ? $_POST['aes_key'] : ''); + $duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 ); + $page = ((x($_POST,'page')) ? intval($_POST['page']) : 0 ); + $version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0); + + $forum = (($page == 1) ? 1 : 0); + $prv = (($page == 2) ? 1 : 0); + + logger('dfrn_confirm: requestee contacted: ' . $node); + logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA); // If $aes_key is set, both of these items require unpacking from the hex transport encoding. @@ -306,7 +569,7 @@ function dfrn_confirm_post(&$a) { dbesc($node)); if(! count($r)) { - $message = t('No user record found for ') . '\'' . $node . '\''; + $message = sprintf(t('No user record found for \'%s\' '), $node); xml_status(3,$message); // failure // NOTREACHED } @@ -315,7 +578,7 @@ function dfrn_confirm_post(&$a) { $local_uid = $r[0]['uid']; - if(! strstr($my_prvkey,'BEGIN RSA PRIVATE KEY')) { + if(! strstr($my_prvkey,'PRIVATE KEY')) { $message = t('Our site encryption key is apparently messed up.'); xml_status(3,$message); } @@ -336,12 +599,22 @@ function dfrn_confirm_post(&$a) { dbesc($decrypted_source_url), intval($local_uid) ); - if(! count($ret)) { - // this is either a bogus confirmation (?) or we deleted the original introduction. - $message = t('Contact record was not found for you on our site.'); - xml_status(3,$message); - return; // NOTREACHED + if(strstr($decrypted_source_url,'http:')) + $newurl = str_replace('http:','https:',$decrypted_source_url); + else + $newurl = str_replace('https:','http:',$decrypted_source_url); + + $ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", + dbesc($newurl), + intval($local_uid) + ); + if(! count($ret)) { + // this is either a bogus confirmation (?) or we deleted the original introduction. + $message = t('Contact record was not found for you on our site.'); + xml_status(3,$message); + return; // NOTREACHED + } } $relation = $ret[0]['rel']; @@ -351,6 +624,11 @@ function dfrn_confirm_post(&$a) { $foreign_pubkey = $ret[0]['site-pubkey']; $dfrn_record = $ret[0]['id']; + if(! $foreign_pubkey) { + $message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl); + xml_status(3,$message); + } + $decrypted_dfrn_id = ""; openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey); @@ -364,8 +642,7 @@ function dfrn_confirm_post(&$a) { } $r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1", - dbesc($decrypted_dfrn_id), - intval($local_uid) + dbesc($decrypted_dfrn_id) ); if(count($r)) { $message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); @@ -373,7 +650,7 @@ function dfrn_confirm_post(&$a) { // NOTREACHED } - $r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d", dbesc($decrypted_dfrn_id), dbesc($dfrn_pubkey), intval($dfrn_record) @@ -383,76 +660,69 @@ function dfrn_confirm_post(&$a) { xml_status(3,$message); } + // It's possible that the other person also requested friendship. + // If it is a duplex relationship, ditch the issued-id if one exists. + + if($duplex) { + $r = q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d", + intval($dfrn_record) + ); + } + // We're good but now we have to scrape the profile photo and send notifications. - require_once("Photo.php"); - $photo_failure = false; $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1", intval($dfrn_record)); - if(count($r)) { - $filename = basename($r[0]['photo']); - $img_str = fetch_url($r[0]['photo'],true); - $img = new Photo($img_str); - if($img->is_valid()) { + if(count($r)) + $photo = $r[0]['photo']; + else + $photo = $a->get_baseurl() . '/images/person-175.jpg'; - $img->scaleImageSquare(175); - - $hash = photo_new_resource(); + require_once("include/Photo.php"); - $r = $img->store($local_uid, $dfrn_record, $hash, $filename, t('Contact Photos') , 4); + $photos = import_profile_photo($photo,$local_uid,$dfrn_record); - if($r === false) - $photo_failure = true; - - $img->scaleImage(80); - $r = $img->store($local_uid, $dfrn_record, $hash, $filename, t('Contact Photos') , 5); + logger('dfrn_confirm: request - photos imported'); - if($r === false) - $photo_failure = true; + $new_relation = CONTACT_IS_SHARING; + if(($relation == CONTACT_IS_FOLLOWER) || ($duplex)) + $new_relation = CONTACT_IS_FRIEND; - $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; - $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; - } - else - $photo_failure = true; - } - else - $photo_failure = true; + if(($relation == CONTACT_IS_FOLLOWER) && ($duplex)) + $duplex = 0; - if($photo_failure) { - $photo = $a->get_baseurl() . '/images/default-profile.jpg'; - $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; - } - - $new_relation = REL_FAN; - if(($relation == REL_VIP) || ($duplex)) - $new_relation = REL_BUD; - - $r = q("UPDATE `contact` SET - `photo` = '%s', - `thumb` = '%s', - `rel` = %d, - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', - `blocked` = 0, + $r = q("UPDATE `contact` SET + `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `rel` = %d, + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `blocked` = 0, `pending` = 0, - `duplex` = %d, - `network` = 'dfrn' WHERE `id` = %d LIMIT 1 + `duplex` = %d, + `forum` = %d, + `prv` = %d, + `network` = '%s' WHERE `id` = %d ", - dbesc($photo), - dbesc($thumb), + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), intval($new_relation), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()), intval($duplex), + intval($forum), + intval($prv), + dbesc(NETWORK_DFRN), intval($dfrn_record) ); - if($r === false) { // indicates schema is messed up or total db failure + if($r === false) { // indicates schema is messed up or total db failure $message = t('Unable to update your contact profile details on our system'); xml_status(3,$message); } @@ -460,30 +730,90 @@ function dfrn_confirm_post(&$a) { // Otherwise everything seems to have worked and we are almost done. Yay! // Send an email notification - $r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` + logger('dfrn_confirm: request: info updated'); + + $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` WHERE `contact`.`id` = %d LIMIT 1", intval($dfrn_record) ); + + if(count($r)) + $combined = $r[0]; + if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { + $mutual = ($new_relation == CONTACT_IS_FRIEND); + notification(array( + 'type' => NOTIFY_CONFIRM, + 'notify_flags' => $r[0]['notify-flags'], + 'language' => $r[0]['language'], + 'to_name' => $r[0]['username'], + 'to_email' => $r[0]['email'], + 'uid' => $r[0]['uid'], + 'link' => $a->get_baseurl() . '/contacts/' . $dfrn_record, + 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')), + 'source_link' => $r[0]['url'], + 'source_photo' => $r[0]['photo'], + 'verb' => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW), + 'otype' => 'intro' + )); + } - $tpl = (($new_relation == REL_BUD) - ? load_view_file('view/friend_complete_eml.tpl') - : load_view_file('view/intro_complete_eml.tpl')); - - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $r[0]['username'], - '$email' => $r[0]['email'], - '$fn' => $r[0]['name'], - '$dfrn_url' => $r[0]['url'], - '$uid' => $newuid ) + // Send a new friend post if we are allowed to... + + if($page && intval(get_pconfig($local_uid,'system','post_joingroup'))) { + $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", + intval($local_uid) ); - - $res = mail($r[0]['email'], t("Connection accepted at ") . $a->config['sitename'], - $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] ); - if(!$res) { - // pointless throwing an error here and confusing the person at the other end of the wire. + + if((count($r)) && ($r[0]['hide-friends'] == 0)) { + + require_once('include/items.php'); + + $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($local_uid) + ); + + if(count($self)) { + + $arr = array(); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); + $arr['uid'] = $local_uid; + $arr['contact-id'] = $self[0]['id']; + $arr['wall'] = 1; + $arr['type'] = 'wall'; + $arr['gravity'] = 0; + $arr['origin'] = 1; + $arr['author-name'] = $arr['owner-name'] = $self[0]['name']; + $arr['author-link'] = $arr['owner-link'] = $self[0]['url']; + $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; + + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + $APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]'; + + $B = '[url=' . $combined['url'] . ']' . $combined['name'] . '[/url]'; + $BPhoto = '[url=' . $combined['url'] . ']' . '[img]' . $combined['thumb'] . '[/img][/url]'; + + $arr['verb'] = ACTIVITY_JOIN; + $arr['object-type'] = ACTIVITY_OBJ_GROUP; + $arr['body'] = sprintf( t('%1$s has joined %2$s'), $A, $B)."\n\n\n" .$BPhoto; + $arr['object'] = '' . ACTIVITY_OBJ_GROUP . '' . $combined['name'] . '' + . '' . $combined['url'] . '/' . $combined['name'] . ''; + $arr['object'] .= '' . xmlify('' . "\n"); + $arr['object'] .= xmlify('' . "\n"); + $arr['object'] .= '' . "\n"; + + $arr['last-child'] = 1; + + $arr['allow_cid'] = $user[0]['allow_cid']; + $arr['allow_gid'] = $user[0]['allow_gid']; + $arr['deny_cid'] = $user[0]['deny_cid']; + $arr['deny_gid'] = $user[0]['deny_gid']; + + $i = item_store($arr); + if($i) + proc_run('php',"include/notifier.php","activity","$i"); + + } } } xml_status(0); // Success @@ -494,7 +824,7 @@ function dfrn_confirm_post(&$a) { // somebody arrived here by mistake or they are fishing. Send them to the homepage. - goaway($a->get_baseurl()); + goaway(z_root()); // NOTREACHED }