Merge pull request pterodactyl#117 from Pterodactyl/feature/filemanager

Feature/filemanager

Author: DaneEveritt

CHANGELOG.md

@@ -8,13 +8,18 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Added
 * Support for creating server without having to assign a node and allocation manually. Simply select the checkbox or pass `auto_deploy=true` to the API to auto-select a node and allocation given a location.
 * Support for setting IP Aliases through the panel on the node overview page. Also cleaned up allocation removal.
+* Support for renaming files through the panel's file mananger.
 
 ### Changed
 * Prevent clicking server start button until server is completely off, not just stopping.
 * Upon successful creation of a node it will redirect to the allocation tab and display a clearer message to add allocations.
 * Trying to add a new node if no location exists redirects user to location management page and alerts them to add a location first.
 * `Server\AjaxController@postSetConnection` is now `Server\AjaxController@postSetPrimary` and accepts one post parameter of `allocation` rather than a combined `ip:port` value.
 * Port allocations on server view are now cleaner and should make more sense.
+* Improved File Manager
+  * Rewritten Javascript to load, rename, and handle other file actions.
+  * Uses Ace Editor for editing files rather than a non-formatted textarea
+  * File actions that were previously icons to the right are now contained in a menu that appears when right-clicking a file or folder.
 
 ### Fixed
 * Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux))

README.md

@@ -1,5 +1,5 @@
 ## Pterodactyl Panel
-Pterodactyl is the free game server management panel designed by users, for users. Featuring support for Vanilla Minecraft, Spigot, Source Dedicated Servers, BungeeCord, and many more. Pterodactyl is built on the `Laravel PHP Framework (v5.2)`.
+Pterodactyl is the free game server management panel designed by users, for users. Featuring support for Vanilla Minecraft, Spigot, Source Dedicated Servers, BungeeCord, and many more. Pterodactyl is built on the `Laravel PHP Framework (v5.3)`.
 
 ## Support & Documentation
 Support for using Pterodactyl can be found on our [wiki](https://github.com/Pterodactyl/Panel/wiki) or on our [Discord chat](https://discord.gg/0gYt8oU8QOkDhKLS).
@@ -28,6 +28,8 @@ SOFTWARE.
 ```
 
 ### Credits
+Ace Editor - [license](https://github.com/ajaxorg/ace/blob/master/LICENSE) - [homepage](https://ace.c9.io)
+
 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/)
@@ -48,6 +50,8 @@ jQuery - [license](https://github.com/jquery/jquery/blob/master/LICENSE.txt) - [
 
 jQuery Terminal - [license](https://github.com/jcubic/jquery.terminal/blob/master/LICENSE) - [homepage](http://terminal.jcubic.pl)
 
+Lodash - [license](https://github.com/lodash/lodash/blob/master/LICENSE) - [homepage](https://lodash.com/)
+
 MetricsGraphics.js - [license](https://github.com/mozilla/metrics-graphics/blob/master/LICENSE) - [homepage](http://metricsgraphicsjs.org/)
 
 Socket.io - [license](https://github.com/socketio/socket.io/blob/master/LICENSE) - [homepage](http://socket.io)

app/Http/Controllers/Server/AjaxController.php

@@ -115,11 +115,12 @@ public function postDirectoryList(Request $request, $uuid)
 
         // Determine if we should show back links in the file browser.
         // This code is strange, and could probably be rewritten much better.
-        $goBack = explode('/', rtrim($this->directory, '/'));
-        if (isset($goBack[2]) && !empty($goBack[2])) {
+        $goBack = explode('/', trim($this->directory, '/'));
+        if (!empty(array_filter($goBack)) && count($goBack) >= 2) {
             $prevDir['show'] = true;
-            $prevDir['link'] = '/' . trim(str_replace(end($goBack), '', $this->directory), '/');
-            $prevDir['link_show'] = trim($prevDir['link'], '/');
+            array_pop($goBack);
+            $prevDir['link'] = '/' . implode('/', $goBack);
+            $prevDir['link_show'] = implode('/', $goBack) . '/';
         }
 
         $controller = new Repositories\Daemon\FileRepository($uuid);
@@ -137,7 +138,7 @@ public function postDirectoryList(Request $request, $uuid)
             'server' => $server,
             'files' => $directoryContents->files,
             'folders' => $directoryContents->folders,
-            'extensions' => Repositories\HelperRepository::editableFiles(),
+            'editableMime' => Repositories\HelperRepository::editableFiles(),
             'directory' => $prevDir
         ]);
 

app/Http/Controllers/Server/ServerController.php

@@ -51,10 +51,10 @@ public function __construct()
         //
     }
 
-    public function getJavascript(Request $request, $uuid, $file)
+    public function getJavascript(Request $request, $uuid, $folder, $file)
     {
         $server = Models\Server::getByUUID($uuid);
-        return response()->view('server.js.' . $server->a_serviceFile . '.' . basename($file, '.js'), [
+        return response()->view('server.js.' . $folder . '.' . basename($file, '.js'), [
             'server' => $server,
             'node' => Models\Node::find($server->node)
         ])->header('Content-Type', 'application/javascript');
@@ -145,9 +145,9 @@ public function getEditFile(Request $request, $uuid, $file)
             'server' => $server,
             'node' => Models\Node::find($server->node),
             'file' => $file,
-            'contents' => $fileContent->content,
-            'directory' => (in_array($fileInfo->dirname, ['.', './', '/'])) ? '/' : trim($fileInfo->dirname, '/') . '/',
-            'extension' => $fileInfo->extension
+            'stat' => $fileContent['stat'],
+            'contents' => $fileContent['file']->content,
+            'directory' => (in_array($fileInfo->dirname, ['.', './', '/'])) ? '/' : trim($fileInfo->dirname, '/') . '/'
         ]);
 
     }
@@ -172,11 +172,11 @@ public function getDownloadFile(Request $request, $uuid, $file)
 
         $download->token = (string) Uuid::generate(4);
         $download->server = $server->uuid;
-        $download->path = str_replace('../', '', $file);
+        $download->path = $file;
 
         $download->save();
 
-        return redirect( $node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/download/' . $download->token);
+        return redirect( $node->scheme . '://' . $node->fqdn . ':' . $node->daemonListen . '/server/file/download/' . $download->token);
 
     }
 

app/Http/Routes/ServerRoutes.php

@@ -167,7 +167,7 @@ public function map(Router $router) {
             // Assorted AJAX Routes
             $router->group(['prefix' => 'js'], function ($server) use ($router) {
                 // Returns Server Status
-                $router->get('{file}', [
+                $router->get('{folder}/{file}', [
                     'as' => 'server.js',
                     'uses' => 'Server\ServerController@getJavascript'
                 ])->where('file', '.*');

app/Repositories/Daemon/FileRepository.php

@@ -85,7 +85,7 @@ public function __construct($uuid)
      * Get the contents of a requested file for the server.
      *
      * @param  string $file
-     * @return string
+     * @return array
      */
     public function returnFileContents($file)
     {
@@ -95,22 +95,39 @@ public function returnFileContents($file)
         }
 
         $file = (object) pathinfo($file);
-        if (!in_array($file->extension, HelperRepository::editableFiles())) {
-            throw new DisplayException('You do not have permission to edit this type of file.');
-        }
 
         $file->dirname = (in_array($file->dirname, ['.', './', '/'])) ? null : trim($file->dirname, '/') . '/';
 
-        $res = $this->client->request('GET', '/server/file/' . rawurlencode($file->dirname.$file->basename), [
+        $res = $this->client->request('GET', '/server/file/stat/' . rawurlencode($file->dirname.$file->basename) , [
+            'headers' => $this->headers
+        ]);
+
+        $stat = json_decode($res->getBody());
+        if($res->getStatusCode() !== 200 || !isset($stat->size)) {
+            throw new DisplayException('The daemon provided a non-200 error code on stat lookup: HTTP\\' . $res->getStatusCode());
+        }
+
+        if (!in_array($stat->mime, HelperRepository::editableFiles())) {
+            throw new DisplayException('You cannot edit that type of file (' . $stat->mime . ') through the panel.');
+        }
+
+        if ($stat->size > 5000000) {
+            throw new DisplayException('That file is too large to open in the browser, consider using a SFTP client.');
+        }
+
+        $res = $this->client->request('GET', '/server/file/f/' . rawurlencode($file->dirname.$file->basename) , [
             'headers' => $this->headers
         ]);
 
         $json = json_decode($res->getBody());
         if($res->getStatusCode() !== 200 || !isset($json->content)) {
-            throw new DisplayException('Scales provided a non-200 error code: HTTP\\' . $res->getStatusCode());
+            throw new DisplayException('The daemon provided a non-200 error code: HTTP\\' . $res->getStatusCode());
         }
 
-        return $json;
+        return [
+            'file' => $json,
+            'stat' => $stat
+        ];
 
     }
 
@@ -119,7 +136,7 @@ public function returnFileContents($file)
      *
      * @param  string $file
      * @param  string $content
-     * @return boolean
+     * @return bool
      */
     public function saveFileContents($file, $content)
     {
@@ -130,15 +147,12 @@ public function saveFileContents($file, $content)
 
         $file = (object) pathinfo($file);
 
-        if(!in_array($file->extension, HelperRepository::editableFiles())) {
-            throw new DisplayException('You do not have permission to edit this type of file.');
-        }
-
         $file->dirname = (in_array($file->dirname, ['.', './', '/'])) ? null : trim($file->dirname, '/') . '/';
 
-        $res = $this->client->request('POST', '/server/file/' . rawurlencode($file->dirname.$file->basename), [
+        $res = $this->client->request('POST', '/server/file/save', [
             'headers' => $this->headers,
             'json' => [
+                'path' => rawurlencode($file->dirname.$file->basename),
                 'content' => $content
             ]
         ]);
@@ -185,7 +199,8 @@ public function returnDirectoryListing($directory)
                     'entry' => $value->name,
                     'directory' => trim($directory, '/'),
                     'size' => null,
-                    'date' => strtotime($value->modified)
+                    'date' => strtotime($value->modified),
+                    'mime' => $value->mime
                 ]]);
 
             } else if ($value->file === true) {
@@ -195,7 +210,8 @@ public function returnDirectoryListing($directory)
                     'directory' => trim($directory, '/'),
                     'extension' => pathinfo($value->name, PATHINFO_EXTENSION),
                     'size' => HelperRepository::bytesToHuman($value->size),
-                    'date' => strtotime($value->modified)
+                    'date' => strtotime($value->modified),
+                    'mime' => $value->mime
                 ]]);
 
             }

app/Repositories/HelperRepository.php

@@ -30,25 +30,20 @@ class HelperRepository {
      * @var array
      */
     protected static $editable = [
-        'txt',
-        'yml',
-        'yaml',
-        'log',
-        'conf',
-        'config',
-        'html',
-        'json',
-        'properties',
-        'props',
-        'cfg',
-        'lang',
-        'ini',
-        'cmd',
-        'sh',
-        'lua',
-        '0' // Supports BungeeCord Files
+        'application/json',
+        'application/javascript',
+        'application/xml',
+        'application/xhtml+xml',
+        'text/xml',
+        'text/css',
+        'text/html',
+        'text/plain',
+        'text/x-perl',
+        'text/x-shellscript',
+        'inode/x-empty'
     ];
 
+
     public function __construct()
     {
         //