Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,10 @@ 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.
 
+## Unreleased
+### Fixed
+* Fixes the application API unable to return server's variables.
+
 ## v1.1.3
 ### Fixed
 * Server bulk power actions command will no longer attempt to run commands against installing or suspended servers.

app/Http/Controllers/Api/Client/Servers/FileController.php

@@ -16,6 +16,7 @@
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ListFilesRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DeleteFileRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\RenameFileRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Files\ChmodFilesRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CreateFolderRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CompressFilesRequest;
 use Pterodactyl\Http\Requests\Api\Client\Servers\Files\DecompressFilesRequest;
@@ -263,6 +264,25 @@ public function delete(DeleteFileRequest $request, Server $server): JsonResponse
         return new JsonResponse([], Response::HTTP_NO_CONTENT);
     }
 
+    /**
+     * Updates file permissions for file(s) in the given root directory.
+     *
+     * @param \Pterodactyl\Http\Requests\Api\Client\Servers\Files\ChmodFilesRequest $request
+     * @param \Pterodactyl\Models\Server $server
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+     */
+    public function chmod(ChmodFilesRequest $request, Server $server): JsonResponse
+    {
+        $this->fileRepository->setServer($server)
+            ->chmodFiles(
+                $request->input('root'), $request->input('files')
+            );
+
+        return new JsonResponse([], Response::HTTP_NO_CONTENT);
+    }
+
     /**
      * Encodes a given file name & path in a format that should work for a good majority
      * of file names without too much confusing logic.

app/Http/Requests/Api/Client/Servers/Files/ChmodFilesRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Files;
+
+use Pterodactyl\Models\Permission;
+use Pterodactyl\Contracts\Http\ClientPermissionsRequest;
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+
+class ChmodFilesRequest extends ClientApiRequest implements ClientPermissionsRequest
+{
+    /**
+     * @return string
+     */
+    public function permission(): string
+    {
+        return Permission::ACTION_FILE_UPDATE;
+    }
+
+    /**
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'root' => 'required|nullable|string',
+            'files' => 'required|array',
+            'files.*.file' => 'required|string',
+            'files.*.mode' => 'required|numeric',
+        ];
+    }
+}

app/Repositories/Wings/DaemonFileRepository.php

@@ -269,4 +269,32 @@ public function decompressFile(?string $root, string $file): ResponseInterface
             throw new DaemonConnectionException($exception);
         }
     }
+
+    /**
+     * Chmods the given files.
+     *
+     * @param string|null $root
+     * @param array $files
+     * @return \Psr\Http\Message\ResponseInterface
+     *
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+     */
+    public function chmodFiles(?string $root, array $files): ResponseInterface
+    {
+        Assert::isInstanceOf($this->server, Server::class);
+
+        try {
+            return $this->getHttpClient()->post(
+                sprintf('/api/servers/%s/files/chmod', $this->server->uuid),
+                [
+                    'json' => [
+                        'root' => $root ?? '/',
+                        'files' => $files,
+                    ],
+                ]
+            );
+        } catch (TransferException $exception) {
+            throw new DaemonConnectionException($exception);
+        }
+    }
 }

app/Transformers/Api/Application/ServerVariableTransformer.php

@@ -2,7 +2,7 @@
 
 namespace Pterodactyl\Transformers\Api\Application;
 
-use Pterodactyl\Models\ServerVariable;
+use Pterodactyl\Models\EggVariable;
 use Pterodactyl\Services\Acl\Api\AdminAcl;
 
 class ServerVariableTransformer extends BaseTransformer
@@ -27,22 +27,22 @@ public function getResourceName(): string
     /**
      * Return a generic transformed server variable array.
      *
-     * @param \Pterodactyl\Models\ServerVariable $variable
+     * @param \Pterodactyl\Models\EggVariable $variable
      * @return array
      */
-    public function transform(ServerVariable $variable)
+    public function transform(EggVariable $variable)
     {
         return $variable->toArray();
     }
 
     /**
      * Return the parent service variable data.
      *
-     * @param \Pterodactyl\Models\ServerVariable $variable
+     * @param \Pterodactyl\Models\EggVariable $variable
      * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource
      * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException
      */
-    public function includeParent(ServerVariable $variable)
+    public function includeParent(EggVariable $variable)
     {
         if (! $this->authorize(AdminAcl::RESOURCE_EGGS)) {
             return $this->null();

app/Transformers/Daemon/FileObjectTransformer.php

@@ -25,6 +25,7 @@ public function transform(array $item)
         return [
             'name' => Arr::get($item, 'name'),
             'mode' => Arr::get($item, 'mode'),
+            'mode_bits' => Arr::get($item, 'mode_bits'),
             'size' => Arr::get($item, 'size'),
             'is_file' => Arr::get($item, 'file', true),
             'is_symlink' => Arr::get($item, 'symlink', false),

resources/scripts/api/server/files/chmodFiles.ts

@@ -0,0 +1,14 @@
+import http from '@/api/http';
+
+interface Data {
+    file: string;
+    mode: string;
+}
+
+export default (uuid: string, directory: string, files: Data[]): Promise<void> => {
+    return new Promise((resolve, reject) => {
+        http.post(`/api/client/servers/${uuid}/files/chmod`, { root: directory, files })
+            .then(() => resolve())
+            .catch(reject);
+    });
+};

resources/scripts/api/server/files/loadDirectory.ts

@@ -5,6 +5,7 @@ export interface FileObject {
     key: string;
     name: string;
     mode: string;
+    modeBits: string,
     size: number;
     isFile: boolean;
     isSymlink: boolean;

resources/scripts/api/transformers.ts

@@ -16,6 +16,7 @@ export const rawDataToFileObject = (data: FractalResponseData): FileObject => ({
     key: `${data.attributes.is_file ? 'file' : 'dir'}_${data.attributes.name}`,
     name: data.attributes.name,
     mode: data.attributes.mode,
+    modeBits: data.attributes.mode_bits,
     size: Number(data.attributes.size),
     isFile: data.attributes.is_file,
     isSymlink: data.attributes.is_symlink,

resources/scripts/components/elements/SubNavigation.tsx

@@ -5,23 +5,24 @@ import config from '../../../../tailwind.config';
 
 const SubNavigation = styled.div`
     ${tw`w-full bg-neutral-700 shadow overflow-x-auto`};
-    
+
     & > div {
         ${tw`flex items-center text-sm mx-auto px-2`};
         max-width: 1200px;
-        
+
         & > a, & > div {
             ${tw`inline-block py-3 px-4 text-neutral-300 no-underline whitespace-no-wrap transition-all duration-150`};
-            
+
             &:not(:first-of-type) {
                 ${tw`ml-2`};
             }
-            
-            &:active, &:hover {
+
+            &:hover {
                 ${tw`text-neutral-100`};
             }
-            
-            &:active, &:hover, &.active {
+
+            &:active, &.active {
+                ${tw`text-neutral-100`};
                 box-shadow: inset 0 -2px ${config.theme.colors.cyan['500']};
             }
         }