fix: flag leet

GZTimeWalker · GZTimeWalker · commit 57d396d764dd · 2022-09-11T14:09:49.000+08:00
diff --git a/GZCTF/Controllers/TeamController.cs b/GZCTF/Controllers/TeamController.cs
@@ -308,9 +308,6 @@ public async Task<IActionResult> KickUser([FromRoute] int id, [FromRoute] string
 
         try
         {
-            if (team is null)
-                return BadRequest(new RequestResponse("队伍未找到"));
-
             if (team.Locked && await teamRepository.AnyActiveGame(team, token))
                 return BadRequest(new RequestResponse("队伍已锁定"));
 
diff --git a/GZCTF/Utils/Codec.cs b/GZCTF/Utils/Codec.cs
@@ -90,10 +90,15 @@ public static class Leet
         public static double LeetEntropy(string flag)
         {
             double entropy = 0;
+            bool doLeet = false;
             foreach (char c in flag)
             {
-                if (CharMap.ContainsKey(c))
-                    entropy += Math.Log2(CharMap[c].Length);
+                if (c == '{' || c == ']')
+                    doLeet = true;
+                else if (doLeet && (c == '}' || c == '['))
+                    doLeet = false;
+                else if (doLeet && CharMap.TryGetValue(char.ToUpper(c), out string? table) && table is not null)
+                    entropy += Math.Log(table.Length, 2);
             }
             return entropy;
         }
@@ -118,7 +123,7 @@ public static string LeetFlag(string original)
                     continue;
                 }
 
-                sb.Append(c);
+                sb.Append(c == ' ' ? '_' : c); // replace blank to underline
             }
 
             return sb.ToString();

Original file line number	Diff line number	Diff line change
`@@ -308,9 +308,6 @@ public async Task<IActionResult> KickUser([FromRoute] int id, [FromRoute] string`
`308`	`308`
`309`	`309`	`try`
`310`	`310`	`{`
`311`		`- if (team is null)`
`312`		`- return BadRequest(new RequestResponse("队伍未找到"));`
`313`		`-`
`314`	`311`	`if (team.Locked && await teamRepository.AnyActiveGame(team, token))`
`315`	`312`	`return BadRequest(new RequestResponse("队伍已锁定"));`
`316`	`313`
Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,15 @@ public static class Leet`
`90`	`90`	`public static double LeetEntropy(string flag)`
`91`	`91`	`{`
`92`	`92`	`double entropy = 0;`
	`93`	`+ bool doLeet = false;`
`93`	`94`	`foreach (char c in flag)`
`94`	`95`	`{`
`95`		`- if (CharMap.ContainsKey(c))`
`96`		`- entropy += Math.Log2(CharMap[c].Length);`
	`96`	`+ if (c == '{' \|\| c == ']')`
	`97`	`+ doLeet = true;`
	`98`	`+ else if (doLeet && (c == '}' \|\| c == '['))`
	`99`	`+ doLeet = false;`
	`100`	`+ else if (doLeet && CharMap.TryGetValue(char.ToUpper(c), out string? table) && table is not null)`
	`101`	`+ entropy += Math.Log(table.Length, 2);`
`97`	`102`	`}`
`98`	`103`	`return entropy;`
`99`	`104`	`}`
`@@ -118,7 +123,7 @@ public static string LeetFlag(string original)`
`118`	`123`	`continue;`
`119`	`124`	`}`
`120`	`125`
`121`		`- sb.Append(c);`
	`126`	`+ sb.Append(c == ' ' ? '_' : c); // replace blank to underline`
`122`	`127`	`}`
`123`	`128`
`124`	`129`	`return sb.ToString();`