Make grouping more flexibel

Group by seconds, minutes or hours. Let the user decide the value.
ckorn · Mar 20, 2021 · 65c59aa · 65c59aa
1 parent e26d78a
commit 65c59aa
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 14 deletions.
diff --git a/UI/SshTarpitAnalyzer.Blazor/Data/TimeIntervall.cs b/UI/SshTarpitAnalyzer.Blazor/Data/TimeIntervall.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace UI.SshTarpitAnalyzer.Blazor.Data
+{
+    public enum TimeIntervall
+    {
+        Seconds,
+        Minutes,
+        Hours
+    }
+}
diff --git a/UI/SshTarpitAnalyzer.Blazor/Pages/SshTarpit.razor b/UI/SshTarpitAnalyzer.Blazor/Pages/SshTarpit.razor
@@ -1,4 +1,5 @@
 @page "/"
+@using UI.SshTarpitAnalyzer.Blazor.Data
 
 <h3>SshTarpit</h3>
 
@@ -12,8 +13,24 @@
     </FieldBody>
 </Field>
 
-<Button Clicked="@(async () => await HandleRedraw())">Analyze log</Button>
-<Button Clicked="@(async () => await HandleRedraw(true))">Group by 10 seconds</Button>
+<Fields>
+    <Field ColumnSize="ColumnSize.Is2.OnDesktop">
+        <Button Color="Color.Primary" Clicked="@(async () => await HandleRedraw())">Analyze log</Button>
+    </Field>
+    <Field ColumnSize="ColumnSize.Is2.OnDesktop">
+        <NumericEdit TValue="int" @ref="timeIntervallToGroupInput" Value="10" Max="10000"></NumericEdit>
+    </Field>
+    <Field ColumnSize="ColumnSize.Is2.OnDesktop">
+        <Select TValue="TimeIntervall" @bind-SelectedValue="@selectedTimeIntervall">
+            <SelectItem Value="TimeIntervall.Seconds">Seconds</SelectItem>
+            <SelectItem Value="TimeIntervall.Minutes">Minutes</SelectItem>
+            <SelectItem Value="TimeIntervall.Hours">Hours</SelectItem>
+        </Select>
+    </Field>
+    <Field ColumnSize="ColumnSize.Is2.OnDesktop">
+        <Button Color="Color.Primary" Clicked="@(async () => await HandleRedraw(true))">Group by</Button>
+    </Field>
+</Fields>
 
 <p>@connections</p>
 
@@ -33,24 +50,25 @@
         </thead>
         <tbody>
             @foreach ((AttackerInfo attackerInfo, int index) in attackerInfoList
-                .OrderByDescending(x => x.Count)
-                .Take(10)
-                .Select((x, i) => (x,i)))
+               .OrderByDescending(x => x.Count)
+               .Take(10)
+               .Select((x, i) => (x, i)))
             {
-            <tr>
-                <td>@(index+1)</td>
-                <td>@attackerInfo.Ip</td>
-                <td>@attackerInfo.Count</td>
-                <td>@GetTimeText(attackerInfo.AverageConnectionTime)</td>
-                <td>@GetTimeText(attackerInfo.StandardDerivation)</td>
-            </tr>
+                <tr>
+                    <td>@(index+1)</td>
+                    <td>@attackerInfo.Ip</td>
+                    <td>@attackerInfo.Count</td>
+                    <td>@GetTimeText(attackerInfo.AverageConnectionTime)</td>
+                    <td>@GetTimeText(attackerInfo.StandardDerivation)</td>
+                </tr>
             }
         </tbody>
     </table>
 }
 
 @code {
     FileEdit fileEdit;
+    NumericEdit<int> timeIntervallToGroupInput;
     string uploadProgress;
     LineChart<double> lineChart;
     IReadOnlyList<ConnectionInformation> connectionInformationList;
@@ -60,6 +78,7 @@
     string connections;
     string filterIp;
     IReadOnlyList<AttackerInfo> attackerInfoList = null;
+    TimeIntervall selectedTimeIntervall = TimeIntervall.Seconds;
 
     async Task OnChanged(FileChangedEventArgs e)
     {
@@ -179,19 +198,42 @@
         int groupPerSeconds = 1;
         if (group)
         {
-            groupPerSeconds = 10;
+            groupPerSeconds = GetGroupBySeconds();
         }
         foreach (var grouped in connectionInformationList
             .GroupBy(x => ((int)x.Duration.TotalSeconds) / groupPerSeconds)
             .OrderBy(x => x.Key))
         {
             int count = grouped.Count();
-            int xValue = (group) ? (grouped.Key * 10) + 10 : grouped.Key;
+            int xValue = (group) ? (grouped.Key * groupPerSeconds) + groupPerSeconds : grouped.Key;
             ret.Add((xValue, count));
         }
         return ret;
     }
 
+    int GetGroupBySeconds()
+    {
+        int seconds = 1;
+        if (timeIntervallToGroupInput.Value > 0)
+        {
+            switch (selectedTimeIntervall)
+            {
+                case TimeIntervall.Seconds:
+                    seconds = timeIntervallToGroupInput.Value;
+                    break;
+                case TimeIntervall.Minutes:
+                    seconds = timeIntervallToGroupInput.Value * 60;
+                    break;
+                case TimeIntervall.Hours:
+                    seconds = timeIntervallToGroupInput.Value * 60 * 60;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException($"{nameof(selectedTimeIntervall)} = {selectedTimeIntervall}");
+            }
+        }
+        return seconds;
+    }
+
     string GetTimeText(int seconds)
     {
         string label = $"{seconds.ToString()} s";