StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/stanjg/panel into feature/user-specific-language

Browse source
This commit is contained in:
stanjg 2018-06-01 15:58:09 +02:00
commit 3bb9e5e8a8
199 changed files with 2390 additions and 1179 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/API/Remote/EggRetrievalController.php
View file

@ -41,7 +41,7 @@ class EggRetrievalController extends Controller
}
/**
* Return a JSON array of Eggs and the SHA1 hash of thier configuration file.
* Return a JSON array of Eggs and the SHA1 hash of their configuration file.
*
* @return \Illuminate\Http\JsonResponse
*/

1
app/Http/Controllers/Admin/ApiController.php
View file

@ -65,6 +65,7 @@ class ApiController extends Controller
* Render view allowing an admin to create a new application API key.
*
* @return \Illuminate\View\View
* @throws \ReflectionException
*/
public function create(): View
{

2
app/Http/Controllers/Admin/LocationController.php
View file

@ -103,7 +103,6 @@ class LocationController extends Controller
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Throwable
* @throws \Watson\Validating\ValidationException
*/
public function create(LocationFormRequest $request)
{
@ -121,7 +120,6 @@ class LocationController extends Controller
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Throwable
* @throws \Watson\Validating\ValidationException
*/
public function update(LocationFormRequest $request, Location $location)
{

3
app/Http/Controllers/Admin/Nests/EggVariableController.php
View file

@ -90,10 +90,11 @@ class EggVariableController extends Controller
* Handle a request to create a new Egg variable.
*
* @param \Pterodactyl\Http\Requests\Admin\Egg\EggVariableFormRequest $request
* @param \Pterodactyl\Models\Egg $egg
* @param \Pterodactyl\Models\Egg $egg
*
* @return \Illuminate\Http\RedirectResponse
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
* @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
*/
public function store(EggVariableFormRequest $request, Egg $egg): RedirectResponse

19
app/Http/Controllers/Admin/ServersController.php
View file

@ -35,6 +35,7 @@ use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
use Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest;
class ServersController extends Controller
{
@ -375,9 +376,15 @@ class ServersController extends Controller
*
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\View\View
*
* @throws \Pterodactyl\Exceptions\DisplayException
*/
public function viewManage(Server $server)
{
if ($server->installed > 1) {
throw new DisplayException('This server is in a failed installation state and must be deleted and recreated.');
}
return view('admin.servers.view.manage', ['server' => $server]);
}
@ -462,6 +469,7 @@ class ServersController extends Controller
*
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\RedirectResponse
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
*/
public function rebuildContainer(Server $server)
{
@ -540,7 +548,8 @@ class ServersController extends Controller
* @param \Pterodactyl\Models\Server $server
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Illuminate\Validation\ValidationException
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
@ -556,15 +565,13 @@ class ServersController extends Controller
/**
* Creates a new database assigned to a specific server.
*
* @param \Illuminate\Http\Request $request
* @param int $server
* @param \Pterodactyl\Http\Requests\Admin\Servers\Databases\StoreServerDatabaseRequest $request
* @param int $server
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Exception
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
public function newDatabase(Request $request, $server)
public function newDatabase(StoreServerDatabaseRequest $request, $server)
{
$this->databaseManagementService->create($server, [
'database' => $request->input('database'),

2
app/Http/Controllers/Admin/Settings/AdvancedController.php
View file

@ -76,6 +76,8 @@ class AdvancedController extends Controller
/**
* @param \Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest $request
* @return \Illuminate\Http\RedirectResponse
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function update(AdvancedSettingsFormRequest $request): RedirectResponse
{

2
app/Http/Controllers/Admin/Settings/IndexController.php
View file

@ -74,6 +74,8 @@ class IndexController extends Controller
*
* @param \Pterodactyl\Http\Requests\Admin\Settings\BaseSettingsFormRequest $request
* @return \Illuminate\Http\RedirectResponse
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function update(BaseSettingsFormRequest $request): RedirectResponse
{

4
app/Http/Controllers/Admin/Settings/MailController.php
View file

@ -83,7 +83,9 @@ class MailController extends Controller
* @param \Pterodactyl\Http\Requests\Admin\Settings\MailSettingsFormRequest $request
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function update(MailSettingsFormRequest $request): RedirectResponse
{

101
app/Http/Controllers/Admin/StatisticsController.php Normal file
View file

@ -0,0 +1,101 @@
<?php
namespace Pterodactyl\Http\Controllers\Admin;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Traits\Controllers\PlainJavascriptInjection;
class StatisticsController extends Controller
{
use PlainJavascriptInjection;
private $allocationRepository;
private $databaseRepository;
private $eggRepository;
private $nodeRepository;
private $serverRepository;
private $userRepository;
function __construct(
AllocationRepositoryInterface $allocationRepository,
DatabaseRepositoryInterface $databaseRepository,
EggRepositoryInterface $eggRepository,
NodeRepositoryInterface $nodeRepository,
ServerRepositoryInterface $serverRepository,
UserRepositoryInterface $userRepository
)
{
$this->allocationRepository = $allocationRepository;
$this->databaseRepository = $databaseRepository;
$this->eggRepository = $eggRepository;
$this->nodeRepository = $nodeRepository;
$this->serverRepository = $serverRepository;
$this->userRepository = $userRepository;
}
public function index()
{
$servers = $this->serverRepository->all();
$nodes = $this->nodeRepository->all();
$usersCount = $this->userRepository->count();
$eggsCount = $this->eggRepository->count();
$databasesCount = $this->databaseRepository->count();
$totalAllocations = $this->allocationRepository->count();
$suspendedServersCount = $this->serverRepository->getSuspendedServersCount();
$totalServerRam = 0;
$totalNodeRam = 0;
$totalServerDisk = 0;
$totalNodeDisk = 0;
foreach ($nodes as $node) {
$stats = $this->nodeRepository->getUsageStatsRaw($node);
$totalServerRam += $stats['memory']['value'];
$totalNodeRam += $stats['memory']['max'];
$totalServerDisk += $stats['disk']['value'];
$totalNodeDisk += $stats['disk']['max'];
}
$tokens = [];
foreach ($nodes as $node) {
$tokens[$node->id] = $node->daemonSecret;
}
$this->injectJavascript([
'servers' => $servers,
'suspendedServers' => $suspendedServersCount,
'totalServerRam' => $totalServerRam,
'totalNodeRam' => $totalNodeRam,
'totalServerDisk' => $totalServerDisk,
'totalNodeDisk' => $totalNodeDisk,
'nodes' => $nodes,
'tokens' => $tokens,
]);
return view('admin.statistics', [
'servers' => $servers,
'nodes' => $nodes,
'usersCount' => $usersCount,
'eggsCount' => $eggsCount,
'totalServerRam' => $totalServerRam,
'databasesCount' => $databasesCount,
'totalNodeRam' => $totalNodeRam,
'totalNodeDisk' => $totalNodeDisk,
'totalServerDisk' => $totalServerDisk,
'totalAllocations' => $totalAllocations,
]);
}
}

2
app/Http/Controllers/Api/Application/Servers/DatabaseController.php
View file

@ -104,8 +104,6 @@ class DatabaseController extends ApplicationApiController
* @return \Illuminate\Http\JsonResponse
*
* @throws \Exception
* @throws \Pterodactyl\Exceptions\DisplayException
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
public function store(StoreServerDatabaseRequest $request): JsonResponse
{

2
app/Http/Controllers/Base/SecurityController.php
View file

@ -96,7 +96,7 @@ class SecurityController extends Controller
}
/**
* Verifies that 2FA token recieved is valid and will work on the account.
* Verifies that 2FA token received is valid and will work on the account.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response

2
app/Http/Controllers/Server/Files/FileActionsController.php
View file

@ -101,7 +101,7 @@ class FileActionsController extends Controller
{
$server = $request->attributes->get('server');
$dirname = pathinfo($file, PATHINFO_DIRNAME);
$dirname = str_replace('\\', '/', pathinfo($file, PATHINFO_DIRNAME));
try {
$content = $this->repository->setServer($server)->setToken($request->attributes->get('server_token'))->getContent($file);
} catch (RequestException $exception) {

4
app/Http/Kernel.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Http;
use Pterodactyl\Http\Middleware\MaintenanceMiddleware;
use Pterodactyl\Models\ApiKey;
use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Auth\Middleware\Authenticate;
@ -108,10 +109,11 @@ class Kernel extends HttpKernel
'can' => Authorize::class,
'bindings' => SubstituteBindings::class,
'recaptcha' => VerifyReCaptcha::class,
'node.maintenance' => MaintenanceMiddleware::class,
// Server specific middleware (used for authenticating access to resources)
//
// These are only used for individual server authentication, and not gloabl
// These are only used for individual server authentication, and not global
// actions from other resources. They are defined in the route files.
'server..database' => DatabaseBelongsToServer::class,
'server..subuser' => SubuserBelongsToServer::class,

2
app/Http/Middleware/Api/Application/AuthenticateApplicationUser.php
View file

@ -10,7 +10,7 @@ class AuthenticateApplicationUser
{
/**
* Authenticate that the currently authenticated user is an administrator
* and should be allowed to proceede through the application API.
* and should be allowed to proceed through the application API.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next

44
app/Http/Middleware/MaintenanceMiddleware.php Normal file
View file

@ -0,0 +1,44 @@
<?php
namespace Pterodactyl\Http\Middleware;
use Closure;
use Illuminate\Contracts\Routing\ResponseFactory;
class MaintenanceMiddleware
{
/**
* @var \Illuminate\Contracts\Routing\ResponseFactory
*/
private $response;
/**
* MaintenanceMiddleware constructor.
*
* @param \Illuminate\Contracts\Routing\ResponseFactory $response
*/
public function __construct(ResponseFactory $response)
{
$this->response = $response;
}
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
/** @var \Pterodactyl\Models\Server $server */
$server = $request->attributes->get('server');
$node = $server->getRelation('node');
if ($node->maintenance_mode) {
return $this->response->view('errors.maintenance');
}
return $next($request);
}
}

2
app/Http/Middleware/RequireTwoFactorAuthentication.php
View file

@ -25,7 +25,7 @@ class RequireTwoFactorAuthentication
private $alert;
/**
* The names of routes that should be accessable without 2FA enabled.
* The names of routes that should be accessible without 2FA enabled.
*
* @var array
*/

2
app/Http/Middleware/Server/AuthenticateAsSubuser.php
View file

@ -33,7 +33,7 @@ class AuthenticateAsSubuser
}
/**
* Determine if a subuser has permissions to access a server, if so set thier access token.
* Determine if a subuser has permissions to access a server, if so set their access token.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next

12
app/Http/Middleware/TrustProxies.php
View file

@ -15,15 +15,9 @@ class TrustProxies extends Middleware
protected $proxies;
/**
* The current proxy header mappings.
* The headers that should be used to detect proxies.
*
* @var array
* @var int
*/
protected $headers = [
Request::HEADER_FORWARDED => 'FORWARDED',
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
];
protected $headers = Request::HEADER_X_FORWARDED_ALL;
}

6
app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php
View file

@ -10,13 +10,15 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
{
/**
* @return array
* @throws \ReflectionException
* @throws \ReflectionException
*/
public function rules()
{
$modelRules = ApiKey::getCreateRules();
return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
return [AdminAcl::COLUMN_IDENTIFER . $resource => $modelRules['r_' . $resource]];
return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];
})->merge(['memo' => $modelRules['memo']])->toArray();
}
@ -33,7 +35,7 @@ class StoreApplicationApiKeyRequest extends AdminFormRequest
public function getKeyPermissions(): array
{
return collect($this->validated())->filter(function ($value, $key) {
return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFER)) === AdminAcl::COLUMN_IDENTIFER;
return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFIER)) === AdminAcl::COLUMN_IDENTIFIER;
})->toArray();
}
}

22
app/Http/Requests/Admin/Servers/Databases/StoreServerDatabaseRequest.php Normal file
View file

@ -0,0 +1,22 @@
<?php
namespace Pterodactyl\Http\Requests\Admin\Servers\Databases;
use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
class StoreServerDatabaseRequest extends AdminFormRequest
{
/**
* Validation rules for database creation.
*
* @return array
*/
public function rules(): array
{
return [
'database' => 'required|string|min:1|max:24',
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
'database_host_id' => 'required|integer|exists:database_hosts,id',
];
}
}

2
app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
View file

@ -8,7 +8,7 @@ use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
class MailSettingsFormRequest extends AdminFormRequest
{
/**
* Return rules to validate mail settings POST data aganist.
* Return rules to validate mail settings POST data against.
*
* @return array
*/

2
app/Http/Requests/Api/Application/ApplicationApiRequest.php
View file

@ -38,7 +38,7 @@ abstract class ApplicationApiRequest extends FormRequest
/**
* Determine if the current user is authorized to perform
* the requested action aganist the API.
* the requested action against the API.
*
* @return bool
*

2
app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
View file

@ -19,7 +19,7 @@ class StoreLocationRequest extends ApplicationApiRequest
protected $permission = AdminAcl::WRITE;
/**
* Rules to validate the request aganist.
* Rules to validate the request against.
*
* @return array
*/

2
app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php
View file

@ -20,7 +20,7 @@ class UpdateLocationRequest extends StoreLocationRequest
}
/**
* Rules to validate this request aganist.
* Rules to validate this request against.
*
* @return array
*/

2
app/Http/Requests/Api/Application/Servers/Databases/StoreServerDatabaseRequest.php
View file

@ -26,7 +26,7 @@ class StoreServerDatabaseRequest extends ApplicationApiRequest
{
return [
'database' => 'required|string|min:1|max:24',
'remote' => 'required|string|min:1',
'remote' => 'required|string|regex:/^[0-9%.]{1,15}$/',
'host' => 'required|integer|exists:database_hosts,id',
];
}

2
app/Http/Requests/Api/Application/Servers/UpdateServerBuildConfigurationRequest.php
View file

@ -7,7 +7,7 @@ use Pterodactyl\Models\Server;
class UpdateServerBuildConfigurationRequest extends ServerWriteRequest
{
/**
* Return the rules to validate this request aganist.
* Return the rules to validate this request against.
*
* @return array
*/

2
app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php
View file

@ -19,7 +19,7 @@ class UpdateServerStartupRequest extends ApplicationApiRequest
protected $permission = AdminAcl::WRITE;
/**
* Validation rules to run the input aganist.
* Validation rules to run the input against.
*
* @return array
*/

2
app/Http/Requests/Api/Client/ClientApiRequest.php
View file

@ -8,7 +8,7 @@ abstract class ClientApiRequest extends ApplicationApiRequest
{
/**
* Determine if the current user is authorized to perform
* the requested action aganist the API.
* the requested action against the API.
*
* @return bool
*/

2
app/Http/Requests/Api/Client/Servers/SendCommandRequest.php
View file

@ -17,7 +17,7 @@ class SendCommandRequest extends GetServerRequest
}
/**
* Rules to validate this request aganist.
* Rules to validate this request against.
*
* @return array
*/

2
app/Http/Requests/Api/Client/Servers/SendPowerRequest.php
View file

@ -18,7 +18,7 @@ class SendPowerRequest extends ClientApiRequest
}
/**
* Rules to validate this request aganist.
* Rules to validate this request against.
*
* @return array
*/

2
app/Http/Requests/Base/StoreAccountKeyRequest.php
View file

@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\FrontendUserFormRequest;
class StoreAccountKeyRequest extends FrontendUserFormRequest
{
/**
* Rules to validate the request input aganist before storing
* Rules to validate the request input against before storing
* an account API key.
*
* @return array

4
app/Http/Requests/Server/Database/DeleteServerDatabaseRequest.php
View file

@ -19,7 +19,7 @@ class DeleteServerDatabaseRequest extends ServerFormRequest
}
/**
* Return the user permission to validate this request aganist.
* Return the user permission to validate this request against.
*
* @return string
*/
@ -29,7 +29,7 @@ class DeleteServerDatabaseRequest extends ServerFormRequest
}
/**
* Rules to validate this request aganist.
* Rules to validate this request against.
*
* @return array
*/

4
app/Http/Requests/Server/Database/StoreServerDatabaseRequest.php
View file

@ -19,7 +19,7 @@ class StoreServerDatabaseRequest extends ServerFormRequest
}
/**
* Return the user permission to validate this request aganist.
* Return the user permission to validate this request against.
*
* @return string
*/
@ -29,7 +29,7 @@ class StoreServerDatabaseRequest extends ServerFormRequest
}
/**
* Rules to validate this request aganist.
* Rules to validate this request against.
*
* @return array
*/

2
app/Http/Requests/Server/ScheduleCreationFormRequest.php
View file

@ -12,7 +12,7 @@ namespace Pterodactyl\Http\Requests\Server;
class ScheduleCreationFormRequest extends ServerFormRequest
{
/**
* Permission to validate this request aganist.
* Permission to validate this request against.
*
* @return string
*/

2
app/Http/Requests/Server/ServerFormRequest.php
View file

@ -8,7 +8,7 @@ use Pterodactyl\Http\Requests\FrontendUserFormRequest;
abstract class ServerFormRequest extends FrontendUserFormRequest
{
/**
* Return the user permission to validate this request aganist.
* Return the user permission to validate this request against.
*
* @return string
*/

4
app/Http/Requests/Server/Subuser/SubuserStoreFormRequest.php
View file

@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\Server\ServerFormRequest;
class SubuserStoreFormRequest extends ServerFormRequest
{
/**
* Return the user permission to validate this request aganist.
* Return the user permission to validate this request against.
*
* @return string
*/
@ -17,7 +17,7 @@ class SubuserStoreFormRequest extends ServerFormRequest
}
/**
* The rules to validate this request submission aganist.
* The rules to validate this request submission against.
*
* @return array
*/

4
app/Http/Requests/Server/Subuser/SubuserUpdateFormRequest.php
View file

@ -7,7 +7,7 @@ use Pterodactyl\Http\Requests\Server\ServerFormRequest;
class SubuserUpdateFormRequest extends ServerFormRequest
{
/**
* Return the user permission to validate this request aganist.
* Return the user permission to validate this request against.
*
* @return string
*/
@ -17,7 +17,7 @@ class SubuserUpdateFormRequest extends ServerFormRequest
}
/**
* The rules to validate this request submission aganist.
* The rules to validate this request submission against.
*
* @return array
*/

2
app/Http/Requests/Server/UpdateFileContentsFormRequest.php
View file

@ -20,7 +20,7 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
class UpdateFileContentsFormRequest extends ServerFormRequest
{
/**
* Return the permission string to validate this request aganist.
* Return the permission string to validate this request against.
*
* @return string
*/