Merge pull request #87 from utopia-php/feat-generate-random-ids

Feat: pad uniqid with random bytes

Author: TorstenDittmann

src/Database/Database.php

@@ -1174,13 +1174,22 @@ protected function decodeAttribute(string $name, $value, Document $document)
     }
 
     /**
-     * Get 13 Chars Unique ID.
-     * 
+     * Get Unique ID
+     *
+     * @param int $padding extra random bytes to append to 13-char uniqid
+     *
      * @return string
      */
-    public function getId(): string
+    public function getId(int $padding = 0): string
     {
-        return \uniqid();
+        $uniqid = \uniqid();
+
+        if ($padding > 0) {
+            $bytes = \random_bytes(\ceil($padding / 2)); // one byte expands to two chars
+            $uniqid .= \substr(\bin2hex($bytes), 0, $padding);
+        }
+
+        return $uniqid;
     }
 
     /**

tests/Database/Base.php

@@ -1680,4 +1680,15 @@ public function testGetIndexLimit()
     {
         $this->assertEquals(61, $this->getDatabase()->getIndexLimit());
     }
+
+    public function testGetId()
+    {
+        $this->assertEquals(13, strlen($this->getDatabase()->getId()));
+        $this->assertEquals(13, strlen($this->getDatabase()->getId(0)));
+        $this->assertEquals(13, strlen($this->getDatabase()->getId(-1)));
+        $this->assertEquals(23, strlen($this->getDatabase()->getId(10)));
+
+        // ensure two sequential calls to getId do not give the same result
+        $this->assertNotEquals($this->getDatabase()->getId(10), $this->getDatabase()->getId(10));
+    }
 }