X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=7ba81681fa3df600d88cd342d87e2270aa943abf;hb=fa154248dcd62677544aa9ac7d82ddcd3df92f6e;hp=ef3c7274bc21dbd505076b1e938cd9d02fa1864a;hpb=6348e70daa113e8b3203de8fbc919d08c90d972e;p=friendica.git
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ef3c7274bc..7ba81681fa 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -3,11 +3,6 @@
if(! function_exists('dfrn_request_init')) {
function dfrn_request_init(&$a) {
- if($_SESSION['authenticated']) {
- // choose which page to show (could be remote auth)
-
- }
-
if($a->argc > 1)
$which = $a->argv[1];
@@ -29,204 +24,315 @@ function dfrn_request_post(&$a) {
goaway($a->get_baseurl());
}
- // callback to local site after remote request and local confirm
- if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)
- && (x($_SESSION,'authenticated')) && (x($_SESSION,'uid'))
- && ($_SESSION['uid'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
+ // We've introduced ourself to another cell, then have been returned to our own cell
+ // to confirm the request, and then we've clicked submit (perhaps after logging in).
+ // That brings us here:
- $dfrn_url = notags(trim($_POST['dfrn_url']));
- $aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
- $confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
- $failed = false;
+ if((x($_POST,'localconfirm')) && ($_POST['localconfirm'] == 1)) {
- require_once('Scrape.php');
+ // Ensure this is a valid request
+
+ if(local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST,'dfrn_url'))) {
- if(x($dfrn_url)) {
- $parms = scrape_dfrn($dfrn_url);
+ $dfrn_url = notags(trim($_POST['dfrn_url']));
+ $aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
+ $confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
- if(! count($parms)) {
- $_SESSION['sysmsg'] .= 'URL is not valid or does not contain profile information.' . EOL ;
- $failed = true;
- }
- else {
- if(! x($parms,'fn'))
- $_SESSION['sysmsg'] .= 'Warning: DFRN profile has no identifiable owner name.' . EOL ;
- if(! x($parms,'photo'))
- $_SESSION['sysmsg'] .= 'Warning: DFRN profile has no profile photo.' . EOL ;
- $invalid = validate_dfrn($parms);
- if($invalid) {
- echo $invalid . ' required DFRN parameter'
- . (($invalid == 1) ? " was " : "s were " )
- . "not found at the given URL" . '
';
+ $contact_record = null;
+
+ if(x($dfrn_url)) {
+
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+ intval($_SESSION['uid']),
+ dbesc($dfrn_url)
+ );
+
+ if(count($r)) {
+ if(strlen($r[0]['dfrn-id'])) {
+ notice( t("This introduction has already been accepted.") . EOL );
+ return;
+ }
+ else
+ $contact_record = $r[0];
+ }
+
+ if(is_array($contact_record)) {
+ $r = q("UPDATE `contact` SET `ret-aes` = %d WHERE `id` = %d LIMIT 1",
+ intval($aes_allow),
+ intval($contact_record['id'])
+ );
+ }
+ else {
+
+ require_once('Scrape.php');
+
+
+ $parms = scrape_dfrn($dfrn_url);
+
+ if(! count($parms)) {
+ notice( t('Profile location is not valid or does not contain profile information.') . EOL );
+ return;
+ }
+ 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;
+ }
+ }
+
+
+
+ $dfrn_request = $parms['dfrn-request'];
+
+ dbesc_array($parms);
+
+
+ $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `photo`, `site-pubkey`,
+ `request`, `confirm`, `notify`, `poll`, `aes_allow`)
+ VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+ intval($_SESSION['uid']),
+ datetime_convert(),
+ dbesc($dfrn_url),
+ $parms['fn'],
+ $parms['photo'],
+ $parms['key'],
+ $parms['dfrn-request'],
+ $parms['dfrn-confirm'],
+ $parms['dfrn-notify'],
+ $parms['dfrn-poll'],
+ intval($aes_allow)
+ );
+ }
- $failed = true;
+ if($r) {
+ notice( t("Introduction complete.") . EOL);
}
- }
- }
- if(! $failed) {
- $dfrn_request = $parms['dfrn-request'];
- /////////////////////////
- dbesc_array($parms);
- ////////////////////////
+ // Allow the blocked remote notification to complete
- $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `name`, `photo`, `site-pubkey`,
- `request`, `confirm`, `notify`, `poll`, `aes_allow`)
- VALUES ( %d, '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', %d)",
- intval($_SESSION['uid']),
- datetime_convert(),
- dbesc($dfrn_url),
- $parms['fn'],
- $parms['photo'],
- $parms['key'],
- $parms['dfrn-request'],
- $parms['dfrn-confirm'],
- $parms['dfrn-notify'],
- $parms['dfrn-poll'],
- intval($aes_allow)
- );
- if($r === false)
- $_SESSION['sysmsg'] .= "Failed to create contact." . EOL;
- else
- $_SESSION['sysmsg'] .= "Introduction complete.";
+ if(is_array($contact_record))
+ $dfrn_request = $contact_record['request'];
- // Allow the blocked remote notification to complete
+ if(strlen($dfrn_request) && strlen($confirm_key))
+ $s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+ // ignore reply
+ goaway($dfrn_url);
+ return; // NOTREACHED
- if(strlen($dfrn_request) && strlen($confirm_key))
- $s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+ }
- goaway($dfrn_url);
}
+
+ // invalid/bogus request
+
+ notice( t("Unrecoverable protocol error.") . EOL );
+ goaway($a->get_baseurl());
+ return; // NOTREACHED
}
+ // Otherwise:
+
+ // We are the requestee. A person from a remote cell has made an introduction
+ // on our profile web page and clicked submit. We will use their DFRN-URL to
+ // figure out how to contact their cell.
- // we are operating as a remote site and an introduction was requested of us.
// Scrape the originating DFRN-URL for everything we need. Create a contact record
// and an introduction to show our user next time he/she logs in.
- // Finally redirect back to the originator so that their site can record the request.
- // If our user confirms the request, a record of it will need to exist on the
- // originator's site in order for the confirmation process to complete..
+ // Finally redirect back to the requestor so that their site can record the request.
+ // If our user (the requestee) later confirms this request, a record of it will need
+ // to exist on the requestor's cell in order for the confirmation process to complete..
+
+ // It's possible that neither the requestor or the requestee are logged in at the moment,
+ // and the requestor does not yet have any credentials to the requestee profile.
- if($a->profile['nickname'])
- $tailname = $a->profile['nickname'];
- else
- $tailname = $a->profile['uid'];
+ // Who is the requestee? We've already loaded their profile which means their nickname should be
+ // in $a->argv[1] and we should have their complete info in $a->profile.
+ if(! (is_array($a->profile) && count($a->profile))) {
+ notice(t("Profile unavailable.") . EOL);
+ return;
+ }
+
+ $nickname = $a->profile['nickname'];
+ $notify_flags = $a->profile['notify-flags'];
$uid = $a->profile['uid'];
+ $contact_record = null;
$failed = false;
+ $parms = null;
- require_once('Scrape.php');
if( x($_POST,'dfrn_url')) {
$url = trim($_POST['dfrn_url']);
- if(x($url)) {
+ if(! strlen($url)) {
+ notice( t("Invalid locator") . EOL );
+ return;
+ }
+
+ // Is this an email-style DFRN locator?
+
+ if(strstr($url,'@')) {
+ $username = substr($url,0,strpos($url,'@'));
+ $hostname = substr($url,strpos($url,'@') + 1);
+ require_once('Scrape.php');
+
+
+ $parms = scrape_meta('https://' . $url);
+ if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) {
+ $url = sprintf($parms['dfrn-template'],$username);
+ }
+ else {
+ $parms = scrape_meta('http://' . $url);
+ if((x($parms,'dfrn-template')) && strstr($parms['dfrn-template'],'%s')) {
+ $url = sprintf($parms['dfrn-template'],$username);
+ }
+ else {
+ $url = '';
+ }
+ }
+
+ }
+
+ if(! strlen($url)) {
+ notice(t("Unable to resolve your name at the provided location.") . EOL);
+ return;
+ }
+
+ $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+ intval($uid),
+ dbesc($url)
+ );
+
+ if(count($ret)) {
+ if(strlen($ret[0]['issued-id'])) {
+ notice( t('You have already introduced yourself here.') . EOL );
+ return;
+ }
+ 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 {
+
+ require_once('Scrape.php');
+
$parms = scrape_dfrn($url);
if(! count($parms)) {
- $_SESSION['sysmsg'] .= 'URL is not valid or does not contain profile information.' . EOL ;
- $failed = true;
+ notice( t('Profile location is not valid or does not contain profile information.') . EOL );
+ killme();
}
else {
if(! x($parms,'fn'))
- $_SESSION['sysmsg'] .= 'Warning: DFRN profile has no identifiable owner name.' . EOL ;
+ notice( t('Warning: profile location has no identifiable owner name.') . EOL );
if(! x($parms,'photo'))
- $_SESSION['sysmsg'] .= 'Warning: DFRN profile has no profile photo.' . EOL ;
+ notice( t('Warning: profile location has no profile photo.') . EOL );
$invalid = validate_dfrn($parms);
if($invalid) {
- echo $invalid . ' required DFRN parameter'
- . (($invalid == 1) ? " was " : "s were " )
- . "not found at the given URL" . '
';
+ notice( $invalid . t(' required parameter')
+ . (($invalid == 1) ? t(" was ") : t("s were ") )
+ . t("not found at the given location.") . EOL ) ;
- $failed = true;
+ return;
}
}
- }
-
- $ret = q("SELECT `url` FROM `contact` WHERE `url` = '%s'", dbesc($url));
- if($ret !== false && count($ret)) {
- $_SESSION['sysmsg'] .= 'You have already introduced yourself here.' . EOL;
- $failed = true;
- }
- if(! $failed) {
-
$parms['url'] = $url;
- $parms['issued-id'] = random_string();
+ $parms['issued-id'] = $issued_id;
- /////////////////////////
- dbesc_array($parms);
- ////////////////////////
- $ret = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `issued-id`, `photo`, `site-pubkey`,
- `request`, `confirm`, `notify`, `poll`, `visible` )
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
- 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'],
- ((x($_POST,'visible')) ? 1 : 0 )
+ 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` = '%s' AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
+ intval($uid),
+ $parms['url'],
+ $parms['issued-id']
+ );
+ if(count($r))
+ $contact_record = $r[0];
+ }
}
- if($ret === false) {
- $_SESSION['sysmsg'] .= 'Failed to create contact record.' . EOL;
+ if($r === false) {
+ notice( 'Failed to update contact record.' . EOL );
return;
}
- $ret = q("SELECT `id` FROM `contact`
- WHERE `uid` = '%s' AND `url` = '%s' AND `issued-id` = '%s'
- LIMIT 1",
- intval($uid),
- $parms['url'],
- $parms['issued-id']
- );
-
- if(($ret !== NULL) && (count($ret)))
- $contact_id = $ret[0]['id'];
-
$hash = random_string() . (string) time(); // Generate a confirm_key
- if($contact_id) {
+ 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_id),
- ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
- dbesc(trim($_POST['dfrn-request-message'])),
- dbesc($hash),
- dbesc(datetime_convert())
+ VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
+ intval($uid),
+ intval($contact_record['id']),
+ ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
+ dbesc(trim($_POST['dfrn-request-message'])),
+ dbesc($hash),
+ dbesc(datetime_convert())
);
}
-
- // TODO: send an email notification if our user wants one
+
+ // This notice will only be seen by the requestor if the requestor and requestee are on the same server.
if(! $failed)
- $_SESSION['sysmsg'] .= "Your introduction has been sent." . EOL;
+ 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/$tailname");
+ $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;
}}
+
+
+
if(! function_exists('dfrn_request_content')) {
function dfrn_request_content(&$a) {
@@ -242,20 +348,20 @@ function dfrn_request_content(&$a) {
if(x($_GET,'dfrn_url')) {
- if(! x($_SESSION,'authenticated')) {
- $_SESSION['sysmsg'] .= "Please login to confirm introduction." . EOL;
+ if(! local_user()) {
+ notice( t("Please login to confirm introduction.") . EOL );
return login();
}
// Edge case, but can easily happen in the wild. This person is authenticated,
// but not as the person who needs to deal with this request.
- if (($_SESSION['uid'] != $a->argv[1]) && ($a->user['nickname'] != $a->argv[1])) {
- $_SESSION['sysmsg'] .= "Incorrect identity currently logged in. Please login to this profile." . EOL;
+ if ($a->user['nickname'] != $a->argv[1]) {
+ notice( t("Incorrect identity currently logged in. Please login to this profile.") . EOL);
return login();
}
- $dfrn_url = notags(trim(pack("H*" , $_GET['dfrn_url'])));
+ $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
$aes_allow = (((x($_GET,'aes_allow')) && ($_GET['aes_allow'] == 1)) ? 1 : 0);
$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
$o .= file_get_contents("view/dfrn_req_confirm.tpl");
@@ -265,26 +371,60 @@ function dfrn_request_content(&$a) {
'$confirm_key' => $confirm_key,
'$username' => $a->user['username'],
'$uid' => $_SESSION['uid'],
+ '$nickname' => $a->user['nickname'],
'dfrn_rawurl' => $_GET['dfrn_url']
));
return $o;
}
- else {
- // safe to send our user their introduction
- if((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
+ elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) {
+
+ // we are the requestee and it is now safe to send our user their introduction,
+ // We could just unblock it, but first we have to jump through a few hoops to
+ // send an email, or even to find out if we need to send an email.
+
+ $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
+ dbesc($_GET['confirm_key'])
+ );
+
+ if(count($intro)) {
+
+ $r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+ WHERE `contact`.`id` = %d LIMIT 1",
+ intval($intro[0]['contact-id'])
+ );
+ if(count($r)) {
+
+ if($r[0]['notify-flags'] & NOTIFY_INTRO) {
+ $email_tpl = file_get_contents('view/request_notify_eml.tpl');
+ $email = replace_macros($email_tpl, array(
+ '$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
+ '$url' => stripslashes($r[0]['url']),
+ '$myname' => $r[0]['username'],
+ '$siteurl' => $a->get_baseurl(),
+ '$sitename' => $a->config['sitename']
+ ));
+ $res = mail($r[0]['email'],t("Introduction received at ") . $a->config['sitename'],$email,t('From: Administrator@') . $_SERVER[SERVER_NAME] );
+ // This is a redundant notification - no point throwing errors if it fails.
+ }
+ }
+
$r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s' LIMIT 1",
dbesc($_GET['confirm_key'])
);
- return;
- }
-
- // Outside request. Display our user's introduction form.
+ }
+ killme();
+ return; // NOTREACHED
+ }
+ else {
+ // Normal web request. Display our user's introduction form.
- $o = file_get_contents("view/dfrn_request.tpl");
- $o = replace_macros($o,array('$uid' => $a->profile['uid']));
- return $o;
+ $o = file_get_contents("view/dfrn_request.tpl");
+ $o = replace_macros($o,array('$nickname' => $a->argv[1]));
+ return $o;
}
+
+ return; // Somebody is fishing.
}}
\ No newline at end of file