Skip to content

Commit 4c29be2

Browse files
DaneEverittDaneEveritt
committed
Adjust some naming real quick
1 parent bfc6f34 commit 4c29be2

File tree

4 files changed

+29
-32
lines changed

4 files changed

+29
-32
lines changed

‎app/Http/Controllers/Api/Client/Servers/BackupController.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function index(GetBackupsRequest $request, Server $server)
8080
public function store(StoreBackupRequest $request, Server $server)
8181
{
8282
/** @var \Pterodactyl\Models\Backup $backup */
83-
$backup = $server->audit(AuditLog::ACTION_SERVER_BACKUP_STARTED, function (AuditLog $model, Server $server) use ($request) {
83+
$backup = $server->audit(AuditLog::SERVER__BACKUP_STARTED, function (AuditLog $model, Server $server) use ($request) {
8484
$backup = $this->initiateBackupService
8585
->setIgnoredFiles(
8686
explode(PHP_EOL, $request->input('ignored') ?? '')
@@ -125,7 +125,9 @@ public function view(GetBackupsRequest $request, Server $server, Backup $backup)
125125
*/
126126
public function delete(DeleteBackupRequest $request, Server $server, Backup $backup)
127127
{
128-
$server->audit(AuditLog::ACTION_SERVER_BACKUP_DELETED, function () use ($backup) {
128+
$server->audit(AuditLog::SERVER__BACKUP_DELETED, function (AuditLog $audit) use ($backup) {
129+
$audit->metadata = ['backup_uuid' => $backup->uuid];
130+
129131
$this->deleteBackupService->handle($backup);
130132
});
131133

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function contents(GetFileContentsRequest $request, Server $server): Respo
110110
*/
111111
public function download(GetFileContentsRequest $request, Server $server)
112112
{
113-
$token = $server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_DOWNLOAD, function (AuditLog $audit, Server $server) use ($request) {
113+
$token = $server->audit(AuditLog::SERVER__FILESYSTEM_DOWNLOAD, function (AuditLog $audit, Server $server) use ($request) {
114114
$audit->metadata = ['file' => $request->get('file')];
115115

116116
return $this->jwtService
@@ -145,7 +145,7 @@ public function download(GetFileContentsRequest $request, Server $server)
145145
*/
146146
public function write(WriteFileContentRequest $request, Server $server): JsonResponse
147147
{
148-
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
148+
$server->audit(AuditLog::SERVER__FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
149149
$audit->subaction = 'write_content';
150150
$audit->metadata = ['file' => $request->get('file')];
151151

@@ -168,7 +168,7 @@ public function write(WriteFileContentRequest $request, Server $server): JsonRes
168168
*/
169169
public function create(CreateFolderRequest $request, Server $server): JsonResponse
170170
{
171-
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
171+
$server->audit(AuditLog::SERVER__FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
172172
$audit->subaction = 'create_folder';
173173
$audit->metadata = ['file' => $request->input('root', '/') . $request->input('name')];
174174

@@ -191,7 +191,7 @@ public function create(CreateFolderRequest $request, Server $server): JsonRespon
191191
*/
192192
public function rename(RenameFileRequest $request, Server $server): JsonResponse
193193
{
194-
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_RENAME, function (AuditLog $audit, Server $server) use ($request) {
194+
$server->audit(AuditLog::SERVER__FILESYSTEM_RENAME, function (AuditLog $audit, Server $server) use ($request) {
195195
$audit->metadata = ['root' => $request->input('root'), 'files' => $request->input('files')];
196196

197197
$this->fileRepository
@@ -213,7 +213,7 @@ public function rename(RenameFileRequest $request, Server $server): JsonResponse
213213
*/
214214
public function copy(CopyFileRequest $request, Server $server): JsonResponse
215215
{
216-
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
216+
$server->audit(AuditLog::SERVER__FILESYSTEM_WRITE, function (AuditLog $audit, Server $server) use ($request) {
217217
$audit->subaction = 'copy_file';
218218
$audit->metadata = ['file' => $request->input('location')];
219219

@@ -234,7 +234,7 @@ public function copy(CopyFileRequest $request, Server $server): JsonResponse
234234
*/
235235
public function compress(CompressFilesRequest $request, Server $server): array
236236
{
237-
$file = $server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_COMPRESS, function (AuditLog $audit, Server $server) use ($request) {
237+
$file = $server->audit(AuditLog::SERVER__FILESYSTEM_COMPRESS, function (AuditLog $audit, Server $server) use ($request) {
238238
// Allow up to five minutes for this request to process before timing out.
239239
set_time_limit(300);
240240

@@ -260,7 +260,7 @@ public function compress(CompressFilesRequest $request, Server $server): array
260260
*/
261261
public function decompress(DecompressFilesRequest $request, Server $server): JsonResponse
262262
{
263-
$file = $server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_DECOMPRESS, function (AuditLog $audit, Server $server) use ($request) {
263+
$file = $server->audit(AuditLog::SERVER__FILESYSTEM_DECOMPRESS, function (AuditLog $audit, Server $server) use ($request) {
264264
// Allow up to five minutes for this request to process before timing out.
265265
set_time_limit(300);
266266

@@ -284,7 +284,7 @@ public function decompress(DecompressFilesRequest $request, Server $server): Jso
284284
*/
285285
public function delete(DeleteFileRequest $request, Server $server): JsonResponse
286286
{
287-
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_DELETE, function (AuditLog $audit, Server $server) use ($request) {
287+
$server->audit(AuditLog::SERVER__FILESYSTEM_DELETE, function (AuditLog $audit, Server $server) use ($request) {
288288
$audit->metadata = ['root' => $request->input('root'), 'files' => $request->input('files')];
289289

290290
$this->fileRepository->setServer($server)
@@ -326,7 +326,7 @@ public function chmod(ChmodFilesRequest $request, Server $server): JsonResponse
326326
*/
327327
public function pull(PullFileRequest $request, Server $server): JsonResponse
328328
{
329-
$server->audit(AuditLog::ACTION_SERVER_FILESYSTEM_PULL, function (AuditLog $audit, Server $server) use ($request) {
329+
$server->audit(AuditLog::SERVER__FILESYSTEM_PULL, function (AuditLog $audit, Server $server) use ($request) {
330330
$audit->metadata = ['directory' => $request->input('directory'), 'url' => $request->input('url')];
331331

332332
$this->fileRepository->setServer($server)->pull($request->input('url'), $request->input('directory'));

‎app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public function __invoke(ReportBackupCompleteRequest $request, string $backup)
5959
}
6060

6161
$action = $request->input('successful')
62-
? AuditLog::ACTION_SERVER_BACKUP_COMPELTED
63-
: AuditLog::ACTION_SERVER_BACKUP_FAILED;
62+
? AuditLog::SERVER__BACKUP_COMPELTED
63+
: AuditLog::SERVER__BACKUP_FAILED;
6464

6565
$model->server->audit($action, function (AuditLog $audit) use ($model, $request) {
6666
$audit->metadata = ['backup_uuid' => $model->uuid];

‎app/Models/AuditLog.php‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,20 @@ class AuditLog extends Model
2525
{
2626
const UPDATED_AT = null;
2727

28-
const ACTION_USER_AUTH_LOGIN = 'user:auth.login';
29-
const ACTION_USER_AUTH_FAILED = 'user:auth.failed';
30-
const ACTION_USER_AUTH_PASSWORD_CHANGED = 'user:auth.password-changed';
31-
32-
const ACTION_SERVER_FILESYSTEM_DOWNLOAD = 'server:filesystem.download';
33-
const ACTION_SERVER_FILESYSTEM_WRITE = 'server:filesystem.write';
34-
const ACTION_SERVER_FILESYSTEM_DELETE = 'server:filesystem.delete';
35-
const ACTION_SERVER_FILESYSTEM_RENAME = 'server:filesystem.rename';
36-
const ACTION_SERVER_FILESYSTEM_COMPRESS = 'server:filesystem.compress';
37-
const ACTION_SERVER_FILESYSTEM_DECOMPRESS = 'server:filesystem.decompress';
38-
const ACTION_SERVER_FILESYSTEM_PULL = 'server:filesystem.pull';
39-
40-
const ACTION_SERVER_BACKUP_STARTED = 'server:backup.started';
41-
const ACTION_SERVER_BACKUP_FAILED = 'server:backup.failed';
42-
const ACTION_SERVER_BACKUP_COMPELTED = 'server:backup.completed';
43-
const ACTION_SERVER_BACKUP_DELETED = 'server:backup.deleted';
44-
const ACTION_SERVER_BACKUP_RESTORE_STARTED = 'server:backup.restore.started';
45-
const ACTION_SERVER_BACKUP_RESTORE_COMPLETED = 'server:backup.restore.completed';
46-
const ACTION_SERVER_BACKUP_RESTORE_FAILED = 'server:backup.restore.failed';
28+
const SERVER__FILESYSTEM_DOWNLOAD = 'server:filesystem.download';
29+
const SERVER__FILESYSTEM_WRITE = 'server:filesystem.write';
30+
const SERVER__FILESYSTEM_DELETE = 'server:filesystem.delete';
31+
const SERVER__FILESYSTEM_RENAME = 'server:filesystem.rename';
32+
const SERVER__FILESYSTEM_COMPRESS = 'server:filesystem.compress';
33+
const SERVER__FILESYSTEM_DECOMPRESS = 'server:filesystem.decompress';
34+
const SERVER__FILESYSTEM_PULL = 'server:filesystem.pull';
35+
const SERVER__BACKUP_STARTED = 'server:backup.started';
36+
const SERVER__BACKUP_FAILED = 'server:backup.failed';
37+
const SERVER__BACKUP_COMPELTED = 'server:backup.completed';
38+
const SERVER__BACKUP_DELETED = 'server:backup.deleted';
39+
const SERVER__BACKUP_RESTORE_STARTED = 'server:backup.restore.started';
40+
const SERVER__BACKUP_RESTORE_COMPLETED = 'server:backup.restore.completed';
41+
const SERVER__BACKUP_RESTORE_FAILED = 'server:backup.restore.failed';
4742

4843
/**
4944
* @var string[]

0 commit comments

Comments
 (0)