Skip to content

Commit 547e884

Browse files
DaneEverittDaneEveritt
committed
Untested code to perform an update of server build settings
1 parent c17f9ba commit 547e884

File tree

10 files changed

+306
-141
lines changed

10 files changed

+306
-141
lines changed

‎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/NodesController.php‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
namespace Pterodactyl\Http\Controllers\Admin;
1111

12-
use Javascript;
1312
use Cake\Chronos\Chronos;
1413
use Illuminate\Http\Request;
1514
use Pterodactyl\Models\Node;
@@ -138,19 +137,6 @@ public function __construct(
138137
$this->versionService = $versionService;
139138
}
140139

141-
/**
142-
* Displays the index page listing all nodes on the panel.
143-
*
144-
* @param \Illuminate\Http\Request $request
145-
* @return \Illuminate\View\View
146-
*/
147-
public function index(Request $request)
148-
{
149-
return view('admin.nodes.index', [
150-
'nodes' => $this->repository->setSearchTerm($request->input('query'))->getNodeListingData(),
151-
]);
152-
}
153-
154140
/**
155141
* Displays create new node page.
156142
*
@@ -184,79 +170,6 @@ public function store(NodeFormRequest $request)
184170
return redirect()->route('admin.nodes.view.allocation', $node->id);
185171
}
186172

187-
/**
188-
* Shows the index overview page for a specific node.
189-
*
190-
* @param \Pterodactyl\Models\Node $node
191-
* @return \Illuminate\View\View
192-
*/
193-
public function viewIndex(Node $node)
194-
{
195-
return view('admin.nodes.view.index', [
196-
'node' => $this->repository->loadLocationAndServerCount($node),
197-
'stats' => $this->repository->getUsageStats($node),
198-
'version' => $this->versionService,
199-
]);
200-
}
201-
202-
/**
203-
* Shows the settings page for a specific node.
204-
*
205-
* @param \Pterodactyl\Models\Node $node
206-
* @return \Illuminate\View\View
207-
*/
208-
public function viewSettings(Node $node)
209-
{
210-
return view('admin.nodes.view.settings', [
211-
'node' => $node,
212-
'locations' => $this->locationRepository->all(),
213-
]);
214-
}
215-
216-
/**
217-
* Shows the configuration page for a specific node.
218-
*
219-
* @param \Pterodactyl\Models\Node $node
220-
* @return \Illuminate\View\View
221-
*/
222-
public function viewConfiguration(Node $node)
223-
{
224-
return view('admin.nodes.view.configuration', ['node' => $node]);
225-
}
226-
227-
/**
228-
* Shows the allocation page for a specific node.
229-
*
230-
* @param \Pterodactyl\Models\Node $node
231-
* @return \Illuminate\View\View
232-
*/
233-
public function viewAllocation(Node $node)
234-
{
235-
$this->repository->loadNodeAllocations($node);
236-
Javascript::put(['node' => collect($node)->only(['id'])]);
237-
238-
return view('admin.nodes.view.allocation', [
239-
'allocations' => $this->allocationRepository->setColumns(['ip'])->getUniqueAllocationIpsForNode($node->id),
240-
'node' => $node,
241-
]);
242-
}
243-
244-
/**
245-
* Shows the server listing page for a specific node.
246-
*
247-
* @param \Pterodactyl\Models\Node $node
248-
* @return \Illuminate\View\View
249-
*/
250-
public function viewServers(Node $node)
251-
{
252-
$servers = $this->serverRepository->loadAllServersForNode($node->id, 25);
253-
Javascript::put([
254-
'node' => collect($node->makeVisible('daemonSecret'))->only(['scheme', 'fqdn', 'daemonListen', 'daemonSecret']),
255-
]);
256-
257-
return view('admin.nodes.view.servers', ['node' => $node, 'servers' => $servers]);
258-
}
259-
260173
/**
261174
* Updates settings for a node.
262175
*

‎app/Models/Server.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,18 @@ public function getTableColumns()
170170
return Schema::getColumnListing($this->getTable());
171171
}
172172

173+
/**
174+
* Returns the format for server allocations when communicating with the Daemon.
175+
*
176+
* @return array
177+
*/
178+
public function getAllocationMappings(): array
179+
{
180+
return $this->allocations->groupBy('ip')->map(function ($item) {
181+
return $item->pluck('port');
182+
})->toArray();
183+
}
184+
173185
/**
174186
* @return bool
175187
*/

0 commit comments

Comments
 (0)