Initial implementation of improved sever model and logic

Author: DaneEveritt

CHANGELOG.md

@@ -21,6 +21,9 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * User model now defines mass assignment fields using `$fillable` rather than `$guarded`.
 * 2FA checkpoint on login is now its own page, and not an AJAX based call. Improves security on that front.
 
+### Removed
+* `Server::getUserDaemonSecret(Server $server)` was removed and replaced with `User::daemonSecret(Server $server)` in order to clean up models.
+
 ## v0.5.6 (Bodacious Boreopterus)
 ### Added
 * Added the following languages: Estonian `et`, Dutch `nl`, Norwegian `nb` (partial), Romanian `ro`, and Russian `ru`. Interested in helping us translate the panel into more languages, or improving existing translations? Contact us on Discord and let us know.

app/Http/Controllers/API/ServerController.php

@@ -122,7 +122,7 @@ public function view(Request $request, $id)
                 'pack'
             )->first();
             if ($request->input('daemon') === 'true') {
-                $node = Models\Node::findOrFail($server->node);
+                $node = Models\Node::findOrFail($server->node_id);
                 $client = Models\Node::guzzleRequest($node->id);
 
                 $response = $client->request('GET', '/servers', [

app/Http/Controllers/API/User/InfoController.php

@@ -37,7 +37,7 @@ public function me(Request $request)
                 'id' => $server->uuidShort,
                 'uuid' => $server->uuid,
                 'name' => $server->name,
-                'node' => $server->nodeName,
+                'node' => $server->node_idName,
                 'ip' => [
                     'set' => $server->ip,
                     'alias' => $server->ip_alias,

app/Http/Controllers/API/User/ServerController.php

@@ -35,7 +35,7 @@ class ServerController extends BaseController
     public function info(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
-        $node = Models\Node::findOrFail($server->node);
+        $node = Models\Node::findOrFail($server->node_id);
         $client = Models\Node::guzzleRequest($node->id);
 
         try {
@@ -61,7 +61,7 @@ public function info(Request $request, $uuid)
 
         $allocations = Models\Allocation::select('id', 'ip', 'port', 'ip_alias as alias')->where('assigned_to', $server->id)->get();
         foreach ($allocations as &$allocation) {
-            $allocation->default = ($allocation->id === $server->allocation);
+            $allocation->default = ($allocation->id === $server->allocation_id);
             unset($allocation->id);
         }
 
@@ -92,7 +92,7 @@ public function info(Request $request, $uuid)
     public function power(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
-        $client = Models\Node::guzzleRequest($server->node);
+        $client = Models\Node::guzzleRequest($server->node_id);
 
         Auth::user()->can('power-' . $request->input('action'), $server);
 

app/Http/Controllers/Admin/NodesController.php

@@ -108,8 +108,8 @@ public function getView(Request $request, $id)
         return view('admin.nodes.view', [
             'node' => $node,
             'servers' => Models\Server::select('servers.*', 'users.email as a_ownerEmail', 'services.name as a_serviceName')
-                ->join('users', 'users.id', '=', 'servers.owner')
-                ->join('services', 'services.id', '=', 'servers.service')
+                ->join('users', 'users.id', '=', 'servers.owner_id')
+                ->join('services', 'services.id', '=', 'servers.service_id')
                 ->where('node', $id)->paginate(10, ['*'], 'servers'),
             'stats' => Models\Server::select(DB::raw('SUM(memory) as memory, SUM(disk) as disk'))->where('node', $node->id)->first(),
             'locations' => Models\Location::all(),

app/Http/Controllers/Admin/ServersController.php

@@ -54,9 +54,9 @@ public function getIndex(Request $request)
             'allocations.ip',
             'allocations.port',
             'allocations.ip_alias'
-        )->join('nodes', 'servers.node', '=', 'nodes.id')
-        ->join('users', 'servers.owner', '=', 'users.id')
-        ->join('allocations', 'servers.allocation', '=', 'allocations.id');
+        )->join('nodes', 'servers.node_id', '=', 'nodes.id')
+        ->join('users', 'servers.owner_id', '=', 'users.id')
+        ->join('allocations', 'servers.allocation_id', '=', 'allocations.id');
 
         if ($request->input('filter') && ! is_null($request->input('filter'))) {
             preg_match_all('/[^\s"\']+|"([^"]*)"|\'([^\']*)\'/', urldecode($request->input('filter')), $matches);
@@ -96,9 +96,9 @@ public function getIndex(Request $request)
                 'allocations.ip',
                 'allocations.port',
                 'allocations.ip_alias'
-            )->join('nodes', 'servers.node', '=', 'nodes.id')
-            ->join('users', 'servers.owner', '=', 'users.id')
-            ->join('allocations', 'servers.allocation', '=', 'allocations.id')
+            )->join('nodes', 'servers.node_id', '=', 'nodes.id')
+            ->join('users', 'servers.owner_id', '=', 'users.id')
+            ->join('allocations', 'servers.allocation_id', '=', 'allocations.id')
             ->paginate(20);
         }
 
@@ -127,11 +127,11 @@ public function getView(Request $request, $id)
             'allocations.ip',
             'allocations.port',
             'allocations.ip_alias'
-        )->join('nodes', 'servers.node', '=', 'nodes.id')
-        ->join('users', 'servers.owner', '=', 'users.id')
-        ->join('services', 'servers.service', '=', 'services.id')
-        ->join('service_options', 'servers.option', '=', 'service_options.id')
-        ->join('allocations', 'servers.allocation', '=', 'allocations.id')
+        )->join('nodes', 'servers.node_id', '=', 'nodes.id')
+        ->join('users', 'servers.owner_id', '=', 'users.id')
+        ->join('services', 'servers.service_id', '=', 'services.id')
+        ->join('service_options', 'servers.option_id', '=', 'service_options.id')
+        ->join('allocations', 'servers.allocation_id', '=', 'allocations.id')
         ->where('servers.id', $id)
         ->first();
 
@@ -145,13 +145,13 @@ public function getView(Request $request, $id)
                     'nodes.*',
                     'locations.long as a_locationName'
                 )->join('locations', 'nodes.location', '=', 'locations.id')
-                ->where('nodes.id', $server->node)
+                ->where('nodes.id', $server->node_id)
                 ->first(),
             'assigned' => Models\Allocation::where('assigned_to', $id)->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(),
-            'unassigned' => Models\Allocation::where('node', $server->node)->whereNull('assigned_to')->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(),
+            'unassigned' => Models\Allocation::where('node', $server->node_id)->whereNull('assigned_to')->orderBy('ip', 'asc')->orderBy('port', 'asc')->get(),
             'startup' => Models\ServiceVariables::select('service_variables.*', 'server_variables.variable_value as a_serverValue')
                 ->join('server_variables', 'server_variables.variable_id', '=', 'service_variables.id')
-                ->where('service_variables.option_id', $server->option)
+                ->where('service_variables.option_id', $server->option_id)
                 ->where('server_variables.server_id', $server->id)
                 ->get(),
             'databases' => Models\Database::select('databases.*', 'database_servers.host as a_host', 'database_servers.port as a_port')
@@ -334,8 +334,8 @@ public function postUpdateContainerDetails(Request $request, $id)
     public function postUpdateServerToggleBuild(Request $request, $id)
     {
         $server = Models\Server::findOrFail($id);
-        $node = Models\Node::findOrFail($server->node);
-        $client = Models\Node::guzzleRequest($server->node);
+        $node = Models\Node::findOrFail($server->node_id);
+        $client = Models\Node::guzzleRequest($server->node_id);
 
         try {
             $res = $client->request('POST', '/server/rebuild', [

app/Http/Controllers/Admin/ServiceController.php

@@ -137,7 +137,7 @@ public function getOption(Request $request, $service, $option)
             'option' => $opt,
             'variables' => Models\ServiceVariables::where('option_id', $option)->get(),
             'servers' => Models\Server::select('servers.*', 'users.email as a_ownerEmail')
-                ->join('users', 'users.id', '=', 'servers.owner')
+                ->join('users', 'users.id', '=', 'servers.owner_id')
                 ->where('option', $option)
                 ->paginate(10),
         ]);

app/Http/Controllers/Admin/UserController.php

@@ -87,7 +87,7 @@ public function getView(Request $request, $id)
         return view('admin.users.view', [
             'user' => User::findOrFail($id),
             'servers' => Server::select('servers.*', 'nodes.name as nodeName', 'locations.long as location')
-                ->join('nodes', 'servers.node', '=', 'nodes.id')
+                ->join('nodes', 'servers.node_id', '=', 'nodes.id')
                 ->join('locations', 'nodes.location', '=', 'locations.id')
                 ->where('owner', $id)
                 ->get(),

app/Http/Controllers/Remote/RemoteController.php

@@ -66,7 +66,7 @@ public function postInstall(Request $request)
             ], 422);
         }
 
-        $node = Models\Node::findOrFail($server->node);
+        $node = Models\Node::findOrFail($server->node_id);
         $hmac = $request->input('signed');
         $status = $request->input('installed');
 
@@ -93,7 +93,7 @@ public function event(Request $request)
             ], 422);
         }
 
-        $node = Models\Node::findOrFail($server->node);
+        $node = Models\Node::findOrFail($server->node_id);
 
         $hmac = $request->input('signed');
         if (base64_decode($hmac) !== hash_hmac('sha256', $server->uuid, $node->daemonSecret, true)) {

app/Http/Controllers/Server/AjaxController.php

@@ -73,7 +73,7 @@ public function getStatus(Request $request, $uuid)
             return response()->json([], 404);
         }
 
-        $client = Models\Node::guzzleRequest($server->node);
+        $client = Models\Node::guzzleRequest($server->node_id);
 
         try {
             $res = $client->request('GET', '/server', [
@@ -178,7 +178,7 @@ public function postSetPrimary(Request $request, $uuid)
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('set-connection', $server);
 
-        if ((int) $request->input('allocation') === $server->allocation) {
+        if ((int) $request->input('allocation') === $server->allocation_id) {
             return response()->json([
                 'error' => 'You are already using this as your default connection.',
             ], 409);