From 38c8431527f35c8858d6bae2a36247cc1bbee479 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 29 Aug 2015 11:38:40 +0200 Subject: [PATCH 1/2] Rino Bugfix: A variable was used that never was fetched --- include/items.php | 19 ++++++++++--------- mod/dfrn_notify.php | 30 ++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/include/items.php b/include/items.php index f15e2a1fc5..a5184abde4 100644 --- a/include/items.php +++ b/include/items.php @@ -1986,13 +1986,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { if($contact['duplex'] && $contact['issued-id']) $idtosend = '1:' . $orig_id; - + $rino = get_config('system','rino_encrypt'); $rino = intval($rino); - + logger("Local rino version: ". $rino, LOGGER_DEBUG); - $ssl_val = intval(get_config('system','ssl_policy')); $ssl_policy = ''; @@ -2043,6 +2042,8 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $rino_remote_version = intval($res->rino); $page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0); + logger("Remote rino version: ".$rino_remote_version, LOGGER_DEBUG); + if($owner['page-flags'] == PAGE_PRVGROUP) $page = 2; @@ -2120,26 +2121,26 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { return -1; } catch (CannotPerformOperation $ex) { logger('Cannot safely create a key'); - return -1; + return -1; } try { $data = Crypto::encrypt($postvars['data'], $key); } catch (CryptoTestFailed $ex) { logger('Cannot safely perform encryption'); - return -1; + return -1; } catch (CannotPerformOperation $ex) { logger('Cannot safely perform encryption'); - return -1; + return -1; } break; default: logger("rino: invalid requested verision '$rino_remote_version'"); return -1; } - + $postvars['rino'] = $rino_remote_version; $postvars['data'] = bin2hex($data); - + #logger('rino: sent key = ' . $key, LOGGER_DEBUG); @@ -2167,7 +2168,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $postvars['key'] = bin2hex($postvars['key']); } - + logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA); diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 874f17c772..ba81e4712a 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -33,6 +33,8 @@ function dfrn_notify_post(&$a) { $dfrn_id = substr($dfrn_id,2); } + logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG); + $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1", dbesc($dfrn_id), dbesc($challenge) @@ -132,16 +134,20 @@ function dfrn_notify_post(&$a) { if($importer['page-flags'] == PAGE_SOAPBOX) xml_status(0); - + $rino = get_config('system','rino_encrypt'); + $rino = intval($rino); + + logger("Local rino version: ". $rino, LOGGER_DEBUG); + if(strlen($key)) { - + // if local rino is lower than remote rino, abort: should not happen! // but only for $remote_rino > 1, because old code did't send rino version if ($rino_remote_version > 1 && $rino < $rino_remote) { logger("rino version '$rino_remote' is lower than supported '$rino'"); xml_status(0,"rino version '$rino_remote' is lower than supported '$rino'"); } - + $rawkey = hex2bin(trim($key)); logger('rino: md5 raw key: ' . md5($rawkey)); $final_key = ''; @@ -164,7 +170,7 @@ function dfrn_notify_post(&$a) { } #logger('rino: received key : ' . $final_key); - + switch($rino_remote) { case 0: case 1: @@ -195,8 +201,8 @@ function dfrn_notify_post(&$a) { logger("rino: invalid sent verision '$rino_remote'"); xml_status(0); } - - + + logger('rino: decrypted data: ' . $data, LOGGER_DATA); } @@ -222,6 +228,8 @@ function dfrn_notify_content(&$a) { logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id); + logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG); + $direction = (-1); if(strpos($dfrn_id,':') == 1) { $direction = intval(substr($dfrn_id,0,1)); @@ -243,7 +251,7 @@ function dfrn_notify_content(&$a) { dbesc($last_update) ); - logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG ); + logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG); $sql_extra = ''; switch($direction) { @@ -295,14 +303,16 @@ function dfrn_notify_content(&$a) { $challenge = bin2hex($challenge); $encrypted_id = bin2hex($encrypted_id); - + $rino = get_config('system','rino_encrypt'); $rino = intval($rino); - + + logger("Local rino version: ". $rino, LOGGER_DEBUG); + // if requested rino is lower than enabled local rino, lower local rino version // if requested rino is higher than enabled local rino, reply with local rino if ($rino_remote < $rino) $rino = $rino_remote; - + if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) { $perm = 'rw'; } From 3246352ba86d3890e41a43502eb0858997752f0f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 29 Aug 2015 16:55:25 +0200 Subject: [PATCH 2/2] More detailled log entries --- include/items.php | 2 +- mod/dfrn_notify.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index a5184abde4..cc03a77646 100644 --- a/include/items.php +++ b/include/items.php @@ -2042,7 +2042,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $rino_remote_version = intval($res->rino); $page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0); - logger("Remote rino version: ".$rino_remote_version, LOGGER_DEBUG); + logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG); if($owner['page-flags'] == PAGE_PRVGROUP) $page = 2; diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index ba81e4712a..edf419e929 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -33,8 +33,6 @@ function dfrn_notify_post(&$a) { $dfrn_id = substr($dfrn_id,2); } - logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG); - $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1", dbesc($dfrn_id), dbesc($challenge) @@ -95,6 +93,8 @@ function dfrn_notify_post(&$a) { $importer = $r[0]; + logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG); + if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) { q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d", intval(($writable == (-1)) ? $importer['writable'] : $writable), @@ -228,8 +228,6 @@ function dfrn_notify_content(&$a) { logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id); - logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG); - $direction = (-1); if(strpos($dfrn_id,':') == 1) { $direction = intval(substr($dfrn_id,0,1)); @@ -281,6 +279,8 @@ function dfrn_notify_content(&$a) { if(! count($r)) $status = 1; + logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG); + $challenge = ''; $encrypted_id = ''; $id_str = $my_id . '.' . mt_rand(1000,9999);