Skip to content

[5.x] Add authorization to revision routes #14301

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

Open
duncanmcclean wants to merge 4 commits into
base: 5.x
Choose a base branch
from
+56 −192
Open

[5.x] Add authorization to revision routes #14301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfbf6f9
Add authorization to entry revision routes
duncanmcclean Mar 19, 2026
8295a38
tests
duncanmcclean Mar 19, 2026
b32126f
abort from unused term revision routes
duncanmcclean Mar 19, 2026
f0e3611
Remove unused term revision controllers, routes, and commented-out UI
jasonvarga Mar 19, 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
39 changes: 0 additions & 39 deletions resources/js/components/terms/PublishForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,45 +131,6 @@
</div>
</div>

<!--
TODO
<div class="flex items-center border-t justify-between px-4 py-2" v-if="!revisionsEnabled">
<label v-text="__('Published')" class="publish-field-label font-medium" />
<toggle-input v-model="published" />
</div>

<div class="border-t p-4" v-if="revisionsEnabled">
<label class="publish-field-label font-medium mb-2" v-text="__('Revisions')"/>
<div class="mb-1 flex items-center" v-if="published">
<span class="text-green-600 w-6 text-center">&check;</span>
<span class="text-2xs" v-text="__('Entry has a published version')"></span>
</div>
<div class="mb-1 flex items-center" v-else="published">
<span class="text-orange w-6 text-center">!</span>
<span class="text-2xs" v-text="__('Entry has not been published')"></span>
</div>
<div class="mb-1 flex items-center" v-if="isWorkingCopy && isDirty">
<span class="text-orange w-6 text-center">!</span>
<span class="text-2xs" v-text="__('Working copy has unsaved changes')"></span>
</div>
<div class="mb-1 flex items-center" v-else-if="isWorkingCopy">
<span class="text-orange w-6 text-center">!</span>
<span class="text-2xs" v-text="__('Entry has unpublished changes')"></span>
</div>
<div class="mb-1 flex items-center" v-if="!isWorkingCopy && published">
<span class="text-green-600 w-6 text-center">&check;</span>
<span class="text-2xs" v-text="__('This is the published version')"></span>
</div>
<button
class="flex items-center justify-center mt-4 btn-flat px-2 w-full"
v-if="!isCreating && revisionsEnabled"
@click="showRevisionHistory = true">
<svg-icon name="history" class="h-4 w-4 rtl:ml-2 ltr:mr-2" />
<span>{{ __('View History') }}</span>
</button>
</div>
-->

<div class="p-4 border-t dark:border-dark-900" v-if="localizations.length > 1">
<label class="publish-field-label font-medium mb-2" v-text="__('Sites')" />
<div
Expand Down
8 changes: 0 additions & 8 deletions routes/cp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,10 @@
use Statamic\Http\Controllers\CP\StartPageController;
use Statamic\Http\Controllers\CP\Taxonomies\PublishedTermsController;
use Statamic\Http\Controllers\CP\Taxonomies\ReorderTaxonomyBlueprintsController;
use Statamic\Http\Controllers\CP\Taxonomies\RestoreTermRevisionController;
use Statamic\Http\Controllers\CP\Taxonomies\TaxonomiesController;
use Statamic\Http\Controllers\CP\Taxonomies\TaxonomyBlueprintsController;
use Statamic\Http\Controllers\CP\Taxonomies\TermActionController;
use Statamic\Http\Controllers\CP\Taxonomies\TermPreviewController;
use Statamic\Http\Controllers\CP\Taxonomies\TermRevisionsController;
use Statamic\Http\Controllers\CP\Taxonomies\TermsController;
use Statamic\Http\Controllers\CP\Updater\UpdateProductController;
use Statamic\Http\Controllers\CP\Updater\UpdaterController;
Expand Down Expand Up @@ -202,12 +200,6 @@
Route::post('/', [PublishedTermsController::class, 'store'])->name('taxonomies.terms.published.store');
Route::delete('/', [PublishedTermsController::class, 'destroy'])->name('taxonomies.terms.published.destroy');

Route::resource('revisions', TermRevisionsController::class, [
'as' => 'taxonomies.terms',
'only' => ['index', 'store', 'show'],
]);

Route::post('restore-revision', RestoreTermRevisionController::class)->name('taxonomies.terms.restore-revision');
Route::post('preview', [TermPreviewController::class, 'edit'])->name('taxonomies.terms.preview.edit');
Route::get('preview', [TermPreviewController::class, 'show'])->name('taxonomies.terms.preview.popout');
Route::patch('/', [TermsController::class, 'update'])->name('taxonomies.terms.update');
Expand Down
12 changes: 12 additions & 0 deletions src/Http/Controllers/CP/Collections/EntryRevisionsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ class EntryRevisionsController extends CpController
{
public function index(Request $request, $collection, $entry)
{
if (User::current()->cant('view', $entry)) {
abort(403);
}

$revisions = $entry
->revisions()
->reverse()
Expand Down Expand Up @@ -39,6 +43,10 @@ public function index(Request $request, $collection, $entry)

public function store(Request $request, $collection, $entry)
{
if (User::current()->cant('edit', $entry)) {
abort(403);
}

$entry->createRevision([
'message' => $request->message,
'user' => User::fromUser($request->user()),
Expand All @@ -49,6 +57,10 @@ public function store(Request $request, $collection, $entry)

public function show(Request $request, $collection, $entry, $revision)
{
if (User::current()->cant('view', $entry)) {
abort(403);
}

$entry = $entry->makeFromRevision($revision);

// TODO: Most of this is duplicated with EntriesController@edit. DRY it off.
Expand Down
26 changes: 0 additions & 26 deletions src/Http/Controllers/CP/Taxonomies/RestoreTermRevisionController.php
View file
Open in desktop

This file was deleted.

118 changes: 0 additions & 118 deletions src/Http/Controllers/CP/Taxonomies/TermRevisionsController.php
View file
Open in desktop

This file was deleted.

45 changes: 44 additions & 1 deletion tests/Feature/Entries/EntryRevisionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function it_gets_revisions()
$now = Carbon::parse('2017-02-03');
Carbon::setTestNow($now);
$this->setTestBlueprint('test', ['foo' => ['type' => 'text']]);
$this->setTestRoles(['test' => ['access cp', 'publish blog entries']]);
$this->setTestRoles(['test' => ['access cp', 'view blog entries', 'publish blog entries']]);
$user = User::make()->id('user-1')->assignRole('test')->save();

$entry = EntryFactory::id('1')
Expand Down Expand Up @@ -97,6 +97,49 @@ public function it_gets_revisions()
->assertJsonPath('1.revisions.1.attributes.item_url', 'http://localhost/cp/collections/blog/entries/1/revisions/'.Carbon::parse('2017-02-03')->timestamp);
}

#[Test]
public function it_denies_access_to_revisions_without_permission_to_view_entry()
{
$now = Carbon::parse('2017-02-03');
Carbon::setTestNow($now);
$this->setTestBlueprint('test', ['foo' => ['type' => 'text']]);
$this->setTestRoles(['test' => ['access cp']]);
$user = User::make()->id('user-1')->assignRole('test')->save();

$entry = EntryFactory::id('1')
->slug('test')
->collection('blog')
->published(true)
->date('2010-12-25')
->data([
'blueprint' => 'test',
'title' => 'Original title',
'foo' => 'bar',
])->create();

tap($entry->makeRevision(), function ($copy) {
$copy->message('Revision one');
$copy->date(Carbon::parse('2017-02-01'));
})->save();

tap($entry->makeRevision(), function ($copy) {
$copy->message('Revision two');
$copy->date(Carbon::parse('2017-02-03'));
})->save();

tap($entry->makeWorkingCopy(), function ($copy) {
$attrs = $copy->attributes();
$attrs['data']['title'] = 'Title modified in working copy';
$attrs['data']['foo'] = 'baz';
$copy->attributes($attrs);
})->save();

$this
->actingAs($user)
->get($entry->revisionsUrl())
->assertForbidden();
}

#[Test]
public function it_publishes_an_entry()
{
Expand Down
Loading