Merge branch 'develop' into develop

Author: DaneEveritt

.eslintignore

@@ -0,0 +1,2 @@
+public
+resources/views

resources/scripts/.eslintrc.yml .eslintrc.ymlresources/scripts/.eslintrc.yml renamed to .eslintrc.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: 🤷 Installation Help
+    url: https://discord.gg/pterodactyl
+    about: Please visit our Discord for help with your installation.
+  - name: ❓ General Question
+    url: https://discord.gg/pterodactyl
+    about: Please visit our Discord for general questions about Pterodactyl.

.github/ISSUE_TEMPLATE/--installation-help.md

@@ -3,6 +3,56 @@ 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.
 
+## v1.0.3
+### Fixed
+* Fixes bug causing subusers to not be creatable or editable via the frontend for servers.
+* Fixes system timezone not being passed along properly to the MySQL connection causing scheduled tasks to run every minute when the MySQL instance and Panel timezone did not line up.
+* Fixes listing servers owned by a user in the admin area to actually list their servers.
+
+### Changed
+* Adds SameSite `lax` attribute for cookies generated by the Panel.
+* Adds better filtering for searching servers in the admin area to better key off name, uuid, or owner username/email.
+
+## v1.0.2
+### Added
+* Adds support for searching inside the file editor.
+* Adds support for manually executing a schedule regardless of if it is currently queued or not.
+* Adds an indicator to the schedule UI to show when a schedule is currently processing.
+* Adds support for setting the `backup_limit` of a server via the API.
+* **[Security]** Adds login throttling to the 2FA verification endpoint.
+
+### Fixed
+* Fixes subuser page title missing server name.
+* Fixes schedule task `sequence_id` not properly being reset when a schedule's task is deleted.
+* Fixes misc. UI bugs throughout the frontend when long text overflows its bounds.
+* Fixes user deletion command to properly handle email & ID searching.
+* Fixes color issues in the terminal causing certain text & background combinations to be illegible.
+* Fixes reCAPTCHA not properly resetting on login failure.
+* Fixes error messages not properly resetting between login screens.
+* Fixes a UI crash when attempting to create or view a directory or file that contained the `%` somewhere in the name.
+
+### Changed
+* Updated the search modal to close itself when the ESC key is pressed.
+* Updates the schedule view and editing UI to better display information to users.
+* Changed logic powering server searching on the frontend to return more accurate results and return all servers when executing the query as an admin.
+* Admin CP link no longer opens in a new tab.
+* Mounts will no longer allow a user to mount certain directory combinations. This blocks mounting one server's files into another server, and blocks using the server data directory as a mount destination.
+* Cleaned up assorted server build modification code.
+* Updates default eggs to have improved install scripts and more consistent container usage.
+
+## v1.0.1
+### Fixed
+* Fixes 500 error when mounting a mount to a server, and other related errors when handling mounts.
+* Ensures that `server_transfers` database is deleted if it already exists to avoid unnecessary error.
+* Fixes servers getting marked as "not installed" when modifying their startup arguments.
+* Fixes filemanager breadcrumbs being set incorrectly when navigating between files and folders.
+
+### Changed
+* Change the requests per minute from 240 to 720 for the client API to avoid unecessarily displaying
+"Too Many Requests" errors.
+* Added error output to certain commands that will output and terminate the command execution if the database
+migrations have not been run correctly for the instance.
+
 ## v1.0.0
 Pterodactyl 1.0 represents the culmination of over two years of work, almost 2,000 commits, endless bug and feature requests, and a dream that
 has been in the making since 2013. 🎉

.github/ISSUE_TEMPLATE/config.yml

@@ -3,7 +3,6 @@
 ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/pterodactyl/panel/tests?label=Tests&style=for-the-badge)
 ![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white&style=for-the-badge)
 ![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/panel/latest/total?style=for-the-badge)
-![GitHub Pre-Releases](https://img.shields.io/github/downloads-pre/pterodactyl/panel/v1.0.0-rc.7/total?style=for-the-badge)
 ![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge)
 
 # Pterodactyl Panel
@@ -16,18 +15,21 @@ Stop settling for less. Make game servers a first class citizen on your platform
 ![Image](https://cdn.pterodactyl.io/site-assets/pterodactyl_v1_demo.gif)
 
 ## Sponsors
-I would like to extend my sincere thanks to the following sponsors for helping find Pterodactyl's developement.
+I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's developement.
 [Interested in becoming a sponsor?](https://github.com/sponsors/DaneEveritt)
 
 | Company | About |
 | ------- | ----- |
+| [**WISP**](https://wisp.gg) | Extra features. |
 | [**Bloom.host**](https://bloom.host) | Bloom.host offers dedicated core VPS and Minecraft hosting with Ryzen 9 processors. With owned-hardware, we offer truly unbeatable prices on high-performance hosting. |
-| [**VersatileNode**](https://versatilenode.com/) | Looking to host a minecraft server, vps, or a website? VersatileNode is one of the most affordable hosting providers to provide quality yet cheap services with incredible support. |
 | [**MineStrator**](https://minestrator.com/) | Looking for a French highend hosting company for you minecraft server? More than 14,000 members on our discord, trust us. |
 | [**DedicatedMC**](https://dedicatedmc.io/) | DedicatedMC provides Raw Power hosting at affordable pricing, making sure to never compromise on your performance and giving you the best performance money can buy. |
 | [**Skynode**](https://www.skynode.pro/) | Skynode provides blazing fast game servers along with a top-notch user experience. Whatever our clients are looking for, we're able to provide it! |
 | [**XCORE-SERVER.de**](https://xcore-server.de/) | XCORE-SERVER.de offers High-End Servers for hosting and gaming since 2012. Fast, excellent and well-known for eSports Gaming. |
-| [**RoyaleHosting**](https://royalehosting.net/) |  Build your dreams and deploy them with RoyaleHosting’s reliable servers and network. Easy to use, provisioned in a couple of minutes. |
+| [**RoyaleHosting**](https://royalehosting.net/) | Build your dreams and deploy them with RoyaleHosting’s reliable servers and network. Easy to use, provisioned in a couple of minutes. |
+| [**Spill Hosting**](https://spillhosting.no/) | Spill Hosting is a Norwegian hosting service, which aims to cheap services on quality servers. Premium i9-9900K processors will run your game like a dream. |
+| [**DeinServerHost**](https://deinserverhost.de/) | DeinServerHost offers Dedicated, vps and Gameservers for many popular Games like Minecraft and Rust in Germany since 2013. |
+| [**HostBend**](https://hostbend.com/) | HostBend offers a variety of solutions for developers, students, and others who have a tight budget but don't want to compromise quality and support. |
 
 ## Documentation
 * [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)

CHANGELOG.md

@@ -144,6 +144,11 @@ public function handle()
             $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm(trans('command/messages.environment.app.settings'), true) ? 'false' : 'true';
         }
 
+        // Make sure session cookies are set as "secure" when using HTTPS
+        if (strpos($this->variables['APP_URL'], 'https://') === 0) {
+            $this->variables['SESSION_SECURE_COOKIE'] = 'true';
+        }
+
         $this->checkForRedis();
         $this->writeToEnvironment($this->variables);
 

README.md

@@ -1,86 +1,79 @@
 <?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\Console\Commands\Schedule;
 
-use Cake\Chronos\Chronos;
+use Throwable;
+use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Support\Collection;
+use Pterodactyl\Models\Schedule;
+use Illuminate\Support\Facades\Log;
 use Pterodactyl\Services\Schedules\ProcessScheduleService;
-use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
 
 class ProcessRunnableCommand extends Command
 {
-    /**
-     * @var string
-     */
-    protected $description = 'Process schedules in the database and determine which are ready to run.';
-
-    /**
-     * @var \Pterodactyl\Services\Schedules\ProcessScheduleService
-     */
-    protected $processScheduleService;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface
-     */
-    protected $repository;
-
     /**
      * @var string
      */
     protected $signature = 'p:schedule:process';
 
     /**
-     * ProcessRunnableCommand constructor.
-     *
-     * @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService
-     * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository
+     * @var string
      */
-    public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository)
-    {
-        parent::__construct();
-
-        $this->processScheduleService = $processScheduleService;
-        $this->repository = $repository;
-    }
+    protected $description = 'Process schedules in the database and determine which are ready to run.';
 
     /**
      * Handle command execution.
      */
     public function handle()
     {
-        $schedules = $this->repository->getSchedulesToProcess(Chronos::now()->toAtomString());
+        $schedules = Schedule::query()->with('tasks')
+            ->where('is_active', true)
+            ->where('is_processing', false)
+            ->whereRaw('next_run_at <= NOW()')
+            ->get();
+
         if ($schedules->count() < 1) {
             $this->line('There are no scheduled tasks for servers that need to be run.');
 
             return;
         }
 
         $bar = $this->output->createProgressBar(count($schedules));
-        $schedules->each(function ($schedule) use ($bar) {
-            if ($schedule->tasks instanceof Collection && count($schedule->tasks) > 0) {
-                $this->processScheduleService->handle($schedule);
-
-                if ($this->input->isInteractive()) {
-                    $bar->clear();
-                    $this->line(trans('command/messages.schedule.output_line', [
-                        'schedule' => $schedule->name,
-                        'hash' => $schedule->hashid,
-                    ]));
-                }
-            }
-
+        foreach ($schedules as $schedule) {
+            $bar->clear();
+            $this->processSchedule($schedule);
             $bar->advance();
             $bar->display();
-        });
+        }
 
         $this->line('');
     }
+
+    /**
+     * Processes a given schedule and logs and errors encountered the console output. This should
+     * never throw an exception out, otherwise you'll end up killing the entire run group causing
+     * any other schedules to not process correctly.
+     *
+     * @param \Pterodactyl\Models\Schedule $schedule
+     * @see https://github.com/pterodactyl/panel/issues/2609
+     */
+    protected function processSchedule(Schedule $schedule)
+    {
+        if ($schedule->tasks->isEmpty()) {
+            return;
+        }
+
+        try {
+            $this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);
+
+            $this->line(trans('command/messages.schedule.output_line', [
+                'schedule' => $schedule->name,
+                'hash' => $schedule->hashid,
+            ]));
+        } catch (Throwable | Exception $exception) {
+            Log::error($exception, ['schedule_id' => $schedule->id]);
+
+            $this->error("An error was encountered while processing Schedule #{$schedule->id}: " . $exception->getMessage());
+        }
+    }
 }

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -58,8 +58,9 @@ public function handle()
         Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
 
         $results = User::query()
-            ->where('email', 'LIKE', "$search%")
-            ->where('username', 'LIKE', "$search%")
+            ->where('id', 'LIKE', "$search%")
+            ->orWhere('username', 'LIKE', "$search%")
+            ->orWhere('email', 'LIKE', "$search%")
             ->get();
 
         if (count($results) < 1) {

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -15,16 +15,6 @@ interface ScheduleRepositoryInterface extends RepositoryInterface
      */
     public function findServerSchedules(int $server): Collection;
 
-    /**
-     * Load the tasks relationship onto the Schedule module if they are not
-     * already present.
-     *
-     * @param \Pterodactyl\Models\Schedule $schedule
-     * @param bool $refresh
-     * @return \Pterodactyl\Models\Schedule
-     */
-    public function loadTasks(Schedule $schedule, bool $refresh = false): Schedule;
-
     /**
      * Return a schedule model with all of the associated tasks as a relationship.
      *
@@ -34,12 +24,4 @@ public function loadTasks(Schedule $schedule, bool $refresh = false): Schedule;
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getScheduleWithTasks(int $schedule): Schedule;
-
-    /**
-     * Return all of the schedules that should be processed.
-     *
-     * @param string $timestamp
-     * @return \Illuminate\Support\Collection
-     */
-    public function getSchedulesToProcess(string $timestamp): Collection;
 }