Improved middleware, console page now using new setup
This commit is contained in:
parent
bae76c2768
commit
4532811fcd
13 changed files with 499 additions and 165 deletions
|
@ -24,8 +24,8 @@
|
|||
|
||||
namespace Pterodactyl\Exceptions\Service\Server;
|
||||
|
||||
use Exception;
|
||||
use Pterodactyl\Exceptions\PterodactylException;
|
||||
|
||||
class RequiredVariableMissingException extends Exception
|
||||
class RequiredVariableMissingException extends PterodactylException
|
||||
{
|
||||
}
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<?php
|
||||
/*
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 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\Exceptions\Service\Server;
|
||||
|
||||
use Pterodactyl\Exceptions\PterodactylException;
|
||||
|
||||
class UserNotLinkedToServerException extends PterodactylException
|
||||
{
|
||||
}
|
99
app/Http/Controllers/Server/ConsoleController.php
Normal file
99
app/Http/Controllers/Server/ConsoleController.php
Normal file
|
@ -0,0 +1,99 @@
|
|||
<?php
|
||||
/*
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 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 Illuminate\Contracts\Session\Session;
|
||||
use Pterodactyl\Http\Controllers\Controller;
|
||||
use Pterodactyl\Traits\Controllers\ServerToJavascript;
|
||||
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||
|
||||
class ConsoleController extends Controller
|
||||
{
|
||||
use ServerToJavascript;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Contracts\Config\Repository
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Contracts\Session\Session
|
||||
*/
|
||||
protected $session;
|
||||
|
||||
/**
|
||||
* ConsoleController constructor.
|
||||
*
|
||||
* @param \Illuminate\Contracts\Config\Repository $config
|
||||
* @param \Illuminate\Contracts\Session\Session $session
|
||||
*/
|
||||
public function __construct(
|
||||
ConfigRepository $config,
|
||||
Session $session
|
||||
) {
|
||||
$this->config = $config;
|
||||
$this->session = $session;
|
||||
}
|
||||
|
||||
/**
|
||||
* Render server index page with the console and power options.
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$server = $this->session->get('server_data.model');
|
||||
|
||||
$this->injectJavascript([
|
||||
'meta' => [
|
||||
'saveFile' => route('server.files.save', $server->uuidShort),
|
||||
'csrfToken' => csrf_token(),
|
||||
],
|
||||
'config' => [
|
||||
'console_count' => $this->config->get('pterodactyl.console.count'),
|
||||
'console_freq' => $this->config->get('pterodactyl.console.frequency'),
|
||||
],
|
||||
]);
|
||||
|
||||
return view('server.index', ['server' => $server, 'node' => $server->node]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Render a stand-alone console in the browser.
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function console()
|
||||
{
|
||||
$server = $this->session->get('server_data.model');
|
||||
|
||||
$this->injectJavascript(['config' => [
|
||||
'console_count' => $this->config->get('pterodactyl.console.count'),
|
||||
'console_freq' => $this->config->get('pterodactyl.console.frequency'),
|
||||
]]);
|
||||
|
||||
return view('server.console', ['server' => $server, 'node' => $server->node]);
|
||||
}
|
||||
}
|
|
@ -31,65 +31,10 @@ use Pterodactyl\Models;
|
|||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
use Pterodactyl\Http\Controllers\Controller;
|
||||
use Pterodactyl\Repositories\ServerRepository;
|
||||
use Pterodactyl\Exceptions\DisplayValidationException;
|
||||
use Pterodactyl\Repositories\old_Daemon\FileRepository;
|
||||
|
||||
class ServerController extends Controller
|
||||
{
|
||||
/**
|
||||
* Renders server index page for specified server.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $uuid
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function getIndex(Request $request, $uuid)
|
||||
{
|
||||
$server = Models\Server::byUuid($uuid);
|
||||
|
||||
$server->js([
|
||||
'meta' => [
|
||||
'saveFile' => route('server.files.save', $server->uuidShort),
|
||||
'csrfToken' => csrf_token(),
|
||||
],
|
||||
'config' => [
|
||||
'console_count' => config('pterodactyl.console.count'),
|
||||
'console_freq' => config('pterodactyl.console.frequency'),
|
||||
],
|
||||
]);
|
||||
|
||||
return view('server.index', [
|
||||
'server' => $server,
|
||||
'node' => $server->node,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders server console as an individual item.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $uuid
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function getConsole(Request $request, $uuid)
|
||||
{
|
||||
\Debugbar::disable();
|
||||
$server = Models\Server::byUuid($uuid);
|
||||
|
||||
$server->js([
|
||||
'config' => [
|
||||
'console_count' => config('pterodactyl.console.count'),
|
||||
'console_freq' => config('pterodactyl.console.frequency'),
|
||||
],
|
||||
]);
|
||||
|
||||
return view('server.console', [
|
||||
'server' => $server,
|
||||
'node' => $server->node,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders file overview page.
|
||||
*
|
||||
|
|
|
@ -54,7 +54,8 @@ class Kernel extends HttpKernel
|
|||
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
|
||||
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
|
||||
'guest' => \Pterodactyl\Http\Middleware\RedirectIfAuthenticated::class,
|
||||
'server' => \Pterodactyl\Http\Middleware\CheckServer::class,
|
||||
'server' => \Pterodactyl\Http\Middleware\ServerAuthenticate::class,
|
||||
'subuser' => \Pterodactyl\Http\Middleware\SubuserAccessAuthenticate::class,
|
||||
'admin' => \Pterodactyl\Http\Middleware\AdminAuthenticate::class,
|
||||
'daemon' => \Pterodactyl\Http\Middleware\DaemonAuthenticate::class,
|
||||
'csrf' => \Pterodactyl\Http\Middleware\VerifyCsrfToken::class,
|
||||
|
|
|
@ -24,106 +24,102 @@
|
|||
|
||||
namespace Pterodactyl\Http\Middleware;
|
||||
|
||||
use Auth;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Session\Session;
|
||||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||
use Pterodactyl\Models\Server;
|
||||
use Illuminate\Contracts\Config\Repository as ConfigRepository;
|
||||
use Illuminate\Auth\AuthenticationException;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
|
||||
|
||||
class CheckServer
|
||||
class ServerAuthenticate
|
||||
{
|
||||
/**
|
||||
* The elquent model for the server.
|
||||
*
|
||||
* @var \Illuminate\Contracts\Config\Repository
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
|
||||
*/
|
||||
protected $repository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Models\Server
|
||||
*/
|
||||
protected $server;
|
||||
|
||||
/**
|
||||
* The request object.
|
||||
*
|
||||
* @var \Illuminate\Http\Request
|
||||
* @var \Illuminate\Contracts\Session\Session
|
||||
*/
|
||||
protected $request;
|
||||
protected $session;
|
||||
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
* ServerAuthenticate constructor.
|
||||
*
|
||||
* @param \Illuminate\Contracts\Config\Repository $config
|
||||
* @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
|
||||
* @param \Illuminate\Contracts\Session\Session $session
|
||||
*/
|
||||
public function __construct(
|
||||
ConfigRepository $config,
|
||||
ServerRepositoryInterface $repository,
|
||||
Session $session
|
||||
) {
|
||||
$this->config = $config;
|
||||
$this->repository = $repository;
|
||||
$this->session = $session;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if a given user has permission to access a server.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*
|
||||
* @throws \Illuminate\Auth\AuthenticationException
|
||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
if (! Auth::user()) {
|
||||
throw new AuthenticationException();
|
||||
if (! $request->user()) {
|
||||
throw new AuthenticationException;
|
||||
}
|
||||
|
||||
$this->request = $request;
|
||||
$this->server = Server::byUuid($request->route()->server);
|
||||
$attributes = $request->route()->parameter('server');
|
||||
$isApiRequest = $request->expectsJson() || $request->is(...$this->config->get('pterodactyl.json_routes', []));
|
||||
$server = $this->repository->getByUuid($attributes instanceof Server ? $attributes->uuid : $attributes);
|
||||
|
||||
if (! $server) {
|
||||
if ($isApiRequest) {
|
||||
throw new NotFoundHttpException('The requested server was not found on the system.');
|
||||
}
|
||||
|
||||
if (! $this->exists()) {
|
||||
return response()->view('errors.404', [], 404);
|
||||
}
|
||||
|
||||
if ($this->suspended()) {
|
||||
if ($server->suspended) {
|
||||
if ($isApiRequest) {
|
||||
throw new AccessDeniedHttpException('Server is suspended.');
|
||||
}
|
||||
|
||||
return response()->view('errors.suspended', [], 403);
|
||||
}
|
||||
|
||||
if (! $this->installed()) {
|
||||
if ($server->installed !== 1) {
|
||||
if ($isApiRequest) {
|
||||
throw new AccessDeniedHttpException('Server is completing install process.');
|
||||
}
|
||||
|
||||
return response()->view('errors.installing', [], 403);
|
||||
}
|
||||
|
||||
// Store the server in the session.
|
||||
$this->session->now('server_data.model', $server);
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the server was found on the system.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
protected function exists()
|
||||
{
|
||||
if (! $this->server) {
|
||||
if ($this->request->expectsJson() || $this->request->is(...config('pterodactyl.json_routes'))) {
|
||||
throw new NotFoundHttpException('The requested server was not found on the system.');
|
||||
}
|
||||
}
|
||||
|
||||
return (! $this->server) ? false : true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the server is suspended.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
protected function suspended()
|
||||
{
|
||||
if ($this->server->suspended) {
|
||||
if ($this->request->expectsJson() || $this->request->is(...config('pterodactyl.json_routes'))) {
|
||||
throw new AccessDeniedHttpException('Server is suspended.');
|
||||
}
|
||||
}
|
||||
|
||||
return $this->server->suspended;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the server is installed.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
protected function installed()
|
||||
{
|
||||
if ($this->server->installed !== 1) {
|
||||
if ($this->request->expectsJson() || $this->request->is(...config('pterodactyl.json_routes'))) {
|
||||
throw new AccessDeniedHttpException('Server is completing install process.');
|
||||
}
|
||||
}
|
||||
|
||||
return $this->server->installed === 1;
|
||||
}
|
||||
}
|
81
app/Http/Middleware/SubuserAccessAuthenticate.php
Normal file
81
app/Http/Middleware/SubuserAccessAuthenticate.php
Normal file
|
@ -0,0 +1,81 @@
|
|||
<?php
|
||||
/*
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 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\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Auth\AuthenticationException;
|
||||
use Illuminate\Contracts\Session\Session;
|
||||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException;
|
||||
use Pterodactyl\Services\Servers\ServerAccessHelperService;
|
||||
|
||||
class SubuserAccessAuthenticate
|
||||
{
|
||||
/**
|
||||
* @var \Pterodactyl\Services\Servers\ServerAccessHelperService
|
||||
*/
|
||||
protected $accessHelperService;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Contracts\Session\Session
|
||||
*/
|
||||
protected $session;
|
||||
|
||||
/**
|
||||
* SubuserAccessAuthenticate constructor.
|
||||
*
|
||||
* @param \Pterodactyl\Services\Servers\ServerAccessHelperService $accessHelperService
|
||||
* @param \Illuminate\Contracts\Session\Session $session
|
||||
*/
|
||||
public function __construct(
|
||||
ServerAccessHelperService $accessHelperService,
|
||||
Session $session
|
||||
) {
|
||||
$this->accessHelperService = $accessHelperService;
|
||||
$this->session = $session;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*
|
||||
* @throws \Illuminate\Auth\AuthenticationException
|
||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
$server = $this->session->get('server_data.model');
|
||||
|
||||
try {
|
||||
$token = $this->accessHelperService->handle($server, $request->user());
|
||||
$this->session->now('server_data.token', $token);
|
||||
} catch (UserNotLinkedToServerException $exception) {
|
||||
throw new AuthenticationException('This account does not have permission to access this server.');
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
|
@ -50,7 +50,7 @@ class RouteServiceProvider extends ServiceProvider
|
|||
->namespace($this->namespace . '\Auth')
|
||||
->group(base_path('routes/auth.php'));
|
||||
|
||||
Route::middleware(['web', 'auth', 'server', 'csrf'])->prefix('/server/{server}')
|
||||
Route::middleware(['web', 'csrf', 'auth', 'server', 'subuser'])->prefix('/server/{server}')
|
||||
->namespace($this->namespace . '\Server')
|
||||
->group(base_path('routes/server.php'));
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
|
||||
namespace Pterodactyl\Services\Servers;
|
||||
|
||||
use Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException;
|
||||
use Pterodactyl\Models\Server;
|
||||
use Pterodactyl\Models\User;
|
||||
use Illuminate\Cache\Repository as CacheRepository;
|
||||
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
||||
|
@ -44,28 +46,37 @@ class ServerAccessHelperService
|
|||
$this->userRepository = $userRepository;
|
||||
}
|
||||
|
||||
public function handle($uuid, $user)
|
||||
/**
|
||||
* @param int|\Pterodactyl\Models\Server $server
|
||||
* @param int|\Pterodactyl\Models\User $user
|
||||
* @return string
|
||||
*
|
||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||
* @throws \Pterodactyl\Exceptions\Service\Server\UserNotLinkedToServerException
|
||||
*/
|
||||
public function handle($server, $user)
|
||||
{
|
||||
if (! $server instanceof Server) {
|
||||
$server = $this->repository->find($server);
|
||||
}
|
||||
|
||||
if (! $user instanceof User) {
|
||||
$user = $this->userRepository->find($user);
|
||||
}
|
||||
|
||||
$server = $this->repository->getByUuid($uuid);
|
||||
if (! $user->root_admin) {
|
||||
if (! in_array($server->id, $this->repository->getUserAccessServers($user->id))) {
|
||||
throw new \Exception('User does not have access.');
|
||||
}
|
||||
|
||||
if ($server->owner_id !== $user->id) {
|
||||
$subuser = $this->subuserRepository->withColumns('daemonSecret')->findWhere([
|
||||
['user_id', '=', $user->id],
|
||||
['server_id', '=', $server->id],
|
||||
]);
|
||||
|
||||
$server->daemonSecret = $subuser->daemonToken;
|
||||
}
|
||||
if ($user->root_admin || $server->owner_id === $user->id) {
|
||||
return $server->daemonSecret;
|
||||
}
|
||||
|
||||
return $server;
|
||||
if (! in_array($server->id, $this->repository->getUserAccessServers($user->id))) {
|
||||
throw new UserNotLinkedToServerException;
|
||||
}
|
||||
|
||||
$subuser = $this->subuserRepository->withColumns('daemonSecret')->findWhere([
|
||||
['user_id', '=', $user->id],
|
||||
['server_id', '=', $server->id],
|
||||
]);
|
||||
|
||||
return $subuser->daemonSecret;
|
||||
}
|
||||
}
|
||||
|
|
64
app/Traits/Controllers/ServerToJavascript.php
Normal file
64
app/Traits/Controllers/ServerToJavascript.php
Normal file
|
@ -0,0 +1,64 @@
|
|||
<?php
|
||||
/*
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 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\Traits\Controllers;
|
||||
|
||||
use Javascript;
|
||||
|
||||
trait ServerToJavascript
|
||||
{
|
||||
/**
|
||||
* @var \Illuminate\Contracts\Session\Session
|
||||
*/
|
||||
protected $session;
|
||||
|
||||
/**
|
||||
* Injects server javascript into the page to be used by other services.
|
||||
*
|
||||
* @param array $args
|
||||
* @param bool $overwrite
|
||||
* @return mixed
|
||||
*/
|
||||
public function injectJavascript($args = [], $overwrite = false)
|
||||
{
|
||||
$server = $this->session->get('server_data.model');
|
||||
$token = $this->session->get('server_data.token');
|
||||
|
||||
$response = array_merge([
|
||||
'server' => [
|
||||
'uuid' => $server->uuid,
|
||||
'uuidShort' => $server->uuidShort,
|
||||
'daemonSecret' => $token,
|
||||
'username' => $server->username,
|
||||
],
|
||||
'node' => [
|
||||
'fqdn' => $server->node->fqdn,
|
||||
'scheme' => $server->node->scheme,
|
||||
'daemonListen' => $server->node->daemonListen,
|
||||
],
|
||||
], $args);
|
||||
|
||||
return Javascript::put($overwrite ? $args : $response);
|
||||
}
|
||||
}
|
|
@ -74,9 +74,9 @@
|
|||
<span class="hidden-xs">{{ Auth::user()->name_first }} {{ Auth::user()->name_last }}</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server"></i></a>
|
||||
</li>
|
||||
{{--<li>--}}
|
||||
{{--<a href="#" data-action="control-sidebar" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.servers') }}"><i class="fa fa-server"></i></a>--}}
|
||||
{{--</li>--}}
|
||||
@if(Auth::user()->isRootAdmin())
|
||||
<li>
|
||||
<li><a href="{{ route('admin.index') }}" data-toggle="tooltip" data-placement="bottom" title="{{ @trans('strings.admin_cp') }}"><i class="fa fa-gears"></i></a></li>
|
||||
|
@ -241,27 +241,28 @@
|
|||
<aside class="control-sidebar control-sidebar-dark">
|
||||
<div class="tab-content">
|
||||
<ul class="control-sidebar-menu">
|
||||
@foreach (Auth::user()->access(null)->get() as $s)
|
||||
<li>
|
||||
<a
|
||||
@if(isset($server) && isset($node))
|
||||
@if($server->uuidShort === $s->uuidShort)
|
||||
class="active"
|
||||
@endif
|
||||
@endif
|
||||
href="{{ route('server.index', $s->uuidShort) }}">
|
||||
@if($s->owner_id === Auth::user()->id)
|
||||
<i class="menu-icon fa fa-user bg-blue"></i>
|
||||
@else
|
||||
<i class="menu-icon fa fa-user-o bg-gray"></i>
|
||||
@endif
|
||||
<div class="menu-info">
|
||||
<h4 class="control-sidebar-subheading">{{ $s->name }}</h4>
|
||||
<p>{{ $s->username }}</p>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
@endforeach
|
||||
{{-- @todo replace this with better logic, or just remove it entirely? --}}
|
||||
{{--@foreach (Auth::user()->access(null)->get() as $s)--}}
|
||||
{{--<li>--}}
|
||||
{{--<a--}}
|
||||
{{--@if(isset($server) && isset($node))--}}
|
||||
{{--@if($server->uuidShort === $s->uuidShort)--}}
|
||||
{{--class="active"--}}
|
||||
{{--@endif--}}
|
||||
{{--@endif--}}
|
||||
{{--href="{{ route('server.index', $s->uuidShort) }}">--}}
|
||||
{{--@if($s->owner_id === Auth::user()->id)--}}
|
||||
{{--<i class="menu-icon fa fa-user bg-blue"></i>--}}
|
||||
{{--@else--}}
|
||||
{{--<i class="menu-icon fa fa-user-o bg-gray"></i>--}}
|
||||
{{--@endif--}}
|
||||
{{--<div class="menu-info">--}}
|
||||
{{--<h4 class="control-sidebar-subheading">{{ $s->name }}</h4>--}}
|
||||
{{--<p>{{ $s->username }}</p>--}}
|
||||
{{--</div>--}}
|
||||
{{--</a>--}}
|
||||
{{--</li>--}}
|
||||
{{--@endforeach--}}
|
||||
</ul>
|
||||
</div>
|
||||
</aside>
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
Route::get('/', 'ServerController@getIndex')->name('server.index');
|
||||
Route::get('/console', 'ServerController@getConsole')->name('server.console');
|
||||
Route::get('/', 'ConsoleController@index')->name('server.index');
|
||||
Route::get('/console', 'ConsoleController@console')->name('server.console');
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
105
tests/Unit/Http/Controllers/Server/ConsoleControllerTest.php
Normal file
105
tests/Unit/Http/Controllers/Server/ConsoleControllerTest.php
Normal file
|
@ -0,0 +1,105 @@
|
|||
<?php
|
||||
/*
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 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 Tests\Unit\Http\Controllers\Server;
|
||||
|
||||
use Illuminate\Contracts\Session\Session;
|
||||
use Mockery as m;
|
||||
use Pterodactyl\Http\Controllers\Server\ConsoleController;
|
||||
use Pterodactyl\Models\Node;
|
||||
use Pterodactyl\Models\Server;
|
||||
use Tests\Assertions\ControllerAssertionsTrait;
|
||||
use Tests\TestCase;
|
||||
use Illuminate\Contracts\Config\Repository;
|
||||
|
||||
class ConsoleControllerTest extends TestCase
|
||||
{
|
||||
use ControllerAssertionsTrait;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Contracts\Config\Repository
|
||||
*/
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Http\Controllers\Server\ConsoleController
|
||||
*/
|
||||
protected $controller;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Contracts\Session\Session
|
||||
*/
|
||||
protected $session;
|
||||
|
||||
/**
|
||||
* Setup tests.
|
||||
*/
|
||||
public function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
$this->config = m::mock(Repository::class);
|
||||
$this->session = m::mock(Session::class);
|
||||
|
||||
$this->controller = m::mock(ConsoleController::class, [$this->config, $this->session])->makePartial();
|
||||
}
|
||||
|
||||
/**
|
||||
* Test both controllers as they do effectively the same thing.
|
||||
*
|
||||
* @dataProvider controllerDataProvider
|
||||
*/
|
||||
public function testAllControllers($function, $view)
|
||||
{
|
||||
$server = factory(Server::class)->make();
|
||||
$node = factory(Node::class)->make();
|
||||
$server->node = $node;
|
||||
|
||||
$this->session->shouldReceive('get')->with('server_data.model')->once()->andReturn($server);
|
||||
$this->config->shouldReceive('get')->with('pterodactyl.console.count')->once()->andReturn(100);
|
||||
$this->config->shouldReceive('get')->with('pterodactyl.console.frequency')->once()->andReturn(10);
|
||||
$this->controller->shouldReceive('injectJavascript')->once()->andReturnNull();
|
||||
|
||||
$response = $this->controller->$function();
|
||||
$this->assertIsViewResponse($response);
|
||||
$this->assertViewNameEquals($view, $response);
|
||||
$this->assertViewHasKey('server', $response);
|
||||
$this->assertViewHasKey('node', $response);
|
||||
$this->assertViewKeyEquals('server', $server, $response);
|
||||
$this->assertViewKeyEquals('node', $node, $response);
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide data for the tests.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function controllerDataProvider()
|
||||
{
|
||||
return [
|
||||
['index', 'server.index'],
|
||||
['console', 'server.console'],
|
||||
];
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue