Fixed duplicate insertions into the filtered database.

This commit is contained in:
Rasmus Rasmussen 2024-11-27 15:53:00 +01:00
parent 7ad691c439
commit f02203c14c
9 changed files with 39 additions and 18 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

View File

@ -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 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 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 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 ReadDiscardedSeqIdsStatement = "SELECT seq FROM sqlite_sequence;";
private const string ReadAndDeleteResumeStatement = "SELECT * FROM Resume WHERE ThreadNumber == @threadNumber; DELETE FROM RESUME WHERE ThreadNumber == @threadNumber;"; 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) 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() public List<SearchResult?> GetSearchResults()

Binary file not shown.

Binary file not shown.