From 214b81e49174b98f09382eec3ef2bd7ecf24ad01 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 9 Dec 2018 16:37:15 -0800
Subject: rmagic discovery for z6 networks

---
 include/network.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'include')

diff --git a/include/network.php b/include/network.php
index 183a47105..cd352e7db 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1,4 +1,8 @@
 <?php
+
+use Zotlabs\Lib\Zotfinger;
+use Zotlabs\Lib\Libzot;
+
 /**
  * @file include/network.php
  * @brief Network related functions.
@@ -1196,6 +1200,31 @@ function discover_by_webbie($webbie, $protocol = '') {
 				}
 			}
 		}
+
+		foreach($x['links'] as $link) {
+			if(array_key_exists('rel',$link)) {
+				if($link['rel'] === PROTOCOL_ZOT6 && ((! $protocol) || (strtolower($protocol) === 'zot6'))) {
+					logger('zot6 found for ' . $webbie, LOGGER_DEBUG);
+					$record = Zotfinger::exec($link['href']);
+
+					// Check the HTTP signature
+
+					$hsig = $record['signature'];
+					if($hsig && ($hsig['signer'] === $url || $hsig['signer'] === $link['href']) && $hsig['header_valid'] === true && $hsig['content_valid'] === true)
+					$hsig_valid = true;
+
+					if(! $hsig_valid) {
+						logger('http signature not valid: ' . print_r($hsig,true));
+						continue;
+					}
+
+					$x = Libzot::import_xchan($record['data']);
+					if($x['success']) {
+						return $x['hash'];
+					}
+				}
+			}
+		}
 	}
 
 	logger('webfinger: ' . print_r($x,true), LOGGER_DATA, LOG_INFO);
-- 
cgit v1.2.3


From 993db01400be17c5e74dfa895c324a7116a4e97e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 11 Dec 2018 12:21:09 +0100
Subject: return on readImageBlob() exception

---
 include/photo/photo_imagick.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
index f04c00245..cb3ad27fb 100644
--- a/include/photo/photo_imagick.php
+++ b/include/photo/photo_imagick.php
@@ -36,6 +36,7 @@ class photo_imagick extends photo_driver {
 		}
 		catch (Exception $e) {
 			logger('imagick readImageBlob() exception:' . print_r($e,true));
+			return;
 		}
 
 		/**
-- 
cgit v1.2.3