Merge branch 'develop' into fix/trusted-proxies

sorry

Author: schrej

.babelrc

@@ -0,0 +1,8 @@
+{
+  "presets": ["es2015"],
+  "compact": true,
+  "minified": true,
+  "only": "public/themes/pterodactyl/js/frontend/files/src/*.js",
+  "sourceMaps": "inline",
+  "comments": false
+}

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

.env.example

@@ -1,12 +1,11 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=SomeRandomString3232RandomString
-APP_THEME=default
+APP_THEME=pterodactyl
 APP_TIMEZONE=UTC
 APP_CLEAR_TASKLOG=720
 APP_DELETE_MINUTES=10
-CONSOLE_PUSH_FREQ=250
-CONSOLE_PUSH_COUNT=10
+APP_URL=http://yoursite.com/
 
 DB_HOST=localhost
 DB_PORT=3306

.github/ISSUE_TEMPLATE.md

@@ -1,61 +1,6 @@
-<!-- The checkboxes below can be clicked once you submit this report if you'd like -->
-<!-- You can also use "- [x]" to mark it as checked. -->
-## Product
-Please check the corresponding boxes below for which products this is about.
+Please describe your issue in full below. Include what products are affected, as well as what version(s) you are running. Please also include information about your system, such as `uname -a` and `php -v` and `docker info` if applicable.
 
-- [ ] Panel
-- [ ] Daemon
-- [ ] Dockerfile(s) [Please list if so: __ ]
+If you're just making a suggestion, be descriptive, and link to any issues that might be releated as well.
 
-## Type
-- [ ] Bug or Issue
-- [ ] Feature Request
-- [ ] Enhancement
-- [ ] Other
-
-<!-- You only need to fill out the information below if this is a bug report.  -->
-<!-- Please delete this line and everything below if this is NOT a bug report. -->
-
-## What Happens
-<!-- Please include a description of what is happening when you encounter this bug. -->
-
-## How to Reproduce
-<!-- Please provide us a list of step for how to reproduce this issue. -->
-
-1. Step 1
-2. Step 2
-3. etc.
-
-## Error Logs
-<!-- Please include a paste output of the errors if they are logged. They can be found in: -->
-<!-- Panel: /var/www/pterodactyl/html/storage/logs/               Daemon: /srv/daemon/logs -->
-<!-- You can also paste them on https://gist.github.com and include their links below.     -->
-
-```
-error logs
-```
-
-## System Information
-#### Output of `uname -a`:
-
-```
-paste here
-```
-
-#### Output of `php -v` (if Panel):
-
-```
-paste here
-```
-
-#### Output of `node -v` (if Daemon):
-
-```
-paste here
-```
-
-#### Output of `docker info` and `docker -v` (if Daemon or Dockerfiles):
-
-```
-paste here
-```
+You can delete from this line up.
+---------------------

.gitignore

@@ -9,5 +9,4 @@ Homestead.yaml
 Vagrantfile
 Vagrantfile
 
-node_modules
-.babelrc
+node_modules

CHANGELOG.md

@@ -3,6 +3,100 @@ 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.6.0-pre.1
+### Added
+* Remote routes for daemon to contact in order to allow Daemon to retrieve updated service configuration files on boot. Centralizes services to the panel rather than to each daemon.
+* Basic service pack implementation to allow assignment of modpacks or software to a server to pre-install applications and allow users to update.
+* Users can now have a username as well as client name assigned to their account.
+* Ability to create a node through the CLI using `pterodactyl:node` as well as locations via `pterodactyl:location`.
+* New theme (AdminLTE) for front-end with tweaks to backend files to work properly with it.
+
+### Fixed
+* Bug causing error logs to be spammed if someone timed out on an ajax based page.
+* Fixes edge case where specific server names could cause daemon errors due to an invalid SFTP username being created by the panel.
+
+### Changed
+* 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`.
+
+### Deprecated
+
+## v0.5.6 (Bodacious Boreopterus)
+### Added
+* Added the following languages: Estonian `et`, Dutch `nl`, Norwegian `nb` (partial), Romanian `ro`, and Russian `ru`. Interested in helping us translate the panel into more languages, or improving existing translations? Contact us on Discord and let us know.
+* Added missing `strings.password` to language file for English.
+* Allow listing of users from the API by passing either the user ID or their email.
+
+### Fixed
+* Fixes bug where assigning a variable a default value (or valid value) of `0` would cause the panel to reject the value thinking it did not exist.
+* Addresses potential for crash by limiting total ports that can be assigned per-range to 2000.
+* Fixes server names requiring at minimum 4 characters. Name can now be 1 to 200 characters long. :pencil2:
+* Fixes bug that would allow adding the owner of a server as a subuser for that same server.
+* Fixes bug that would allow creating multiple subusers with the same email address.
+* Fixes bug where Sponge servers were improperly tagged as a spigot server in the daemon causing issues when booting or modifying configuration files.
+* Use transpiled ES6 -> ES5 filemanager code in browsers.
+* Fixes service option name displaying the name of a nwly added variable after the variable is added and until the page is refreshed. (see #208)
+
+### Changed
+* Filemanager and EULA checking javascript is now written in pure ES6 code rather than as a blade-syntax template. This allows the use of babel to transpile into ES5 as a minified version.
+
+## v0.5.5 (Bodacious Boreopterus)
+### Added
+* New API route to return allocations given a server ID. This adds support for a community-driven WHMCS module :rocket: available [here](https://github.com/hammerdawn/Pterodactyl-WHMCS).
+
+### Fixed
+* Fixes subuser display when trying to edit an existing subuser.
+
+## v0.5.4 (Bodacious Boreopterus)
+### Added
+* Changing node configuration values now automatically makes a call to the daemon and updates the configuration there. Changing daemon tokens now does not require any intervention, and takes effect immediately. SSL & Port configurations will still require a daemon reboot.
+* New button in file manager that triggers the right click menu to enable support on mobile devices and those who cannot right click (blessed be them).
+* Support for filtering users when listing all users on the system.
+* Container ID and User ID on the daemon are now shown when viewing a server in the panel.
+
+### Changed
+* File uploads now account for a maximum file size that is assigned for the daemon, and gives cleaner errors when that limit is reached.
+* File upload limit can now be controlled from the panel.
+* Updates regex and default values for some Minecraft services to reflect current technology.
+
+### Fixed
+* Fixes potential for generated password to not meet own validation requirements.
+* Fixes some regex checking issues with newer versions of Minecraft.
+
+## v0.5.3 (Bodacious Boreopterus)
+### Fixed
+* Fixed an error that occurred when viewing a node listing when no nodes were created yet due to a mis-declared variable. Also fixes a bug that would have all nodes trying to connect to the daemon using the same secret token on the node listing, causing only the last node to display properly.
+* Fixes a bug that displayed the panel version rather than the daemon version when viewing a node.
+* Fixes a multiplicator being applied to an overallocation field rather than a storage space field when adding a node.
+
+### Changed
+* Added a few new configuration variables for nodes to the default config, as well as a variable that will be used in future versions of the daemon.
+
+## v0.5.2 (Bodacious Boreopterus)
+### Fixed
+* Time axis on server graphs is corrected to show the minutes rather than the current month.
+* Node deletion now works correctly and deletes allocations as well.
+* Fixes a bug that would leave orphaned databases on the system if there was an error during creation.
+* Fixes an issue that could occur if a UUID contained `#e#` formatting within it when it comes to creating databases.
+* Fixed node status display to account for updated daemon security changes.
+* Fixes default language being selected as German (defaults to English now).
+* Fixes bug preventing the deletion of database servers.
+
+### Changed
+* Using `node:<name>` when filtering servers now properly filters the servers by node name, rather than looking for the node ID.
+* Using `owner:<email>` when filtering servers now properly filters by the owner's email rather than ID.
+* Added some quick help buttons to the admin index page for getting support or checking the documentation.
+* Panel now displays `Pterodactyl Panel` as the company name if one is not set.
+
+### Added
+* Added basic information about the daemon when viewing a node, including the host OS and version, CPU count, and the daemon version.
+* Added version checking for the daemon and panel that alerts admins when daemons or the panel is out of date.
+* Added multiplicator support to certain memory and disk fields that allow users to enter `10g` and have it converted to MB automatically.
+
+## v0.5.1 (Bodacious Boreopterus)
+### Fixed
+* Fixes a bug that allowed a user to bypass 2FA authentication if using the correct username and password for an account.
+
 ## v0.5.0 (Bodacious Boreopterus)
 After nearly a month in the works, version `v0.5.0` is finally here! 🎉
 

LICENSE.md

@@ -1,7 +1,7 @@
 # The MIT License (MIT)
 
 ```
-Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,7 +6,7 @@ Support for using Pterodactyl can be found on our [wiki](https://github.com/Pter
 
 ## License
 ```
-Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
+Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +33,8 @@ A huge thanks to [PhraseApp](https://phraseapp.com) who provide us the software
 
 Ace Editor - [license](https://github.com/ajaxorg/ace/blob/master/LICENSE) - [homepage](https://ace.c9.io)
 
+AdminLTE - [license](https://github.com/almasaeed2010/AdminLTE/blob/master/LICENSE) - [homepage](https://almsaeedstudio.com)
+
 Animate.css - [license](https://github.com/daneden/animate.css/blob/master/LICENSE) - [homepage](http://daneden.github.io/animate.css/)
 
 Async.js - [license](https://github.com/caolan/async/blob/master/LICENSE) - [homepage](https://github.com/caolan/async/)
@@ -57,8 +59,12 @@ jQuery Terminal - [license](https://github.com/jcubic/jquery.terminal/blob/maste
 
 Lodash - [license](https://github.com/lodash/lodash/blob/master/LICENSE) - [homepage](https://lodash.com/)
 
+Select2 - [license](https://github.com/select2/select2/blob/master/LICENSE.md) - [homepage](https://select2.github.io)
+
 Socket.io - [license](https://github.com/socketio/socket.io/blob/master/LICENSE) - [homepage](http://socket.io)
 
+Socket.io File Upload - [license](https://github.com/vote539/socketio-file-upload/blob/master/server.js#L1-L27) - [homepage](https://github.com/vote539/socketio-file-upload)
+
 SweetAlert - [license](https://github.com/t4t5/sweetalert/blob/master/LICENSE) - [homepage](http://t4t5.github.io/sweetalert/)
 
 Typeahead — [license](https://github.com/bassjobsen/Bootstrap-3-Typeahead/blob/master/bootstrap3-typeahead.js) — [homepage](https://github.com/bassjobsen/Bootstrap-3-Typeahead)

app/Console/Commands/AddLocation.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Pterodactyl\Console\Commands;
+
+use Illuminate\Console\Command;
+use Pterodactyl\Repositories\LocationRepository;
+
+class AddLocation extends Command
+{
+    protected $data = [];
+
+     /**
+      * The name and signature of the console command.
+      *
+      * @var string
+      */
+     protected $signature = 'pterodactyl:location
+                             {--short= : The shortcode name of this location (ex. us1).}
+                             {--long= : A longer description of this location.}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Creates a new location on the system via the CLI.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->data['short'] = (is_null($this->option('short'))) ? $this->ask('Location Short Code') : $this->option('short');
+        $this->data['long'] = (is_null($this->option('long'))) ? $this->ask('Location Description') : $this->option('long');
+
+        $repo = new LocationRepository;
+        $id = $repo->create($this->data);
+
+        $this->info('Location ' . $this->data['short'] . ' created with ID: ' . $id);
+    }
+}