Merge pull request #10976 from nupplaphil/feat/api_tests

[friendica.git] / src / BaseModule.php

diff --git a/src/BaseModule.php b/src/BaseModule.php
index ce7774bfd09a634b0b53d7a54d5c14fc74dd6cdc..ced1e55c397c51d81f2f6b866cac58ea83f422f3 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica;
 
 use Friendica\Core\Logger;
+use Friendica\Model\User;
 
 /**
  * All modules in Friendica should extend BaseModule, although not all modules
@@ -72,6 +73,26 @@ abstract class BaseModule
                return $o;
        }
 
+       /**
+        * Module DELETE method to process submitted data
+        *
+        * Extend this method if the module is supposed to process DELETE requests.
+        * Doesn't display any content
+        */
+       public static function delete(array $parameters = [])
+       {
+       }
+
+       /**
+        * Module PATCH method to process submitted data
+        *
+        * Extend this method if the module is supposed to process PATCH requests.
+        * Doesn't display any content
+        */
+       public static function patch(array $parameters = [])
+       {
+       }
+
        /**
         * Module POST method to process submitted data
         *
@@ -92,6 +113,16 @@ abstract class BaseModule
        {
        }
 
+       /**
+        * Module PUT method to process submitted data
+        *
+        * Extend this method if the module is supposed to process PUT requests.
+        * Doesn't display any content
+        */
+       public static function put(array $parameters = [])
+       {
+       }
+
        /*
         * Functions used to protect against Cross-Site Request Forgery
         * The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key.
@@ -105,10 +136,9 @@ abstract class BaseModule
         */
        public static function getFormSecurityToken($typename = '')
        {
-               $a = DI::app();
-
+               $user = User::getById(DI::app()->getLoggedInUserId(), ['guid', 'prvkey']);
                $timestamp = time();
-               $sec_hash = hash('whirlpool', ($a->user['guid'] ?? '') . ($a->user['prvkey'] ?? '') . session_id() . $timestamp . $typename);
+               $sec_hash = hash('whirlpool', ($user['guid'] ?? '') . ($user['prvkey'] ?? '') . session_id() . $timestamp . $typename);
 
                return $timestamp . '.' . $sec_hash;
        }
@@ -133,14 +163,14 @@ abstract class BaseModule
 
                $max_livetime = 10800; // 3 hours
 
-               $a = DI::app();
+               $user = User::getById(DI::app()->getLoggedInUserId(), ['guid', 'prvkey']);
 
                $x = explode('.', $hash);
                if (time() > (intval($x[0]) + $max_livetime)) {
                        return false;
                }
 
-               $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename);
+               $sec_hash = hash('whirlpool', ($user['guid'] ?? '') . ($user['prvkey'] ?? '') . session_id() . $x[0] . $typename);
 
                return ($sec_hash == $x[1]);
        }
@@ -153,9 +183,8 @@ abstract class BaseModule
        public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
        {
                if (!self::checkFormSecurityToken($typename, $formname)) {
-                       $a = DI::app();
-                       Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-                       Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
+                       Logger::notice('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
+                       Logger::debug('checkFormSecurityToken failed', ['request' => $_REQUEST]);
                        notice(self::getFormSecurityStandardErrorMessage());
                        DI::baseUrl()->redirect($err_redirect);
                }
@@ -164,9 +193,8 @@ abstract class BaseModule
        public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
        {
                if (!self::checkFormSecurityToken($typename, $formname)) {
-                       $a = DI::app();
-                       Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-                       Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
+                       Logger::notice('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
+                       Logger::debug('checkFormSecurityToken failed', ['request' => $_REQUEST]);
 
                        throw new \Friendica\Network\HTTPException\ForbiddenException();
                }