Add Trending Tags widget + template

[friendica.git] / src / Util / HTTPSignature.php

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index ba44bcc80b5416786a4e6dea932ea92eedeeb1d3..8a058c3b5c7e45d15bd4737daf29dc41b76b5890 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -5,6 +5,7 @@
  */
 namespace Friendica\Util;
 
+use Friendica\Database\DBA;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Model\User;
@@ -314,7 +315,66 @@ class HTTPSignature
 
                Logger::log('Transmit to ' . $target . ' returned ' . $return_code, Logger::DEBUG);
 
-               return ($return_code >= 200) && ($return_code <= 299);
+               $success = ($return_code >= 200) && ($return_code <= 299);
+
+               self::setInboxStatus($target, $success);
+
+               return $success;
+       }
+
+       /**
+        * @brief Set the delivery status for a given inbox
+        *
+        * @param string  $url     The URL of the inbox
+        * @param boolean $success Transmission status
+        */
+       static private function setInboxStatus($url, $success)
+       {
+               $now = DateTimeFormat::utcNow();
+
+               $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
+               if (!DBA::isResult($status)) {
+                       DBA::insert('inbox-status', ['url' => $url, 'created' => $now]);
+                       $status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
+               }
+
+               if ($success) {
+                       $fields = ['success' => $now];
+               } else {
+                       $fields = ['failure' => $now];
+               }
+
+               if ($status['failure'] > DBA::NULL_DATETIME) {
+                       $new_previous_stamp = strtotime($status['failure']);
+                       $old_previous_stamp = strtotime($status['previous']);
+
+                       // Only set "previous" with at least one day difference.
+                       // We use this to assure to not accidentally archive too soon.
+                       if (($new_previous_stamp - $old_previous_stamp) >= 86400) {
+                               $fields['previous'] = $status['failure'];
+                       }
+               }
+
+               if (!$success) {
+                       if ($status['success'] <= DBA::NULL_DATETIME) {
+                               $stamp1 = strtotime($status['created']);
+                       } else {
+                               $stamp1 = strtotime($status['success']);
+                       }
+
+                       $stamp2 = strtotime($now);
+                       $previous_stamp = strtotime($status['previous']);
+
+                       // Archive the inbox when there had been failures for five days.
+                       // Additionally ensure that at least one previous attempt has to be in between.
+                       if ((($stamp2 - $stamp1) >= 86400 * 5) && ($previous_stamp > $stamp1)) {
+                               $fields['archive'] = true;
+                       }
+               } else {
+                       $fields['archive'] = false;
+               }
+
+               DBA::update('inbox-status', $fields, ['url' => $url]);
        }
 
        /**
@@ -395,7 +455,7 @@ class HTTPSignature
                $curl_opts = $opts;
                $curl_opts['header'] = $headers;
 
-               $curlResult = Network::curl($request, false, $redirects, $curl_opts);
+               $curlResult = Network::curl($request, false, $curl_opts);
                $return_code = $curlResult->getReturnCode();
 
                Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG);
@@ -488,8 +548,10 @@ class HTTPSignature
                        return false;
                }
 
+               $hasGoodSignedContent = false;
+
                // Check the digest when it is part of the signed data
-               if (in_array('digest', $sig_block['headers'])) {
+               if (!empty($content) && in_array('digest', $sig_block['headers'])) {
                        $digest = explode('=', $headers['digest'], 2);
                        if ($digest[0] === 'SHA-256') {
                                $hashalg = 'sha256';
@@ -503,6 +565,8 @@ class HTTPSignature
                        if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) {
                                return false;
                        }
+
+                       $hasGoodSignedContent = true;
                }
 
                //  Check if the signed date field is in an acceptable range
@@ -512,6 +576,7 @@ class HTTPSignature
                                Logger::log("Header date '" . $headers['date'] . "' is with " . $diff . " seconds out of the 300 second frame. The signature is invalid.");
                                return false;
                        }
+                       $hasGoodSignedContent = true;
                }
 
                // Check the content-length when it is part of the signed data
@@ -521,6 +586,12 @@ class HTTPSignature
                        }
                }
 
+               // Ensure that the authentication had been done with some content
+               // Without this check someone could authenticate with fakeable data
+               if (!$hasGoodSignedContent) {
+                       return false;
+               }
+
                return $key['url'];
        }