Merge branch 'develop' into feature/api-v1

Author: DaneEveritt

.env.example

@@ -1,21 +1,18 @@
 APP_ENV=production
 APP_DEBUG=false
-APP_KEY=SomeRandomString3232RandomString
+APP_KEY=
 APP_THEME=pterodactyl
 APP_TIMEZONE=America/New_York
 APP_CLEAR_TASKLOG=720
 APP_DELETE_MINUTES=10
-APP_URL=
+APP_ENVIRONMENT_ONLY=true
 
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=panel
 DB_USERNAME=pterodactyl
 DB_PASSWORD=
 
-CACHE_DRIVER=
-SESSION_DRIVER=
-
 HASHIDS_SALT=
 HASHIDS_LENGTH=8
 
@@ -27,9 +24,6 @@ MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
 MAIL_FROM=no-reply@example.com
 
-QUEUE_DRIVER=
 QUEUE_HIGH=high
 QUEUE_STANDARD=standard
 QUEUE_LOW=low
-
-APP_SERVICE_AUTHOR=undefined@unknown-author.com

CHANGELOG.md

@@ -3,6 +3,13 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.7.0-beta.4 (Derelict Dermodactylus)
+### Fixed
+* `[beta.3]` — Fixes a bug with the default environment file that was causing an inability to perform a fresh install when running package discovery.
+* `[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.
+
 ## v0.7.0-beta.3 (Derelict Dermodactylus)
 ### Fixed
 * `[beta.2]` — Fixes a bug that would cause an endless exception message stream in the console when attemping to setup environment settings in certain instances.
@@ -12,15 +19,17 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * `[beta.2]` — Fixes bug that caused incorrect rendering of CPU usage on server graphs due to missing variable.
 * `[beta.2]` — Fixes bug causing schedules to be un-deletable.
 * `[beta.2]` — Fixes bug that prevented the deletion of nodes due to an allocation deletion cascade issue with the SQL schema.
+* `[beta.2]` — Fixes a bug causing eggs not extending other eggs to fail validation.
 
 ### Changed
 * Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account.
 * Updated core framework to Laravel 5.5. This includes many dependency updates.
 * Certain AWS specific environment keys were changed, this should have minimal impact on users unless you specifically enabled AWS specific features. The renames are: `AWS_KEY -> AWS_ACCESS_KEY_ID`, `AWS_SECRET -> AWS_SECRET_ACCESS_KEY`, `AWS_REGION -> AWS_DEFAULT_REGION`
+* API keys have been changed to only use a single public key passed in a bearer token. All existing keys can continue being used, however only the first 32 characters should be sent.
 
 ### Added
 * Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.
-* Settings are now editable via the Admin CP and override config values where possible.
+* Creating a new node will now requires a SSL connection if the Panel is configured to use SSL as well.
 
 ## v0.7.0-beta.2 (Derelict Dermodactylus)
 ### Fixed

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -66,7 +66,8 @@ class AppSettingsCommand extends Command
                             {--queue= : The queue driver backend to use.}
                             {--redis-host= : Redis host to use for connections.}
                             {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
+                            {--redis-port= : Port to connect to redis over.}
+                            {--disable-settings-ui}';
 
     /**
      * @var array
@@ -136,6 +137,12 @@ public function handle()
             array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null
         );
 
+        if ($this->option('disable-settings-ui')) {
+            $this->variables['APP_ENVIRONMENT_ONLY'] = 'true';
+        } else {
+            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm(trans('command/messages.environment.app.settings'), true) ? 'false' : 'true';
+        }
+
         $this->checkForRedis();
         $this->writeToEnvironment($this->variables);
 

app/Exceptions/DisplayException.php

@@ -65,7 +65,7 @@ public function render($request)
         if ($request->expectsJson()) {
             return response()->json(Handler::convertToArray($this, [
                 'detail' => $this->getMessage(),
-            ]), 500);
+            ]), method_exists($this, 'getStatusCode') ? $this->getStatusCode() : 500);
         }
 
         app()->make(AlertsMessageBag::class)->danger($this->getMessage())->flash();

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -7,18 +7,38 @@
 
 class DaemonConnectionException extends DisplayException
 {
+    /**
+     * @var int
+     */
+    private $statusCode = 500;
+
     /**
      * Throw a displayable exception caused by a daemon connection error.
      *
      * @param \GuzzleHttp\Exception\GuzzleException $previous
+     * @param bool                                  $useStatusCode
      */
-    public function __construct(GuzzleException $previous)
+    public function __construct(GuzzleException $previous, bool $useStatusCode = false)
     {
         /** @var \GuzzleHttp\Psr7\Response|null $response */
         $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
 
+        if ($useStatusCode) {
+            $this->statusCode = is_null($response) ? 500 : $response->getStatusCode();
+        }
+
         parent::__construct(trans('admin/server.exceptions.daemon_exception', [
             'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
         ]), $previous, DisplayException::LEVEL_WARNING);
     }
+
+    /**
+     * Return the HTTP status code for this exception.
+     *
+     * @return int
+     */
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
 }

app/Http/Controllers/Admin/UserController.php

@@ -9,13 +9,16 @@
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Contracts\Translation\Translator;
 use Pterodactyl\Services\Users\UserUpdateService;
+use Pterodactyl\Traits\Helpers\AvailableLanguages;
 use Pterodactyl\Services\Users\UserCreationService;
 use Pterodactyl\Services\Users\UserDeletionService;
 use Pterodactyl\Http\Requests\Admin\UserFormRequest;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class UserController extends Controller
 {
+    use AvailableLanguages;
+
     /**
      * @var \Prologue\Alerts\AlertsMessageBag
      */
@@ -92,7 +95,9 @@ public function index(Request $request)
      */
     public function create()
     {
-        return view('admin.users.new');
+        return view('admin.users.new', [
+            'languages' => $this->getAvailableLanguages(true),
+        ]);
     }
 
     /**
@@ -103,7 +108,10 @@ public function create()
      */
     public function view(User $user)
     {
-        return view('admin.users.view', ['user' => $user]);
+        return view('admin.users.view', [
+            'user' => $user,
+            'languages' => $this->getAvailableLanguages(true),
+        ]);
     }
 
     /**

app/Http/Requests/Admin/AdminFormRequest.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\Http\Requests\Admin;
 
@@ -39,11 +32,11 @@ public function authorize()
      * Return only the fields that we are interested in from the request.
      * This will include empty fields as a null value.
      *
-     * @param array $only
+     * @param array|null $only
      * @return array
      */
-    public function normalize($only = [])
+    public function normalize(array $only = null)
     {
-        return $this->all(empty($only) ? array_keys($this->rules()) : $only);
+        return $this->only($only ?? array_keys($this->rules()));
     }
 }

app/Http/Requests/Admin/UserFormRequest.php

@@ -22,12 +22,16 @@ public function rules()
         return User::getCreateRules();
     }
 
-    public function normalize($only = [])
+    /**
+     * @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', 'ignore_connection_error'])
+                $this->only(['email', 'username', 'name_first', 'name_last', 'root_admin', 'language', 'ignore_connection_error'])
             );
         }
 

app/Models/User.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\Models;
 
@@ -127,6 +120,8 @@ class User extends Model implements
         'name_first' => 'required',
         'name_last' => 'required',
         'password' => 'sometimes',
+        'language' => 'sometimes',
+        'use_totp' => 'sometimes',
     ];
 
     /**

app/Observers/UserObserver.php

@@ -1,36 +1,21 @@
 <?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\Observers;
 
 use Pterodactyl\Events;
 use Pterodactyl\Models\User;
-use Pterodactyl\Services\Components\UuidService;
 
 class UserObserver
 {
     protected $uuid;
 
-    public function __construct(UuidService $uuid)
-    {
-        $this->uuid = $uuid;
-    }
-
     /**
      * Listen to the User creating event.
      *
      * @param \Pterodactyl\Models\User $user
      */
     public function creating(User $user)
     {
-        $user->uuid = $this->uuid->generate('users', 'uuid');
-
         event(new Events\User\Creating($user));
     }