From c947b7f211e2468561a8864b2141dfcbfe65b63b Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 29 Jun 2020 20:22:00 +0000 Subject: [PATCH] "print_r" in logging replaced / obsolete stuff removed --- include/api.php | 9 +---- mod/dfrn_confirm.php | 6 +-- mod/dfrn_poll.php | 4 +- mod/events.php | 2 +- mod/salmon.php | 2 +- mod/settings.php | 2 +- src/Module/Admin/Summary.php | 2 +- src/Module/Diaspora/Receive.php | 2 +- src/Module/Magic.php | 6 +-- src/Module/Owa.php | 7 ++-- src/Network/CurlResult.php | 4 +- src/Network/FKOAuth1.php | 4 +- src/Object/Image.php | 1 - src/Protocol/DFRN.php | 2 +- src/Protocol/Diaspora.php | 63 ++++++++------------------------ src/Protocol/Feed.php | 2 +- src/Protocol/PortableContact.php | 2 +- src/Protocol/Salmon.php | 2 +- src/Util/Crypto.php | 2 +- 19 files changed, 43 insertions(+), 81 deletions(-) diff --git a/include/api.php b/include/api.php index 7a6769ebc1..85a34d2753 100644 --- a/include/api.php +++ b/include/api.php @@ -1244,7 +1244,7 @@ function api_media_upload() "image_type" => $media["type"], "friendica_preview_url" => $media["preview"]]; - Logger::log("Media uploaded: " . print_r($returndata, true), Logger::DEBUG); + Logger::info('Media uploaded', ['return' => $returndata]); return ["media" => $returndata]; } @@ -2233,12 +2233,7 @@ function api_statuses_user_timeline($type) throw new ForbiddenException(); } - Logger::log( - "api_statuses_user_timeline: api_user: ". api_user() . - "\nuser_info: ".print_r($user_info, true) . - "\n_REQUEST: ".print_r($_REQUEST, true), - Logger::DEBUG - ); + Logger::info('api_statuses_user_timeline', ['api_user' => api_user(), 'user_info' => $user_info, '_REQUEST' => $_REQUEST]); $since_id = $_REQUEST['since_id'] ?? 0; $max_id = $_REQUEST['max_id'] ?? 0; diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index c191d3e170..cf6bd4a78a 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -214,7 +214,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['page'] = 2; } - Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA); + Logger::debug('Confirm: posting data', ['confirm' => $dfrn_confirm, 'parameter' => $params]); /* * @@ -372,9 +372,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) $forum = (($page == 1) ? 1 : 0); $prv = (($page == 2) ? 1 : 0); - Logger::log('dfrn_confirm: requestee contacted: ' . $node); + Logger::notice('requestee contacted', ['node' => $node]); - Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), Logger::DATA); + Logger::debug('request', ['POST' => $_POST]); // If $aes_key is set, both of these items require unpacking from the hex transport encoding. diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 14221c7e6e..8d50761db1 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -379,7 +379,7 @@ function dfrn_poll_post(App $a) // NOTREACHED } else { // Update the writable flag if it changed - Logger::log('dfrn_poll: post request feed: ' . print_r($_POST, true), Logger::DATA); + Logger::debug('post request feed', ['post' => $_POST]); if ($dfrn_version >= 2.21) { if ($perm === 'rw') { $writable = 1; @@ -521,7 +521,7 @@ function dfrn_poll_content(App $a) if (strlen($s) && strstr($s, ' $xml]); Logger::log('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash); Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec); diff --git a/mod/events.php b/mod/events.php index 6c5c274ea3..437cc160b4 100644 --- a/mod/events.php +++ b/mod/events.php @@ -66,7 +66,7 @@ function events_init(App $a) function events_post(App $a) { - Logger::log('post: ' . print_r($_REQUEST, true), Logger::DATA); + Logger::debug('post', ['request' => $_REQUEST]); if (!local_user()) { return; diff --git a/mod/salmon.php b/mod/salmon.php index 1932d3ba41..ea5c334c08 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -120,7 +120,7 @@ function salmon_post(App $a, $xml = '') { $m = Strings::base64UrlDecode($key_info[1]); $e = Strings::base64UrlDecode($key_info[2]); - Logger::log('key details: ' . print_r($key_info,true), Logger::DEBUG); + Logger::info('key details', ['info' => $key_info]); $pubkey = Crypto::meToPem($m, $e); diff --git a/mod/settings.php b/mod/settings.php index c4e2482939..9b2f4f650e 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -183,7 +183,7 @@ function settings_post(App $a) intval($mail_pubmail), intval(local_user()) ); - Logger::log("mail: updating mailaccount. Response: ".print_r($r, true)); + Logger::notice('updating mailaccount', ['response' => $r]); $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", intval(local_user()) ); diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index 4d30f8ebf3..4c94b6e26a 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -202,7 +202,7 @@ class Summary extends BaseAdmin } DBA::close($pageFlagsCountStmt); - Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA); + Logger::debug('accounts', ['accounts' => $accounts]); $pending = Register::getPendingCount(); diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php index 01c04dfb6c..372e739463 100644 --- a/src/Module/Diaspora/Receive.php +++ b/src/Module/Diaspora/Receive.php @@ -148,7 +148,7 @@ class Receive extends BaseModule } self::$logger->info('Diaspora: Post decoded.'); - self::$logger->debug('Diaspora: Decoded message.', ['msg' => print_r($msg, true)]); + self::$logger->debug('Diaspora: Decoded message.', ['msg' => $msg]); if (!is_array($msg)) { throw new HTTPException\InternalServerErrorException('Message is not an array.'); diff --git a/src/Module/Magic.php b/src/Module/Magic.php index 85da8eb485..f27ffeac58 100644 --- a/src/Module/Magic.php +++ b/src/Module/Magic.php @@ -42,9 +42,9 @@ class Magic extends BaseModule { $a = DI::app(); $ret = ['success' => false, 'url' => '', 'message' => '']; - Logger::log('magic mdule: invoked', Logger::DEBUG); + Logger::info('magic mdule: invoked'); - Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA); + Logger::debug('args', ['request' => $_REQUEST]); $addr = $_REQUEST['addr'] ?? ''; $dest = $_REQUEST['dest'] ?? ''; @@ -73,7 +73,7 @@ class Magic extends BaseModule return $ret; } - Logger::log('Contact is already authenticated', Logger::DEBUG); + Logger::info('Contact is already authenticated'); System::externalRedirect($dest); } diff --git a/src/Module/Owa.php b/src/Module/Owa.php index 9a8d8fbb65..322cafa097 100644 --- a/src/Module/Owa.php +++ b/src/Module/Owa.php @@ -76,8 +76,7 @@ class Owa extends BaseModule $verified = HTTPSignature::verifyMagic($contact['pubkey']); if ($verified && $verified['header_signed'] && $verified['header_valid']) { - Logger::log('OWA header: ' . print_r($verified, true), Logger::DATA); - Logger::log('OWA success: ' . $contact['addr'], Logger::DATA); + Logger::debug('OWA header', ['addr' => $contact['addr'], 'data' => $verified]); $ret['success'] = true; $token = Strings::getRandomHex(32); @@ -94,10 +93,10 @@ class Owa extends BaseModule openssl_public_encrypt($token, $result, $contact['pubkey']); $ret['encrypted_token'] = Strings::base64UrlEncode($result); } else { - Logger::log('OWA fail: ' . $contact['id'] . ' ' . $contact['addr'] . ' ' . $contact['url'], Logger::DEBUG); + Logger::info('OWA fail', ['id' => $contact['id'], 'addr' => $contact['addr'], 'url' => $contact['url']]); } } else { - Logger::log('Contact not found: ' . $handle, Logger::DEBUG); + Logger::info('Contact not found', ['handle' => $handle]); } } } diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php index d7e0e884c3..9f52edfad6 100644 --- a/src/Network/CurlResult.php +++ b/src/Network/CurlResult.php @@ -131,7 +131,7 @@ class CurlResult $this->errorNumber = $errorNumber; $this->error = $error; - Logger::log($url . ': ' . $this->returnCode . " " . $result, Logger::DATA); + Logger::debug('construct', ['url' => $url, 'returncode' => $this->returnCode, 'result' => $result]); $this->parseBodyHeader($result); $this->checkSuccess(); @@ -167,7 +167,7 @@ class CurlResult } if (!$this->isSuccess) { - Logger::error('error', ['url' => $this->url, 'code' => $this->returnCode, 'error' => $this->error, 'callstack' => System::callstack(20)]); + Logger::notice('http error', ['url' => $this->url, 'code' => $this->returnCode, 'error' => $this->error, 'callstack' => System::callstack(20)]); Logger::debug('debug', ['info' => $this->info]); } diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php index 642fab111a..9833d5e0af 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Network/FKOAuth1.php @@ -51,12 +51,12 @@ class FKOAuth1 extends OAuthServer */ public function loginUser($uid) { - Logger::log("FKOAuth1::loginUser $uid"); + Logger::notice("FKOAuth1::loginUser $uid"); $a = DI::app(); $record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]); if (!DBA::isResult($record)) { - Logger::log('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), Logger::DEBUG); + Logger::info('FKOAuth1::loginUser failure', ['server' => $_SERVER]); header('HTTP/1.0 401 Unauthorized'); die('This api requires login'); } diff --git a/src/Object/Image.php b/src/Object/Image.php index 4d064f3c3a..8787db0528 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -456,7 +456,6 @@ class Image break; } - // Logger::log('exif: ' . print_r($exif,true)); return $exif; } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 10541c0e3e..cd9fc0ca14 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1341,7 +1341,7 @@ class DFRN } - Logger::log('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), Logger::DATA); + Logger::debug('dfrn_deliver', ['post' => $postvars]); $postResult = Network::post($contact['notify'], $postvars); diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 0115814bdd..b579f92df0 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -293,37 +293,6 @@ class Diaspora return $contacts; } - /** - * repairs a signature that was double encoded - * - * The function is unused at the moment. It was copied from the old implementation. - * - * @param string $signature The signature - * @param string $handle The handle of the signature owner - * @param integer $level This value is only set inside this function to avoid endless loops - * - * @return string the repaired signature - * @throws \Exception - */ - private static function repairSignature($signature, $handle = "", $level = 1) - { - if ($signature == "") { - return ($signature); - } - - if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) { - $signature = base64_decode($signature); - Logger::log("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, Logger::DEBUG); - - // Do a recursive call to be able to fix even multiple levels - if ($level < 10) { - $signature = self::repairSignature($signature, $handle, ++$level); - } - } - - return($signature); - } - /** * verify the envelope and return the verified data * @@ -542,7 +511,7 @@ class Diaspora $basedom = XML::parseString($xml); if (!is_object($basedom)) { - Logger::log("XML is not parseable."); + Logger::notice('XML is not parseable.'); return false; } $children = $basedom->children('https://joindiaspora.com/protocol'); @@ -556,7 +525,7 @@ class Diaspora } else { // This happens with posts from a relais if (empty($privKey)) { - Logger::log("This is no private post in the old format", Logger::DEBUG); + Logger::info('This is no private post in the old format'); return false; } @@ -575,7 +544,7 @@ class Diaspora $decrypted = self::aesDecrypt($outer_key, $outer_iv, $ciphertext); - Logger::log('decrypted: '.$decrypted, Logger::DEBUG); + Logger::info('decrypted', ['data' => $decrypted]); $idom = XML::parseString($decrypted); $inner_iv = base64_decode($idom->iv); @@ -724,7 +693,7 @@ class Diaspora $type = $fields->getName(); - Logger::log("Received message type ".$type." from ".$sender." for user ".$importer["uid"], Logger::DEBUG); + Logger::info('Received message', ['type' => $type, 'sender' => $sender, 'user' => $importer["uid"]]); switch ($type) { case "account_migration": @@ -816,7 +785,7 @@ class Diaspora $data = XML::parseString($msg["message"]); if (!is_object($data)) { - Logger::log("No valid XML ".$msg["message"], Logger::DEBUG); + Logger::info('No valid XML', ['message' => $msg['message']]); return false; } @@ -928,7 +897,7 @@ class Diaspora if (isset($parent_author_signature)) { $key = self::key($msg["author"]); if (empty($key)) { - Logger::log("No key found for parent author ".$msg["author"], Logger::DEBUG); + Logger::info('No key found for parent', ['author' => $msg["author"]]); return false; } @@ -940,7 +909,7 @@ class Diaspora $key = self::key($fields->author); if (empty($key)) { - Logger::log("No key found for author ".$fields->author, Logger::DEBUG); + Logger::info('No key found', ['author' => $fields->author]); return false; } @@ -994,7 +963,7 @@ class Diaspora } if (DBA::isResult($person)) { - Logger::debug("In cache " . print_r($person, true)); + Logger::debug('In cache', ['person' => $person]); if (is_null($update)) { // update record occasionally so it doesn't get stale @@ -1108,7 +1077,7 @@ class Diaspora */ public static function urlFromContactGuid($fcontact_guid) { - Logger::log("fcontact guid is ".$fcontact_guid, Logger::DEBUG); + Logger::info('fcontact', ['guid' => $fcontact_guid]); $r = q( "SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'", @@ -3427,7 +3396,7 @@ class Diaspora "profile" => $profile, "signature" => $signature]; - Logger::log("Send account migration ".print_r($message, true), Logger::DEBUG); + Logger::info('Send account migration', ['msg' => $message]); return self::buildAndTransmit($owner, $contact, "account_migration", $message); } @@ -3471,7 +3440,7 @@ class Diaspora "following" => "true", "sharing" => "true"]; - Logger::log("Send share ".print_r($message, true), Logger::DEBUG); + Logger::info('Send share', ['msg' => $message]); return self::buildAndTransmit($owner, $contact, "contact", $message); } @@ -3492,7 +3461,7 @@ class Diaspora "following" => "false", "sharing" => "false"]; - Logger::log("Send unshare ".print_r($message, true), Logger::DEBUG); + Logger::info('Send unshare', ['msg' => $message]); return self::buildAndTransmit($owner, $contact, "contact", $message); } @@ -4054,7 +4023,7 @@ class Diaspora $message["parent_author_signature"] = self::signature($owner, $message); - Logger::log("Relayed data ".print_r($message, true), Logger::DEBUG); + Logger::info('Relayed data', ['msg' => $message]); return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]); } @@ -4089,7 +4058,7 @@ class Diaspora "target_guid" => $item['guid'], "target_type" => $target_type]; - Logger::log("Got message ".print_r($message, true), Logger::DEBUG); + Logger::info('Got message', ['msg' => $message]); return self::buildAndTransmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]); } @@ -4330,7 +4299,7 @@ class Diaspora { $owner = User::getOwnerDataById($uid); if (empty($owner)) { - Logger::log("No owner post, so not storing signature", Logger::DEBUG); + Logger::info('No owner post, so not storing signature'); return false; } @@ -4361,7 +4330,7 @@ class Diaspora { $owner = User::getOwnerDataById($uid); if (empty($owner)) { - Logger::log("No owner post, so not storing signature", Logger::DEBUG); + Logger::info('No owner post, so not storing signature'); return false; } diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index c4cb62a710..3518298321 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -556,7 +556,7 @@ class Feed $items[] = $item; break; } else { - Logger::info("Stored feed: " . print_r($item, true)); + Logger::info('Stored feed', ['item' => $item]); $notify = Item::isRemoteSelf($contact, $item); diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index 70acf5064c..f255347c12 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -116,7 +116,7 @@ class PortableContact $j = json_decode($s, true); - Logger::log('load: json: ' . print_r($j, true), Logger::DATA); + Logger::debug('load', ['json' => $j]); if (!isset($j['entry'])) { return; diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php index d082909ae5..7708459102 100644 --- a/src/Protocol/Salmon.php +++ b/src/Protocol/Salmon.php @@ -78,7 +78,7 @@ class Salmon } - Logger::log('Key located: ' . print_r($ret, true)); + Logger::notice('Key located', ['ret' => $ret]); if (count($ret) == 1) { // We only found one one key so we don't care if the hash matches. diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php index 1b84a92f64..d44800e942 100644 --- a/src/Util/Crypto.php +++ b/src/Util/Crypto.php @@ -393,7 +393,7 @@ class Crypto // log the offending call so we can track it down if (!openssl_public_encrypt($key, $k, $pubkey)) { $x = debug_backtrace(); - Logger::log('RSA failed. ' . print_r($x[0], true)); + Logger::notice('RSA failed', ['trace' => $x[0]]); } $result['alg'] = $alg;