Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 13:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

more instrumentation on dfrn_confirm to help track down why it quietly gives up on occasion with no helpful log messages.

Browse source
This commit is contained in:
Friendika 2010-12-08 15:30:26 -08:00
parent a42b9ea3de
commit 4d0f0f9a94
1 changed files with 116 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

166
mod/dfrn_confirm.php
View file

@ -1,14 +1,28 @@
<?php <?php
// There are two possible entry points. /*
* Module: dfrn_confirm
* Purpose: Friendship acceptance for DFRN contacts
*
* There are two possible entry points and three scenarios.
*
* 1. A form was submitted by our user approving a friendship that originated elsewhere.
* This may also be called from dfrn_request to automatically approve a friendship.
*
* 2. We may be the target or other side of the conversation to scenario 1, and will
* interact with that process on our own user's behalf.
*
*/
function dfrn_confirm_post(&$a,$handsfree = null) { function dfrn_confirm_post(&$a,$handsfree = null) {
if(is_array($handsfree)) { if(is_array($handsfree)) {
// called directly from dfrn_request due to automatic friend acceptance /**
// any $_POST parameters we may require are supplied in the $handsfree array * We were called directly from dfrn_request due to automatic friend acceptance.
* Any $_POST parameters we may require are supplied in the $handsfree array.
*
*/
$node = $handsfree['node']; $node = $handsfree['node'];
$a->interactive = false; // notice() becomes a no-op since nobody is there to see it $a->interactive = false; // notice() becomes a no-op since nobody is there to see it
@ -19,10 +33,17 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$node = $a->argv[1]; $node = $a->argv[1];
} }
// Main entry point. Our user received a friend request notification (perhaps /**
// from another site) and clicked 'Approve'. $POST['source_url'] is not set. *
// OR we have been called directly from dfrn_request ($handsfree != null) due to * Main entry point. Scenario 1. Our user received a friend request notification (perhaps
// this being a page type which supports automatic friend acceptance. * 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')) { if(! x($_POST,'source_url')) {
@ -43,27 +64,44 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
} }
// These come from either the friend request notification form or $handsfree array. // These data elements may come from either the friend request notification form or $handsfree array.
if(is_array($handsfree)) { if(is_array($handsfree)) {
logger('dfrn_confirm: Confirm in handsfree mode');
$dfrn_id = $handsfree['dfrn_id']; $dfrn_id = $handsfree['dfrn_id'];
$intro_id = $handsfree['intro_id']; $intro_id = $handsfree['intro_id'];
$duplex = $handsfree['duplex']; $duplex = $handsfree['duplex'];
logger('dfrn_confirm: Confirm in handsfree mode');
} }
else { else {
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ""); $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : "");
$intro_id = intval($_POST['intro_id']); $intro_id = ((x($_POST,'intro_id')) ? intval($_POST['intro_id']) : 0 );
$duplex = intval($_POST['duplex']); $duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 );
$cid = intval($_POST['contact_id']); $cid = ((x($_POST,'contact_id')) ? intval($_POST['contact_id']) : 0 );
} }
/**
*
* 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('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id); logger('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id);
if($cid)
logger('dfrn_confirm: 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. * 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 LIMIT 1", $r = q("SELECT * FROM `contact` WHERE ( ( `issued-id` != '' AND `issued-id` = '%s' ) OR ( `id` = %d AND `id` != 0 ) ) AND `uid` = %d LIMIT 1",
dbesc($dfrn_id), dbesc($dfrn_id),
@ -72,6 +110,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
); );
if(! count($r)) { if(! count($r)) {
logger('dfrn_confirm: Contact not found in DB.');
notice( t('Contact not found.') . EOL ); notice( t('Contact not found.') . EOL );
return; return;
} }
@ -88,11 +127,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
if($network === 'dfrn') { if($network === 'dfrn') {
// 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 * Generate a key pair for all further communications with this person.
// any single key is compromised. It is a robust key. We're much more * We have a keypair for every contact, and a site key for unknown people.
// worried about key leakage than anybody cracking it. * 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.
*
*/
$res = openssl_pkey_new(array( $res = openssl_pkey_new(array(
'digest_alg' => 'sha1', 'digest_alg' => 'sha1',
@ -100,7 +143,6 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
'encrypt_key' => false ) 'encrypt_key' => false )
); );
$private_key = ''; $private_key = '';
openssl_pkey_export($res, $private_key); openssl_pkey_export($res, $private_key);
@ -118,16 +160,20 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$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 * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our
// it with their site private key. If the decryption on the other end fails for either * site private key (person on the other end can decrypt it with our site public key).
// item, it indicates tampering or key failure on at least one site and we will not be * Then encrypt our profile URL with the other person's site public key. They can decrypt
// able to provide a secure communication pathway. * 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
// If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 * able to provide a secure communication pathway.
// 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();
@ -153,7 +199,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
if($duplex == 1) if($duplex == 1)
$params['duplex'] = 1; $params['duplex'] = 1;
logger('dfrn_confirm: Confirm: posted data: ' . print_r($params,true), LOGGER_DATA); logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
// POST all this stuff to the other site. // POST all this stuff to the other site.
@ -233,9 +279,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
return; 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. *
* 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("Photo.php"); require_once("Photo.php");
@ -276,12 +329,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
); );
} }
else { else {
// $network !== 'dfrn'
$notify = ''; $notify = '';
$poll = ''; $poll = '';
// $network !== 'dfrn'
$arr = lrdd($contact['url']); $arr = lrdd($contact['url']);
if(count($arr)) { if(count($arr)) {
foreach($arr as $link) { foreach($arr as $link) {
@ -332,31 +384,33 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
if($handsfree === null) if($handsfree === null)
goaway($a->get_baseurl() . '/contacts/' . intval($contact_id)); goaway($a->get_baseurl() . '/contacts/' . intval($contact_id));
return; //NOTREACHED else
return;
//NOTREACHED
} }
/**
*
// End of first scenario. [Local confirmation of remote friend request]. *
* End of Scenario 1. [Local confirmation of remote friend request].
*
* Begin Scenario 2. This is the remote response to the above scenario.
// 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.
// 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
// In the section above where the confirming party makes a POST and * retrieves xml status information, they are communicating with the following code.
// retrieves xml status information, they are communicating with the following code. *
*/
if(x($_POST,'source_url')) { if(x($_POST,'source_url')) {
// We are processing an external confirmation to an introduction created by our user. // We are processing an external confirmation to an introduction created by our user.
$public_key = $_POST['public_key']; $public_key = ((x($_POST,'public_key')) ? $_POST['public_key'] : '');
$dfrn_id = hex2bin($_POST['dfrn_id']); $dfrn_id = ((x($_POST,'dfrn_id')) ? hex2bin($_POST['dfrn_id']) : '');
$source_url = hex2bin($_POST['source_url']); $source_url = ((x($_POST,'source_url')) ? hex2bin($_POST['source_url']) : '');
$aes_key = $_POST['aes_key']; $aes_key = ((x($_POST,'aes_key')) ? $_POST['aes_key'] : '');
$duplex = $_POST['duplex']; $duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 );
$version_id = (float) $_POST['dfrn_version']; $version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
logger('dfrn_confirm: requestee contacted: ' . $node); logger('dfrn_confirm: requestee contacted: ' . $node);