upstream test123

CHANGELOG.md

@@ -3,6 +3,12 @@ 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.
 
+## v1.11.11
+
+### Fixed
+
+* Fixed CVE-2025-49132
+
 ## v1.11.10
 
 ### BREAKING

README.md

@@ -70,3 +70,4 @@ and there are plenty more games available provided by the community. Some of the
 Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors.
 
 Code released under the [MIT License](./LICENSE.md).
+# Pterodactyl-S

app/Contracts/Repository/HookRepositoryInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Hook;
+use Illuminate\Support\Collection;
+
+interface HookRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return all the hooks for a given server.
+     */
+    public function findServerHooks(int $server): Collection;
+
+    /**
+     * Return a hook model with the associated trigger and action as a relationship.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getHookWithTriggerAndAction(int $schedule): Hook;
+}

app/Exceptions/ActionExecutionException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Pterodactyl\Exceptions;
+
+class ActionExecutionException extends DisplayException
+{
+    protected array $errors;
+
+    public function __construct(string $message, array $errors, \Throwable $previous = null)
+    {
+        parent::__construct($message, $previous);
+        $this->errors = $errors;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}

app/Exceptions/HookActionValidationException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Pterodactyl\Exceptions;
+
+class HookActionValidationException extends DisplayException
+{
+    protected array $errors;
+
+    public function __construct(string $message, array $errors, \Throwable $previous = null)
+    {
+        parent::__construct($message, $previous);
+        $this->errors = $errors;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}

app/Exceptions/HookTriggerValidationException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Pterodactyl\Exceptions;
+
+class HookTriggerValidationException extends DisplayException
+{
+    protected array $errors;
+
+    public function __construct(string $message, array $errors, \Throwable $previous = null)
+    {
+        parent::__construct($message, $previous);
+        $this->errors = $errors;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}

app/Exceptions/TriggerExecutionException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Pterodactyl\Exceptions;
+
+class TriggerExecutionException extends DisplayException
+{
+    protected array $errors;
+
+    public function __construct(string $message, array $errors, \Throwable $previous = null)
+    {
+        parent::__construct($message, $previous);
+        $this->errors = $errors;
+    }
+
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
+
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\ViewHooksRequest;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Models\ActionDefinition;
+
+class ActionDefinitionController extends Controller
+{
+    public function index(ViewHooksRequest $request, Server $server) {
+        return response()->json(["data"=>ActionDefinition::all()]);
+    }
+
+}

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

@@ -0,0 +1,95 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
+
+use Illuminate\Support\Facades\Log;
+use Pterodactyl\Exceptions\HookActionValidationException;
+use Pterodactyl\Exceptions\HookTriggerValidationException;
+use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\DeleteHookRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\StoreHookRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\TriggerHookRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\UpdateHookRequest;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\ViewHooksRequest;
+use Pterodactyl\Models\Hook;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Repositories\Eloquent\HookRepository;
+use Pterodactyl\Services\Hooks\HookCreationService;
+use Pterodactyl\Services\Hooks\HookDeletionService;
+use Pterodactyl\Services\Hooks\HookExecutionService;
+use Pterodactyl\Services\Hooks\HookUpdateService;
+use Pterodactyl\Transformers\Api\Client\HookTransformer;
+
+class HookController extends ClientApiController
+{
+    public function __construct(
+        private HookCreationService $creationService,
+        private HookDeletionService $deletionService,
+        private HookUpdateService $updateService,
+        private HookExecutionService $executionService,
+        private HookRepository $repository,
+    ) {
+        parent::__construct();
+    }
+    public function index(ViewHooksRequest $request, Server $server): array {
+        return $this->fractal->collection(
+            $this->repository->findServerHooks($server->id)
+        )->transformWith($this->getTransformer(HookTransformer::class))->toArray();
+    }
+
+    public function view(ViewHooksRequest $request, Server $server) {
+        return response()->json([
+            "data"=> Hook::where('server_id', $server->id)->get()
+        ]);
+    }
+
+    public function execute(TriggerHookRequest $request, Server $server, Hook $hook) {
+        $this->executionService->handle($hook);
+        return response()->json([
+            "status" => "success",
+        ]);
+    }
+
+    public function store(StoreHookRequest $request, Server $server) {
+        $validated = $request->validated();
+        try {
+            $hook = $this->creationService->handle($server, $validated);
+            return $this->fractal->item(
+                $hook
+            )->transformWith($this->getTransformer(HookTransformer::class))->toArray();
+        } catch (HookTriggerValidationException | HookActionValidationException $e) {
+            return response()->json([
+                'message' => $e instanceof HookTriggerValidationException
+                    ? 'One or more triggers are invalid'
+                    : 'One or more actions are invalid',
+                'errors' => $e->getErrors(),
+            ], 422);
+        }
+    }
+
+    public function update(UpdateHookRequest $request, Server $server, Hook $hook) {
+        $validated = $request->validated();
+        try {
+            $hook = $this->updateService->handle($hook, $validated);
+            return $this->fractal->item(
+                $hook->fresh(['trigger', 'action'])
+            )->transformWith($this->getTransformer(HookTransformer::class))->toArray();
+        } catch (HookTriggerValidationException $e) {
+            return response()->json([
+                'message' => 'One or more triggers are invalid',
+                'errors' => $e->getErrors(),
+            ], 422);
+        } catch (HookActionValidationException $e) {
+            return response()->json([
+                'message' => 'One or more actions are invalid',
+                'errors' => $e->getErrors(),
+            ], 422);
+        }
+    }
+
+    public function delete(DeleteHookRequest $request, Server $server, Hook $hook) {
+        $this->deletionService->handle($hook);
+        return response()->noContent();
+    }
+}

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Log;
+use Pterodactyl\Http\Controllers\Controller;
+use Pterodactyl\Http\Requests\Api\Client\Servers\Hooks\ViewHooksRequest;
+use Pterodactyl\Models\Hook;
+use Pterodactyl\Models\Server;
+use Pterodactyl\Models\TriggerDefinition;
+
+class TriggerDefinitionController extends Controller
+{
+    public function index(ViewHooksRequest $request, Server $server) {
+        return response()->json(["data"=>TriggerDefinition::all()]);
+    }
+
+}

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

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
 use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\Log;
 use Pterodactyl\Models\Server;
 use Illuminate\Http\JsonResponse;
 use Pterodactyl\Models\Permission;

app/Http/Controllers/Api/Remote/Servers/HookController.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Remote\Servers;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Pterodactyl\Models\Hook;
+use Pterodactyl\Repositories\Eloquent\HookRepository;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Services\Hooks\HookExecutionService;
+use Pterodactyl\Transformers\Api\Application\HookTransformer;
+use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
+
+class HookController extends ApplicationApiController
+{
+    /**
+     * HookController constructor.
+     */
+    public function __construct(
+        private HookRepository $hookRepository,
+        private HookExecutionService $executionService,
+        private ServerRepository $repository
+    )
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Return all the hooks that currently exist on the server.
+     */
+    public function index(Request $request, $uuid): array
+    {
+        $server = $this->repository->getByUuid($uuid);
+
+        return $this->fractal->collection($this->hookRepository->findServerHooks($server->id))
+            ->transformWith($this->getTransformer(HookTransformer::class))
+            ->toArray();
+    }
+
+    public function trigger(Request $request, $uuid): JsonResponse
+    {
+        $this->executionService->handle(Hook::where('id', '=', $request->input('id'))->first());
+        return response()->json(["status"=>"success"]);
+    }
+}

app/Http/Requests/Api/Client/Servers/Hooks/DeleteHookRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Hooks;
+
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+use Pterodactyl\Models\Permission;
+
+class DeleteHookRequest extends ClientApiRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+
+    public function permission(): string
+    {
+        // ACTION_HOOKS_READ,ACTION_HOOKS_CREATE,ACTION_HOOKS_UPDATE,ACTION_HOOKS_DELETE
+        return Permission::ACTION_HOOKS_DELETE;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [];
+    }
+}

app/Http/Requests/Api/Client/Servers/Hooks/StoreHookRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Client\Servers\Hooks;
+
+use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
+use Pterodactyl\Models\Permission;
+
+class StoreHookRequest extends ClientApiRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function permission(): string
+    {
+        // ACTION_HOOKS_READ,ACTION_HOOKS_CREATE,ACTION_HOOKS_UPDATE,ACTION_HOOKS_DELETE
+        return Permission::ACTION_HOOKS_CREATE;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string',
+            'enabled' => 'nullable|boolean',
+            'trigger' => 'required|array',
+            'action' => 'required|array',
+        ];
+    }
+}