Merge pull request #22 from PandaTechAM/development

RandomId generator logic change
PandaTechAM · Jun 21, 2024 · 62a959e · 62a959e
2 parents ab23260 + 0ace076
commit 62a959e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/src/Pandatech.Crypto/Pandatech.Crypto.csproj b/src/Pandatech.Crypto/Pandatech.Crypto.csproj
@@ -8,12 +8,12 @@
         <Copyright>MIT</Copyright>
         <PackageIcon>pandatech.png</PackageIcon>
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
-        <Version>2.4.1</Version>
+        <Version>2.5.0</Version>
         <Title>Pandatech.Crypto</Title>
         <PackageTags>Pandatech, library, encryption, hash, algorythms, security</PackageTags>
         <Description>PandaTech.Crypto is a .NET library simplifying common cryptograhic functions.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-pandatech-crypto</RepositoryUrl>
-        <PackageReleaseNotes>Aes256 empty string handle</PackageReleaseNotes>
+        <PackageReleaseNotes>RandomId generator logic change</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,7 +23,7 @@
 
     <ItemGroup>
       <PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" />
-      <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0" />
+      <PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.1" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
       <PackageReference Include="Pandatech.RegexBox" Version="1.2.4" />
     </ItemGroup>

diff --git a/src/Pandatech.Crypto/Random.cs b/src/Pandatech.Crypto/Random.cs
@@ -20,17 +20,11 @@ public static string GenerateAes256KeyString()
         return Convert.ToBase64String(buffer);
     }
 
-    public static long GeneratePandaId(long? previousId)
+    public static long GenerateIdWithVariableSequence(long previousId, int approximateSequenceVariability = 100)
     {
-        var random = GenerateBytes(4);
-        var randomValue = BitConverter.ToInt32(random, 0) & 0x7FFFFFFF;
-        var randomOffset = randomValue % 36 + 1;
+        var minimumRandRange = approximateSequenceVariability / 25;
+        var random = System.Random.Shared.NextInt64(minimumRandRange, approximateSequenceVariability + 1);
 
-        if (previousId is 0 or null)
-        {
-            return 1_000_000 + randomOffset;
-        }
-
-        return (long)(previousId + randomOffset)!;
+        return (previousId + random);
     }
 }
diff --git a/test/Pandatech.Crypto.Tests/RandomTests.cs b/test/Pandatech.Crypto.Tests/RandomTests.cs
@@ -11,26 +11,15 @@ public void Generate_ShouldReturnByteArray()
         Assert.NotNull(randomBytes);
         Assert.Equal(length, randomBytes.Length);
     }
-
-    [Fact]
-    public void GeneratePandaId_WithZeroPreviousId_ReturnsValidId()
-    {
-        const long previousId = 0;
-        for (var i = 0; i < 1_000_000; ++i)
-        {
-            var newId = Random.GeneratePandaId(previousId);
-
-            Assert.True(newId is > 1_000_000 and < 1_000_037);
-        }
-    }
+
 
     [Fact]
     public void GeneratePandaId_WithNonZeroPreviousId_ReturnsIncrementedId()
     {
         const long previousId = 1_000_000;
         for (var i = 0; i < 1_000_000; ++i)
         {
-            var newId = Random.GeneratePandaId(previousId);
+            var newId = Random.GenerateIdWithVariableSequence(previousId);
 
             Assert.True(newId > previousId);
         }
@@ -43,7 +32,7 @@ public void GeneratePandaId_WithinReasonableIterations_DoesNotProduceDuplicates(
 
         for (var i = 0; i < 1_000_000; ++i)
         {
-            var id = Random.GeneratePandaId(previousId);
+            var id = Random.GenerateIdWithVariableSequence(previousId);
             Assert.NotEqual(previousId, id);
             previousId = id;
         }