From 3db2e97e6c80a3ea74a7554d9d71bf7d82cfac7e Mon Sep 17 00:00:00 2001
From: Skylar Ittner <skylar@netsyms.com>
Date: Fri, 26 Jun 2020 20:40:01 -0600
Subject: [PATCH] Restrict machine and component IDs to a basic pattern

---
 lib/Component.lib.php | 10 ++++------
 lib/Machine.lib.php   | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/Component.lib.php b/lib/Component.lib.php
index e6a778a..b595d50 100644
--- a/lib/Component.lib.php
+++ b/lib/Component.lib.php
@@ -230,20 +230,18 @@ class Component implements JsonSerializable {
     }
 
     /**
-     * Generate a random machine ID number that is not in use.
+     * Generate a random ID number that is not in use.
+     * Default: 681######
      * @global $database
      * @param int $min Optional minimum number.
      * @param int $max Optional maximum number.
      * @return int
      */
-    public static function generateId(int $min = 1000000000, int $max = 9999999999): int {
+    public static function generateId(int $min = 681000000, int $max = 681999999): int {
         global $database;
 
-        $id = random_int(1000000000, 9999999999);
-        ;
-
         do {
-            $id = random_int(1000000000, 9999999999);
+            $id = random_int($min, $max);
         } while ($database->has('components', ['compid' => $id]) || $database->has('machines', ['machineid' => $id]));
 
         return $id;
diff --git a/lib/Machine.lib.php b/lib/Machine.lib.php
index a1744e9..4818281 100644
--- a/lib/Machine.lib.php
+++ b/lib/Machine.lib.php
@@ -280,20 +280,18 @@ class Machine implements JsonSerializable {
     }
 
     /**
-     * Generate a random machine ID number that is not in use.
+     * Generate a random ID number that is not in use.
+     * Default: 680######
      * @global $database
      * @param int $min Optional minimum number.
      * @param int $max Optional maximum number.
      * @return int
      */
-    public static function generateId(int $min = 1000000000, int $max = 9999999999): int {
+    public static function generateId(int $min = 680100000, int $max = 680999999): int {
         global $database;
 
-        $id = random_int(1000000000, 9999999999);
-        ;
-
         do {
-            $id = random_int(1000000000, 9999999999);
+            $id = random_int($min, $max);
         } while ($database->has('machines', ['machineid' => $id]) || $database->has('components', ['compid' => $id]));
 
         return $id;