Skip to content

Commit 2173c9f

Browse files
author
Ioseba Palop
authored
Clean references and update packages (#99)
1 parent 1f8f55f commit 2173c9f

File tree

15 files changed

+94
-4165
lines changed

15 files changed

+94
-4165
lines changed

‎FOCA/Analysis/FingerPrinting/DNS.cs

Lines changed: 79 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,102 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Linq;
4-
using System.Text;
5-
using FOCA.ModifiedComponents;
63

74
namespace FOCA.Analysis.FingerPrinting
85
{
96
[Serializable]
107
public class DNS : FingerPrinting
118
{
129

13-
public override event EventHandler FingerPrintingFinished; // salta cuando se finaliza la conexion y el analisis
14-
public override event EventHandler FingerPrintingError; // salta cuando se produce un error en la conexion
10+
public override event EventHandler FingerPrintingFinished; // salta cuando se finaliza la conexion y el analisis
11+
public override event EventHandler FingerPrintingError; // salta cuando se produce un error en la conexion
1512

16-
public DNS()
17-
{
18-
}
13+
public DNS()
14+
{
15+
}
1916

20-
public DNS(string host) : base(host, 53) { }
17+
public DNS(string host) : base(host, 53) { }
2118

22-
public override void GetVersion()
19+
public override void GetVersion()
20+
{
21+
try
2322
{
24-
try
25-
{
26-
System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(Host);
23+
System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(Host);
2724

28-
if (ips.Length == 0)
29-
return;
25+
if (ips.Length == 0)
26+
return;
3027

31-
// Hace la query como 'TXT'. Es mejor hacerla como 'ALL', pero no veo la opción en la lista de QTypes. ¿Quizas ANY?
32-
Heijden.DNS.Resolver r = new Heijden.DNS.Resolver(ips[0], base.Port);
33-
r.TimeOut = 1000;
34-
Heijden.DNS.Response response = r.Query("version.bind", Heijden.DNS.QType.TXT, Heijden.DNS.QClass.CH);
35-
if (response.RecordsTXT.Length > 0)
36-
{
37-
Version = response.RecordsTXT[0].TXT;
38-
this.os = AnalyzeBanner(Version);
39-
}
40-
if (this.FingerPrintingFinished != null)
41-
FingerPrintingFinished(this, null);
42-
}
43-
catch
28+
Heijden.DNS.Resolver r = new Heijden.DNS.Resolver(ips[0], base.Port);
29+
r.TimeOut = 10;
30+
Heijden.DNS.Response response = r.Query("version.bind", Heijden.DNS.QType.TXT, Heijden.DNS.QClass.CH);
31+
if (response.RecordsTXT.Length > 0)
4432
{
45-
if (FingerPrintingError != null)
46-
FingerPrintingError(this, null);
33+
OperatingSystem.OS os = OperatingSystem.OS.Unknown;
34+
Version = response.RecordsTXT.SelectMany(p => p.TXT.Where(q => !String.IsNullOrEmpty(q)))
35+
.FirstOrDefault(p =>
36+
{
37+
os = AnalyzeBanner(p);
38+
return os != OperatingSystem.OS.Unknown;
39+
}
40+
);
41+
42+
this.os = os;
4743
}
44+
if (this.FingerPrintingFinished != null)
45+
FingerPrintingFinished(this, null);
46+
}
47+
catch
48+
{
49+
if (FingerPrintingError != null)
50+
FingerPrintingError(this, null);
51+
}
4852
}
4953

50-
private OperatingSystem.OS AnalyzeBanner(string banner)
51-
{
52-
if (this.os != OperatingSystem.OS.Unknown)
53-
return this.os; // Si ya tiene OS no se re-analiza...
54+
private OperatingSystem.OS AnalyzeBanner(string banner)
55+
{
56+
if (this.os != OperatingSystem.OS.Unknown)
57+
return this.os; // Si ya tiene OS no se re-analiza...
5458

55-
// Familia Windows
56-
if (banner.ToLower().Contains("win32"))
57-
return OperatingSystem.OS.Windows;
58-
else if (banner.ToLower().Contains("macos"))
59-
return OperatingSystem.OS.MacOS;
60-
else if (banner.ToLower().Contains("mac os"))
61-
return OperatingSystem.OS.MacOS;
62-
// Familia BSD
63-
else if (banner.ToLower().Contains("freebsd"))
64-
return OperatingSystem.OS.FreeBSD;
65-
else if (banner.ToLower().Contains("openbsd"))
66-
return OperatingSystem.OS.OpenBSD;
67-
// Familia *nix
68-
else if (banner.ToLower().Contains("centos"))
69-
return OperatingSystem.OS.CentOS;
70-
else if (banner.ToLower().Contains("solaris"))
71-
return OperatingSystem.OS.Solaris;
72-
// Familia Linux
73-
else if (banner.ToLower().Contains("red hat"))
74-
return OperatingSystem.OS.LinuxRedHat;
75-
else if (banner.ToLower().Contains("redhat"))
76-
return OperatingSystem.OS.LinuxRedHat;
77-
else if (banner.ToLower().Contains("ubuntu"))
78-
return OperatingSystem.OS.LinuxUbuntu;
79-
else if (banner.ToLower().Contains("debian"))
80-
return OperatingSystem.OS.LinuxDebian;
81-
else if (banner.ToLower().Contains("fedora"))
82-
return OperatingSystem.OS.LinuxFedora;
83-
else if (banner.ToLower().Contains("mandrake"))
84-
return OperatingSystem.OS.LinuxFedora;
85-
else if (banner.ToLower().Contains("mandriva"))
86-
return OperatingSystem.OS.LinuxFedora;
87-
else if (banner.ToLower().Contains("suse"))
88-
return OperatingSystem.OS.LinuxSuse;
89-
else if (banner.ToLower().Contains("linux"))
90-
return OperatingSystem.OS.Linux;
91-
else if (banner.ToLower().Contains("unix"))
92-
return OperatingSystem.OS.Linux;
93-
else
94-
return OperatingSystem.OS.Unknown;
95-
}
59+
// Familia Windows
60+
if (banner.ToLower().Contains("win32"))
61+
return OperatingSystem.OS.Windows;
62+
else if (banner.ToLower().Contains("macos"))
63+
return OperatingSystem.OS.MacOS;
64+
else if (banner.ToLower().Contains("mac os"))
65+
return OperatingSystem.OS.MacOS;
66+
// Familia BSD
67+
else if (banner.ToLower().Contains("freebsd"))
68+
return OperatingSystem.OS.FreeBSD;
69+
else if (banner.ToLower().Contains("openbsd"))
70+
return OperatingSystem.OS.OpenBSD;
71+
// Familia *nix
72+
else if (banner.ToLower().Contains("centos"))
73+
return OperatingSystem.OS.CentOS;
74+
else if (banner.ToLower().Contains("solaris"))
75+
return OperatingSystem.OS.Solaris;
76+
// Familia Linux
77+
else if (banner.ToLower().Contains("red hat"))
78+
return OperatingSystem.OS.LinuxRedHat;
79+
else if (banner.ToLower().Contains("redhat"))
80+
return OperatingSystem.OS.LinuxRedHat;
81+
else if (banner.ToLower().Contains("ubuntu"))
82+
return OperatingSystem.OS.LinuxUbuntu;
83+
else if (banner.ToLower().Contains("debian"))
84+
return OperatingSystem.OS.LinuxDebian;
85+
else if (banner.ToLower().Contains("fedora"))
86+
return OperatingSystem.OS.LinuxFedora;
87+
else if (banner.ToLower().Contains("mandrake"))
88+
return OperatingSystem.OS.LinuxFedora;
89+
else if (banner.ToLower().Contains("mandriva"))
90+
return OperatingSystem.OS.LinuxFedora;
91+
else if (banner.ToLower().Contains("suse"))
92+
return OperatingSystem.OS.LinuxSuse;
93+
else if (banner.ToLower().Contains("linux"))
94+
return OperatingSystem.OS.Linux;
95+
else if (banner.ToLower().Contains("unix"))
96+
return OperatingSystem.OS.Linux;
97+
else
98+
return OperatingSystem.OS.Unknown;
99+
}
96100

97101
}
98102
}

‎FOCA/FOCA.csproj

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@
8282
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
8383
</PropertyGroup>
8484
<ItemGroup>
85-
<Reference Include="Ionic.Zip">
86-
<HintPath>..\lib\Ionic.Zip.dll</HintPath>
87-
</Reference>
88-
<Reference Include="DNSLibrary">
89-
<HintPath>..\lib\DNSLibrary.dll</HintPath>
90-
</Reference>
9185
<Reference Include="PluginsAPI, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
9286
<SpecificVersion>False</SpecificVersion>
9387
<HintPath>..\Plugins Release\PluginsAPI.dll</HintPath>
@@ -98,31 +92,8 @@
9892
<Reference Include="System.Core">
9993
<RequiredTargetFramework>3.5</RequiredTargetFramework>
10094
</Reference>
101-
<Reference Include="System.Runtime.Serialization">
102-
<RequiredTargetFramework>3.0</RequiredTargetFramework>
103-
</Reference>
104-
<Reference Include="System.Security" />
105-
<Reference Include="System.ServiceModel">
106-
<RequiredTargetFramework>3.0</RequiredTargetFramework>
107-
</Reference>
108-
<Reference Include="System.ServiceModel.Web">
109-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
110-
</Reference>
111-
<Reference Include="System.ServiceProcess" />
11295
<Reference Include="System.Web" />
113-
<Reference Include="System.Web.Extensions" />
114-
<Reference Include="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
115-
<SpecificVersion>False</SpecificVersion>
116-
<HintPath>..\..\..\..\..\..\Windows\assembly\GAC_MSIL\System.Web.Services\2.0.0.0__b03f5f7f11d50a3a\System.Web.Services.dll</HintPath>
117-
</Reference>
118-
<Reference Include="System.Xml.Linq">
119-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
120-
</Reference>
121-
<Reference Include="System.Data.DataSetExtensions">
122-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
123-
</Reference>
12496
<Reference Include="System.Data" />
125-
<Reference Include="System.Deployment" />
12697
<Reference Include="System.Drawing" />
12798
<Reference Include="System.Windows.Forms" />
12899
<Reference Include="System.Xml" />
@@ -866,14 +837,17 @@
866837
<PackageReference Include="EntityFramework">
867838
<Version>6.4.0</Version>
868839
</PackageReference>
840+
<PackageReference Include="Heijden.Dns">
841+
<Version>2.0.0</Version>
842+
</PackageReference>
869843
<PackageReference Include="HtmlAgilityPack">
870-
<Version>1.11.17</Version>
844+
<Version>1.11.23</Version>
871845
</PackageReference>
872846
<PackageReference Include="Newtonsoft.Json">
873847
<Version>12.0.3</Version>
874848
</PackageReference>
875849
<PackageReference Include="NLog.Config">
876-
<Version>4.6.8</Version>
850+
<Version>4.7.0</Version>
877851
</PackageReference>
878852
<PackageReference Include="ParallelExtensionsExtras">
879853
<Version>1.2.0</Version>

‎FOCA/PanelDNSSearch.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ private void PanelDNSSearch_Load(object sender, EventArgs e)
5656
if (Program.DesignMode()) return;
5757
Resolve = new Resolver
5858
{
59-
TimeOut = 1000,
60-
SearchWithAllDNS = Program.cfgCurrent.UseAllDns
59+
TimeOut = 1000
6160
};
6261

6362
Program.data.SetResolver(Resolve);

‎MetadataExtractCore/Metadata/OpenOfficeDocument.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override FileMetadata AnalyzeFile()
3939
{
4040
using (Stream stmXML = new MemoryStream())
4141
{
42-
zip.Extract(strFile, stmXML);
42+
zip[strFile].Extract(stmXML);
4343
stmXML.Seek(0, SeekOrigin.Begin);
4444
AnalizeFileMeta(stmXML);
4545
}
@@ -49,7 +49,7 @@ public override FileMetadata AnalyzeFile()
4949
{
5050
using (Stream stmXML = new MemoryStream())
5151
{
52-
zip.Extract(strFile, stmXML);
52+
zip[strFile].Extract(stmXML);
5353
stmXML.Seek(0, SeekOrigin.Begin);
5454
analizeFileSettings(stmXML);
5555
}
@@ -59,7 +59,7 @@ public override FileMetadata AnalyzeFile()
5959
{
6060
using (Stream stmXML = new MemoryStream())
6161
{
62-
zip.Extract(strFile, stmXML);
62+
zip[strFile].Extract(stmXML);
6363
stmXML.Seek(0, SeekOrigin.Begin);
6464
AnalizeFileContent(stmXML);
6565
}
@@ -69,7 +69,7 @@ public override FileMetadata AnalyzeFile()
6969
{
7070
using (Stream stmXML = new MemoryStream())
7171
{
72-
zip.Extract(strFile, stmXML);
72+
zip[strFile].Extract(stmXML);
7373
stmXML.Seek(0, SeekOrigin.Begin);
7474
AnalizeFileVersionList(stmXML, zip);
7575
}
@@ -84,7 +84,7 @@ public override FileMetadata AnalyzeFile()
8484
{
8585
using (Stream stmXML = new MemoryStream())
8686
{
87-
zip.Extract(strFileName, stmXML);
87+
zip[strFile].Extract(stmXML);
8888
stmXML.Seek(0, SeekOrigin.Begin);
8989
using (EXIFDocument eDoc = new EXIFDocument(stmXML))
9090
{
@@ -425,7 +425,7 @@ private void AnalizeFileVersionList(Stream stm, ZipFile zip)
425425
{
426426
using (Stream stmXML = new MemoryStream())
427427
{
428-
zip.Extract(strFile, stmXML);
428+
zip[strFile].Extract(stmXML);
429429
stmXML.Seek(0, SeekOrigin.Begin);
430430
using (OpenOfficeDocument ooDoc = new OpenOfficeDocument(stmXML, strExtlo))
431431
{

‎MetadataExtractCore/MetadataExtractCore.csproj

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,10 @@
4848
<Prefer32Bit>false</Prefer32Bit>
4949
</PropertyGroup>
5050
<ItemGroup>
51-
<Reference Include="Ionic.Zip, Version=1.7.2.12, Culture=neutral, PublicKeyToken=f1a302b3881c2619, processorArchitecture=MSIL">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\lib\Ionic.Zip.dll</HintPath>
54-
</Reference>
5551
<Reference Include="System" />
5652
<Reference Include="System.Core">
5753
<RequiredTargetFramework>3.5</RequiredTargetFramework>
5854
</Reference>
59-
<Reference Include="System.Web" />
60-
<Reference Include="System.Windows.Forms" />
61-
<Reference Include="System.Xml.Linq">
62-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
63-
</Reference>
64-
<Reference Include="System.Data.DataSetExtensions">
65-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
66-
</Reference>
67-
<Reference Include="System.Data" />
6855
<Reference Include="System.Xml" />
6956
<Reference Include="WindowsBase">
7057
<RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -152,18 +139,11 @@
152139
<EmbeddedResource Include="resources\SonyMarkernote.txt" />
153140
</ItemGroup>
154141
<ItemGroup>
155-
<Content Include="..\lib\Ionic.Zip.dll" />
156-
<Content Include="..\lib\PdfSharp.dll" />
157-
</ItemGroup>
158-
<ItemGroup>
159-
<PackageReference Include="HtmlAgilityPack">
160-
<Version>1.11.17</Version>
142+
<PackageReference Include="DotNetZip">
143+
<Version>1.13.7</Version>
161144
</PackageReference>
162145
<PackageReference Include="MetadataExtractor">
163-
<Version>2.2.0</Version>
164-
</PackageReference>
165-
<PackageReference Include="Newtonsoft.Json">
166-
<Version>12.0.3</Version>
146+
<Version>2.3.0</Version>
167147
</PackageReference>
168148
<PackageReference Include="PdfSharp">
169149
<Version>1.50.5147</Version>

‎SearcherCore/SearcherCore/Properties/Settings.Designer.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)