Skip to content

Plugin Debug use dummy session #39526

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 7 commits into from
Jun 26, 2023
Merged

Plugin Debug use dummy session #39526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
678b799
Plugin Debug use dummy session
Fedik Dec 30, 2022
22573c1
Unused imports
Fedik Dec 30, 2022
6d51b86
Remove Joomla session data from session data
Fedik Dec 31, 2022
79cbc8e
Replace Joomla session data from session data
Fedik Dec 31, 2022
41f3026
Replace Joomla session data from session data
Fedik Dec 31, 2022
a99826e
Merge branch '4.3-dev' into plg-debug-fake-session
richard67 Jun 25, 2023
eb4673b
Merge branch '4.3-dev' into plg-debug-fake-session
obuisard Jun 26, 2023
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
5 changes: 5 additions & 0 deletions plugins/system/debug/src/DataCollector/RequestDataCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ public function collect()

$data = $GLOBALS[$var];

// Replace Joomla session data from session data, it will be collected by SessionCollector
if ($var === '_SESSION' && !empty($data['joomla'])) {
$data['joomla'] = '***redacted***';
}

array_walk_recursive($data, static function (&$value, $key) {
if (!preg_match(\PlgSystemDebug::PROTECTED_COLLECTOR_KEYS, $key)) {
return;
Expand Down
33 changes: 4 additions & 29 deletions plugins/system/debug/src/JoomlaHttpDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
namespace Joomla\Plugin\System\Debug;

use DebugBar\HttpDriverInterface;
use Joomla\Application\SessionAwareWebApplicationInterface;
use Joomla\Application\WebApplicationInterface;
use Joomla\CMS\Application\CMSApplicationInterface;
use Joomla\CMS\Session\Session;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand All @@ -34,13 +32,6 @@ final class JoomlaHttpDriver implements HttpDriverInterface
*/
private $app;

/**
* @var Session
*
* @since 4.1.5
*/
private $session;

/**
* @var array
*
Expand All @@ -58,10 +49,6 @@ final class JoomlaHttpDriver implements HttpDriverInterface
public function __construct(CMSApplicationInterface $app)
{
$this->app = $app;

if ($app instanceof SessionAwareWebApplicationInterface) {
$this->session = $app->getSession();
}
}

/**
Expand Down Expand Up @@ -89,7 +76,7 @@ public function setHeaders(array $headers)
*/
public function isSessionStarted()
{
return $this->session ? $this->session->isStarted() : true;
return true;
}

/**
Expand All @@ -102,11 +89,7 @@ public function isSessionStarted()
*/
public function setSessionValue($name, $value)
{
if ($this->session) {
$this->session->set($name, $value);
} else {
$this->dummySession[$name] = $value;
}
$this->dummySession[$name] = $value;
}

/**
Expand All @@ -120,7 +103,7 @@ public function setSessionValue($name, $value)
*/
public function hasSessionValue($name)
{
return $this->session ? $this->session->has($name) : array_key_exists($name, $this->dummySession);
return array_key_exists($name, $this->dummySession);
}

/**
Expand All @@ -134,10 +117,6 @@ public function hasSessionValue($name)
*/
public function getSessionValue($name)
{
if ($this->session) {
return $this->session->get($name);
}

return $this->dummySession[$name] ?? null;
}

Expand All @@ -150,10 +129,6 @@ public function getSessionValue($name)
*/
public function deleteSessionValue($name)
{
if ($this->session) {
$this->session->remove($name);
} else {
unset($this->dummySession[$name]);
}
unset($this->dummySession[$name]);
}
}