Skip to content

Strip empty flash data and token from session #42

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
Naoray merged 2 commits into from
Feb 8, 2026
Merged

Strip empty flash data and token from session #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2017afc
fix(tracing): strip empty flash data and token from session
Naoray Feb 8, 2026
321b95c
refactor: use Arr::except instead of collection for session data filt…
Naoray Feb 8, 2026
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
24 changes: 17 additions & 7 deletions src/Tracing/SessionCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Naoray\LaravelGithubMonolog\Tracing;

use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Context;
use Illuminate\Support\Facades\Session;
use Naoray\LaravelGithubMonolog\Tracing\Concerns\RedactsData;
Expand All @@ -27,12 +28,21 @@ public function collect(): void
return;
}

Context::addHidden('session', [
'data' => $this->redactPayload(Session::all()),
'flash' => [
'old' => Session::get('_flash.old', []),
'new' => Session::get('_flash.new', []),
],
]);
$data = Arr::except(Session::all(), ['_token', '_flash']);

$session = [
'data' => $this->redactPayload($data),
];

$flash = [
'old' => Session::get('_flash.old', []),
'new' => Session::get('_flash.new', []),
];

if (! empty($flash['old']) || ! empty($flash['new'])) {
$session['flash'] = $flash;
}

Context::addHidden('session', $session);
}
}
38 changes: 38 additions & 0 deletions tests/Tracing/SessionCollectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,41 @@

expect(Context::hasHidden('session'))->toBeFalse();
});

it('strips empty flash data from session', function () {
Session::start();
Session::put('key', 'value');

$this->collector->collect();

$session = Context::getHidden('session');

expect($session)->not->toHaveKey('flash');
expect($session['data'])->not->toHaveKey('_flash');
});

it('preserves non-empty flash data', function () {
Session::start();
Session::put('key', 'value');
Session::flash('message', 'Hello World');

$this->collector->collect();

$session = Context::getHidden('session');

expect($session)->toHaveKey('flash');
expect($session['flash']['new'])->toContain('message');
});

it('strips _token from session data', function () {
Session::start();
Session::put('key', 'value');
Session::put('_token', 'csrf-token-value');

$this->collector->collect();

$session = Context::getHidden('session');

expect($session['data'])->not->toHaveKey('_token');
expect($session['data']['key'])->toBe('value');
});