Scrape the public key from the hcard if not present in webfinger

diff --git a/include/Scrape.php b/include/Scrape.php
index 6ee3dabfca88c11c42576e2a5c75c5194a96283e..af91d38d5cf16fabe500352497304fc57925708e 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -529,9 +529,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
                        }
                }
 
-
                if(strlen($dfrn)) {
                        $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
+
                        if(is_array($ret) && x($ret,'dfrn-request')) {
                                $network = NETWORK_DFRN;
                                $request = $ret['dfrn-request'];
@@ -547,6 +547,19 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
                }
        }
 
+       // Scrape the public key from the hcard.
+       // Diaspora will remove it from the webfinger somewhere in the future.
+       if (($hcard != "") AND ($pubkey == "")) {
+               $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
+               if (isset($ret["key"])) {
+                       $hcard_key = $ret["key"];
+                       if(strstr($hcard_key,'RSA '))
+                               $pubkey = rsatopem($hcard_key);
+                       else
+                               $pubkey = $hcard_key;
+               }
+       }
+
        if($diaspora && $diaspora_base && $diaspora_guid) {
                if($mode == PROBE_DIASPORA || ! $notify) {
                        $notify = $diaspora_base . 'receive/users/' . $diaspora_guid;