自动截断，避免超长导致对比时不一致

NewLifeX · Jan 24, 2024 · b526d2b · b526d2b
1 parent ca39b16
commit b526d2b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Stardust.Server/Services/NodeService.cs b/Stardust.Server/Services/NodeService.cs
@@ -9,6 +9,7 @@
 using Stardust.Data.Nodes;
 using Stardust.Models;
 using XCode;
+using XCode.Configuration;
 
 namespace Stardust.Server.Services;
 
@@ -130,6 +131,13 @@ private static Node CheckNode(Node node, NodeInfo di, String productCode, String
         var board = di.Board;
         var diskid = di.DiskID;
 
+        // 自动截断，避免超长导致对比时不一致
+        uuid = TrimLength(uuid, Node._.Uuid);
+        guid = TrimLength(guid, Node._.MachineGuid);
+        serial = TrimLength(serial, Node._.SerialNumber);
+        board = TrimLength(board, Node._.Board);
+        diskid = TrimLength(diskid, Node._.DiskID);
+
         var level = 5;
         if (!uuid.IsNullOrEmpty() && uuid != node.Uuid)
         {
@@ -186,6 +194,14 @@ private static Node CheckNode(Node node, NodeInfo di, String productCode, String
         return node;
     }
 
+    private static String TrimLength(String value, FieldItem field)
+    {
+        if (value.IsNullOrEmpty()) return value;
+        if (field.Length <= 0 || value.Length < field.Length) return value;
+
+        return value[..field.Length];
+    }
+
     private Node AutoRegister(Node node, LoginInfo inf, String ip, StarServerSetting set)
     {
         if (!set.AutoRegister) throw new ApiException(12, "禁止自动注册");

diff --git a/Stardust.ServerTests/Services/AppServiceTests.cs b/Stardust.ServerTests/Services/AppServiceTests.cs
@@ -13,7 +13,7 @@ public void AuthorizeTest()
         var app = App.FindByName("test");
         if (app != null) app.Delete();
 
-        var service = new TokenService(null);
+        var service = new TokenService();
 
         // 没有自动注册
         var ex = Assert.Throws<ApiException>(() => service.Authorize("test", "xxx", false));
@@ -46,7 +46,7 @@ public void IssueTokenTest()
         var app = new App { Name = "test" };
 
         var set = StarServerSetting.Current;
-        var service = new TokenService(null);
+        var service = new TokenService();
 
         var model = service.IssueToken(app.Name, set.TokenSecret, set.TokenExpire);
         Assert.NotNull(model);
@@ -68,7 +68,7 @@ public void DecodeTokenTest()
         }
 
         var set = StarServerSetting.Current;
-        var service = new TokenService(null);
+        var service = new TokenService();
 
         var model = service.IssueToken(app.Name, set.TokenSecret, set.TokenExpire);
         Assert.NotNull(model);