From d99a96ef4979e9c5840f7a7534f8c327434e5cb9 Mon Sep 17 00:00:00 2001 From: Matthew Exon Date: Mon, 30 Jan 2017 00:55:38 +0000 Subject: [PATCH 01/21] Global is an integer, do not set it to an empty string --- include/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 74dde2fdf..ab928bf12 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1164,7 +1164,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); // sanitizes src attributes (only relative redir URIs or http URLs) - $Text = preg_replace('#<([^>]*?)(src)="(?!http|redir)(.*?)"(.*?)>#ism', '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text); + $Text = preg_replace('#<([^>]*?)(src)="(?!http|redir|cid)(.*?)"(.*?)>#ism', '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text); // sanitize href attributes (only whitelisted protocols URLs) // default value for backward compatibility From ce10a9aa7f97424caa3f2db5d5fd54a2da850ca3 Mon Sep 17 00:00:00 2001 From: Matthew Exon Date: Mon, 30 Jan 2017 15:48:12 +0000 Subject: [PATCH 02/21] Break out list of acceptable protocols in "src" attribute into separate variable similar to "href" attributes --- include/bbcode.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index ab928bf12..0f1a705fa 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1163,8 +1163,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // fix any escaped ampersands that may have been converted into links $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); - // sanitizes src attributes (only relative redir URIs or http URLs) - $Text = preg_replace('#<([^>]*?)(src)="(?!http|redir|cid)(.*?)"(.*?)>#ism', '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text); + // sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails) + $allowed_src_protocols = array('http', 'redir', 'cid'); + $Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism', + '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text); // sanitize href attributes (only whitelisted protocols URLs) // default value for backward compatibility From 96aadb23f8beb2b0ae453d9f4ba6bf9fc86ba1cd Mon Sep 17 00:00:00 2001 From: Matthew Exon Date: Tue, 31 Jan 2017 03:44:32 +0000 Subject: [PATCH 03/21] Change $allowed_src_protocols to static --- include/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 0f1a705fa..489ef8b2e 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1164,7 +1164,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text); // sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails) - $allowed_src_protocols = array('http', 'redir', 'cid'); + static $allowed_src_protocols = array('http', 'redir', 'cid'); $Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism', '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text); From 2424cb78d1abc9e0527f68b90b03556b1fb61cd5 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 31 Jan 2017 19:39:09 +0000 Subject: [PATCH 04/21] Only process feed and dfrn items when they aren't already stored --- include/dfrn.php | 60 ++++++++++++++++++++++++++-------------------- include/feed.php | 42 ++++++++++++++++---------------- include/poller.php | 10 ++++++++ 3 files changed, 65 insertions(+), 47 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 702fbb15f..903db9b60 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -391,7 +391,7 @@ class dfrn { * * @return object XML root object */ - private function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) { + private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) { if ($alternatelink == "") $alternatelink = $owner['url']; @@ -462,7 +462,7 @@ class dfrn { * * @return object XML author object */ - private function add_author($doc, $owner, $authorelement, $public) { + private static function add_author($doc, $owner, $authorelement, $public) { // Is the profile hidden or shouldn't be published in the net? Then add the "hide" element $r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` @@ -591,7 +591,7 @@ class dfrn { * * @return object XML author object */ - private function add_entry_author($doc, $element, $contact_url, $item) { + private static function add_entry_author($doc, $element, $contact_url, $item) { $contact = get_contact_details_by_url($contact_url, $item["uid"]); @@ -631,7 +631,7 @@ class dfrn { * * @return object XML activity object */ - private function create_activity($doc, $element, $activity) { + private static function create_activity($doc, $element, $activity) { if($activity) { $entry = $doc->createElement($element); @@ -685,7 +685,7 @@ class dfrn { * * @return object XML attachment object */ - private function get_attachment($doc, $root, $item) { + private static function get_attachment($doc, $root, $item) { $arr = explode('[/attach],',$item['attach']); if(count($arr)) { foreach($arr as $r) { @@ -720,7 +720,7 @@ class dfrn { * * @return object XML entry object */ - private function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) { + private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) { $mentioned = array(); @@ -1103,7 +1103,7 @@ class dfrn { * @param string $birthday Birthday of the contact * */ - private function birthday_event($contact, $birthday) { + private static function birthday_event($contact, $birthday) { // Check for duplicates $r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1", @@ -1146,7 +1146,7 @@ class dfrn { * * @return Returns an array with relevant data of the author */ - private function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") { + private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") { $author = array(); $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue; @@ -1358,7 +1358,7 @@ class dfrn { * * @return string XML string */ - private function transform_activity($xpath, $activity, $element) { + private static function transform_activity($xpath, $activity, $element) { if (!is_object($activity)) return ""; @@ -1403,7 +1403,7 @@ class dfrn { * @param object $mail mail elements * @param array $importer Record of the importer user mixed with contact of the content */ - private function process_mail($xpath, $mail, $importer) { + private static function process_mail($xpath, $mail, $importer) { logger("Processing mails"); @@ -1454,7 +1454,7 @@ class dfrn { * @param object $suggestion suggestion elements * @param array $importer Record of the importer user mixed with contact of the content */ - private function process_suggestion($xpath, $suggestion, $importer) { + private static function process_suggestion($xpath, $suggestion, $importer) { $a = get_app(); logger("Processing suggestions"); @@ -1556,7 +1556,7 @@ class dfrn { * @param object $relocation relocation elements * @param array $importer Record of the importer user mixed with contact of the content */ - private function process_relocation($xpath, $relocation, $importer) { + private static function process_relocation($xpath, $relocation, $importer) { logger("Processing relocations"); @@ -1685,7 +1685,7 @@ class dfrn { * @param array $importer Record of the importer user mixed with contact of the content * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? */ - private function update_content($current, $item, $importer, $entrytype) { + private static function update_content($current, $item, $importer, $entrytype) { $changed = false; if (edited_timestamp_is_newer($current, $item)) { @@ -1737,7 +1737,7 @@ class dfrn { * * @return int Is it a toplevel entry, a comment or a relayed comment? */ - private function get_entry_type($importer, $item) { + private static function get_entry_type($importer, $item) { if ($item["parent-uri"] != $item["uri"]) { $community = false; @@ -1803,7 +1803,7 @@ class dfrn { * @param array $importer Record of the importer user mixed with contact of the content * @param int $posted_id The record number of item record that was just posted */ - private function do_poke($item, $importer, $posted_id) { + private static function do_poke($item, $importer, $posted_id) { $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1)); if(!$verb) return; @@ -1858,7 +1858,7 @@ class dfrn { * * @return bool Should the processing of the entries be continued? */ - private function process_verbs($entrytype, $importer, &$item, &$is_like) { + private static function process_verbs($entrytype, $importer, &$item, &$is_like) { logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG); @@ -1958,7 +1958,7 @@ class dfrn { * @param object $links link elements * @param array $item the item record */ - private function parse_links($links, &$item) { + private static function parse_links($links, &$item) { $rel = ""; $href = ""; $type = ""; @@ -2001,7 +2001,7 @@ class dfrn { * @param object $entry entry elements * @param array $importer Record of the importer user mixed with contact of the content */ - private function process_entry($header, $xpath, $entry, $importer) { + private static function process_entry($header, $xpath, $entry, $importer) { logger("Processing entries"); @@ -2010,6 +2010,20 @@ class dfrn { // Get the uri $item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue; + $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue; + + $current = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($item["uri"]), + intval($importer["importer_uid"]) + ); + + // Is there an existing item? + if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND + (datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) { + logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG); + return; + } + // Fetch the owner $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true); @@ -2027,7 +2041,6 @@ class dfrn { $item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue; $item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue; - $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue; $item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue; $item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]); @@ -2215,18 +2228,13 @@ class dfrn { } } - $r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($item["uri"]), - intval($importer["importer_uid"]) - ); - if (!self::process_verbs($entrytype, $importer, $item, $is_like)) { logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG); return; } // Update content if 'updated' changes - if (dbm::is_result($r)) { + if (dbm::is_result($current)) { if (self::update_content($r[0], $item, $importer, $entrytype)) logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG); else @@ -2311,7 +2319,7 @@ class dfrn { * @param object $deletion deletion elements * @param array $importer Record of the importer user mixed with contact of the content */ - private function process_deletion($xpath, $deletion, $importer) { + private static function process_deletion($xpath, $deletion, $importer) { logger("Processing deletions"); diff --git a/include/feed.php b/include/feed.php index 579ff7caa..e0fef50db 100644 --- a/include/feed.php +++ b/include/feed.php @@ -177,18 +177,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { foreach (array_reverse($entrylist) AS $entry) { $item = array_merge($header, $author); - $item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue; - - if ($item["title"] == "") - $item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue; - - if ($item["title"] == "") - $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue; - - $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes; - if (!is_object($alternate)) - $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes; - if (is_object($alternate)) foreach($alternate AS $attributes) if ($attributes->name == "href") @@ -212,6 +200,27 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { $item["parent-uri"] = $item["uri"]; + if (!$simulate) { + $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')", + intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN)); + if ($r) { + logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); + continue; + } + } + + $item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue; + + if ($item["title"] == "") + $item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue; + + if ($item["title"] == "") + $item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue; + + $alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes; + if (!is_object($alternate)) + $alternate = $xpath->query("atom:link", $entry)->item(0)->attributes; + $published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue; if ($published == "") @@ -250,15 +259,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) { if ($creator != "") $item["author-name"] = $creator; - if (!$simulate) { - $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')", - intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN)); - if ($r) { - logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); - continue; - } - } - /// @TODO ? // Ausland // diff --git a/include/poller.php b/include/poller.php index e8bfb8838..16198580f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -206,6 +206,16 @@ function poller_exec_function($queue, $funcname, $argv) { $duration = number_format(microtime(true) - $stamp, 3); + if ($duration > 3600) { + logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG); + } elseif ($duration > 600) { + logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", LOGGER_DEBUG); + } elseif ($duration > 300) { + logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", LOGGER_DEBUG); + } elseif ($duration > 120) { + logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", LOGGER_DEBUG); + } + logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds."); // Write down the performance values into the log From 7324a661f1e6fdf6320b5a4846980b7493254617 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 1 Feb 2017 00:15:37 +0000 Subject: [PATCH 05/21] Optimized timeouts during network operations --- include/dfrn.php | 8 +- include/network.php | 2 + include/onepoll.php | 211 ++++++++++++++++++++++++------------------- include/socgraph.php | 22 ++++- 4 files changed, 148 insertions(+), 95 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 903db9b60..fbf6aea56 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -913,7 +913,13 @@ class dfrn { logger('dfrn_deliver: ' . $url); - $xml = fetch_url($url); + $ret = z_fetch_url($url); + + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return(-1); // timed out + } + + $xml = $ret['body']; $curl_stat = $a->get_curl_code(); if(! $curl_stat) diff --git a/include/network.php b/include/network.php index b7839de21..60b05bc77 100644 --- a/include/network.php +++ b/include/network.php @@ -141,6 +141,8 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) { logger('fetch_url error fetching '.$url.': '.curl_error($ch), LOGGER_NORMAL); } + $ret['errno'] = curl_errno($ch); + $base = $s; $curl_info = @curl_getinfo($ch); diff --git a/include/onepoll.php b/include/onepoll.php index 5219d9f3b..552fea36f 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -15,11 +15,11 @@ function RemoveReply($subject) { function onepoll_run(&$argv, &$argc){ global $a, $db; - if(is_null($a)) { + if (is_null($a)) { $a = new App; } - if(is_null($db)) { + if (is_null($db)) { @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -48,21 +48,25 @@ function onepoll_run(&$argv, &$argc){ $force = false; $restart = false; - if(($argc > 1) && (intval($argv[1]))) + if (($argc > 1) && (intval($argv[1]))) { $contact_id = intval($argv[1]); + } - if(($argc > 2) && ($argv[2] == "force")) + if (($argc > 2) && ($argv[2] == "force")) { $force = true; + } - if(! $contact_id) { + if (! $contact_id) { logger('onepoll: no contact'); return; } // Don't check this stuff if the function is called by the poller - if (App::callstack() != "poller_run") - if (App::is_already_running('onepoll'.$contact_id, '', 540)) + if (App::callstack() != "poller_run") { + if (App::is_already_running('onepoll'.$contact_id, '', 540)) { return; + } + } $d = datetime_convert(); @@ -83,8 +87,9 @@ function onepoll_run(&$argv, &$argc){ intval($contact_id) ); - if(! count($contacts)) + if (! count($contacts)) { return; + } $contact = $contacts[0]; @@ -94,9 +99,11 @@ function onepoll_run(&$argv, &$argc){ where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", intval($contact['id']) ); - if (dbm::is_result($r)) - if (!$r[0]['total']) + if (dbm::is_result($r)) { + if (!$r[0]['total']) { poco_load($contact['id'],$importer_uid,0,$contact['poco']); + } + } } /// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?) @@ -127,24 +134,24 @@ function onepoll_run(&$argv, &$argc){ $t = $contact['last-update']; - if($contact['subhub']) { + if ($contact['subhub']) { $poll_interval = get_config('system','pushpoll_frequency'); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); $hub_update = false; - if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) - $hub_update = true; - } - else + if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) { + $hub_update = true; + } + } else { $hub_update = false; - + } $importer_uid = $contact['uid']; $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($importer_uid) ); - if (! dbm::is_result($r)) { + if (!dbm::is_result($r)) { return; } @@ -158,7 +165,7 @@ function onepoll_run(&$argv, &$argc){ ); // Update the contact entry - if(($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) { + if (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) { if (!poco_reachable($contact['url'])) { logger("Skipping probably dead contact ".$contact['url']); return; @@ -167,40 +174,50 @@ function onepoll_run(&$argv, &$argc){ if (!update_contact($contact["id"])) { mark_for_death($contact); return; - } else + } else { unmark_for_death($contact); + } } - if($contact['network'] === NETWORK_DFRN) { + if ($contact['network'] === NETWORK_DFRN) { $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); - if(intval($contact['duplex']) && $contact['dfrn-id']) + if (intval($contact['duplex']) && $contact['dfrn-id']) { $idtosend = '0:' . $orig_id; - if(intval($contact['duplex']) && $contact['issued-id']) + } + if (intval($contact['duplex']) && $contact['issued-id']) { $idtosend = '1:' . $orig_id; + } // they have permission to write to us. We already filtered this in the contact query. $perm = 'rw'; // But this may be our first communication, so set the writable flag if it isn't set already. - if(! intval($contact['writable'])) + if (! intval($contact['writable'])) { q("update contact set writable = 1 where id = %d", intval($contact['id'])); - + } $url = $contact['poll'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=data&last_update=' . $last_update . '&perm=' . $perm ; - $handshake_xml = fetch_url($url); + $ret = z_fetch_url($url); + + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return; + } + + $handshake_xml = $ret['body']; + $html_code = $a->get_curl_code(); logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA); - if((! strlen($handshake_xml)) || ($html_code >= 400) || (! $html_code)) { + if ((! strlen($handshake_xml)) || ($html_code >= 400) || (! $html_code)) { logger("poller: $url appears to be dead - marking for death "); // dead connection - might be a transient event, or this might @@ -219,7 +236,7 @@ function onepoll_run(&$argv, &$argc){ return; } - if(! strstr($handshake_xml,'<')) { + if (! strstr($handshake_xml,'<')) { logger('poller: response from ' . $url . ' did not contain XML.'); mark_for_death($contact); @@ -235,7 +252,7 @@ function onepoll_run(&$argv, &$argc){ $res = parse_xml_string($handshake_xml); - if(intval($res->status) == 1) { + if (intval($res->status) == 1) { logger("poller: $url replied status 1 - marking for death "); // we may not be friends anymore. Will keep trying for one month. @@ -248,18 +265,16 @@ function onepoll_run(&$argv, &$argc){ intval($contact['id']) ); mark_for_death($contact); - } - else { - if($contact['term-date'] != '0000-00-00 00:00:00') { - logger("poller: $url back from the dead - removing mark for death"); - unmark_for_death($contact); - } + } elseif ($contact['term-date'] != '0000-00-00 00:00:00') { + logger("poller: $url back from the dead - removing mark for death"); + unmark_for_death($contact); } - if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) + if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) { return; + } - if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) { + if (((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) { q("update contact set poco = '%s' where id = %d", dbesc(str_replace('/profile/','/poco/', $contact['url'])), intval($contact['id']) @@ -273,21 +288,21 @@ function onepoll_run(&$argv, &$argc){ $final_dfrn_id = ''; - if(($contact['duplex']) && strlen($contact['prvkey'])) { + if (($contact['duplex']) && strlen($contact['prvkey'])) { openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']); openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']); - } - else { + } else { openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']); } $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); - if(strpos($final_dfrn_id,':') == 1) + if (strpos($final_dfrn_id,':') == 1) { $final_dfrn_id = substr($final_dfrn_id,2); + } - if($final_dfrn_id != $orig_id) { + if ($final_dfrn_id != $orig_id) { logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); // did not decode properly - cannot trust this site return; @@ -299,10 +314,9 @@ function onepoll_run(&$argv, &$argc){ $xml = post_url($contact['poll'],$postvars); - } - elseif(($contact['network'] === NETWORK_OSTATUS) + } elseif (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) - || ($contact['network'] === NETWORK_FEED) ) { + || ($contact['network'] === NETWORK_FEED)) { // Upgrading DB fields from an older Friendica version // Will only do this once per notify-enabled OStatus contact @@ -311,10 +325,11 @@ function onepoll_run(&$argv, &$argc){ $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); // Contacts from OStatus are always writable - if($contact['network'] === NETWORK_OSTATUS) + if ($contact['network'] === NETWORK_OSTATUS) { $stat_writeable = 1; + } - if($stat_writeable != $contact['writable']) { + if ($stat_writeable != $contact['writable']) { q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d", intval($stat_writeable), intval($contact['id']) @@ -323,19 +338,26 @@ function onepoll_run(&$argv, &$argc){ // Are we allowed to import from this person? - if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) + if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) { return; + } $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-'); - $xml = fetch_url($contact['poll'], false, $redirects, 0, Null, $cookiejar); + $ret = z_fetch_url($contact['poll'], false, $redirects, array('cookiejar' => $cookiejar)); + + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return; + } + + $xml = $ret['body']; + unlink($cookiejar); - } - elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) { + } elseif ($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) { logger("Mail: Fetching", LOGGER_DEBUG); $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); - if($mail_disabled) + if ($mail_disabled) return; logger("Mail: Enabled", LOGGER_DEBUG); @@ -347,38 +369,38 @@ function onepoll_run(&$argv, &$argc){ $mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1", intval($importer_uid) ); - if(count($x) && count($mailconf)) { + if (count($x) && count($mailconf)) { $mailbox = construct_mailbox_name($mailconf[0]); $password = ''; openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']); $mbox = email_connect($mailbox,$mailconf[0]['user'],$password); unset($password); logger("Mail: Connect to " . $mailconf[0]['user']); - if($mbox) { + if ($mbox) { q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc(datetime_convert()), intval($mailconf[0]['id']), intval($importer_uid) ); logger("Mail: Connected to " . $mailconf[0]['user']); - } else + } else { logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors(), true)); + } } - if($mbox) { + if ($mbox) { $msgs = email_poll($mbox,$contact['addr']); - if(count($msgs)) { + if (count($msgs)) { logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG); $metas = email_msg_meta($mbox,implode(',',$msgs)); - if(count($metas) != count($msgs)) { + if (count($metas) != count($msgs)) { logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); - } - else { + } else { $msgs = array_combine($msgs, $metas); - foreach($msgs as $msg_uid => $meta) { + foreach ($msgs as $msg_uid => $meta) { logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); $datarray = array(); @@ -400,7 +422,7 @@ function onepoll_run(&$argv, &$argc){ // Only delete when mails aren't automatically moved or deleted if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3)) - if($meta->deleted && ! $r[0]['deleted']) { + if ($meta->deleted && ! $r[0]['deleted']) { q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($r[0]['id']) @@ -434,13 +456,13 @@ function onepoll_run(&$argv, &$argc){ // $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : ''); $raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : ''); - if(! trim($raw_refs)) + if (! trim($raw_refs)) $raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : ''); $raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr - if($raw_refs) { + if ($raw_refs) { $refs_arr = explode(' ', $raw_refs); - if(count($refs_arr)) { + if (count($refs_arr)) { for($x = 0; $x < count($refs_arr); $x ++) $refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'"; } @@ -456,12 +478,13 @@ function onepoll_run(&$argv, &$argc){ // Decoding the header $subject = imap_mime_header_decode($meta->subject); $datarray['title'] = ""; - foreach($subject as $subpart) - if ($subpart->charset != "default") + foreach ($subject as $subpart) { + if ($subpart->charset != "default") { $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); - else + } else { $datarray['title'] .= $subpart->text; - + } + } $datarray['title'] = notags(trim($datarray['title'])); //$datarray['title'] = notags(trim($meta->subject)); @@ -476,7 +499,7 @@ function onepoll_run(&$argv, &$argc){ $datarray['title'] = RemoveReply($datarray['title']); // If it seems to be a reply but a header couldn't be found take the last message with matching subject - if(!x($datarray,'parent-uri') and $reply) { + if (!x($datarray,'parent-uri') and $reply) { $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1", dbesc(protect_sprintf($datarray['title'])), intval($importer_uid), @@ -485,12 +508,12 @@ function onepoll_run(&$argv, &$argc){ $datarray['parent-uri'] = $r[0]['parent-uri']; } - if(! x($datarray,'parent-uri')) + if (! x($datarray,'parent-uri')) $datarray['parent-uri'] = $datarray['uri']; $r = email_get_msg($mbox,$msg_uid, $reply); - if(! $r) { + if (! $r) { logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']); continue; } @@ -502,23 +525,26 @@ function onepoll_run(&$argv, &$argc){ // some mailing lists have the original author as 'from' - add this sender info to msg body. /// @TODO Adding a gravatar for the original author would be cool - if(! stristr($meta->from,$contact['addr'])) { + if (! stristr($meta->from,$contact['addr'])) { $from = imap_mime_header_decode($meta->from); $fromdecoded = ""; - foreach($from as $frompart) - if ($frompart->charset != "default") + foreach ($from as $frompart) { + if ($frompart->charset != "default") { $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); - else + } else { $fromdecoded .= $frompart->text; + } + } $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname()); $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host; - if (isset($fromarr[0]->personal)) + if (isset($fromarr[0]->personal)) { $fromname = $fromarr[0]->personal; - else + } else { $fromname = $frommail; + } //$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; @@ -538,9 +564,9 @@ function onepoll_run(&$argv, &$argc){ $datarray['uid'] = $importer_uid; $datarray['contact-id'] = $contact['id']; - if($datarray['parent-uri'] === $datarray['uri']) + if ($datarray['parent-uri'] === $datarray['uri']) $datarray['private'] = 1; - if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { + if (($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { $datarray['private'] = 1; $datarray['allow_cid'] = '<' . $contact['id'] . '>'; } @@ -574,24 +600,24 @@ function onepoll_run(&$argv, &$argc){ } } } - } else + } else { logger("Mail: no mails for ".$mailconf[0]['user']); + } logger("Mail: closing connection for ".$mailconf[0]['user']); imap_close($mbox); } - } - elseif($contact['network'] === NETWORK_FACEBOOK) { + } elseif ($contact['network'] === NETWORK_FACEBOOK) { // This is picked up by the Facebook plugin on a cron hook. // Ignored here. - } elseif($contact['network'] === NETWORK_PUMPIO) { + } elseif ($contact['network'] === NETWORK_PUMPIO) { // This is picked up by the pump.io plugin on a cron hook. // Ignored here. } - if($xml) { + if ($xml) { logger('poller: received xml : ' . $xml, LOGGER_DATA); - if(! strstr($xml,'<')) { + if (! strstr($xml,'<')) { logger('poller: post_handshake: response from ' . $url . ' did not contain XML.'); $r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), @@ -611,10 +637,10 @@ function onepoll_run(&$argv, &$argc){ consume_feed($xml,$importer,$contact,$hub,1,2); $hubmode = 'subscribe'; - if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) + if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) $hubmode = 'unsubscribe'; - if(($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) + if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) $hub_update = true; if ($force) @@ -622,14 +648,15 @@ function onepoll_run(&$argv, &$argc){ logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update); - if((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) { + if ((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) { logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']); $hubs = explode(',', $hub); - if(count($hubs)) { - foreach($hubs as $h) { + if (count($hubs)) { + foreach ($hubs as $h) { $h = trim($h); - if(! strlen($h)) + if (! strlen($h)) { continue; + } subscribe_to_hub($h,$importer,$contact,$hubmode); } } @@ -671,7 +698,7 @@ function onepoll_run(&$argv, &$argc){ return; } -if (array_search(__file__,get_included_files())===0){ +if (array_search(__file__,get_included_files())===0) { onepoll_run($_SERVER["argv"],$_SERVER["argc"]); killme(); } diff --git a/include/socgraph.php b/include/socgraph.php index 32c151c04..312b1b73f 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -732,14 +732,32 @@ function poco_check_server($server_url, $network = "", $force = false) { $orig_last_failure = $last_failure; // Check if the page is accessible via SSL. + $orig_server_url = $server_url; $server_url = str_replace("http://", "https://", $server_url); - $serverret = z_fetch_url($server_url."/.well-known/host-meta"); + + // We set the timeout to 20 seconds since this operation should be done in no time if the server was vital + $serverret = z_fetch_url($server_url."/.well-known/host-meta", false, $redirects, array('timeout' => 20)); + + // Quit if there is a timeout. + // But we want to make sure to only quit if we are mostly sure that this server url fits. + if (($orig_server_url == $server_url) AND ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { + logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); + return false; + } // Maybe the page is unencrypted only? $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0"); if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { $server_url = str_replace("https://", "http://", $server_url); - $serverret = z_fetch_url($server_url."/.well-known/host-meta"); + + // We set the timeout to 20 seconds since this operation should be done in no time if the server was vital + $serverret = z_fetch_url($server_url."/.well-known/host-meta", false, $redirects, array('timeout' => 20)); + + // Quit if there is a timeout + if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) { + logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); + return false; + } $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0"); } From 7a89d06465a69ad211aabdd5e2778506a7b2f81e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 1 Feb 2017 08:43:18 +0000 Subject: [PATCH 06/21] Make sure that we only quit when we are sure we can --- include/socgraph.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 312b1b73f..19b94205a 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -690,7 +690,7 @@ function poco_check_server($server_url, $network = "", $force = false) { return false; $servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url))); - if ($servers) { + if (dbm::is_result($servers)) { if ($servers[0]["created"] == "0000-00-00 00:00:00") q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'", @@ -740,7 +740,8 @@ function poco_check_server($server_url, $network = "", $force = false) { // Quit if there is a timeout. // But we want to make sure to only quit if we are mostly sure that this server url fits. - if (($orig_server_url == $server_url) AND ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { + if (dbm::is_result($servers) AND ($orig_server_url == $server_url) AND + ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); return false; } From ef0fb5148c9ce2e718aecc3d2d8a6fabd7340a1a Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 1 Feb 2017 21:35:01 +0000 Subject: [PATCH 07/21] Some more timeout checks --- include/Probe.php | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/include/Probe.php b/include/Probe.php index 0b3c66412..026ae33e6 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -60,7 +60,12 @@ class Probe { $xrd_timeout = Config::get('system','xrd_timeout', 20); $redirects = 0; - $xml = fetch_url($ssl_url, false, $redirects, $xrd_timeout, "application/xrd+xml"); + $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return false; + } + $xml = $ret['body']; + $xrd = parse_xml_string($xml, false); if (!is_object($xrd)) { @@ -430,7 +435,12 @@ class Probe { $xrd_timeout = Config::get('system','xrd_timeout', 20); $redirects = 0; - $data = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml"); + $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return false; + } + $data = $ret['body']; + $xrd = parse_xml_string($data, false); if (!is_object($xrd)) { @@ -482,9 +492,14 @@ class Probe { * @return array noscrape data */ private function poll_noscrape($noscrape, $data) { - $content = fetch_url($noscrape); - if (!$content) + $ret = z_fetch_url($noscrape); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { return false; + } + $content = $ret['body']; + if (!$content) { + return false; + } $json = json_decode($content, true); if (!is_array($json)) @@ -663,10 +678,14 @@ class Probe { * @return array hcard data */ private function poll_hcard($hcard, $data, $dfrn = false) { - - $content = fetch_url($hcard); - if (!$content) + $ret = z_fetch_url($hcard); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { return false; + } + $content = $ret['body']; + if (!$content) { + return false; + } $doc = new DOMDocument(); if (!@$doc->loadHTML($content)) @@ -1035,7 +1054,11 @@ class Probe { * @return array feed data */ private function feed($url, $probe = true) { - $feed = fetch_url($url); + $ret = z_fetch_url($url); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return false; + } + $feed = $ret['body']; $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true); if (!$feed_data) { From 9a19ae7ce1b73f935d5d2e41a852fdb51f7e54da Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 2 Feb 2017 05:52:45 +0000 Subject: [PATCH 08/21] The queue now works with the cache - whoch should speed it up --- include/Probe.php | 21 +++++++++++++++++---- include/queue.php | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 43 insertions(+), 24 deletions(-) diff --git a/include/Probe.php b/include/Probe.php index 026ae33e6..1b6feb107 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -69,7 +69,11 @@ class Probe { $xrd = parse_xml_string($xml, false); if (!is_object($xrd)) { - $xml = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml"); + $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return false; + } + $xml = $ret['body']; $xrd = parse_xml_string($xml, false); } if (!is_object($xrd)) @@ -878,8 +882,13 @@ class Probe { $pubkey = substr($pubkey, strpos($pubkey, ',') + 1); else $pubkey = substr($pubkey, 5); - } elseif (normalise_link($pubkey) == 'http://') - $pubkey = fetch_url($pubkey); + } elseif (normalise_link($pubkey) == 'http://') { + $ret = z_fetch_url($pubkey); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return false; + } + $pubkey = $ret['body']; + } $key = explode(".", $pubkey); @@ -899,7 +908,11 @@ class Probe { return false; // Fetch all additional data from the feed - $feed = fetch_url($data["poll"]); + $ret = z_fetch_url($data["poll"]); + if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + return false; + } + $feed = $ret['body']; $feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true); if (!$feed_data) return false; diff --git a/include/queue.php b/include/queue.php index bcd32985d..3ccceb475 100644 --- a/include/queue.php +++ b/include/queue.php @@ -5,15 +5,16 @@ use \Friendica\Core\Config; require_once("boot.php"); require_once('include/queue_fn.php'); require_once('include/dfrn.php'); +require_once('include/cache.php'); function queue_run(&$argv, &$argc){ global $a, $db; - if(is_null($a)){ + if (is_null($a)){ $a = new App; } - if(is_null($db)){ + if (is_null($db)){ @include(".htconfig.php"); require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); @@ -42,9 +43,8 @@ function queue_run(&$argv, &$argc){ else $queue_id = 0; - $deadguys = array(); - $deadservers = array(); - $serverlist = array(); + $cachekey_deadguy = 'queue_run:deadguy:'; + $cachekey_server = 'queue_run:server:'; if (!$queue_id) { @@ -133,26 +133,32 @@ function queue_run(&$argv, &$argc){ remove_queue_item($q_item['id']); continue; } - if(in_array($c[0]['notify'],$deadguys)) { - logger('queue: skipping known dead url: ' . $c[0]['notify']); + + $dead = Cache::get($cachekey_deadguy.$c[0]['notify']); + + if (!is_null($dead) AND $dead) { + logger('queue: skipping known dead url: '.$c[0]['notify']); update_queue_time($q_item['id']); continue; } $server = poco_detect_server($c[0]['url']); - if (($server != "") AND !in_array($server, $serverlist)) { - logger("Check server ".$server." (".$c[0]["network"].")"); - if (!poco_check_server($server, $c[0]["network"], true)) - $deadservers[] = $server; + if ($server != "") { + $vital = Cache::get($cachekey_server.$server); - $serverlist[] = $server; - } + if (is_null($vital)) { + logger("Check server ".$server." (".$c[0]["network"].")"); - if (($server != "") AND in_array($server, $deadservers)) { - logger('queue: skipping known dead server: '.$server); - update_queue_time($q_item['id']); - continue; + $vital = poco_check_server($server, $c[0]["network"], true); + Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR); + } + + if (!is_null($vital) AND !$vital) { + logger('queue: skipping dead server: '.$server); + update_queue_time($q_item['id']); + continue; + } } $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` @@ -178,7 +184,7 @@ function queue_run(&$argv, &$argc){ if($deliver_status == (-1)) { update_queue_time($q_item['id']); - $deadguys[] = $contact['notify']; + Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); } else remove_queue_item($q_item['id']); @@ -190,7 +196,7 @@ function queue_run(&$argv, &$argc){ if($deliver_status == (-1)) { update_queue_time($q_item['id']); - $deadguys[] = $contact['notify']; + Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); } else remove_queue_item($q_item['id']); } @@ -202,7 +208,7 @@ function queue_run(&$argv, &$argc){ if($deliver_status == (-1)) { update_queue_time($q_item['id']); - $deadguys[] = $contact['notify']; + Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); } else remove_queue_item($q_item['id']); From 9c4a53e38027f6a8649763507ed395fde1e0cca9 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 4 Feb 2017 16:16:15 +0000 Subject: [PATCH 09/21] Optimized query for nodeinfo, better way to analyze posting problems with DFRN --- include/delivery.php | 2 +- include/dfrn.php | 20 ++++++++++---------- include/queue.php | 43 +++++++++++++++++++++++-------------------- mod/nodeinfo.php | 7 ++++--- 4 files changed, 38 insertions(+), 34 deletions(-) diff --git a/include/delivery.php b/include/delivery.php index 5000a1edb..8ccb19ced 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -398,7 +398,7 @@ function delivery_run(&$argv, &$argc){ logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status); - if ($deliver_status == (-1)) { + if ($deliver_status < 0) { logger('notifier: delivery failed: queuing message'); add_to_queue($contact['id'],NETWORK_DFRN,$atom); diff --git a/include/dfrn.php b/include/dfrn.php index fbf6aea56..30057001c 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -916,14 +916,14 @@ class dfrn { $ret = z_fetch_url($url); if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { - return(-1); // timed out + return -2; // timed out } $xml = $ret['body']; $curl_stat = $a->get_curl_code(); if(! $curl_stat) - return(-1); // timed out + return -3; // timed out logger('dfrn_deliver: ' . $xml, LOGGER_DATA); @@ -1023,24 +1023,24 @@ class dfrn { $key = Crypto::createNewRandomKey(); } catch (CryptoTestFailed $ex) { logger('Cannot safely create a key'); - return -1; + return -4; } catch (CannotPerformOperation $ex) { logger('Cannot safely create a key'); - return -1; + return -5; } try { $data = Crypto::encrypt($postvars['data'], $key); } catch (CryptoTestFailed $ex) { logger('Cannot safely perform encryption'); - return -1; + return -6; } catch (CannotPerformOperation $ex) { logger('Cannot safely perform encryption'); - return -1; + return -7; } break; default: logger("rino: invalid requested verision '$rino_remote_version'"); - return -1; + return -8; } $postvars['rino'] = $rino_remote_version; @@ -1074,16 +1074,16 @@ class dfrn { logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA); - $xml = post_url($contact['notify'],$postvars); + $xml = post_url($contact['notify'], $postvars); logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA); $curl_stat = $a->get_curl_code(); if((! $curl_stat) || (! strlen($xml))) - return(-1); // timed out + return -9; // timed out if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) - return(-1); + return -10; if(strpos($xml,' 1) + if ($argc > 1) { $queue_id = intval($argv[1]); - else + } else { $queue_id = 0; + } $cachekey_deadguy = 'queue_run:deadguy:'; $cachekey_server = 'queue_run:server:'; @@ -64,7 +65,7 @@ function queue_run(&$argv, &$argc){ foreach ($r as $rr) { logger('queue: deliverq'); proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']); - if($interval) { + if ($interval) { time_sleep_until(microtime(true) + (float) $interval); } } @@ -111,10 +112,10 @@ function queue_run(&$argv, &$argc){ // queue_predeliver hooks may have changed the queue db details, // so check again if this entry still needs processing - if($queue_id) + if ($queue_id) { $qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1", intval($queue_id)); - elseif (get_config("system", "worker")) { + } elseif (get_config("system", "worker")) { logger('Call queue for id '.$q_item['id']); proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']); continue; @@ -122,8 +123,9 @@ function queue_run(&$argv, &$argc){ $qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ", intval($q_item['id'])); - if(! count($qi)) + if (!dbm::is_result($qi)) { continue; + } $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", @@ -182,36 +184,37 @@ function queue_run(&$argv, &$argc){ logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>'); $deliver_status = dfrn::deliver($owner,$contact,$data); - if($deliver_status == (-1)) { + if ($deliver_status < 0) { update_queue_time($q_item['id']); Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); - } else + } else { remove_queue_item($q_item['id']); - + } break; case NETWORK_OSTATUS: - if($contact['notify']) { + if ($contact['notify']) { logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>'); $deliver_status = slapper($owner,$contact['notify'],$data); - if($deliver_status == (-1)) { + if ($deliver_status == (-1)) { update_queue_time($q_item['id']); Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); - } else + } else { remove_queue_item($q_item['id']); + } } break; case NETWORK_DIASPORA: - if($contact['notify']) { + if ($contact['notify']) { logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>'); $deliver_status = Diaspora::transmit($owner,$contact,$data,$public,true); - if($deliver_status == (-1)) { + if ($deliver_status == (-1)) { update_queue_time($q_item['id']); Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR); - } else + } else { remove_queue_item($q_item['id']); - + } } break; @@ -219,15 +222,15 @@ function queue_run(&$argv, &$argc){ $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false); call_hooks('queue_deliver', $a, $params); - if($params['result']) + if ($params['result']) { remove_queue_item($q_item['id']); - else + } else { update_queue_time($q_item['id']); - + } break; } - logger('Deliver status '.$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>'); + logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>'); } return; diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php index e084b25da..6f2049475 100644 --- a/mod/nodeinfo.php +++ b/mod/nodeinfo.php @@ -228,9 +228,10 @@ function nodeinfo_cron() { logger("local_posts: ".$local_posts, LOGGER_DEBUG); - $posts = qu("SELECT COUNT(*) AS `local_comments` FROM `item` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `contact`.`self` and `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')", + $posts = qu("SELECT COUNT(*) FROM `contact` + INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND + `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s') + WHERE `contact`.`self`", dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN)); if (!is_array($posts)) From f5a634abbcad08131abbefa8442f622ba1b40b14 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 10 Feb 2017 19:23:46 +0000 Subject: [PATCH 10/21] Changed server detection. --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index 19b94205a..689a39614 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -765,7 +765,7 @@ function poco_check_server($server_url, $network = "", $force = false) { if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { // Workaround for bad configured servers (known nginx problem) - if ($serverret["debug"]["http_code"] != "403") { + if (!in_array($serverret["debug"]["http_code"], array("403", "404"))) { $last_failure = datetime_convert(); $failure = true; } From 3ea830e22152e2d2ded6cad28599e22061406bbe Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 3 Mar 2017 21:45:36 -0500 Subject: [PATCH 11/21] Strip @hubzilla.server part from guid for autoscrolling purpuses --- view/theme/frio/js/mod_display.js | 3 ++- view/theme/frio/templates/wall_thread.tpl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/view/theme/frio/js/mod_display.js b/view/theme/frio/js/mod_display.js index 86608821e..ed126d60c 100644 --- a/view/theme/frio/js/mod_display.js +++ b/view/theme/frio/js/mod_display.js @@ -4,8 +4,9 @@ // Catch the GUID from the URL var itemGuid = window.location.pathname.split("/").pop(); +var itemGuidSafe = itemGuid.replace(/%.*/, ''); $(window).load(function(){ // Scroll to the Item by its GUID - scrollToItem('item-'+itemGuid); + scrollToItem('item-' + itemGuidSafe); }); diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index e71dc7b84..1977f541c 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -68,9 +68,9 @@ as the value of $top_child_total (this is done at the end of this file) {{* Use a different div container in dependence max thread-level = 7 *}} {{if $item.thread_level<7}} -
+
{{else}} -
+
{{/if}}
{{* Put addional actions in a top-right dropdown menu *}} From ff64beeb4e437ae408bfc2f56b6829ce9694f278 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Mar 2017 05:37:01 -0500 Subject: [PATCH 12/21] Reformatted get_contact() - Resolved one `@todo` (the catch-all contact query) - Improved code readability by naming variables - Code standards compliance --- include/Contact.php | 141 ++++++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 64 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 2aab828f8..553bf938c 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -508,72 +508,81 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) { /** * @brief Fetch the contact id for a given url and user * + * First lookup in the contact table to find a record matching either `url`, `nurl`, + * `addr` or `alias`. + * + * If there's no record and we aren't looking for a public contact, we quit. + * If there's one, we check that it isn't time to update the picture else we + * directly return the found contact id. + * + * Second, we probe the provided $url wether it's http://server.tld/profile or + * nick@server.tld. We quit if we can't get any info back. + * + * Third, we create the contact record if it doesn't exist + * + * Fourth, we update the existing record with the new data (avatar, alias, nick) + * if there's any updates + * * @param string $url Contact URL - * @param integer $uid The user id for the contact + * @param integer $uid The user id for the contact (0 = public contact) * @param boolean $no_update Don't update the contact * * @return integer Contact ID */ function get_contact($url, $uid = 0, $no_update = false) { - require_once("include/Scrape.php"); + require_once "include/Scrape.php"; logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);; $data = array(); - $contactid = 0; + $contact_id = 0; - // is it an address in the format user@server.tld? - /// @todo use gcontact and/or the addr field for a lookup - if (!strstr($url, "http") OR strstr($url, "@")) { - $data = probe_url($url); - $url = $data["url"]; - if ($url == "") - return 0; - } + // Catch-all query, may return multiple rows + $contacts = q("SELECT `id`, `avatar-date` FROM `contact` + WHERE ('%s' IN (`url`, `addr`, `alias`) OR '%s' IN (`nurl`, `alias`)) + AND `uid` = %d", + dbesc($url), + dbesc(normalise_link($url)), + intval($uid)); - $contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", - dbesc(normalise_link($url)), - intval($uid)); - - if (!$contact) - $contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d ORDER BY `id` LIMIT 1", - dbesc($url), - dbesc(normalise_link($url)), - intval($uid)); - - if ($contact) { - $contactid = $contact[0]["id"]; + if (dbm::is_result($contacts)) { + $contact_id = $contacts[0]["id"]; // Update the contact every 7 days - $update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days')); - //$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours')); + $update_photo = ($contacts[0]['avatar-date'] < datetime_convert('','','now -7 days')); if (!$update_photo OR $no_update) { - return($contactid); + return $contact_id; } - } elseif ($uid != 0) + } elseif ($uid != 0) { return 0; + } - if (!count($data)) - $data = probe_url($url); - - // Does this address belongs to a valid network? - if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { - if ($uid != 0) - return 0; - - // Get data from the gcontact table - $r = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'", - dbesc(normalise_link($url))); - if (!$r) - return 0; - - $data = $r[0]; + $data = probe_url($url); + if (!$data['url']) { + return 0; } $url = $data["url"]; - if ($contactid == 0) { + // Does this address belongs to a valid network? + if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + if ($uid != 0) { + return 0; + } + + // Get data from the gcontact table + $gcontacts = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'", + dbesc(normalise_link($url))); + if (!$gcontacts) { + return 0; + } + + $data = $gcontacts[0]; + } + + + if (!$contact_id) { q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, `batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`, @@ -602,45 +611,48 @@ function get_contact($url, $uid = 0, $no_update = false) { dbesc(datetime_convert()) ); - $contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", + $contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", dbesc(normalise_link($data["url"])), intval($uid)); - if (!$contact) + if (!dbm::is_result($contacts)) { return 0; + } - $contactid = $contact[0]["id"]; + $contact_id = $contacts[0]["id"]; // Update the newly created contact from data in the gcontact table - $r = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'", + $gcontacts = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($data["url"]))); - if ($r) { - logger("Update contact ".$data["url"]); + if (dbm::is_result($gcontacts)) { + logger("Update contact " . $data["url"] . ' from gcontact'); q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d", - dbesc($r["location"]), dbesc($r["about"]), dbesc($r["keywords"]), - dbesc($r["gender"]), intval($contactid)); + dbesc($gcontacts[0]["location"]), dbesc($gcontacts[0]["about"]), dbesc($gcontacts[0]["keywords"]), + dbesc($gcontacts[0]["gender"]), intval($contact_id)); } } - if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != "")) + if (count($contacts) > 1 AND $uid == 0 AND $contact_id != 0 AND $url != "") { q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`", dbesc(normalise_link($url)), - intval($contactid)); + intval($contact_id)); + } - require_once("Photo.php"); + require_once "Photo.php"; - update_contact_avatar($data["photo"],$uid,$contactid); + update_contact_avatar($data["photo"], $uid, $contact_id); - $r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contactid)); + $contacts = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contact_id)); // This condition should always be true - if (!dbm::is_result($r)) - return $contactid; + if (!dbm::is_result($contacts)) { + return $contact_id; + } // Only update if there had something been changed - if (($data["addr"] != $r[0]["addr"]) OR - ($data["alias"] != $r[0]["alias"]) OR - ($data["name"] != $r[0]["name"]) OR - ($data["nick"] != $r[0]["nick"])) + if ($data["addr"] != $contacts[0]["addr"] OR + $data["alias"] != $contacts[0]["alias"] OR + $data["name"] != $contacts[0]["name"] OR + $data["nick"] != $contacts[0]["nick"]) { q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s', `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d", dbesc($data["addr"]), @@ -649,10 +661,11 @@ function get_contact($url, $uid = 0, $no_update = false) { dbesc($data["nick"]), dbesc(datetime_convert()), dbesc(datetime_convert()), - intval($contactid) + intval($contact_id) ); + } - return $contactid; + return $contact_id; } /** From 116b9e1c1f983cc3504cb5f1bf7877a46fb502d5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Mar 2017 06:01:08 -0500 Subject: [PATCH 13/21] Use Probe::uri instead of probe_url() - Moved file inclusion to enable lazy loading --- include/Contact.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 553bf938c..ae06ecf11 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -1,7 +1,5 @@ Date: Mon, 6 Mar 2017 16:19:12 -0500 Subject: [PATCH 14/21] Split slow catch-all query into three fast queries Thanks @annando for the tip. --- include/Contact.php | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index ae06ecf11..845ee168c 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -534,14 +534,32 @@ function get_contact($url, $uid = 0, $no_update = false) { $data = array(); $contact_id = 0; - // Catch-all query, may return multiple rows + // We first try the addr (nick@server.tld) $contacts = q("SELECT `id`, `avatar-date` FROM `contact` - WHERE ('%s' IN (`url`, `addr`, `alias`) OR '%s' IN (`nurl`, `alias`)) + WHERE `addr` = '%s' AND `uid` = %d", dbesc($url), - dbesc(normalise_link($url)), intval($uid)); + // Then the nurl (http://server.tld/nick) + if (! dbm::is_result($contacts)) { + $contacts = q("SELECT `id`, `avatar-date` FROM `contact` + WHERE `nurl` = '%s' + AND `uid` = %d", + dbesc(normalise_link($url)), + intval($uid)); + } + + // Then the alias (which could be anything) + if (! dbm::is_result($contacts)) { + $contacts = q("SELECT `id`, `avatar-date` FROM `contact` + WHERE `alias` IN ('%s', '%s') + AND `uid` = %d", + dbesc($url), + dbesc(normalise_link($url)), + intval($uid)); + } + if (dbm::is_result($contacts)) { $contact_id = $contacts[0]["id"]; @@ -552,6 +570,7 @@ function get_contact($url, $uid = 0, $no_update = false) { return $contact_id; } } elseif ($uid != 0) { + // Non-existing user-specific contact, exiting return 0; } From 97378893cd5875b37647f41e57349ba8af51b8c7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Mar 2017 16:26:04 -0500 Subject: [PATCH 15/21] Switch nurl and addr lookups - nurl lookup is more frequent than addr lookup, saves queries --- include/Contact.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 845ee168c..1fcdc6951 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -534,20 +534,21 @@ function get_contact($url, $uid = 0, $no_update = false) { $data = array(); $contact_id = 0; - // We first try the addr (nick@server.tld) + // We first try the nurl (http://server.tld/nick), most common case $contacts = q("SELECT `id`, `avatar-date` FROM `contact` - WHERE `addr` = '%s' - AND `uid` = %d", - dbesc($url), - intval($uid)); - - // Then the nurl (http://server.tld/nick) - if (! dbm::is_result($contacts)) { - $contacts = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d", dbesc(normalise_link($url)), intval($uid)); + + + // Then the addr (nick@server.tld) + if (! dbm::is_result($contacts)) { + $contacts = q("SELECT `id`, `avatar-date` FROM `contact` + WHERE `addr` = '%s' + AND `uid` = %d", + dbesc($url), + intval($uid)); } // Then the alias (which could be anything) From d7f62e82b96d0980e6e54fa8a1899f208b520a8b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 7 Mar 2017 16:28:15 -0500 Subject: [PATCH 16/21] Fix behavior regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverted quitting get_contact if Probe::uri didn’t yield an url for “nick@server.tld” form. --- include/Contact.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 1fcdc6951..5b0599449 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -577,11 +577,6 @@ function get_contact($url, $uid = 0, $no_update = false) { require_once('include/Probe.php'); $data = Probe::uri($url); - if (!$data['url']) { - return 0; - } - - $url = $data["url"]; // Does this address belongs to a valid network? if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { @@ -599,6 +594,12 @@ function get_contact($url, $uid = 0, $no_update = false) { $data = $gcontacts[0]; } + // Unable to convert nick@server.tld into http://server.tld/nick + if (!$data['url'] && (!strstr($url, "http") OR strstr($url, "@"))) { + return 0; + } + + $url = $data["url"]; if (!$contact_id) { q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, From 37b15995d84e3833363bb169dcab8c467bbf26b3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 7 Mar 2017 16:43:22 -0500 Subject: [PATCH 17/21] Add pump.io network to probing supported networks - Remove useless condition --- include/Contact.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 5b0599449..ee5ec0cfc 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -578,8 +578,8 @@ function get_contact($url, $uid = 0, $no_update = false) { require_once('include/Probe.php'); $data = Probe::uri($url); - // Does this address belongs to a valid network? - if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + // Last try in gcontact for unsupported networks + if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO))) { if ($uid != 0) { return 0; } @@ -594,11 +594,6 @@ function get_contact($url, $uid = 0, $no_update = false) { $data = $gcontacts[0]; } - // Unable to convert nick@server.tld into http://server.tld/nick - if (!$data['url'] && (!strstr($url, "http") OR strstr($url, "@"))) { - return 0; - } - $url = $data["url"]; if (!$contact_id) { From 2d2a35af730c323d9358d65c218907a914e5cf13 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 8 Mar 2017 18:03:41 +0000 Subject: [PATCH 18/21] Make Hypolite happy --- include/dfrn.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 30057001c..39372aef1 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -922,8 +922,9 @@ class dfrn { $xml = $ret['body']; $curl_stat = $a->get_curl_code(); - if(! $curl_stat) + if (!$curl_stat) { return -3; // timed out + } logger('dfrn_deliver: ' . $xml, LOGGER_DATA); @@ -1079,11 +1080,13 @@ class dfrn { logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA); $curl_stat = $a->get_curl_code(); - if((! $curl_stat) || (! strlen($xml))) + if ((!$curl_stat) || (!strlen($xml))) { return -9; // timed out + } - if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) + if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) { return -10; + } if(strpos($xml,' Date: Sun, 12 Mar 2017 03:55:22 -0400 Subject: [PATCH 19/21] Normalize line endings instead of adding
before Markdown() --- include/bb2diaspora.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index f18a0f3c2..e50999923 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -39,9 +39,9 @@ function diaspora2bb($s) { $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8'); // Handles single newlines - $s = str_replace("\r", '
', $s); - + $s = str_replace("\r\n", "\n", $s); $s = str_replace("\n", " \n", $s); + $s = str_replace("\r", " \n", $s); // Replace lonely stars in lines not starting with it with literal stars $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s); From 2bfa870c475e752c7911cf5047df24f6b48f3dd3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Mar 2017 14:38:01 +0100 Subject: [PATCH 20/21] Friendica Version 3.5.1 --- CHANGELOG | 2 +- VERSION | 1 + boot.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 VERSION diff --git a/CHANGELOG b/CHANGELOG index 7a8c8d48d..a3a974eb6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Version 3.5.1 +Version 3.5.1 (2017-03-12) Friendica Core: Updates to the translations (BG, CA, CS, DE, EO, ES, FR, IS, IT, NL, PL, PT-BR, RU, SV) [translation teams] Fix for a potential XSS vector [heluecht, thanks to Vít Šesták 'v6ak' for reporting the problem] diff --git a/VERSION b/VERSION new file mode 100644 index 000000000..d5c0c9914 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.5.1 diff --git a/boot.php b/boot.php index 832a95de4..c8e84e5c7 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ require_once('include/dbstructure.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); -define ( 'FRIENDICA_VERSION', '3.5.1-rc' ); +define ( 'FRIENDICA_VERSION', '3.5.1' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1215 ); From 30d82f43910f97b0e99c2e7235cbc5c812d39c35 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 12 Mar 2017 14:40:08 +0100 Subject: [PATCH 21/21] mark the develop version in the version string --- VERSION | 2 +- boot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d5c0c9914..ded27b074 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.1 +3.5.2-dev diff --git a/boot.php b/boot.php index c8e84e5c7..285c70370 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ require_once('include/dbstructure.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); -define ( 'FRIENDICA_VERSION', '3.5.1' ); +define ( 'FRIENDICA_VERSION', '3.5.2-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1215 );