Complete implementation of new Server model.

Author: DaneEveritt

CHANGELOG.md

@@ -20,9 +20,12 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Admin API and base routes for user management now define the fields that should be passed to repositories rather than passing all fields.
 * 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.
+* Updated Server model code to be more efficient, as well as make life easier for backend changes and work.
 
-### Removed
+### Deprecated
 * `Server::getUserDaemonSecret(Server $server)` was removed and replaced with `User::daemonSecret(Server $server)` in order to clean up models.
+* `Server::getByUUID()` was replaced with `Server::byUuid()` as well as various other functions through-out the Server model.
+* `Server::getHeaders()` was removed and replaced with `Server::getClient()` which returns a Guzzle Client with the correct headers already assigned.
 
 ## v0.5.6 (Bodacious Boreopterus)
 ### Added

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

@@ -34,17 +34,10 @@ class ServerController extends BaseController
 {
     public function info(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
-        $node = Models\Node::findOrFail($server->node_id);
-        $client = Models\Node::guzzleRequest($node->id);
+        $server = Models\Server::byUuid($uuid)->load('allocations');
 
         try {
-            $response = $client->request('GET', '/server', [
-                'headers' => [
-                    'X-Access-Token' => $server->daemonSecret,
-                    'X-Access-Server' => $server->uuid,
-                ],
-            ]);
+            $response = $server->guzzleClient()->request('GET', '/server');
 
             $json = json_decode($response->getBody());
             $daemon = [
@@ -59,8 +52,7 @@ public function info(Request $request, $uuid)
             Log::error($ex);
         }
 
-        $allocations = Models\Allocation::select('id', 'ip', 'port', 'ip_alias as alias')->where('assigned_to', $server->id)->get();
-        foreach ($allocations as &$allocation) {
+        foreach ($server->allocations as &$allocation) {
             $allocation->default = ($allocation->id === $server->allocation_id);
             unset($allocation->id);
         }
@@ -69,7 +61,7 @@ public function info(Request $request, $uuid)
             'uuidShort' => $server->uuidShort,
             'uuid' => $server->uuid,
             'name' => $server->name,
-            'node' => $node->name,
+            'node' => $server->node->name,
             'limits' => [
                 'memory' => $server->memory,
                 'swap' => $server->swap,
@@ -78,7 +70,7 @@ public function info(Request $request, $uuid)
                 'cpu' => $server->cpu,
                 'oom_disabled' => (bool) $server->oom_disabled,
             ],
-            'allocations' => $allocations,
+            'allocations' => $server->allocations,
             'sftp' => [
                 'username' => (Auth::user()->can('view-sftp', $server)) ? $server->username : null,
             ],
@@ -91,16 +83,10 @@ public function info(Request $request, $uuid)
 
     public function power(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
-        $client = Models\Node::guzzleRequest($server->node_id);
-
+        $server = Models\Server::byUuid($uuid);
         Auth::user()->can('power-' . $request->input('action'), $server);
 
-        $res = $client->request('PUT', '/server/power', [
-            'headers' => [
-                'X-Access-Server' => $server->uuid,
-                'X-Access-Token' => $server->daemonSecret,
-            ],
+        $res = $server->guzzleClient()->request('PUT', '/server/power', [
             'exceptions' => false,
             'json' => [
                 'action' => $request->input('action'),

app/Http/Controllers/Server/AjaxController.php

@@ -67,18 +67,14 @@ public function __construct()
      */
     public function getStatus(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
+        $server = Models\Server::byUuid($uuid);
 
         if (! $server) {
             return response()->json([], 404);
         }
 
-        $client = Models\Node::guzzleRequest($server->node_id);
-
         try {
-            $res = $client->request('GET', '/server', [
-                'headers' => Models\Server::getGuzzleHeaders($uuid),
-            ]);
+            $res = $server->guzzleClient()->request('GET', '/server');
             if ($res->getStatusCode() === 200) {
                 return response()->json(json_decode($res->getBody()));
             }
@@ -98,10 +94,10 @@ public function getStatus(Request $request, $uuid)
      */
     public function postDirectoryList(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
-        $this->directory = '/' . trim(urldecode($request->input('directory', '/')), '/');
+        $server = Models\Server::byUuid($uuid);
         $this->authorize('list-files', $server);
 
+        $this->directory = '/' . trim(urldecode($request->input('directory', '/')), '/');
         $prevDir = [
             'header' => ($this->directory !== '/') ? $this->directory : '',
         ];
@@ -149,7 +145,7 @@ public function postDirectoryList(Request $request, $uuid)
      */
     public function postSaveFile(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
+        $server = Models\Server::byUuid($uuid);
         $this->authorize('save-files', $server);
 
         $controller = new Repositories\Daemon\FileRepository($uuid);
@@ -175,7 +171,7 @@ public function postSaveFile(Request $request, $uuid)
      */
     public function postSetPrimary(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
+        $server = Models\Server::byUuid($uuid)->load('allocations');
         $this->authorize('set-connection', $server);
 
         if ((int) $request->input('allocation') === $server->allocation_id) {
@@ -185,7 +181,7 @@ public function postSetPrimary(Request $request, $uuid)
         }
 
         try {
-            $allocation = Models\Allocation::where('id', $request->input('allocation'))->where('assigned_to', $server->id)->first();
+            $allocation = $server->allocations->where('id', $request->input('allocation'))->where('assigned_to', $server->id)->first();
             if (! $allocation) {
                 return response()->json([
                     'error' => 'No allocation matching your request was found in the system.',
@@ -217,10 +213,10 @@ public function postSetPrimary(Request $request, $uuid)
 
     public function postResetDatabasePassword(Request $request, $uuid)
     {
-        $server = Models\Server::getByUUID($uuid);
-        $database = Models\Database::where('id', $request->input('database'))->where('server_id', $server->id)->firstOrFail();
-
+        $server = Models\Server::byUuid($uuid);
         $this->authorize('reset-db-password', $server);
+
+        $database = Models\Database::where('id', $request->input('database'))->where('server_id', $server->id)->firstOrFail();
         try {
             $repo = new Repositories\DatabaseRepository;
             $password = str_random(16);