Skip to content

Commit e6008d6

Browse files
DaneEverittDaneEveritt
authored
Merge branch 'develop' into lancepioch-patch-3
2 parents ce614ad + 63918cb commit e6008d6

File tree

361 files changed

+5524
-19819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+5524
-19819
lines changed

‎app/Console/Commands/Server/RebuildServerCommand.php‎

Lines changed: 0 additions & 109 deletions
This file was deleted.

‎app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<?php
2-
/**
3-
* Pterodactyl - Panel
4-
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
5-
*
6-
* This software is licensed under the terms of the MIT license.
7-
* https://opensource.org/licenses/MIT
8-
*/
92

103
namespace Pterodactyl\Exceptions\Service\User;
114

12-
use Exception;
5+
use Pterodactyl\Exceptions\DisplayException;
136

14-
class TwoFactorAuthenticationTokenInvalid extends Exception
7+
class TwoFactorAuthenticationTokenInvalid extends DisplayException
158
{
169
}

‎app/Http/Controllers/Admin/Nodes/NodeController.php‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
3+
namespace Pterodactyl\Http\Controllers\Admin\Nodes;
4+
5+
use Illuminate\Http\Request;
6+
use Illuminate\Contracts\View\Factory;
7+
use Pterodactyl\Http\Controllers\Controller;
8+
use Pterodactyl\Repositories\Eloquent\NodeRepository;
9+
10+
class NodeController extends Controller
11+
{
12+
/**
13+
* @var \Illuminate\Contracts\View\Factory
14+
*/
15+
private $view;
16+
17+
/**
18+
* @var \Pterodactyl\Repositories\Eloquent\NodeRepository
19+
*/
20+
private $repository;
21+
22+
/**
23+
* NodeController constructor.
24+
*
25+
* @param \Pterodactyl\Repositories\Eloquent\NodeRepository $repository
26+
* @param \Illuminate\Contracts\View\Factory $view
27+
*/
28+
public function __construct(NodeRepository $repository, Factory $view)
29+
{
30+
$this->view = $view;
31+
$this->repository = $repository;
32+
}
33+
34+
/**
35+
* Returns a listing of nodes on the system.
36+
*
37+
* @param \Illuminate\Http\Request $request
38+
* @return \Illuminate\Contracts\View\View
39+
*/
40+
public function index(Request $request)
41+
{
42+
$nodes = $this->repository
43+
->setSearchTerm($request->input('query'))
44+
->getNodeListingData();
45+
46+
return $this->view->make('admin.nodes.index', compact('nodes'));
47+
}
48+
}

‎app/Http/Controllers/Admin/Nodes/NodeViewController.php‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
<?php
2+
3+
namespace Pterodactyl\Http\Controllers\Admin\Nodes;
4+
5+
use Illuminate\Http\Request;
6+
use Pterodactyl\Models\Node;
7+
use Illuminate\Support\Collection;
8+
use Illuminate\Contracts\View\Factory;
9+
use Pterodactyl\Http\Controllers\Controller;
10+
use Pterodactyl\Repositories\Eloquent\NodeRepository;
11+
use Pterodactyl\Repositories\Eloquent\ServerRepository;
12+
use Pterodactyl\Traits\Controllers\JavascriptInjection;
13+
use Pterodactyl\Services\Helpers\SoftwareVersionService;
14+
use Pterodactyl\Repositories\Eloquent\LocationRepository;
15+
use Pterodactyl\Repositories\Eloquent\AllocationRepository;
16+
17+
class NodeViewController extends Controller
18+
{
19+
use JavascriptInjection;
20+
21+
/**
22+
* @var \Pterodactyl\Repositories\Eloquent\NodeRepository
23+
*/
24+
private $repository;
25+
26+
/**
27+
* @var \Illuminate\Contracts\View\Factory
28+
*/
29+
private $view;
30+
31+
/**
32+
* @var \Pterodactyl\Services\Helpers\SoftwareVersionService
33+
*/
34+
private $versionService;
35+
36+
/**
37+
* @var \Pterodactyl\Repositories\Eloquent\LocationRepository
38+
*/
39+
private $locationRepository;
40+
41+
/**
42+
* @var \Pterodactyl\Repositories\Eloquent\AllocationRepository
43+
*/
44+
private $allocationRepository;
45+
46+
/**
47+
* @var \Pterodactyl\Repositories\Eloquent\ServerRepository
48+
*/
49+
private $serverRepository;
50+
51+
/**
52+
* NodeViewController constructor.
53+
*
54+
* @param \Pterodactyl\Repositories\Eloquent\AllocationRepository $allocationRepository
55+
* @param \Pterodactyl\Repositories\Eloquent\LocationRepository $locationRepository
56+
* @param \Pterodactyl\Repositories\Eloquent\NodeRepository $repository
57+
* @param \Pterodactyl\Repositories\Eloquent\ServerRepository $serverRepository
58+
* @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService
59+
* @param \Illuminate\Contracts\View\Factory $view
60+
*/
61+
public function __construct(
62+
AllocationRepository $allocationRepository,
63+
LocationRepository $locationRepository,
64+
NodeRepository $repository,
65+
ServerRepository $serverRepository,
66+
SoftwareVersionService $versionService,
67+
Factory $view
68+
) {
69+
$this->repository = $repository;
70+
$this->view = $view;
71+
$this->versionService = $versionService;
72+
$this->locationRepository = $locationRepository;
73+
$this->allocationRepository = $allocationRepository;
74+
$this->serverRepository = $serverRepository;
75+
}
76+
77+
/**
78+
* Returns index view for a specific node on the system.
79+
*
80+
* @param \Illuminate\Http\Request $request
81+
* @param \Pterodactyl\Models\Node $node
82+
* @return \Illuminate\Contracts\View\View
83+
*/
84+
public function index(Request $request, Node $node)
85+
{
86+
$node = $this->repository->loadLocationAndServerCount($node);
87+
88+
return $this->view->make('admin.nodes.view.index', [
89+
'node' => $node,
90+
'stats' => $this->repository->getUsageStats($node),
91+
'version' => $this->versionService,
92+
]);
93+
}
94+
95+
/**
96+
* Returns the settings page for a specific node.
97+
*
98+
* @param \Illuminate\Http\Request $request
99+
* @param \Pterodactyl\Models\Node $node
100+
* @return \Illuminate\Contracts\View\View
101+
*/
102+
public function settings(Request $request, Node $node)
103+
{
104+
return $this->view->make('admin.nodes.view.settings', [
105+
'node' => $node,
106+
'locations' => $this->locationRepository->all(),
107+
]);
108+
}
109+
110+
/**
111+
* Return the node configuration page for a specific node.
112+
*
113+
* @param \Illuminate\Http\Request $request
114+
* @param \Pterodactyl\Models\Node $node
115+
* @return \Illuminate\Contracts\View\View
116+
*/
117+
public function configuration(Request $request, Node $node)
118+
{
119+
return $this->view->make('admin.nodes.view.configuration', compact('node'));
120+
}
121+
122+
/**
123+
* Return the node allocation management page.
124+
*
125+
* @param \Illuminate\Http\Request $request
126+
* @param \Pterodactyl\Models\Node $node
127+
* @return \Illuminate\Contracts\View\View
128+
*/
129+
public function allocations(Request $request, Node $node)
130+
{
131+
$node = $this->repository->loadNodeAllocations($node);
132+
133+
$this->plainInject(['node' => Collection::wrap($node)->only(['id'])]);
134+
135+
return $this->view->make('admin.nodes.view.allocation', [
136+
'node' => $node,
137+
'allocations' => $this->allocationRepository->setColumns(['ip'])->getUniqueAllocationIpsForNode($node->id),
138+
]);
139+
}
140+
141+
/**
142+
* Return a listing of servers that exist for this specific node.
143+
*
144+
* @param \Illuminate\Http\Request $request
145+
* @param \Pterodactyl\Models\Node $node
146+
* @return \Illuminate\Contracts\View\View
147+
*/
148+
public function servers(Request $request, Node $node)
149+
{
150+
$this->plainInject([
151+
'node' => Collection::wrap($node->makeVisible('daemonSecret'))
152+
->only(['scheme', 'fqdn', 'daemonListen', 'daemonSecret']),
153+
]);
154+
155+
return $this->view->make('admin.nodes.view.servers', [
156+
'node' => $node,
157+
'servers' => $this->serverRepository->loadAllServersForNode($node->id, 25),
158+
]);
159+
}
160+
}

‎app/Http/Controllers/Admin/Nodes/SystemInformationController.php‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
3+
namespace Pterodactyl\Http\Controllers\Admin\Nodes;
4+
5+
use Illuminate\Support\Str;
6+
use Illuminate\Http\Request;
7+
use Pterodactyl\Models\Node;
8+
use Illuminate\Http\JsonResponse;
9+
use Pterodactyl\Http\Controllers\Controller;
10+
use Pterodactyl\Repositories\Wings\DaemonConfigurationRepository;
11+
12+
class SystemInformationController extends Controller
13+
{
14+
/**
15+
* @var \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository
16+
*/
17+
private $repository;
18+
19+
/**
20+
* SystemInformationController constructor.
21+
*
22+
* @param \Pterodactyl\Repositories\Wings\DaemonConfigurationRepository $repository
23+
*/
24+
public function __construct(DaemonConfigurationRepository $repository)
25+
{
26+
$this->repository = $repository;
27+
}
28+
29+
/**
30+
* Returns system information from the Daemon.
31+
*
32+
* @param \Illuminate\Http\Request $request
33+
* @param \Pterodactyl\Models\Node $node
34+
* @return \Illuminate\Http\JsonResponse
35+
*
36+
* @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
37+
*/
38+
public function __invoke(Request $request, Node $node)
39+
{
40+
$data = $this->repository->setNode($node)->getSystemInformation();
41+
42+
return JsonResponse::create([
43+
'version' => $data['version'] ?? '',
44+
'system' => [
45+
'type' => Str::title($data['os'] ?? 'Unknown'),
46+
'arch' => $data['architecture'] ?? '--',
47+
'release' => $data['kernel_version'] ?? '--',
48+
'cpus' => $data['cpu_count'] ?? 0,
49+
],
50+
]);
51+
}
52+
}

0 commit comments

Comments
 (0)