Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust some naming real quick

Browse source
This commit is contained in:
Dane Everitt 2021-01-17 15:25:49 -08:00
parent bfc6f34c50
commit 4c29be2e54
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/Client/Servers/BackupController.php
View file

@ -80,7 +80,7 @@ class BackupController extends ClientApiController
public function store(StoreBackupRequest $request, Server $server) public function store(StoreBackupRequest $request, Server $server)
{ {
/** @var \Pterodactyl\Models\Backup $backup */ /** @var \Pterodactyl\Models\Backup $backup */
$backup = $server->audit(AuditLog::ACTION_SERVER_BACKUP_STARTED, function (AuditLog $model, Server $server) use ($request) { $backup = $server->audit(AuditLog::SERVER__BACKUP_STARTED, function (AuditLog $model, Server $server) use ($request) {
$backup = $this->initiateBackupService $backup = $this->initiateBackupService
->setIgnoredFiles( ->setIgnoredFiles(
explode(PHP_EOL, $request->input('ignored') ?? '') explode(PHP_EOL, $request->input('ignored') ?? '')
@ -125,7 +125,9 @@ class BackupController extends ClientApiController
*/ */
public function delete(DeleteBackupRequest $request, Server $server, Backup $backup) public function delete(DeleteBackupRequest $request, Server $server, Backup $backup)
{ {
$server->audit(AuditLog::ACTION_SERVER_BACKUP_DELETED, function () use ($backup) { $server->audit(AuditLog::SERVER__BACKUP_DELETED, function (AuditLog $audit) use ($backup) {
$audit->metadata = ['backup_uuid' => $backup->uuid];
$this->deleteBackupService->handle($backup); $this->deleteBackupService->handle($backup);
}); });

18
app/Http/Controllers/Api/Client/Servers/FileController.php
View file

@ -110,7 +110,7 @@ class FileController extends ClientApiController
*/ */
public function download(GetFileContentsRequest $request, Server $server) public function download(GetFileContentsRequest $request, Server $server)
{ {
$token = $server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_DOWNLOAD, function (AuditLog $audit, Server $server) use ($request) { $token = $server->audit(AuditLog::SERVER__FILESYSTEM_DOWNLOAD, function (AuditLog $audit, Server $server) use ($request) {
$audit->metadata = ['file' => $request->get('file')]; $audit->metadata = ['file' => $request->get('file')];
return $this->jwtService return $this->jwtService
@ -145,7 +145,7 @@ class FileController extends ClientApiController
*/ */
public function write(WriteFileContentRequest $request, Server $server): JsonResponse public function write(WriteFileContentRequest $request, Server $server): JsonResponse
{ {
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) { $server->audit(AuditLog::SERVER__FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
$audit->subaction = 'write_content'; $audit->subaction = 'write_content';
$audit->metadata = ['file' => $request->get('file')]; $audit->metadata = ['file' => $request->get('file')];
@ -168,7 +168,7 @@ class FileController extends ClientApiController
*/ */
public function create(CreateFolderRequest $request, Server $server): JsonResponse public function create(CreateFolderRequest $request, Server $server): JsonResponse
{ {
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) { $server->audit(AuditLog::SERVER__FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
$audit->subaction = 'create_folder'; $audit->subaction = 'create_folder';
$audit->metadata = ['file' => $request->input('root', '/') . $request->input('name')]; $audit->metadata = ['file' => $request->input('root', '/') . $request->input('name')];
@ -191,7 +191,7 @@ class FileController extends ClientApiController
*/ */
public function rename(RenameFileRequest $request, Server $server): JsonResponse public function rename(RenameFileRequest $request, Server $server): JsonResponse
{ {
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_RENAME, function (AuditLog $audit, Server $server) use ($request) { $server->audit(AuditLog::SERVER__FILESYSTEM_RENAME, function (AuditLog $audit, Server $server) use ($request) {
$audit->metadata = ['root' => $request->input('root'), 'files' => $request->input('files')]; $audit->metadata = ['root' => $request->input('root'), 'files' => $request->input('files')];
$this->fileRepository $this->fileRepository
@ -213,7 +213,7 @@ class FileController extends ClientApiController
*/ */
public function copy(CopyFileRequest $request, Server $server): JsonResponse public function copy(CopyFileRequest $request, Server $server): JsonResponse
{ {
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) { $server->audit(AuditLog::SERVER__FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
$audit->subaction = 'copy_file'; $audit->subaction = 'copy_file';
$audit->metadata = ['file' => $request->input('location')]; $audit->metadata = ['file' => $request->input('location')];
@ -234,7 +234,7 @@ class FileController extends ClientApiController
*/ */
public function compress(CompressFilesRequest $request, Server $server): array public function compress(CompressFilesRequest $request, Server $server): array
{ {
$file = $server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_COMPRESS, function (AuditLog $audit, Server $server) use ($request) { $file = $server->audit(AuditLog::SERVER__FILESYSTEM_COMPRESS, function (AuditLog $audit, Server $server) use ($request) {
// Allow up to five minutes for this request to process before timing out. // Allow up to five minutes for this request to process before timing out.
set_time_limit(300); set_time_limit(300);
@ -260,7 +260,7 @@ class FileController extends ClientApiController
*/ */
public function decompress(DecompressFilesRequest $request, Server $server): JsonResponse public function decompress(DecompressFilesRequest $request, Server $server): JsonResponse
{ {
$file = $server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_DECOMPRESS, function (AuditLog $audit, Server $server) use ($request) { $file = $server->audit(AuditLog::SERVER__FILESYSTEM_DECOMPRESS, function (AuditLog $audit, Server $server) use ($request) {
// Allow up to five minutes for this request to process before timing out. // Allow up to five minutes for this request to process before timing out.
set_time_limit(300); set_time_limit(300);
@ -284,7 +284,7 @@ class FileController extends ClientApiController
*/ */
public function delete(DeleteFileRequest $request, Server $server): JsonResponse public function delete(DeleteFileRequest $request, Server $server): JsonResponse
{ {
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_DELETE, function (AuditLog $audit, Server $server) use ($request) { $server->audit(AuditLog::SERVER__FILESYSTEM_DELETE, function (AuditLog $audit, Server $server) use ($request) {
$audit->metadata = ['root' => $request->input('root'), 'files' => $request->input('files')]; $audit->metadata = ['root' => $request->input('root'), 'files' => $request->input('files')];
$this->fileRepository->setServer($server) $this->fileRepository->setServer($server)
@ -326,7 +326,7 @@ class FileController extends ClientApiController
*/ */
public function pull(PullFileRequest $request, Server $server): JsonResponse public function pull(PullFileRequest $request, Server $server): JsonResponse
{ {
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_PULL, function (AuditLog $audit, Server $server) use ($request) { $server->audit(AuditLog::SERVER__FILESYSTEM_PULL, function (AuditLog $audit, Server $server) use ($request) {
$audit->metadata = ['directory' => $request->input('directory'), 'url' => $request->input('url')]; $audit->metadata = ['directory' => $request->input('directory'), 'url' => $request->input('url')];
$this->fileRepository->setServer($server)->pull($request->input('url'), $request->input('directory')); $this->fileRepository->setServer($server)->pull($request->input('url'), $request->input('directory'));

4
app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
View file

@ -59,8 +59,8 @@ class BackupStatusController extends Controller
} }
$action = $request->input('successful') $action = $request->input('successful')
? AuditLog::ACTION_SERVER_BACKUP_COMPELTED ? AuditLog::SERVER__BACKUP_COMPELTED
: AuditLog::ACTION_SERVER_BACKUP_FAILED; : AuditLog::SERVER__BACKUP_FAILED;
$model->server->audit($action, function (AuditLog $audit) use ($model, $request) { $model->server->audit($action, function (AuditLog $audit) use ($model, $request) {
$audit->metadata = ['backup_uuid' => $model->uuid]; $audit->metadata = ['backup_uuid' => $model->uuid];

33
app/Models/AuditLog.php
View file

@ -25,25 +25,20 @@ class AuditLog extends Model
{ {
const UPDATED_AT = null; const UPDATED_AT = null;
const ACTION_USER_AUTH_LOGIN = 'user:auth.login'; const SERVER__FILESYSTEM_DOWNLOAD = 'server:filesystem.download';
const ACTION_USER_AUTH_FAILED = 'user:auth.failed'; const SERVER__FILESYSTEM_WRITE = 'server:filesystem.write';
const ACTION_USER_AUTH_PASSWORD_CHANGED = 'user:auth.password-changed'; const SERVER__FILESYSTEM_DELETE = 'server:filesystem.delete';
const SERVER__FILESYSTEM_RENAME = 'server:filesystem.rename';
const ACTION_SERVER_FILESYSTEM_DOWNLOAD = 'server:filesystem.download'; const SERVER__FILESYSTEM_COMPRESS = 'server:filesystem.compress';
const ACTION_SERVER_FILESYSTEM_WRITE = 'server:filesystem.write'; const SERVER__FILESYSTEM_DECOMPRESS = 'server:filesystem.decompress';
const ACTION_SERVER_FILESYSTEM_DELETE = 'server:filesystem.delete'; const SERVER__FILESYSTEM_PULL = 'server:filesystem.pull';
const ACTION_SERVER_FILESYSTEM_RENAME = 'server:filesystem.rename'; const SERVER__BACKUP_STARTED = 'server:backup.started';
const ACTION_SERVER_FILESYSTEM_COMPRESS = 'server:filesystem.compress'; const SERVER__BACKUP_FAILED = 'server:backup.failed';
const ACTION_SERVER_FILESYSTEM_DECOMPRESS = 'server:filesystem.decompress'; const SERVER__BACKUP_COMPELTED = 'server:backup.completed';
const ACTION_SERVER_FILESYSTEM_PULL = 'server:filesystem.pull'; const SERVER__BACKUP_DELETED = 'server:backup.deleted';
const SERVER__BACKUP_RESTORE_STARTED = 'server:backup.restore.started';
const ACTION_SERVER_BACKUP_STARTED = 'server:backup.started'; const SERVER__BACKUP_RESTORE_COMPLETED = 'server:backup.restore.completed';
const ACTION_SERVER_BACKUP_FAILED = 'server:backup.failed'; const SERVER__BACKUP_RESTORE_FAILED = 'server:backup.restore.failed';
const ACTION_SERVER_BACKUP_COMPELTED = 'server:backup.completed';
const ACTION_SERVER_BACKUP_DELETED = 'server:backup.deleted';
const ACTION_SERVER_BACKUP_RESTORE_STARTED = 'server:backup.restore.started';
const ACTION_SERVER_BACKUP_RESTORE_COMPLETED = 'server:backup.restore.completed';
const ACTION_SERVER_BACKUP_RESTORE_FAILED = 'server:backup.restore.failed';
/** /**
* @var string[] * @var string[]