move key conversion to separate lib

4 files changed, 60 insertions, 57 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index cedc9adc8..abb28fc64 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1566,7 +1566,7 @@ class Activity {
 			if ($person_obj['id'] === $person_obj['publicKey']['owner']) {
 				$pubkey = $person_obj['publicKey']['publicKeyPem'];
 				if (strstr($pubkey, 'RSA ')) {
-					$pubkey = rsatopem($pubkey);
+					$pubkey = Keyutils::rsaToPem($pubkey);
 				}
 			}
 		}
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index d24a31a15..6f2864615 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -3,34 +3,35 @@ namespace Zotlabs\Module;
 
 require_once('include/zot.php');
 
+use Zotlabs\Lib\Keyutils;
 use Zotlabs\Lib\Libzot;
 
 class Wfinger extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		session_write_close();
 
 		$result = array();
-	
+
 		$scheme = '';
-	
+
 		if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
 			$scheme = 'https';
 		elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
 			$scheme = 'https';
-	
+
 		$zot = intval($_REQUEST['zot']);
-	
+
 		if(($scheme !== 'https') && (! $zot)) {
 			header($_SERVER["SERVER_PROTOCOL"] . ' ' . 500 . ' ' . 'Webfinger requires HTTPS');
 			killme();
 		}
-	
-	
+
+
 		$resource = $_REQUEST['resource'];
 		logger('webfinger: ' . $resource,LOGGER_DEBUG);
-	
+
 
 		$root_resource  = false;
 		$pchan = false;
@@ -39,9 +40,9 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			$root_resource = true;
 
 		$r = null;
-	
+
 		if(($resource) && (! $root_resource)) {
-	
+
 			if(strpos($resource,'acct:') === 0) {
 				$channel = str_replace('acct:','',$resource);
 				if(substr($channel,0,1) === '@' && strpos(substr($channel,1),'@')) {
@@ -56,12 +57,12 @@ class Wfinger extends \Zotlabs\Web\Controller {
 						goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=' . $zot : ''));
 					}
 					$channel = substr($channel,0,strpos($channel,'@'));
-				}		
+				}
 			}
 			if(strpos($resource,'http') === 0) {
 				$channel = str_replace('~','',basename($resource));
 			}
-	
+
 			if(substr($channel,0,1) === '[' ) {
 				$channel = substr($channel,1);
 				$channel = substr($channel,0,-1);
@@ -74,16 +75,16 @@ class Wfinger extends \Zotlabs\Web\Controller {
 					$r[0] = pchan_to_chan($r[0]);
 				}
 			}
-			else {	
+			else {
 				$r = q("select * from channel left join xchan on channel_hash = xchan_hash 
 					where channel_address = '%s' limit 1",
 					dbesc($channel)
 				);
 			}
 		}
-	
+
 		header('Access-Control-Allow-Origin: *');
-	
+
 
 		if($root_resource) {
 			$result['subject'] = $resource;
@@ -100,52 +101,52 @@ class Wfinger extends \Zotlabs\Web\Controller {
 
 
 
-	
+
 		}
 
 		if($resource && $r) {
-	
+
 			$h = q("select hubloc_addr from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
 				dbesc($r[0]['channel_hash'])
 			);
-	
+
 			$result['subject'] = $resource;
-	
+
 			$aliases = array(
 				z_root() . (($pchan) ? '/pchan/' : '/channel/') . $r[0]['channel_address'],
 				z_root() . '/~' . $r[0]['channel_address'],
 				z_root() . '/@' . $r[0]['channel_address']
 			);
-	
+
 			if($h) {
 				foreach($h as $hh) {
 					$aliases[] = 'acct:' . $hh['hubloc_addr'];
 				}
 			}
-	
+
 			$result['aliases'] = [];
-	
+
 			$result['properties'] = [
 					'http://webfinger.net/ns/name'   => $r[0]['channel_name'],
 					'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
 					'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'],
 					'http://purl.org/zot/federation' => 'zot6,zot'
 			];
-	
-			foreach($aliases as $alias) 
+
+			foreach($aliases as $alias)
 				if($alias != $resource)
 					$result['aliases'][] = $alias;
-	
+
 
 			if($pchan) {
 				$result['links'] = [
-	
+
 					[
 						'rel'  => 'http://webfinger.net/rel/avatar',
 						'type' => $r[0]['xchan_photo_mimetype'],
 						'href' => $r[0]['xchan_photo_l']
 					],
-	
+
 					[
 						'rel'  => 'http://webfinger.net/rel/profile-page',
 						'href' => $r[0]['xchan_url'],
@@ -153,7 +154,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 
 					[
 						'rel'  => 'magic-public-key',
-						'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
+						'href' => 'data:application/magic-public-key,' . Keyutils::salmonKey($r[0]['channel_pubkey']),
 					]
 
 				];
@@ -167,13 +168,13 @@ class Wfinger extends \Zotlabs\Web\Controller {
 					[
 						'rel'  => 'http://webfinger.net/rel/avatar',
 						'type' => $r[0]['xchan_photo_mimetype'],
-						'href' => $r[0]['xchan_photo_l']	
+						'href' => $r[0]['xchan_photo_l']
 					],
 
 					[
 						'rel'  => 'http://microformats.org/profile/hcard',
 						'type' => 'text/html',
-						'href' => z_root() . '/hcard/' . $r[0]['channel_address']	
+						'href' => z_root() . '/hcard/' . $r[0]['channel_address']
 					],
 
 					[
@@ -187,8 +188,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
 					],
 
 					[
-						'rel'  => 'http://schemas.google.com/g/2010#updates-from', 
-						'type' => 'application/atom+xml', 
+						'rel'  => 'http://schemas.google.com/g/2010#updates-from',
+						'type' => 'application/atom+xml',
 						'href' => z_root() . '/ofeed/'  . $r[0]['channel_address']
 					],
 
@@ -221,7 +222,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 
 					[
 						'rel'  => 'magic-public-key',
-						'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
+						'href' => 'data:application/magic-public-key,' . Keyutils::salmonKey($r[0]['channel_pubkey']),
 					]
 				];
 			}
@@ -236,12 +237,12 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			header($_SERVER["SERVER_PROTOCOL"] . ' ' . 400 . ' ' . 'Bad Request');
 			killme();
 		}
-	
+
 		$arr = [ 'channel' => $r[0], 'pchan' => $pchan, 'request' => $_REQUEST, 'result' => $result ];
 		call_hooks('webfinger',$arr);
 
 		json_return_and_die($arr['result'],'application/jrd+json');
-	
+
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 959e31cbe..21574eb8d 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -1,19 +1,21 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Lib\Keyutils;
+
 require_once('include/crypto.php');
 
 
 class Xrd extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		$uri = urldecode(notags(trim($_GET['uri'])));
 		$subject = $uri;
 		logger('xrd: ' . $uri,LOGGER_DEBUG);
-	
+
 		$resource = $uri;
-	
+
 		if(substr($uri,0,4) === 'http') {
 			$uri = str_replace('~','',$uri);
 			$name = basename($uri);
@@ -22,29 +24,29 @@ class Xrd extends \Zotlabs\Web\Controller {
 			$local = str_replace('acct:', '', $uri);
 			if(substr($local,0,2) == '//')
 				$local = substr($local,2);
-	
+
 			$name = substr($local,0,strpos($local,'@'));
 		}
-	
+
 		$r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
 			dbesc($name)
 		);
-		if(! $r) 
+		if(! $r)
 			killme();
-		
-		$salmon_key = salmon_key($r[0]['channel_pubkey']);
-	
+
+		$salmon_key = Keyutils::salmonKey($r[0]['channel_pubkey']);
+
 		header('Access-Control-Allow-Origin: *');
 		header("Content-type: application/xrd+xml");
-	
-	
+
+
 		$aliases = array('acct:' . channel_reddress($r[0]), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']);
-	
+
 		for($x = 0; $x < count($aliases); $x ++) {
 			if($aliases[$x] === $resource)
 				unset($aliases[$x]);
 		}
-		
+
 		$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
 			'$nick'        => $r[0]['channel_address'],
 			'$accturi'     => $resource,
@@ -60,14 +62,14 @@ class Xrd extends \Zotlabs\Web\Controller {
 			'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
 			'$subscribe'   => z_root() . '/follow?f=&amp;url={uri}',
 		));
-	
-	
+
+
 		$arr = array('user' => $r[0], 'xml' => $o);
 		call_hooks('personal_xrd', $arr);
-	
+
 		echo $arr['xml'];
 		killme();
-	
+
 	}
-	
+
 }
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php
index 7c3903682..8dd999e59 100644
--- a/Zotlabs/Web/HTTPSig.php
+++ b/Zotlabs/Web/HTTPSig.php
@@ -3,8 +3,8 @@
 namespace Zotlabs\Web;
 
 use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\Keyutils;
 use Zotlabs\Lib\Webfinger;
-use Zotlabs\Web\HTTPHeaders;
 use Zotlabs\Lib\Libzot;
 
 /**
@@ -252,7 +252,7 @@ class HTTPSig {
 			return rsatopem($key);
 		}
 		elseif(substr($key,0,5) === 'data:') {
-			return convert_salmon_key($key);
+			return Keyutils::convertSalmonKey($key);
 		}
 		else {
 			return $key;