Merge branch 'develop' into matthewpi/server-details-patch-1

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/BackupController.php

@@ -60,7 +60,8 @@ class BackupController extends ClientApiController
      */
     public function index(GetBackupsRequest $request, Server $server)
     {
-        return $this->fractal->collection($server->backups()->paginate(20))
+        $limit = min($request->query('per_page') ?? 20, 50);
+        return $this->fractal->collection($server->backups()->paginate($limit))
             ->transformWith($this->getTransformer(BackupTransformer::class))
             ->toArray();
     }

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

@@ -16,6 +16,7 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CopyFileRequest;
 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 @@ class FileController extends ClientApiController
         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/Controllers/Api/Client/Servers/SubuserController.php

@@ -135,7 +135,7 @@ class SubuserController extends ClientApiController
             ]);
 
             try {
-                $this->serverRepository->setServer($server)->revokeJTIs([md5($subuser->user_id . $server->uuid)]);
+                $this->serverRepository->setServer($server)->revokeUserJTI($subuser->user_id);
             } catch (DaemonConnectionException $exception) {
                 // Don't block this request if we can't connect to the Wings instance. Chances are it is
                 // offline in this event and the token will be invalid anyways once Wings boots back.
@@ -163,7 +163,7 @@ class SubuserController extends ClientApiController
         $this->repository->delete($subuser->id);
 
         try {
-            $this->serverRepository->setServer($server)->revokeJTIs([md5($subuser->user_id . $server->uuid)]);
+            $this->serverRepository->setServer($server)->revokeUserJTI($subuser->user_id);
         } catch (DaemonConnectionException $exception) {
             // Don't block this request if we can't connect to the Wings instance.
             Log::warning($exception, ['user_id' => $subuser->user_id, 'server_id' => $server->id]);

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 @@ class DaemonFileRepository extends DaemonRepository
             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/Repositories/Wings/DaemonServerRepository.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Repositories\Wings;
 
 use Webmozart\Assert\Assert;
+use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\TransferException;
 use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
@@ -144,6 +145,21 @@ class DaemonServerRepository extends DaemonRepository
         }
     }
 
+    /**
+     * Revokes a single user's JTI by using their ID. This is simply a helper function to
+     * make it easier to revoke tokens on the fly. This ensures that the JTI key is formatted
+     * correctly and avoids any costly mistakes in the codebase.
+     *
+     * @param int $id
+     * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
+     */
+    public function revokeUserJTI(int $id): void
+    {
+        Assert::isInstanceOf($this->server, Server::class);
+
+        $this->revokeJTIs([ md5($id . $this->server->uuid) ]);
+    }
+
     /**
      * Revokes an array of JWT JTI's by marking any token generated before the current time on
      * the Wings instance as being invalid.
@@ -151,7 +167,7 @@ class DaemonServerRepository extends DaemonRepository
      * @param array $jtis
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      */
-    public function revokeJTIs(array $jtis): void
+    protected function revokeJTIs(array $jtis): void
     {
         Assert::isInstanceOf($this->server, Server::class);
 

app/Services/Nodes/NodeUpdateService.php

@@ -4,6 +4,7 @@ namespace Pterodactyl\Services\Nodes;
 
 use Illuminate\Support\Str;
 use Pterodactyl\Models\Node;
+use Illuminate\Support\Facades\Log;
 use GuzzleHttp\Exception\ConnectException;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Encryption\Encrypter;
@@ -90,11 +91,17 @@ class NodeUpdateService
 
                 $this->configurationRepository->setNode($node)->update($updated);
             } catch (DaemonConnectionException $exception) {
-                if (! is_null($exception->getPrevious()) && $exception->getPrevious() instanceof ConnectException) {
+                Log::warning($exception, ['node_id' => $node->id]);
-                    return [$updated, true];
-                }
 
-                throw $exception;
+                // Never actually throw these exceptions up the stack. If we were able to change the settings
+                // but something went wrong with Wings we just want to store the update and let the user manually
+                // make changes as needed.
+                //
+                // This avoids issues with proxies such as CloudFlare which will see Wings as offline and then
+                // inject their own response pages, causing this logic to get fucked up.
+                //
+                // @see https://github.com/pterodactyl/panel/issues/2712
+                return [ $updated, true ];
             }
 
             return [$updated, false];

app/Services/Servers/DetailsModificationService.php

@@ -2,10 +2,12 @@
 
 namespace Pterodactyl\Services\Servers;
 
+use Illuminate\Support\Arr;
 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Traits\Services\ReturnsUpdatedModels;
-use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class DetailsModificationService
 {
@@ -17,22 +19,20 @@ class DetailsModificationService
     private $connection;
 
     /**
-     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
-    private $repository;
+    private $serverRepository;
 
     /**
      * DetailsModificationService constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $serverRepository
      */
-    public function __construct(
+    public function __construct(ConnectionInterface $connection, DaemonServerRepository $serverRepository)
-        ConnectionInterface $connection,
+    {
-        ServerRepository $repository
-    ) {
         $this->connection = $connection;
-        $this->repository = $repository;
+        $this->serverRepository = $serverRepository;
     }
 
     /**
@@ -40,24 +40,36 @@ class DetailsModificationService
      *
      * @param \Pterodactyl\Models\Server $server
      * @param array $data
-     * @return bool|\Pterodactyl\Models\Server
+     * @return \Pterodactyl\Models\Server
      *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Throwable
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(Server $server, array $data)
+    public function handle(Server $server, array $data): Server
     {
-        $this->connection->beginTransaction();
+        return $this->connection->transaction(function () use ($data, $server) {
+            $owner = $server->owner_id;
 
-        $response = $this->repository->setFreshModel($this->getUpdatedModel())->update($server->id, [
+            $server->forceFill([
-            'external_id' => array_get($data, 'external_id'),
+                'external_id' => Arr::get($data, 'external_id'),
-            'owner_id' => array_get($data, 'owner_id'),
+                'owner_id' => Arr::get($data, 'owner_id'),
-            'name' => array_get($data, 'name'),
+                'name' => Arr::get($data, 'name'),
-            'description' => array_get($data, 'description') ?? '',
+                'description' => Arr::get($data, 'description') ?? '',
-        ], true, true);
+            ])->saveOrFail();
 
-        $this->connection->commit();
+            // If the owner_id value is changed we need to revoke any tokens that exist for the server
+            // on the Wings instance so that the old owner no longer has any permission to access the
+            // websockets.
+            if ($server->owner_id !== $owner) {
+                try {
+                    $this->serverRepository->setServer($server)->revokeUserJTI($owner);
+                } catch (DaemonConnectionException $exception) {
+                    // Do nothing. A failure here is not ideal, but it is likely to be caused by Wings
+                    // being offline, or in an entirely broken state. Remeber, these tokens reset every
+                    // few minutes by default, we're just trying to help it along a little quicker.
+                }
+            }
 
-        return $response;
+            return $server;
+        });
     }
 }

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,10 +27,10 @@ class ServerVariableTransformer extends BaseTransformer
     /**
      * 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();
     }
@@ -38,11 +38,11 @@ class ServerVariableTransformer extends BaseTransformer
     /**
      * 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 @@ class FileObjectTransformer extends BaseDaemonTransformer
         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/swr/getServerBackups.ts

@@ -3,8 +3,17 @@ import http, { getPaginationSet, PaginatedResult } from '@/api/http';
 import { ServerBackup } from '@/api/server/types';
 import { rawDataToServerBackup } from '@/api/transformers';
 import { ServerContext } from '@/state/server';
+import { createContext, useContext } from 'react';
 
-export default (page?: number | string) => {
+interface ctx {
+    page: number;
+    setPage: (value: number | ((s: number) => number)) => void;
+}
+
+export const Context = createContext<ctx>({ page: 1, setPage: () => 1 });
+
+export default () => {
+    const { page } = useContext(Context);
     const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
 
     return useSWR<PaginatedResult<ServerBackup>>([ 'server:backups', uuid, page ], async () => {

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/dashboard/ApiKeyModal.tsx

@@ -13,7 +13,7 @@ const ApiKeyModal = ({ apiKey }: Props) => {
 
     return (
         <>
-            <h3 css={tw`mb-6`}>Your API Key</h3>
+            <h3 css={tw`mb-6 text-2xl`}>Your API Key</h3>
             <p css={tw`text-sm mb-6`}>
                 The API key you have requested is shown below. Please store this in a safe location, it will not be
                 shown again.

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']};
             }
         }

resources/scripts/components/server/backups/BackupContainer.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import Spinner from '@/components/elements/Spinner';
 import useFlash from '@/plugins/useFlash';
 import Can from '@/components/elements/Can';
@@ -6,11 +6,13 @@ import CreateBackupButton from '@/components/server/backups/CreateBackupButton';
 import FlashMessageRender from '@/components/FlashMessageRender';
 import BackupRow from '@/components/server/backups/BackupRow';
 import tw from 'twin.macro';
-import getServerBackups from '@/api/swr/getServerBackups';
+import getServerBackups, { Context as ServerBackupContext } from '@/api/swr/getServerBackups';
 import { ServerContext } from '@/state/server';
 import ServerContentBlock from '@/components/elements/ServerContentBlock';
+import Pagination from '@/components/elements/Pagination';
 
-export default () => {
+const BackupContainer = () => {
+    const { page, setPage } = useContext(ServerBackupContext);
     const { clearFlashes, clearAndAddHttpError } = useFlash();
     const { data: backups, error, isValidating } = getServerBackups();
 
@@ -33,19 +35,29 @@ export default () => {
     return (
         <ServerContentBlock title={'Backups'}>
             <FlashMessageRender byKey={'backups'} css={tw`mb-4`}/>
-            {!backups.items.length ?
+            <Pagination data={backups} onPageSelect={setPage}>
-                <p css={tw`text-center text-sm text-neutral-300`}>
+                {({ items }) => (
-                    There are no backups stored for this server.
+                    !items.length ?
-                </p>
+                        // Don't show any error messages if the server has no backups and the user cannot
-                :
+                        // create additional ones for the server.
-                <div>
+                        !backupLimit ?
-                    {backups.items.map((backup, index) => <BackupRow
+                            null
-                        key={backup.uuid}
+                            :
-                        backup={backup}
+                            <p css={tw`text-center text-sm text-neutral-300`}>
-                        css={index > 0 ? tw`mt-2` : undefined}
+                                {page > 1 ?
-                    />)}
+                                    'Looks like we\'ve run out of backups to show you, try going back a page.'
-                </div>
+                                    :
-            }
+                                    'It looks like there are no backups currently stored for this server.'
+                                }
+                            </p>
+                        :
+                        items.map((backup, index) => <BackupRow
+                            key={backup.uuid}
+                            backup={backup}
+                            css={index > 0 ? tw`mt-2` : undefined}
+                        />)
+                )}
+            </Pagination>
             {backupLimit === 0 &&
             <p css={tw`text-center text-sm text-neutral-300`}>
                 Backups cannot be created for this server.
@@ -59,10 +71,19 @@ export default () => {
                     </p>
                     }
                     {backupLimit > 0 && backupLimit !== backups.items.length &&
-                        <CreateBackupButton css={tw`w-full sm:w-auto`}/>
+                    <CreateBackupButton css={tw`w-full sm:w-auto`}/>
                     }
                 </div>
             </Can>
         </ServerContentBlock>
     );
 };
+
+export default () => {
+    const [ page, setPage ] = useState<number>(1);
+    return (
+        <ServerBackupContext.Provider value={{ page, setPage }}>
+            <BackupContainer/>
+        </ServerBackupContext.Provider>
+    );
+};

resources/scripts/components/server/backups/ChecksumModal.tsx

@@ -4,7 +4,7 @@ import tw from 'twin.macro';
 
 const ChecksumModal = ({ checksum, ...props }: RequiredModalProps & { checksum: string }) => (
     <Modal {...props}>
-        <h3 css={tw`mb-6`}>Verify file checksum</h3>
+        <h3 css={tw`mb-6 text-2xl`}>Verify file checksum</h3>
         <p css={tw`text-sm`}>
             The checksum of this file is:
         </p>

resources/scripts/components/server/databases/DatabaseRow.tsx

@@ -111,7 +111,7 @@ export default ({ database, className }: Props) => {
             </Formik>
             <Modal visible={connectionVisible} onDismissed={() => setConnectionVisible(false)}>
                 <FlashMessageRender byKey={'database-connection-modal'} css={tw`mb-6`}/>
-                <h3 css={tw`mb-6`}>Database connection details</h3>
+                <h3 css={tw`mb-6 text-2xl`}>Database connection details</h3>
                 <div>
                     <Label>Endpoint</Label>
                     <CopyOnClick text={database.connectionString}><Input type={'text'} readOnly value={database.connectionString} /></CopyOnClick>

resources/scripts/components/server/files/ChmodFileModal.tsx

@@ -0,0 +1,75 @@
+import { fileBitsToString } from '@/helpers';
+import useFileManagerSwr from '@/plugins/useFileManagerSwr';
+import React from 'react';
+import Modal, { RequiredModalProps } from '@/components/elements/Modal';
+import { Form, Formik, FormikHelpers } from 'formik';
+import Field from '@/components/elements/Field';
+import chmodFiles from '@/api/server/files/chmodFiles';
+import { ServerContext } from '@/state/server';
+import tw from 'twin.macro';
+import Button from '@/components/elements/Button';
+import useFlash from '@/plugins/useFlash';
+
+interface FormikValues {
+    mode: string;
+}
+
+interface File {
+    file: string,
+    mode: string,
+}
+
+type OwnProps = RequiredModalProps & { files: File[] };
+
+const ChmodFileModal = ({ files, ...props }: OwnProps) => {
+    const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
+    const { mutate } = useFileManagerSwr();
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+    const directory = ServerContext.useStoreState(state => state.files.directory);
+    const setSelectedFiles = ServerContext.useStoreActions(actions => actions.files.setSelectedFiles);
+
+    const submit = ({ mode }: FormikValues, { setSubmitting }: FormikHelpers<FormikValues>) => {
+        clearFlashes('files');
+
+        mutate(data => data.map(f => f.name === files[0].file ? { ...f, mode: fileBitsToString(mode, !f.isFile), modeBits: mode } : f), false);
+
+        const data = files.map(f => ({ file: f.file, mode: mode }));
+
+        chmodFiles(uuid, directory, data)
+            .then((): Promise<any> => files.length > 0 ? mutate() : Promise.resolve())
+            .then(() => setSelectedFiles([]))
+            .catch(error => {
+                mutate();
+                setSubmitting(false);
+                clearAndAddHttpError({ key: 'files', error });
+            })
+            .then(() => props.onDismissed());
+    };
+
+    return (
+        <Formik onSubmit={submit} initialValues={{ mode: files.length > 1 ? '' : (files[0].mode || '') }}>
+            {({ isSubmitting }) => (
+                <Modal {...props} dismissable={!isSubmitting} showSpinnerOverlay={isSubmitting}>
+                    <Form css={tw`m-0`}>
+                        <div css={tw`flex flex-wrap items-end`}>
+                            <div css={tw`w-full sm:flex-1 sm:mr-4`}>
+                                <Field
+                                    type={'string'}
+                                    id={'file_mode'}
+                                    name={'mode'}
+                                    label={'File Mode'}
+                                    autoFocus
+                                />
+                            </div>
+                            <div css={tw`w-full sm:w-auto mt-4 sm:mt-0`}>
+                                <Button css={tw`w-full`}>Update</Button>
+                            </div>
+                        </div>
+                    </Form>
+                </Modal>
+            )}
+        </Formik>
+    );
+};
+
+export default ChmodFileModal;

resources/scripts/components/server/files/FileDropdownMenu.tsx

@@ -5,6 +5,7 @@ import {
     faCopy,
     faEllipsisH,
     faFileArchive,
+    faFileCode,
     faFileDownload,
     faLevelUpAlt,
     faPencilAlt,
@@ -30,8 +31,9 @@ import compressFiles from '@/api/server/files/compressFiles';
 import decompressFiles from '@/api/server/files/decompressFiles';
 import isEqual from 'react-fast-compare';
 import ConfirmationModal from '@/components/elements/ConfirmationModal';
+import ChmodFileModal from '@/components/server/files/ChmodFileModal';
 
-type ModalType = 'rename' | 'move';
+type ModalType = 'rename' | 'move' | 'chmod';
 
 const StyledRow = styled.div<{ $danger?: boolean }>`
     ${tw`p-2 flex items-center rounded`};
@@ -140,14 +142,23 @@ const FileDropdownMenu = ({ file }: { file: FileObject }) => {
                 renderToggle={onClick => (
                     <div css={tw`p-3 hover:text-white`} onClick={onClick}>
                         <FontAwesomeIcon icon={faEllipsisH}/>
-                        {!!modal &&
+                        {modal ?
-                        <RenameFileModal
+                            modal === 'chmod' ?
-                            visible
+                                <ChmodFileModal
-                            appear
+                                    visible
-                            files={[ file.name ]}
+                                    appear
-                            useMoveTerminology={modal === 'move'}
+                                    files={[ { file: file.name, mode: file.modeBits } ]}
-                            onDismissed={() => setModal(null)}
+                                    onDismissed={() => setModal(null)}
-                        />
+                                />
+                                :
+                                <RenameFileModal
+                                    visible
+                                    appear
+                                    files={[ file.name ]}
+                                    useMoveTerminology={modal === 'move'}
+                                    onDismissed={() => setModal(null)}
+                                />
+                            : null
                         }
                         <SpinnerOverlay visible={showSpinner} fixed size={'large'}/>
                     </div>
@@ -156,6 +167,7 @@ const FileDropdownMenu = ({ file }: { file: FileObject }) => {
                 <Can action={'file.update'}>
                     <Row onClick={() => setModal('rename')} icon={faPencilAlt} title={'Rename'}/>
                     <Row onClick={() => setModal('move')} icon={faLevelUpAlt} title={'Move'}/>
+                    <Row onClick={() => setModal('chmod')} icon={faFileCode} title={'Permissions'}/>
                 </Can>
                 {file.isFile &&
                 <Can action={'file.create'}>

resources/scripts/components/server/files/FileManagerBreadcrumbs.tsx

@@ -44,7 +44,7 @@ export default ({ withinFileEditor, isNewFile }: Props) => {
     };
 
     return (
-        <div css={tw`flex items-center text-sm mb-4 text-neutral-500`}>
+        <div css={tw`flex flex-grow-0 items-center text-sm text-neutral-500 overflow-x-hidden`}>
             {(files && files.length > 0 && !params?.action) ?
                 <FileActionCheckbox
                     type={'checkbox'}

resources/scripts/components/server/files/FileManagerContainer.tsx

@@ -51,9 +51,28 @@ export default () => {
 
     return (
         <ServerContentBlock title={'File Manager'} showFlashKey={'files'}>
-            <ErrorBoundary>
+            <div css={tw`flex flex-wrap-reverse md:flex-no-wrap justify-center mb-4`}>
-                <FileManagerBreadcrumbs/>
+                <ErrorBoundary>
-            </ErrorBoundary>
+                    <FileManagerBreadcrumbs/>
+                </ErrorBoundary>
+
+                <Can action={'file.create'}>
+                    <ErrorBoundary>
+                        <div css={tw`flex flex-shrink-0 flex-wrap-reverse md:flex-no-wrap justify-end mb-4 md:mb-0 ml-0 md:ml-auto`}>
+                            <NewDirectoryButton css={tw`w-full flex-none mt-4 sm:mt-0 sm:w-auto sm:mr-4`}/>
+                            <UploadButton css={tw`flex-1 mr-4 sm:flex-none sm:mt-0`}/>
+                            <NavLink
+                                to={`/server/${id}/files/new${window.location.hash}`}
+                                css={tw`flex-1 sm:flex-none sm:mt-0`}
+                            >
+                                <Button css={tw`w-full`}>
+                                    New File
+                                </Button>
+                            </NavLink>
+                        </div>
+                    </ErrorBoundary>
+                </Can>
+            </div>
             {
                 !files ?
                     <Spinner size={'large'} centered/>
@@ -83,22 +102,6 @@ export default () => {
                                 </div>
                             </CSSTransition>
                         }
-                        <Can action={'file.create'}>
-                            <ErrorBoundary>
-                                <div css={tw`flex flex-wrap-reverse justify-end mt-4`}>
-                                    <NewDirectoryButton css={tw`w-full flex-none mt-4 sm:mt-0 sm:w-auto sm:mr-4`}/>
-                                    <UploadButton css={tw`flex-1 mr-4 sm:flex-none sm:mt-0`}/>
-                                    <NavLink
-                                        to={`/server/${id}/files/new${window.location.hash}`}
-                                        css={tw`flex-1 sm:flex-none sm:mt-0`}
-                                    >
-                                        <Button css={tw`w-full`}>
-                                            New File
-                                        </Button>
-                                    </NavLink>
-                                </div>
-                            </ErrorBoundary>
-                        </Can>
                     </>
             }
         </ServerContentBlock>

resources/scripts/components/server/files/FileObjectRow.tsx

@@ -64,7 +64,11 @@ const FileObjectRow = ({ file }: { file: FileObject }) => (
     >
         <SelectFileCheckbox name={file.name}/>
         <Clickable file={file}>
-            <div css={tw`flex-none self-center text-neutral-400 mr-4 text-lg pl-3 ml-6`}>
+            <div css={tw`w-24 ml-6 pl-3 hidden md:block`}>
+                {file.mode}
+            </div>
+
+            <div css={tw`flex-none self-center text-neutral-400 ml-6 md:ml-0 mr-4 text-lg pl-3`}>
                 {file.isFile ?
                     <FontAwesomeIcon icon={file.isSymlink ? faFileImport : file.isArchiveType() ? faFileArchive : faFileAlt}/>
                     :

resources/scripts/components/server/files/NewDirectoryButton.tsx

@@ -25,7 +25,8 @@ const schema = object().shape({
 const generateDirectoryData = (name: string): FileObject => ({
     key: `dir_${name.split('/', 1)[0] ?? name}`,
     name: name.replace(/^(\/*)/, '').split('/', 1)[0] ?? name,
-    mode: '0644',
+    mode: 'drwxr-xr-x',
+    modeBits: '0755',
     size: 0,
     isFile: false,
     isSymlink: false,

resources/scripts/components/server/users/UserRow.tsx

@@ -48,21 +48,23 @@ export default ({ subuser }: Props) => {
                 </p>
                 <p css={tw`text-2xs text-neutral-500 uppercase`}>Permissions</p>
             </div>
-            <Can action={'user.update'}>
+            {subuser.uuid !== uuid &&
-                {subuser.uuid !== uuid &&
+                <>
-                <button
+                    <Can action={'user.update'}>
-                    type={'button'}
+                        <button
-                    aria-label={'Edit subuser'}
+                            type={'button'}
-                    css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
+                            aria-label={'Edit subuser'}
-                    onClick={() => setVisible(true)}
+                            css={tw`block text-sm p-1 md:p-2 text-neutral-500 hover:text-neutral-100 transition-colors duration-150 mx-4`}
-                >
+                            onClick={() => setVisible(true)}
-                    <FontAwesomeIcon icon={faPencilAlt}/>
+                        >
-                </button>
+                            <FontAwesomeIcon icon={faPencilAlt} />
-                }
+                        </button>
-            </Can>
+                    </Can>
-            <Can action={'user.delete'}>
+                    <Can action={'user.delete'}>
-                <RemoveSubuserButton subuser={subuser}/>
+                        <RemoveSubuserButton subuser={subuser} />
-            </Can>
+                    </Can>
+                </>
+            }
         </GreyRowBox>
     );
 };

resources/scripts/helpers.ts

@@ -20,3 +20,33 @@ export const randomInt = (low: number, high: number) => Math.floor(Math.random()
 export const cleanDirectoryPath = (path: string) => path.replace(/(^#\/*)|(\/(\/*))|(^$)/g, '/');
 
 export const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
+
+export function fileBitsToString (mode: string, directory: boolean): string {
+    const m = parseInt(mode, 8);
+
+    let buf = '';
+    'dalTLDpSugct?'.split('').forEach((c, i) => {
+        if ((m & (1 << (32 - 1 - i))) !== 0) {
+            buf = buf + c;
+        }
+    });
+
+    if (buf.length === 0) {
+        // If the file is directory, make sure it has the directory flag.
+        if (directory) {
+            buf = 'd';
+        } else {
+            buf = '-';
+        }
+    }
+
+    'rwxrwxrwx'.split('').forEach((c, i) => {
+        if ((m & (1 << (9 - 1 - i))) !== 0) {
+            buf = buf + c;
+        } else {
+            buf = buf + '-';
+        }
+    });
+
+    return buf;
+}

routes/api-client.php

@@ -64,6 +64,7 @@ Route::group(['prefix' => '/servers/{server}', 'middleware' => [AuthenticateServ
         Route::post('/decompress', 'Servers\FileController@decompress');
         Route::post('/delete', 'Servers\FileController@delete');
         Route::post('/create-folder', 'Servers\FileController@create');
+        Route::post('/chmod', 'Servers\FileController@chmod');
         Route::get('/upload', 'Servers\FileUploadController');
     });
 

tests/Unit/Services/Nodes/NodeUpdateServiceTest.php

@@ -210,11 +210,8 @@ class NodeUpdateServiceTest extends TestCase
             try {
                 $closure();
             } catch (Exception $exception) {
-                $this->assertInstanceOf(DaemonConnectionException::class, $exception);
+                $this->assertInstanceOf(Exception::class, $exception);
-                $this->assertSame(
+                $this->assertSame('Foo', $exception->getMessage());
-                    'There was an exception while attempting to communicate with the daemon resulting in a HTTP/E_CONN_REFUSED response code. This exception has been logged.',
-                    $exception->getMessage()
-                );
 
                 return true;
             }
@@ -224,9 +221,7 @@ class NodeUpdateServiceTest extends TestCase
 
         $this->repository->expects('withFreshModel->update')->andReturns($updatedModel);
         $this->configurationRepository->expects('setNode->update')->andThrow(
-            new DaemonConnectionException(
+            new Exception('Foo')
-                new TransferException('', 500, new Exception)
-            )
         );
 
         $this->getService()->handle($model, ['name' => $updatedModel->name]);