banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 00:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PORT_FLOOR check and CIDR_MAX_BITS in AssignmentService (#491)

Browse Source 
* fix max cidr

* fix port floor
This commit is contained in:
Boy132 2024-07-17 13:01:13 +02:00 committed by GitHub
parent 8a3d67ada0
commit a04937d698
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/Allocations/AssignmentService.php
View File

@ -14,7 +14,7 @@ use App\Exceptions\Service\Allocation\TooManyPortsInRangeException;
class AssignmentService class AssignmentService
{ {
public const CIDR_MAX_BITS = 27; public const CIDR_MAX_BITS = 25;
public const CIDR_MIN_BITS = 32; public const CIDR_MIN_BITS = 32;
public const PORT_FLOOR = 1024; public const PORT_FLOOR = 1024;
public const PORT_CEIL = 65535; public const PORT_CEIL = 65535;
@ -74,7 +74,7 @@ class AssignmentService
throw new TooManyPortsInRangeException(); throw new TooManyPortsInRangeException();
} }
if ((int) $matches[1] <= self::PORT_FLOOR || (int) $matches[2] > self::PORT_CEIL) { if ((int) $matches[1] < self::PORT_FLOOR || (int) $matches[2] > self::PORT_CEIL) {
throw new PortOutOfRangeException(); throw new PortOutOfRangeException();
} }
@ -88,7 +88,7 @@ class AssignmentService
]; ];
} }
} else { } else {
if ((int) $port <= self::PORT_FLOOR || (int) $port > self::PORT_CEIL) { if ((int) $port < self::PORT_FLOOR || (int) $port > self::PORT_CEIL) {
throw new PortOutOfRangeException(); throw new PortOutOfRangeException();
} }

2
lang/en/exceptions.php
View File

@ -11,7 +11,7 @@ return [
'too_many_ports' => 'Adding more than 1000 ports in a single range at once is not supported.', 'too_many_ports' => 'Adding more than 1000 ports in a single range at once is not supported.',
'invalid_mapping' => 'The mapping provided for :port was invalid and could not be processed.', 'invalid_mapping' => 'The mapping provided for :port was invalid and could not be processed.',
'cidr_out_of_range' => 'CIDR notation only allows masks between /25 and /32.', 'cidr_out_of_range' => 'CIDR notation only allows masks between /25 and /32.',
'port_out_of_range' => 'Ports in an allocation must be greater than 1024 and less than or equal to 65535.', 'port_out_of_range' => 'Ports in an allocation must be greater than or equal to 1024 and less than or equal to 65535.',
], ],
'egg' => [ 'egg' => [
'delete_has_servers' => 'An Egg with active servers attached to it cannot be deleted from the Panel.', 'delete_has_servers' => 'An Egg with active servers attached to it cannot be deleted from the Panel.',