From 8bfebf5b3250e9d7c3f8c501ec5b741da2524d0d Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 21 Sep 2017 13:48:57 -0400 Subject: [PATCH 1/2] Use proper route name instead of using class in route file --- app/Http/Kernel.php | 1 + routes/server.php | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 1e98b9cfd..ffb3b9188 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -63,5 +63,6 @@ class Kernel extends HttpKernel 'can' => \Illuminate\Auth\Middleware\Authorize::class, 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class, 'recaptcha' => \Pterodactyl\Http\Middleware\VerifyReCaptcha::class, + 'schedule' => \Pterodactyl\Http\Middleware\Server\ScheduleAccess::class, ]; } diff --git a/routes/server.php b/routes/server.php index b064a7ef4..fd3586554 100644 --- a/routes/server.php +++ b/routes/server.php @@ -21,8 +21,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -use Pterodactyl\Http\Middleware\Server\ScheduleAccess; - Route::get('/', 'ConsoleController@index')->name('server.index'); Route::get('/console', 'ConsoleController@console')->name('server.console'); @@ -93,14 +91,14 @@ Route::group(['prefix' => 'users'], function () { Route::group(['prefix' => 'schedules'], function () { Route::get('/', 'Tasks\TaskManagementController@index')->name('server.schedules'); Route::get('/new', 'Tasks\TaskManagementController@create')->name('server.schedules.new'); - Route::get('/view/{schedule}', 'Tasks\TaskManagementController@view')->middleware(ScheduleAccess::class)->name('server.schedules.view'); + Route::get('/view/{schedule}', 'Tasks\TaskManagementController@view')->middleware('schedule')->name('server.schedules.view'); Route::post('/new', 'Tasks\TaskManagementController@store'); - Route::patch('/view/{schedule}', 'Tasks\TaskManagementController@update')->middleware(ScheduleAccess::class); - Route::patch('/view/{schedule}/toggle', 'Tasks\TaskToggleController@index')->middleware(ScheduleAccess::class)->name('server.schedules.toggle'); + Route::patch('/view/{schedule}', 'Tasks\TaskManagementController@update')->middleware('schedule'); + Route::patch('/view/{schedule}/toggle', 'Tasks\TaskToggleController@index')->middleware('schedule')->name('server.schedules.toggle'); - Route::delete('/view/{schedule}/delete', 'Tasks\TaskManagementController@delete')->middleware(ScheduleAccess::class)->name('server.schedules.delete'); + Route::delete('/view/{schedule}/delete', 'Tasks\TaskManagementController@delete')->middleware('schedule')->name('server.schedules.delete'); }); /* From 8197b1733f3396160ea3006e3b8c8a16993d228e Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Sun, 24 Sep 2017 21:27:57 -0400 Subject: [PATCH 2/2] Fix some more routes --- app/Http/Kernel.php | 3 ++- routes/server.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index ffb3b9188..ba1dab68f 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -55,7 +55,8 @@ class Kernel extends HttpKernel 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'guest' => \Pterodactyl\Http\Middleware\RedirectIfAuthenticated::class, 'server' => \Pterodactyl\Http\Middleware\ServerAuthenticate::class, - 'subuser' => \Pterodactyl\Http\Middleware\SubuserAccessAuthenticate::class, + 'subuser.auth' => \Pterodactyl\Http\Middleware\SubuserAccessAuthenticate::class, + 'subuser' => \Pterodactyl\Http\Middleware\Server\SubuserAccess::class, 'admin' => \Pterodactyl\Http\Middleware\AdminAuthenticate::class, 'daemon' => \Pterodactyl\Http\Middleware\DaemonAuthenticate::class, 'csrf' => \Pterodactyl\Http\Middleware\VerifyCsrfToken::class, diff --git a/routes/server.php b/routes/server.php index fd3586554..750c0f103 100644 --- a/routes/server.php +++ b/routes/server.php @@ -71,13 +71,13 @@ Route::group(['prefix' => 'files'], function () { Route::group(['prefix' => 'users'], function () { Route::get('/', 'SubuserController@index')->name('server.subusers'); Route::get('/new', 'SubuserController@create')->name('server.subusers.new'); - Route::get('/view/{subuser}', 'SubuserController@view')->middleware(SubuserAccess::class)->name('server.subusers.view'); + Route::get('/view/{subuser}', 'SubuserController@view')->middleware('subuser')->name('server.subusers.view'); Route::post('/new', 'SubuserController@store'); - Route::patch('/view/{subuser}', 'SubuserController@update')->middleware(SubuserAccess::class); + Route::patch('/view/{subuser}', 'SubuserController@update')->middleware('subuser'); - Route::delete('/view/{subuser}/delete', 'SubuserController@delete')->middleware(SubuserAccess::class)->name('server.subusers.delete'); + Route::delete('/view/{subuser}/delete', 'SubuserController@delete')->middleware('subuser')->name('server.subusers.delete'); }); /*