Merge pull request #1868 from annando/1508-rino

RINO: More logging and a bugfix

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." for ".$contact["url"], 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);
 

mod/dfrn_notify.php

@@ -93,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),
@@ -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);
 	}
 
@@ -243,7 +249,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) {
@@ -273,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);
@@ -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';
 		}