Merge branch 'develop' into feature/api-v1

Author: DaneEveritt

CHANGELOG.md

@@ -9,6 +9,11 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * `[beta.3]` — Fixes an edge case caused by the Laravel 5.5 upgrade that would try to perform an in_array check aganist a null value.
 * `[beta.3]` — Fixes a bug that would cause an error when attempting to create a new user on the Panel.
 * `[beta.3]` — Fixes error handling of the settings service provider when no migrations have been run.
+* `[beta.3]` — Fixes validation error when trying to use 'None' as the 'Copy Script From' option for an egg script.
+* Fixes a design bug in the database that prevented the storage of negative numbers, thus preventing a server from being assigned unlimited swap.
+
+### Added
+* Nest and Egg listings now show the associated ID in order to make API requests easier.
 
 ## v0.7.0-beta.3 (Derelict Dermodactylus)
 ### Fixed

app/Http/Controllers/Server/Files/FileActionsController.php

@@ -95,11 +95,10 @@ public function create(Request $request): View
      * @param string                                                          $file
      * @return \Illuminate\View\View
      *
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     * @throws \Pterodactyl\Exceptions\DisplayException
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update(UpdateFileContentsFormRequest $request, string $uuid, string $file): View
+    public function view(UpdateFileContentsFormRequest $request, string $uuid, string $file): View
     {
         $server = $request->attributes->get('server');
 

app/Http/Controllers/Server/Files/RemoteRequestController.php

@@ -101,7 +101,7 @@ public function store(Request $request): Response
             $this->repository->setNode($server->node_id)
                 ->setAccessServer($server->uuid)
                 ->setAccessToken($request->attributes->get('server_token'))
-                ->putContent($request->input('file'), $request->input('contents'));
+                ->putContent($request->input('file'), $request->input('contents') ?? '');
 
             return response('', 204);
         } catch (RequestException $exception) {

app/Http/Requests/Admin/UserFormRequest.php

@@ -7,34 +7,21 @@
 class UserFormRequest extends AdminFormRequest
 {
     /**
-     * {@inheritdoc}
+     * Rules to apply to requests for updating or creating a user
+     * in the Admin CP.
      */
     public function rules()
     {
+        $rules = collect(User::getCreateRules());
         if ($this->method() === 'PATCH') {
-            $rules = User::getUpdateRulesForId($this->route()->parameter('user')->id);
-
-            return array_merge($rules, [
-                'ignore_connection_error' => 'sometimes|nullable|boolean',
+            $rules = collect(User::getUpdateRulesForId($this->route()->parameter('user')->id))->merge([
+                'ignore_connection_error' => ['sometimes', 'nullable', 'boolean'],
             ]);
         }
 
-        return User::getCreateRules();
-    }
-
-    /**
-     * @param array|null $only
-     * @return array
-     */
-    public function normalize(array $only = null)
-    {
-        if ($this->method === 'PATCH') {
-            return array_merge(
-                $this->all(['password']),
-                $this->only(['email', 'username', 'name_first', 'name_last', 'root_admin', 'language', 'ignore_connection_error'])
-            );
-        }
-
-        return parent::normalize();
+        return $rules->only([
+            'email', 'username', 'name_first', 'name_last', 'password',
+            'language', 'ignore_connection_error', 'root_admin',
+        ])->toArray();
     }
 }

app/Http/Requests/Server/UpdateFileContentsFormRequest.php

@@ -12,6 +12,7 @@
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Contracts\Config\Repository;
 use Pterodactyl\Exceptions\Http\Server\FileSizeTooLargeException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
 use Pterodactyl\Exceptions\Http\Server\FileTypeNotEditableException;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@@ -80,7 +81,12 @@ private function checkFileCanBeEdited($server, $token)
                 ->setAccessToken($token)
                 ->getFileStat($this->route()->parameter('file'));
         } catch (RequestException $exception) {
-            throw new DaemonConnectionException($exception);
+            switch ($exception->getCode()) {
+                case 404:
+                    throw new NotFoundHttpException;
+                default:
+                    throw new DaemonConnectionException($exception);
+            }
         }
 
         if (! $stats->file || ! in_array($stats->mime, $config->get('pterodactyl.files.editable'))) {

app/Models/Server.php

@@ -76,7 +76,7 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'owner_id' => 'exists:users,id',
         'name' => 'regex:/^([\w .-]{1,200})$/',
         'node_id' => 'exists:nodes,id',
-        'description' => 'nullable|string',
+        'description' => 'string',
         'memory' => 'numeric|min:0',
         'swap' => 'numeric|min:-1',
         'io' => 'numeric|between:10,1000',

app/Models/User.php

@@ -115,6 +115,7 @@ class User extends Model implements
      * @var array
      */
     protected static $applicationRules = [
+        'uuid' => 'required',
         'email' => 'required',
         'username' => 'required',
         'name_first' => 'required',
@@ -130,6 +131,7 @@ class User extends Model implements
      * @var array
      */
     protected static $dataIntegrityRules = [
+        'uuid' => 'string|size:36|unique:users,uuid',
         'email' => 'email|unique:users,email',
         'username' => 'alpha_dash|between:1,255|unique:users,username',
         'name_first' => 'string|between:1,255',

app/Notifications/AccountCreated.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Notifications;
 
+use Pterodactyl\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -19,7 +13,15 @@ class AccountCreated extends Notification implements ShouldQueue
     use Queueable;
 
     /**
-     * The password reset token to send.
+     * The authentication token to be used for the user to set their
+     * password for the first time.
+     *
+     * @var string|null
+     */
+    public $token;
+
+    /**
+     * The user model for the created user.
      *
      * @var object
      */
@@ -28,11 +30,13 @@ class AccountCreated extends Notification implements ShouldQueue
     /**
      * Create a new notification instance.
      *
-     * @param aray $user
+     * @param \Pterodactyl\Models\User $user
+     * @param string|null              $token
      */
-    public function __construct(array $user)
+    public function __construct(User $user, string $token = null)
     {
-        $this->user = (object) $user;
+        $this->token = $token;
+        $this->user = $user;
     }
 
     /**
@@ -56,12 +60,12 @@ public function toMail($notifiable)
     {
         $message = (new MailMessage)
             ->greeting('Hello ' . $this->user->name . '!')
-            ->line('You are recieving this email because an account has been created for you on Pterodactyl Panel.')
+            ->line('You are recieving this email because an account has been created for you on ' . config('app.name') . '.')
             ->line('Username: ' . $this->user->username)
-            ->line('Email: ' . $notifiable->email);
+            ->line('Email: ' . $this->user->email);
 
-        if (! is_null($this->user->token)) {
-            return $message->action('Setup Your Account', url('/auth/password/reset/' . $this->user->token . '?email=' . $notifiable->email));
+        if (! is_null($this->token)) {
+            return $message->action('Setup Your Account', url('/auth/password/reset/' . $this->token . '?email=' . $this->user->email));
         }
 
         return $message;

app/Services/Servers/BuildModificationService.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Services\Servers;
 
@@ -113,6 +106,7 @@ public function getBuild($attribute = null)
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function handle($server, array $data)
     {
@@ -138,11 +132,11 @@ public function handle($server, array $data)
         }
 
         $server = $this->repository->update($server->id, [
-            'memory' => array_get($data, 'memory', $server->memory),
-            'swap' => array_get($data, 'swap', $server->swap),
-            'io' => array_get($data, 'io', $server->io),
-            'cpu' => array_get($data, 'cpu', $server->cpu),
-            'disk' => array_get($data, 'disk', $server->disk),
+            'memory' => (int) array_get($data, 'memory', $server->memory),
+            'swap' => (int) array_get($data, 'swap', $server->swap),
+            'io' => (int) array_get($data, 'io', $server->io),
+            'cpu' => (int) array_get($data, 'cpu', $server->cpu),
+            'disk' => (int) array_get($data, 'disk', $server->disk),
             'allocation_id' => array_get($data, 'allocation_id', $server->allocation_id),
         ]);
 

app/Services/Servers/DetailsModificationService.php

@@ -95,9 +95,9 @@ public function edit($server, array $data)
 
         $this->connection->beginTransaction();
         $this->repository->withoutFresh()->update($server->id, [
-            'owner_id' => array_get($data, 'owner_id') ?? $server->owner_id,
-            'name' => array_get($data, 'name') ?? $server->name,
-            'description' => array_get($data, 'description') ?? $server->description,
+            'owner_id' => array_get($data, 'owner_id'),
+            'name' => array_get($data, 'name'),
+            'description' => array_get($data, 'description', ''),
         ], true, true);
 
         if (array_get($data, 'owner_id') != $server->owner_id) {