Merge branch 'develop' into feature/api-v1

Author: DaneEveritt

.env.travis

@@ -16,3 +16,4 @@ MAIL_DRIVER=array
 QUEUE_DRIVER=sync
 
 HASHIDS_SALT=test123
+APP_ENVIRONMENT_ONLY=true

.php_cs

@@ -51,5 +51,5 @@ return PhpCsFixer\Config::create()
             'equal' => false,
             'identical' => false,
             'less_and_greater' => false,
-        ]
+        ],
     ])->setRiskyAllowed(true)->setFinder($finder);

.travis.yml

@@ -1,9 +1,13 @@
 language: php
 dist: trusty
 php:
-  - '7.0'
-  - '7.1'
-#  - '7.2'
+  - 7.0
+  - 7.1
+  - 7.2
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: 7.2
 sudo: false
 cache:
   directories:

CHANGELOG.md

@@ -10,6 +10,17 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * `[beta.2]` — Fixes a bug that would throw a red page of death when submitting an invalid egg variable value for a server in the Admin CP.
 * `[beta.2]` — Someone found a `@todo` that I never `@todid` and thus database hosts could not be created without being linked to a node. This is fixed...
 * `[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.
+
+### Changed
+* Revoking the administrative status for an admin will revoke all authentication tokens currently assigned to their account.
+
+### Added
+* Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.
+
+### Changed
+* 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.
 
 ### Changed
 * 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.

app/Contracts/Repository/Daemon/ServerRepositoryInterface.php

@@ -78,8 +78,10 @@ public function details();
     /**
      * Revoke an access key on the daemon before the time is expired.
      *
-     * @param string $key
+     * @param string|array $key
      * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \GuzzleHttp\Exception\RequestException
      */
     public function revokeAccessKey($key);
 }

app/Contracts/Repository/DaemonKeyRepositoryInterface.php

@@ -24,7 +24,9 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Pterodactyl\Models\User;
 use Pterodactyl\Models\DaemonKey;
+use Illuminate\Support\Collection;
 
 interface DaemonKeyRepositoryInterface extends RepositoryInterface
 {
@@ -59,4 +61,22 @@ public function getServerKeys($server);
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getKeyWithServer($key);
+
+    /**
+     * Get all of the keys for a specific user including the information needed
+     * from their server relation for revocation on the daemon.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @return \Illuminate\Support\Collection
+     */
+    public function getKeysForRevocation(User $user): Collection;
+
+    /**
+     * Delete an array of daemon keys from the database. Used primarily in
+     * conjunction with getKeysForRevocation.
+     *
+     * @param array $ids
+     * @return bool|int
+     */
+    public function deleteKeys(array $ids);
 }

app/Contracts/Repository/SettingsRepositoryInterface.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface SettingsRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Store a new persistent setting in the database.
+     *
+     * @param string $key
+     * @param string $value
+     * @return mixed
+     */
+    public function set(string $key, string $value);
+
+    /**
+     * Retrieve a persistent setting from the database.
+     *
+     * @param string $key
+     * @param mixed  $default
+     * @return mixed
+     */
+    public function get(string $key, $default);
+
+    /**
+     * Remove a key from the database cache.
+     *
+     * @param string $key
+     * @return mixed
+     */
+    public function forget(string $key);
+}

app/Exceptions/Http/Connection/DaemonConnectionException.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\Exceptions\Http\Connection;
 

app/Http/Controllers/Admin/BaseController.php

@@ -1,51 +1,25 @@
 <?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\Controllers\Admin;
 
-use Krucas\Settings\Settings;
-use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\View\View;
 use Pterodactyl\Http\Controllers\Controller;
-use Pterodactyl\Http\Requests\Admin\BaseFormRequest;
 use Pterodactyl\Services\Helpers\SoftwareVersionService;
 
 class BaseController extends Controller
 {
-    /**
-     * @var \Prologue\Alerts\AlertsMessageBag
-     */
-    protected $alert;
-
-    /**
-     * @var \Krucas\Settings\Settings
-     */
-    protected $settings;
-
     /**
      * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
      */
-    protected $version;
+    private $version;
 
     /**
      * BaseController constructor.
      *
-     * @param \Prologue\Alerts\AlertsMessageBag                    $alert
-     * @param \Krucas\Settings\Settings                            $settings
      * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $version
      */
-    public function __construct(
-        AlertsMessageBag $alert,
-        Settings $settings,
-        SoftwareVersionService $version
-    ) {
-        $this->alert = $alert;
-        $this->settings = $settings;
+    public function __construct(SoftwareVersionService $version)
+    {
         $this->version = $version;
     }
 
@@ -54,34 +28,8 @@ public function __construct(
      *
      * @return \Illuminate\View\View
      */
-    public function getIndex()
+    public function index(): View
     {
         return view('admin.index', ['version' => $this->version]);
     }
-
-    /**
-     * Return the admin settings view.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function getSettings()
-    {
-        return view('admin.settings');
-    }
-
-    /**
-     * Handle settings post request.
-     *
-     * @param \Pterodactyl\Http\Requests\Admin\BaseFormRequest $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function postSettings(BaseFormRequest $request)
-    {
-        $this->settings->set('company', $request->input('company'));
-        $this->settings->set('2fa', $request->input('2fa'));
-
-        $this->alert->success('Settings have been successfully updated.')->flash();
-
-        return redirect()->route('admin.settings');
-    }
 }

app/Http/Controllers/Admin/Settings/AdvancedController.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Admin\Settings;
+
+use Illuminate\View\View;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
+use Illuminate\Contracts\Console\Kernel;
+use Pterodactyl\Http\Controllers\Controller;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
+use Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest;
+
+class AdvancedController extends Controller
+{
+    /**
+     * @var \Prologue\Alerts\AlertsMessageBag
+     */
+    private $alert;
+
+    /**
+     * @var \Illuminate\Contracts\Config\Repository
+     */
+    private $config;
+
+    /**
+     * @var \Illuminate\Contracts\Console\Kernel
+     */
+    private $kernel;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface
+     */
+    private $settings;
+
+    /**
+     * AdvancedController constructor.
+     *
+     * @param \Prologue\Alerts\AlertsMessageBag                             $alert
+     * @param \Illuminate\Contracts\Config\Repository                       $config
+     * @param \Illuminate\Contracts\Console\Kernel                          $kernel
+     * @param \Pterodactyl\Contracts\Repository\SettingsRepositoryInterface $settings
+     */
+    public function __construct(
+        AlertsMessageBag $alert,
+        ConfigRepository $config,
+        Kernel $kernel,
+        SettingsRepositoryInterface $settings
+    ) {
+        $this->alert = $alert;
+        $this->config = $config;
+        $this->kernel = $kernel;
+        $this->settings = $settings;
+    }
+
+    /**
+     * Render advanced Panel settings UI.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function index(): View
+    {
+        $showRecaptchaWarning = false;
+        if (
+            $this->config->get('recaptcha._shipped_secret_key') === $this->config->get('recaptcha.secret_key')
+            || $this->config->get('recaptcha._shipped_website_key') === $this->config->get('recaptcha.website_key')
+        ) {
+            $showRecaptchaWarning = true;
+        }
+
+        return view('admin.settings.advanced', [
+            'showRecaptchaWarning' => $showRecaptchaWarning,
+        ]);
+    }
+
+    /**
+     * @param \Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function update(AdvancedSettingsFormRequest $request): RedirectResponse
+    {
+        foreach ($request->normalize() as $key => $value) {
+            $this->settings->set('settings::' . $key, $value);
+        }
+
+        $this->kernel->call('queue:restart');
+        $this->alert->success('Advanced settings have been updated successfully and the queue worker was restarted to apply these changes.')->flash();
+
+        return redirect()->route('admin.settings.advanced');
+    }
+}