Disable ability to change primary allocation ; Don't create allocatio…

…n with automatic allocation ; Use allocations in order with automatic allocation ; Respect automatic allocation ports range
PolycubeHosting · Aug 6, 2024 · 85e8dc5 · 85e8dc5
1 parent 0e84c7a
commit 85e8dc5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/app/Services/Allocations/FindAssignableAllocationService.php b/app/Services/Allocations/FindAssignableAllocationService.php
@@ -34,17 +34,27 @@ public function handle(Server $server): Allocation
             throw new AutoAllocationNotEnabledException();
         }
 
-        // Attempt to find a given available allocation for a server. If one cannot be found
-        // we will fall back to attempting to create a new allocation that can be used for the
-        // server.
+        $start = config('pterodactyl.client_features.allocations.range_start', null);
+        $end = config('pterodactyl.client_features.allocations.range_end', null);
+
+        if (!$start || !$end) {
+            throw new AutoAllocationNotEnabledException();
+        }
+
         /** @var \Pterodactyl\Models\Allocation|null $allocation */
         $allocation = $server->node->allocations()
             ->where('ip', $server->allocation->ip)
+            ->where('port', '>=', $start)
+            ->where('port', '<=', $end)
             ->whereNull('server_id')
-            ->inRandomOrder()
+            //->inRandomOrder()
             ->first();
 
-        $allocation = $allocation ?? $this->createNewAllocation($server);
+        //$allocation = $allocation ?? $this->createNewAllocation($server);
+
+        if (!$allocation) {
+            throw new NoAutoAllocationSpaceAvailableException();
+        }
 
         $allocation->update(['server_id' => $server->id]);
 

diff --git a/routes/api-client.php b/routes/api-client.php
@@ -108,7 +108,7 @@
         Route::get('/allocations', [Client\Servers\NetworkAllocationController::class, 'index']);
         Route::post('/allocations', [Client\Servers\NetworkAllocationController::class, 'store']);
         Route::post('/allocations/{allocation}', [Client\Servers\NetworkAllocationController::class, 'update']);
-        Route::post('/allocations/{allocation}/primary', [Client\Servers\NetworkAllocationController::class, 'setPrimary']);
+        //Route::post('/allocations/{allocation}/primary', [Client\Servers\NetworkAllocationController::class, 'setPrimary']);
         Route::delete('/allocations/{allocation}', [Client\Servers\NetworkAllocationController::class, 'delete']);
     });