Refactoring Database folder structure and namespaces and minor other …

…fixes
ElevenPaths · Aug 8, 2019 · c248211 · c248211
1 parent 24d3f76
commit c248211
Show file tree

Hide file tree

Showing 72 changed files with 1,126 additions and 1,089 deletions.
diff --git a/FOCA/Analysis/FingerPrinting/FingerPrintingEventHandler.cs b/FOCA/Analysis/FingerPrinting/FingerPrintingEventHandler.cs
@@ -1,10 +1,10 @@
+using FOCA.Database.Entities;
+using FOCA.ModifiedComponents;
+using MetadataExtractCore.Diagrams;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
-using FOCA.ModifiedComponents;
-using MetadataExtractCore.Diagrams;
 
 namespace FOCA.Analysis.FingerPrinting
 {
@@ -74,7 +74,7 @@ static public void data_NewWebDomain(object sender, EventArgs e)
                     fprintingIP.FingerPrintingError += new EventHandler(fprinting_FingerPrintingError);
                     Thread tIP = new Thread(new ThreadStart(fprintingIP.GetVersion));
                     tIP.IsBackground = true;
-                    Program.data.tasker.AddTask(new FOCA.TaskManager.TaskFOCA(tIP, null,"Fingerprinting HTTP (" + ip + ":80)"));
+                    Program.data.tasker.AddTask(new FOCA.TaskManager.TaskFOCA(tIP, null, "Fingerprinting HTTP (" + ip + ":80)"));
 
                     // FP por IP:443 SSL
                     ip = Program.data.GetResolutionIPs(domain.Domain)[0].Ip;
@@ -84,10 +84,10 @@ static public void data_NewWebDomain(object sender, EventArgs e)
                     fprintingIP.FingerPrintingError += new EventHandler(fprinting_FingerPrintingError);
                     tIP = new Thread(new ThreadStart(fprintingIP.GetVersion));
                     tIP.IsBackground = true;
-                    Program.data.tasker.AddTask(new TaskManager.TaskFOCA(tIP, null,"Fingerprinting HTTPS (" + ip + ":443)"));
+                    Program.data.tasker.AddTask(new TaskManager.TaskFOCA(tIP, null, "Fingerprinting HTTPS (" + ip + ":443)"));
                 }
                 catch
-                {}
+                { }
             }
         }
 

diff --git a/FOCA/Analysis/HttpMap/HttpMap.cs b/FOCA/Analysis/HttpMap/HttpMap.cs
@@ -1,5 +1,6 @@
 using FOCA.Analysis.FingerPrinting;
 using FOCA.Analysis.Technology;
+using FOCA.Database.Entities;
 using FOCA.ModifiedComponents;
 using FOCA.TaskManager;
 using MetadataExtractCore.Diagrams;

diff --git a/FOCA/Analysis/OperatingSystemUtils.cs b/FOCA/Analysis/OperatingSystemUtils.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using MetadataExtractCore.Diagrams;
+using System;
 
 namespace FOCA
 {
@@ -51,7 +48,7 @@ public static string OSToString(FOCA.OperatingSystem.OS os)
                 case FOCA.OperatingSystem.OS.WindowsNT40: return "Windows NT 4.0";
                 // Others
                 case FOCA.OperatingSystem.OS.Unknown: return "Unknown";
-                default:                return "Unknown";
+                default: return "Unknown";
             }
         }
 

diff --git a/FOCA/Analysis/Pinger/Pinger.cs b/FOCA/Analysis/Pinger/Pinger.cs
@@ -1,7 +1,6 @@
-using System;
+using FOCA.Utilites;
 using System.Net;
 using System.Net.NetworkInformation;
-using System.Text;
 
 namespace FOCA.Analysis.Pinger
 {

diff --git a/FOCA/Analysis/ShodanRecognition.cs b/FOCA/Analysis/ShodanRecognition.cs
@@ -1,6 +1,7 @@
 using FOCA.Analysis.FingerPrinting;
 using FOCA.ModifiedComponents;
 using FOCA.Threads;
+using FOCA.Utilites;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/FOCA/Analysis/Technology/TechnologyAnalysis.cs b/FOCA/Analysis/Technology/TechnologyAnalysis.cs
@@ -1,3 +1,4 @@
+using FOCA.Database.Entities;
 using FOCA.Threads;
 using System;
 using System.Collections.Generic;

diff --git a/FOCA/Analysis/Technology/TechnologyAnalysisHandler.cs b/FOCA/Analysis/Technology/TechnologyAnalysisHandler.cs
@@ -1,3 +1,4 @@
+using FOCA.Database.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/FOCA/Configuration.cs b/FOCA/Configuration.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using FOCA.Analysis.FingerPrinting;
-using FOCA.Controllers;
+using FOCA.Database.Controllers;
 using FOCA.Plugins;
 using Newtonsoft.Json.Linq;
 

diff --git a/FOCA/Data/ComputerDomains.cs b/FOCA/Data/ComputerDomains.cs
diff --git a/FOCA/Data/ComputerIPs.cs b/FOCA/Data/ComputerIPs.cs
diff --git a/FOCA/Data/Computers.cs b/FOCA/Data/Computers.cs