Zot6: some things that need to be done ahead of time so we can turbocharge the delivery engine and split off site records from channel records.

Zotlabs/Daemon/Deliver.php

@@ -53,22 +53,29 @@ class Deliver {
 						remove_queue_item($r[0]['outq_hash']);
 
 						if($dresult && is_array($dresult)) {
-							foreach($dresult as $xx) {
+							if(array_key_exists('iv',$dresult)) {
-								if(is_array($xx) && array_key_exists('message_id',$xx)) {
+								$dresult = json_decode(crypto_unencapsulate($dresult,get_config('system','prvkey')),true);
-									if(delivery_report_is_storable($xx)) {
+							}
-										q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
+							if(! $dresult) {
-											dbesc($xx['message_id']),
+								logger('dreport decryption failure');
-											dbesc($xx['location']),
+							}
-											dbesc($xx['recipient']),
+							else {
-											dbesc($xx['status']),
+								foreach($dresult as $xx) {
-											dbesc(datetime_convert($xx['date'])),
+									if(is_array($xx) && array_key_exists('message_id',$xx)) {
-											dbesc($xx['sender'])
+										if(delivery_report_is_storable($xx)) {
-										);
+											q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
+												dbesc($xx['message_id']),
+												dbesc($xx['location']),
+												dbesc($xx['recipient']),
+												dbesc($xx['status']),
+												dbesc(datetime_convert($xx['date'])),
+												dbesc($xx['sender'])
+											);
+										}
 									}
 								}
 							}
 						}
-
 						q("delete from dreport where dreport_queue = '%s'",
 							dbesc($argv[$x])
 						);

Zotlabs/Daemon/Notifier.php

@@ -492,7 +492,7 @@ class Notifier {
 		// Now we have collected recipients (except for external mentions, FIXME)
 		// Let's reduce this to a set of hubs; checking that the site is not dead.
 
-		$r = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") 
+		$r = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") 
 			and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) "
 		);		
  

boot.php

@@ -72,6 +72,8 @@ define ( 'DIRECTORY_MODE_PRIMARY',     0x0001); // There can only be *one* prima
 define ( 'DIRECTORY_MODE_SECONDARY',   0x0002); // All other mirror directory servers
 define ( 'DIRECTORY_MODE_STANDALONE',  0x0100); // A detached (off the grid) hub with itself as directory server.
 
+define ( 'ZOT6_COMPLIANT',             0x1000);
+
 // We will look for upstream directories whenever me make contact
 // with other sites, but if this is a new installation and isn't
 // a standalone hub, we need to seed the service with a starting

include/zot.php

@@ -2875,8 +2875,13 @@ function import_site($arr, $pubkey) {
 		$site_directory = DIRECTORY_MODE_NORMAL;
 	}
 
+	$site_flags = $site_directory;
+
+	if(array_key_exists('zot',$arr) && ((float) $arr['zot']) >= 6.0)
+		$site_flags = ($site_flags & ZOT6_COMPLIANT); 
+
 	if($exists) {
-		if(($siterecord['site_flags'] != $site_directory)
+		if(($siterecord['site_flags'] != $site_flags)
 			|| ($siterecord['site_access'] != $access_policy)
 			|| ($siterecord['site_directory'] != $directory_url)
 			|| ($siterecord['site_sellpage'] != $sellpage)
@@ -2896,7 +2901,7 @@ function import_site($arr, $pubkey) {
 			$r = q("update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d, site_project = '%s', site_version = '%s', site_crypto = '%s'
 				where site_url = '%s'",
 				dbesc($site_location),
-				intval($site_directory),
+				intval($site_flags),
 				intval($access_policy),
 				dbesc($directory_url),
 				intval($register_policy),
@@ -2929,7 +2934,7 @@ function import_site($arr, $pubkey) {
 				'site_location'  => $site_location,
 				'site_url'       => $url,
 				'site_access'    => intval($access_policy),
-				'site_flags'     => intval($site_directory),
+				'site_flags'     => intval($site_flags),
 				'site_update'    => datetime_convert(),
 				'site_directory' => $directory_url,
 				'site_register'  => intval($register_policy),
@@ -4161,9 +4166,27 @@ function zotinfo($arr) {
 	if($x)
 		$ret['locations'] = $x;
 
-	$ret['site'] = array();
+	$ret['site'] = zot_site_info($e);
+
+
+	check_zotinfo($e,$x,$ret);
+
+
+	call_hooks('zot_finger',$ret);
+	return($ret);
+
+}
+
+
+function zot_site_info($channel = null) {
+
+	$signing_key = (($channel) ? $channel['channel_prvkey'] : get_config('system','prvkey'));
+	$sig_method = get_config('system','signature_algorithm','sha256');
+
+	$ret = [];
+	$ret['site'] = [];
 	$ret['site']['url'] = z_root();
-	$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$e['channel_prvkey'],$sig_method));
+	$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$signing_key,$sig_method));
 	$ret['site']['zot_auth'] = z_root() . '/magic';
 
 	$dirmode = get_config('system','directory_mode');
@@ -4182,6 +4205,12 @@ function zotinfo($arr) {
 
 	$ret['site']['encryption'] = crypto_methods();
 	$ret['site']['signing'] = signing_methods();
+	if(function_exists('zotvi_load')) {
+		$ret['site']['zot'] = '6.0';
+	}
+	else {
+		$ret['site']['zot'] = ZOT_REVISION;
+	}
 
 	// hide detailed site information if you're off the grid
 
@@ -4234,15 +4263,10 @@ function zotinfo($arr) {
 
 	}
 
-	check_zotinfo($e,$x,$ret);
+	return $ret['site'];
-
-
-	call_hooks('zot_finger',$ret);
-	return($ret);
 
 }
 
-
 function check_zotinfo($channel,$locations,&$ret) {