Merge pull request 'Fixed.' (#14) from FixGetProgress into main

Reviewed-on: #14

Backend/Handler/Communication.cs

@@ -53,7 +53,7 @@ public class Communication
             
             CommunicationObject? communicationObject = JsonSerializer.Deserialize<CommunicationObject>(message);
 
-            rep.SendFrame(JsonSerializer.SerializeToUtf8Bytes("Success"));
+            //rep.SendFrame(JsonSerializer.SerializeToUtf8Bytes("Success"));
             
             if (communicationObject is null)
             {
@@ -164,6 +164,8 @@ public class Communication
                     _contentFilter.SetTimeout(value);
                 }
                 
+                rep.SendFrame(JsonSerializer.SerializeToUtf8Bytes("Success"));
+                
                 break;
             }
         }

Backend/Handler/ContentFilter.cs

@@ -1,6 +1,5 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
-using System.Text;
 using Backend.Helper;
 using Models.Handler;
 using Models.Model.Backend;
@@ -15,18 +14,18 @@ public class ContentFilter
     private readonly string _getDomainPort443;
     private bool _stop;
     private int _timeOut;
-    private string _basePath;
+    private readonly string _basePath;
     
     public ContentFilter(ConcurrentQueue<QueueItem> queue, DbHandler dbHandler, string basePath)
     {
         _queue = queue;
         _dbHandler = dbHandler;
         _basePath = basePath;
-
+        
         _getDomainPort80 = $"{basePath}/Backend/Scripts/GetDomainNamePort80.sh";
         _getDomainPort443 = $"{basePath}/Backend/Scripts/GetDomainNamePort443.sh";
         
-        SetTimeout(60000);
+        SetTimeout(3000);
     }
     
     public void SetTimeout(int timeOut)
@@ -39,6 +38,7 @@ public class ContentFilter
         WaitHandle[] waitHandles = new WaitHandle[1];
         EventWaitHandle handle = new(false, EventResetMode.ManualReset);
         waitHandles[0] = handle;
+        
         Thread f = new (Filter!);
         f.Start(handle);
         
@@ -229,12 +229,11 @@ public class ContentFilter
         Process proc = new();
         proc.StartInfo = new()
         {
-            FileName = fileName,
-            Arguments = $"{ip}",
+            FileName = "/bin/bash",
+            Arguments = $"{fileName} {ip} {_basePath}/Backend/Scripts/{port}Header.txt",
             UseShellExecute = false,
             RedirectStandardOutput = false,
             RedirectStandardError = false,
-            RedirectStandardInput = false,
             CreateNoWindow = true
         };
         

Backend/Handler/IpScanner.cs

@@ -117,7 +117,6 @@ public class IpScanner
                     
                     if (_discardedQueue.Count >= 2000)
                     {
-                        Console.WriteLine("loooooooooooooooooooooooooooool");
                         Thread.Sleep(500);
                     }
                     
@@ -143,9 +142,9 @@ public class IpScanner
                                 responseCode = ping.Send(address, _timeout, buf, null).Status;
                             }
                         }
-                        catch (Exception e)
+                        catch
                         {
-                            Console.WriteLine(e);
+                            //
                         }
                         
                         if (responseCode != IPStatus.Success)

Backend/Handler/ThreadHandler.cs

@@ -51,7 +51,7 @@ public class ThreadHandler
     {
         Thread.Sleep(10000); // Let the database handler instantiate and warm up first.
         
-        WaitHandle[] wait = _ipScanner.Start(2);
+        WaitHandle[] wait = _ipScanner.Start(4);
         
         WaitHandle.WaitAll(wait);
         

Backend/Helper/HttpClientHelper.cs

@@ -18,14 +18,14 @@ public static class HttpClientHelper
         client.DefaultRequestHeaders.Accept.Clear();
         
         HttpResponseMessage? response = null;
-
+        
         try
         {
             response = await client.GetAsync("/");
         }
-        catch (Exception e)
+        catch
         {
-            Console.WriteLine(e);
+            //
         }
         
         if (response is null || !response.IsSuccessStatusCode)
@@ -35,7 +35,7 @@ public static class HttpClientHelper
         
         return await response.Content.ReadAsStringAsync();
     }
-
+    
     public static async Task<bool> HasRobotsTxt(string url, int port)
     {
         using HttpClient client = new();
@@ -57,9 +57,9 @@ public static class HttpClientHelper
         {
             response = await client.GetAsync("/robots.txt");
         }
-        catch (Exception e)
+        catch
         {
-            Console.WriteLine(e);
+            //
         }
         
         return response is not null && response.IsSuccessStatusCode;

Backend/Scripts/GetDomainNamePort443.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-curl -k -vvI -m 10 https://"$1" &> 443Header.txt
+curl -k -vvI -m 10 https://"$1" &> "$2"

Backend/Scripts/GetDomainNamePort80.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-curl -k -vvI -m 10 http://"$1" &> 80Header.txt
+curl -k -vvI -m 10 http://"$1" &> "$2"
+#80Header.txt

Manager/Commands.cs

@@ -109,8 +109,6 @@ public static class Commands
     [RequiresDynamicCode("Calls System.Text.Json.JsonSerializer.SerializeToUtf8Bytes<TValue>(TValue, JsonSerializerOptions)")]
     private static ScanningStatus GetProgress(CommunicationObject communicationObject)
     {
-        //byte[] bytes = MessagePackSerializer.Serialize(communicationObject, ContractlessStandardResolver.Options);
-
         byte[] lol = JsonSerializer.SerializeToUtf8Bytes(communicationObject);
         
         using RequestSocket client = new();

Models/Handler/DbHandler.cs

@@ -25,6 +25,7 @@ public class DbHandler
     private const string ReadUnfilteredIdsStatement = "SELECT Id FROM Unfiltered WHERE Id != 0 ORDER BY Id DESC LIMIT 1;";
     private const string ReadFilteredStatement = "SELECT Title2, Url2 FROM Filtered WHERE (Url2 NOT NULL AND Url2 != '') AND (Title2 NOT NULL AND Title2 != '') ORDER BY Url2 DESC;";
     private const string ReadFilteredIdsStatement = "SELECT Id FROM Filtered WHERE Id != 0 ORDER BY Id DESC LIMIT 1;";
+    private const string ReadFilteredIpStatement = "SELECT Ip FROM Filtered WHERE Ip == @ip ORDER BY Ip DESC LIMIT 1;";
     private const string ReadDiscardedSeqIdsStatement = "SELECT seq FROM sqlite_sequence;";
     private const string ReadAndDeleteResumeStatement = "SELECT * FROM Resume WHERE ThreadNumber == @threadNumber; DELETE FROM RESUME WHERE ThreadNumber == @threadNumber;";
     
@@ -365,7 +366,27 @@ public class DbHandler
 
     public bool GetFilteredIp(string ip)
     {
-        return true;
+        using SqliteConnection connection = new(_filteredConnectionString);
+        connection.Open();
+        
+        using SqliteCommand command = new(ReadFilteredIpStatement, connection);
+        command.Parameters.AddWithValue("@ip", ip);
+        
+        using SqliteDataReader reader = command.ExecuteReader();
+        
+        if (!reader.HasRows)
+        {
+            return false;
+        }
+        
+        string ipAddress = "";
+        
+        while (reader.Read())
+        {
+            ipAddress = reader.GetString(0);
+        }
+        
+        return ipAddress == ip;
     }
     
     public List<SearchResult?> GetSearchResults()

RSE.sln.DotSettings.user

@@ -18,6 +18,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIPStatus_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8fe420eaf60c4dfca87ce1d5f1cdfa4816200_003Fbd_003F71bcce16_003FIPStatus_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMessagePackReader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F5cffb8c94881849b6aa8abe7ba5e7cafe05d991f859903020362d6aac371_003FMessagePackReader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMessagePackSerializer_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fe5f8b0187e62d74a4b9fefd657c192dab367bb342ef5ffbd90a4ed2ea428ec7a_003FMessagePackSerializer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AOutgoingSocketExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003Fc4824d483bf85fa615ad2125f13f6d75788d45d1510ec1cfb8226831da54f_003FOutgoingSocketExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APingOptions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F77bf2fbffc5491eadd62f1dbebc233798cd7fcb9b39ab7ee3bb35519f4d94ecc_003FPingOptions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APing_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F3080b18e3637ea741b5b65abd6aee06e41494a82a58b3e2ed87d4ddb5cc62_003FPing_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003APing_002ERawSocket_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FSourcesCache_003F2f645da43e51b8be94c9217511b45c23384f041ffa9aad041f0ddc158d732f0_003FPing_002ERawSocket_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>