Improve scheduled task layout and data handling
This commit is contained in:
Dane Everitt
parent
c1301c7190
commit
67d9f9f4ab
11 changed files with 639 additions and 0 deletions
87
app/Http/Controllers/Server/TaskController.php
Normal file
87
app/Http/Controllers/Server/TaskController.php
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
namespace Pterodactyl\Http\Controllers\Server;
|
||||
|
||||
use Alert;
|
||||
use Log;
|
||||
use Cron;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||
|
||||
use Pterodactyl\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class TaskController extends Controller
|
||||
{
|
||||
public function __constructor()
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
public function getIndex(Request $request, $uuid)
|
||||
{
|
||||
$server = Models\Server::getByUUID($uuid);
|
||||
$this->authorize('list-tasks', $server);
|
||||
|
||||
return view('server.tasks.index', [
|
||||
'server' => $server,
|
||||
'node' => Models\Node::findOrFail($server->node),
|
||||
'tasks' => Models\Task::where('server', $server->id)->get(),
|
||||
'actions' => [
|
||||
'command' => 'Send Command',
|
||||
'power' => 'Set Power Status'
|
||||
]
|
||||
]);
|
||||
}
|
||||
|
||||
public function getNew(Request $request, $uuid)
|
||||
{
|
||||
$server = Models\Server::getByUUID($uuid);
|
||||
$this->authorize('create-task', $server);
|
||||
|
||||
return view('server.tasks.new', [
|
||||
'server' => $server,
|
||||
'node' => Models\Node::findOrFail($server->node)
|
||||
]);
|
||||
}
|
||||
|
||||
public function postNew(Request $request, $uuid)
|
||||
{
|
||||
dd($request->input());
|
||||
}
|
||||
|
||||
public function getView(Request $request, $uuid, $id)
|
||||
{
|
||||
$server = Models\Server::getByUUID($uuid);
|
||||
$this->authorize('view-task', $server);
|
||||
|
||||
return view('server.tasks.view', [
|
||||
'server' => $server,
|
||||
'node' => Models\Node::findOrFail($server->node),
|
||||
'task' => Models\Task::where('id', $id)->where('server', $server->id)->firstOrFail()
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -117,6 +117,30 @@ class ServerRoutes {
|
|||
'uses' => 'Server\SubuserController@deleteSubuser'
|
||||
]);
|
||||
|
||||
$router->get('tasks/', [
|
||||
'as' => 'server.tasks',
|
||||
'uses' => 'Server\TaskController@getIndex'
|
||||
]);
|
||||
|
||||
$router->get('tasks/view/{id}', [
|
||||
'as' => 'server.tasks.view',
|
||||
'uses' => 'Server\TaskController@getView'
|
||||
]);
|
||||
|
||||
$router->get('tasks/new', [
|
||||
'as' => 'server.tasks.new',
|
||||
'uses' => 'Server\TaskController@getNew'
|
||||
]);
|
||||
|
||||
$router->post('tasks/new', [
|
||||
'uses' => 'Server\TaskController@postNew'
|
||||
]);
|
||||
|
||||
$router->delete('tasks/delete/{id}', [
|
||||
'as' => 'server.tasks.delete',
|
||||
'uses' => 'Server\TaskController@deleteTask'
|
||||
]);
|
||||
|
||||
// Assorted AJAX Routes
|
||||
$router->group(['prefix' => 'ajax'], function ($server) use ($router) {
|
||||
// Returns Server Status
|
||||
|
|
|
|||
|
|
@ -450,4 +450,100 @@ class ServerPolicy
|
|||
return $user->permissions()->server($server)->permission('view-databases')->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user has permission to view all tasks for a server.
|
||||
*
|
||||
* @param Pterodactyl\Models\User $user
|
||||
* @param Pterodactyl\Models\Server $server
|
||||
* @return boolean
|
||||
*/
|
||||
public function listTasks(User $user, Server $server)
|
||||
{
|
||||
if ($this->isOwner($user, $server)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->permissions()->server($server)->permission('list-tasks')->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user has permission to view a specific task for a server.
|
||||
*
|
||||
* @param Pterodactyl\Models\User $user
|
||||
* @param Pterodactyl\Models\Server $server
|
||||
* @return boolean
|
||||
*/
|
||||
public function viewTask(User $user, Server $server)
|
||||
{
|
||||
if ($this->isOwner($user, $server)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->permissions()->server($server)->permission('view-task')->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user has permission to view a toggle a task for a server.
|
||||
*
|
||||
* @param Pterodactyl\Models\User $user
|
||||
* @param Pterodactyl\Models\Server $server
|
||||
* @return boolean
|
||||
*/
|
||||
public function toggleTask(User $user, Server $server)
|
||||
{
|
||||
if ($this->isOwner($user, $server)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->permissions()->server($server)->permission('toggle-task')->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user has permission to queue a task for a server.
|
||||
*
|
||||
* @param Pterodactyl\Models\User $user
|
||||
* @param Pterodactyl\Models\Server $server
|
||||
* @return boolean
|
||||
*/
|
||||
public function queueTask(User $user, Server $server)
|
||||
{
|
||||
if ($this->isOwner($user, $server)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->permissions()->server($server)->permission('queue-task')->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user has permission to delete a specific task for a server.
|
||||
*
|
||||
* @param Pterodactyl\Models\User $user
|
||||
* @param Pterodactyl\Models\Server $server
|
||||
* @return boolean
|
||||
*/
|
||||
public function deleteTask(User $user, Server $server)
|
||||
{
|
||||
if ($this->isOwner($user, $server)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->permissions()->server($server)->permission('delete-task')->exists();
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user has permission to create a task for a server.
|
||||
*
|
||||
* @param Pterodactyl\Models\User $user
|
||||
* @param Pterodactyl\Models\Server $server
|
||||
* @return boolean
|
||||
*/
|
||||
public function createTask(User $user, Server $server)
|
||||
{
|
||||
if ($this->isOwner($user, $server)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->permissions()->server($server)->permission('create-task')->exists();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,6 +79,14 @@ class SubuserRepository
|
|||
'create-subuser' => null,
|
||||
'delete-subuser' => null,
|
||||
|
||||
// Tasks
|
||||
'list-tasks' => null,
|
||||
'view-task' => null,
|
||||
'toggle-task' => null,
|
||||
'delete-task' => null,
|
||||
'create-task' => null,
|
||||
'queue-task' => null,
|
||||
|
||||
// Management
|
||||
'set-connection' => null,
|
||||
'view-startup' => null,
|
||||
|
|
|
|||
130
app/Repositories/TaskRepository.php
Normal file
130
app/Repositories/TaskRepository.php
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
namespace Pterodactyl\Repositories;
|
||||
|
||||
use Cron;
|
||||
use Validator;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
|
||||
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
|
||||
class TaskRepository
|
||||
{
|
||||
|
||||
protected $defaults = [
|
||||
'year' => '*',
|
||||
'day_of_week' => '*',
|
||||
'month' => '*',
|
||||
'day_of_month' => '*',
|
||||
'hour' => '*',
|
||||
'minute' => '*/30',
|
||||
];
|
||||
|
||||
protected $actions = [
|
||||
'command',
|
||||
'power',
|
||||
];
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new scheduled task for a given server.
|
||||
* @param int $id
|
||||
* @param array $data
|
||||
*
|
||||
* @throws DisplayException
|
||||
* @throws DisplayValidationException
|
||||
* @return void
|
||||
*/
|
||||
public function create($id, $data)
|
||||
{
|
||||
$server = Models\Server::findOrFail($id);
|
||||
|
||||
$validator = Validator::make($data, [
|
||||
'action' => 'string|required',
|
||||
'data' => 'string|required',
|
||||
'year' => 'string|sometimes|required',
|
||||
'day_of_week' => 'string|sometimes|required',
|
||||
'month' => 'string|sometimes|required',
|
||||
'day_of_month' => 'string|sometimes|required',
|
||||
'hour' => 'string|sometimes|required',
|
||||
'minute' => 'string|sometimes|required'
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
throw new DisplayValidationException(json_encode($validator->errors()));
|
||||
}
|
||||
|
||||
if (!in_array($data['action'], $this->actions)) {
|
||||
throw new DisplayException('The action provided is not valid.');
|
||||
}
|
||||
|
||||
$cron = $this->defaults;
|
||||
foreach ($this->defaults as $setting => $value) {
|
||||
if (array_key_exists($setting, $data)) {
|
||||
$cron[$setting] = $data[$setting];
|
||||
}
|
||||
}
|
||||
|
||||
// Check that is this a valid Cron Entry
|
||||
try {
|
||||
$buildCron = Cron::factory(sprintf('%s %s %s %s %s %s',
|
||||
$cron['minute'],
|
||||
$cron['hour'],
|
||||
$cron['day_of_month'],
|
||||
$cron['month'],
|
||||
$cron['day_of_week'],
|
||||
$cron['year']
|
||||
));
|
||||
} catch (\Exception $ex) {
|
||||
throw new DisplayException($ex);
|
||||
}
|
||||
|
||||
$task = new Models\Task;
|
||||
$task->fill([
|
||||
'server' => $server->id,
|
||||
'active' => 1,
|
||||
'action' => $data['action'],
|
||||
'data' => $data['data'],
|
||||
'queued' => 0,
|
||||
'year' => $cron['year'],
|
||||
'day_of_week' => $cron['day_of_week'],
|
||||
'month' => $cron['month'],
|
||||
'day_of_month' => $cron['day_of_month'],
|
||||
'hour' => $cron['hour'],
|
||||
'minute' => $cron['minute'],
|
||||
'last_run' => null,
|
||||
'next_run' => $buildCron->getNextRunDate()
|
||||
]);
|
||||
|
||||
return $task->save();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue