Skip to content

[4.1] Fix Debug plugin to dump $_POST requests #37465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 6, 2022
Merged

[4.1] Fix Debug plugin to dump $_POST requests #37465

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c77d011
Fix Debug plugin to dump post requests
Fedik Apr 3, 2022
3f69aee
Merge branch '4.1-dev' into fix-debug-post2
chmst Apr 5, 2022
ed6f6d3
Better comment
Fedik Apr 5, 2022
b8af7cb
Merge branch '4.1-dev' into fix-debug-post2
laoneo Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions plugins/system/debug/debug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use DebugBar\DataCollector\RequestDataCollector;
use DebugBar\DebugBar;
use DebugBar\OpenHandler;
use Joomla\Application\ApplicationEvents;
use Joomla\CMS\Application\CMSApplicationInterface;
use Joomla\CMS\Document\HtmlDocument;
use Joomla\CMS\Log\Log;
Expand All @@ -25,6 +26,7 @@
use Joomla\Database\DatabaseDriver;
use Joomla\Database\Event\ConnectionEvent;
use Joomla\Event\DispatcherInterface;
use Joomla\Event\SubscriberInterface;
use Joomla\Plugin\System\Debug\DataCollector\InfoCollector;
use Joomla\Plugin\System\Debug\DataCollector\LanguageErrorsCollector;
use Joomla\Plugin\System\Debug\DataCollector\LanguageFilesCollector;
Expand All @@ -40,7 +42,7 @@
*
* @since 1.5
*/
class PlgSystemDebug extends CMSPlugin
class PlgSystemDebug extends CMSPlugin implements SubscriberInterface
{
/**
* True if debug lang is on.
Expand Down Expand Up @@ -136,6 +138,25 @@ class PlgSystemDebug extends CMSPlugin
*/
protected $showLogs = false;

/**
* Returns an array of events this subscriber will listen to.
*
* @return array
*
* @since __DEPLOY_VERSION__
*/
public static function getSubscribedEvents(): array
{
return [
'onBeforeCompileHead' => 'onBeforeCompileHead',
'onAjaxDebug' => 'onAjaxDebug',
'onBeforeRespond' => 'onBeforeRespond',
'onAfterRespond' => 'onAfterRespond',
ApplicationEvents::AFTER_RESPOND => 'onAfterRespond',
Copy link
Contributor

@bembelimen bembelimen Apr 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't this two lines identical?

Copy link
Member Author

@Fedik Fedik Apr 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, and that the issue, should be somehow fixed in J5, I guess

Copy link
Member Author

@Fedik Fedik Apr 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Application class trigger diferent AfterRespond event for normal request, and for redirect (that usualy happen after POST)

Copy link
Member Author

@Fedik Fedik Apr 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here for respond

joomla-cms/libraries/src/Application/WebApplication.php

Lines 160 to 161 in c604191

// Trigger the onBeforeRespond event.
$this->triggerEvent('onBeforeRespond');

and there for redirect
https://github.com/joomla-framework/application/blob/e7b950d2d1358c0baac95a8633a60de20a1e82ab/src/AbstractWebApplication.php#L519-L521

'onAfterDisconnect' => 'onAfterDisconnect',
];
}

/**
* Constructor.
*
Expand Down Expand Up @@ -245,7 +266,7 @@ public function onBeforeCompileHead()
public function onAfterRespond()
{
// Do not render if debugging or language debug is not enabled.
if (!JDEBUG && !$this->debugLang || $this->isAjax || !($this->app->getDocument() instanceof HtmlDocument))
if (!JDEBUG && !$this->debugLang || $this->isAjax)
{
return;
}
Expand Down Expand Up @@ -349,32 +370,34 @@ public function onAfterRespond()
/**
* AJAX handler
*
* @return string
* @param Joomla\Event\Event $event
*
* @return void
*
* @since 4.0.0
*/
public function onAjaxDebug()
public function onAjaxDebug($event)
{
// Do not render if debugging or language debug is not enabled.
if (!JDEBUG && !$this->debugLang)
{
return '';
return;
}

// User has to be authorised to see the debug information.
if (!$this->isAuthorisedDisplayDebug() || !Session::checkToken('request'))
{
return '';
return;
}

switch ($this->app->input->get('action'))
{
case 'openhandler':
$result = $event['result'] ?: [];
$handler = new OpenHandler($this->debugBar);

return $handler->handle($this->app->input->request->getArray(), false, false);
default:
return '';
$result[] = $handler->handle($this->app->input->request->getArray(), false, false);
$event['result'] = $result;
}
}

Expand Down