Merge pull request #64 from BornToBeRoot/HttpHeaders

BornToBeRoot · web-flow · commit bc9a06da0130 · 2017-11-24T23:49:52.000+01:00
Get "HTTP Headers" added
diff --git a/Source/NETworkManager/Helpers/RegexHelper.cs b/Source/NETworkManager/Helpers/RegexHelper.cs
@@ -32,5 +32,8 @@ public static class RegexHelper
 
         // Match a IPv4-Address like 192.168.[50-100].1
         public const string IPv4AddressSpecialRangeRegex = @"^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|" + SpecialRangeRegex + @")\.){3}((?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|" + SpecialRangeRegex + @")$";
+
+        // Test for http|https uris
+        public const string httpAndHttpsUriRegex = @"^http(s)?:\/\/([\w-]+.)+[\w-]+(\/[\w- ./?%&=])?$";
     }
 }
diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -341,6 +341,7 @@ private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
         RemoteDesktopView remoteDesktopView;
         WakeOnLANView wakeOnLANView;
         SubnetCalculatorView subnetCalculatorView;
+        HTTPHeadersView httpHeadersView;
         ARPTableView arpTableView;
         LookupView lookupView;
 
@@ -407,6 +408,12 @@ private void ChangeApplicationView(ApplicationViewManager.Name name)
 
                     contentControlApplication.Content = subnetCalculatorView;
                     break;
+                case ApplicationViewManager.Name.HTTPHeaders:
+                    if (httpHeadersView == null)
+                        httpHeadersView = new HTTPHeadersView();
+
+                    contentControlApplication.Content = httpHeadersView;
+                    break;
                 case ApplicationViewManager.Name.ARPTable:
                     if (arpTableView == null)
                         arpTableView = new ARPTableView();
diff --git a/Source/NETworkManager/Models/Network/HTTPHeaders.cs b/Source/NETworkManager/Models/Network/HTTPHeaders.cs
@@ -0,0 +1,23 @@
+﻿using System;
+using System.Net;
+using System.Threading.Tasks;
+
+namespace NETworkManager.Models.Network
+{
+    public class HTTPHeaders
+    {
+        public static async Task<WebHeaderCollection> GetHeadersAsync(Uri uri)
+        {
+            WebHeaderCollection headers;
+
+            HttpWebRequest request = WebRequest.CreateHttp(uri);
+
+            using (HttpWebResponse response = (HttpWebResponse)(await request.GetResponseAsync().ConfigureAwait(false)))
+            {
+                headers = response.Headers;
+            }
+
+            return headers;
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -1249,6 +1249,36 @@ public bool RemoteDesktop_ExpandSessionView
             }
         }
         #endregion
+
+        #region HTTP Headers
+        private List<string> _httpHeader_WebsiteUriHistory = new List<string>();
+        public List<string> HTTPHeader_WebsiteUriHistory
+        {
+            get { return _httpHeader_WebsiteUriHistory; }
+            set
+            {
+                if (value == _httpHeader_WebsiteUriHistory)
+                    return;
+
+                _httpHeader_WebsiteUriHistory = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private bool _httpHeader_ExpandStatistics = true;
+        public bool HTTPHeader_ExpandStatistics
+        {
+            get { return _httpHeader_ExpandStatistics; }
+            set
+            {
+                if (value == _httpHeader_ExpandStatistics)
+                    return;
+
+                _httpHeader_ExpandStatistics = value;
+                SettingsChanged = true;
+            }
+        }
+        #endregion
         #endregion
 
         #region Constructor
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
@@ -186,10 +186,13 @@
     <Compile Include="Converters\ValidateNetworkInterfaceProfileConverter.cs" />
     <Compile Include="Converters\ValidateSubnetCalculatorIPv4SplitterConverter.cs" />
     <Compile Include="Helpers\SingleInstanceHelper.cs" />
+    <Compile Include="Models\Network\HTTPHeaders.cs" />
     <Compile Include="Models\Network\ARPTableInfo.cs" />
     <Compile Include="Models\RemoteDesktop\RemoteDesktopSessionInfo.cs" />
     <Compile Include="Models\Settings\RemoteDesktopSessionManager.cs" />
     <Compile Include="Models\Settings\RemoteDesktopSessionInfo.cs" />
+    <Compile Include="Validators\HttpAndHttpsUriValidator.cs" />
+    <Compile Include="ViewModels\Applications\HTTPHeadersViewModel.cs" />
     <Compile Include="ViewModels\Applications\ARPTableViewModel.cs" />
     <Compile Include="ViewModels\Dialogs\NetworkInterfaceProfileViewModel.cs" />
     <Compile Include="ViewModels\Dialogs\PortScannerProfileViewModel.cs" />
@@ -224,6 +227,9 @@
     <Compile Include="Controls\RemoteDesktopControl.xaml.cs">
       <DependentUpon>RemoteDesktopControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Applications\HTTPHeadersView.xaml.cs">
+      <DependentUpon>HTTPHeadersView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Applications\ARPTableView.xaml.cs">
       <DependentUpon>ARPTableView.xaml</DependentUpon>
     </Compile>
@@ -354,6 +360,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\Applications\HTTPHeadersView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Applications\ARPTableView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Source/NETworkManager/Properties/AssemblyInfo.cs b/Source/NETworkManager/Properties/AssemblyInfo.cs
@@ -49,4 +49,4 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -82,7 +82,9 @@
     <system:String x:Key="String_Header_Display">Anzeige</system:String>
     <system:String x:Key="String_Header_Filter">Filter</system:String>
     <system:String x:Key="String_Header_ARPTable">ARP-Tabelle</system:String>
-
+    <system:String x:Key="String_Header_Website">Webseite</system:String>
+    <system:String x:Key="String_Header_Headers">Headers</system:String>
+    
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
     <system:String x:Key="String_Slogan">Ein leistungsstarkes Tool zum Verwalten von Netzwerken und zur Behebung von Netzwerkproblemen!</system:String>
@@ -325,6 +327,7 @@
     <system:String x:Key="String_Button_Refresh">Aktualisieren</system:String>
     <system:String x:Key="String_Button_Reconnect">Wiederverbinden</system:String>
     <system:String x:Key="String_Button_ClearCache">Cache leeren</system:String>
+    <system:String x:Key="String_Button_Check">Prüfen</system:String>
 
     <!-- ContextMenuItem.Header -->
     <system:String x:Key="String_ContextMenu_Cut">Ausschneiden</system:String>
@@ -360,7 +363,8 @@
     <system:String x:Key="String_Watermark_EamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnet">192.168.178.133/22 oder 192.168.178.133/255.255.252.0</system:String>
     <system:String x:Key="String_Watermark_Filter">Filter...</system:String>
-    
+    <system:String x:Key="String_Watermark_ExampleWebsiteUri">http(s)://example.com/index.html</system:String>
+
     <!-- ShowProgress -->
     <system:String x:Key="String_ProgessHeader_ConfigureNetworkInterface">Konfiguriere Netzwerkinterface</system:String>
     <system:String x:Key="String_Progress_SetStaticIPAddress">Setze statische IP-Adresse und Gateway...</system:String>
@@ -385,6 +389,7 @@
     <system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Geben Sie einen gültigen Wert ein zwischen 10 und 100!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPAddress">Geben Sie eine gültige IP-Adresse ein!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidSubnet">Geben Sie ein gültiges Subnetz ein (z.B. 192.168.178.133/26)</system:String>
+    <system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Geben Sie eine gültige Webseite ein (z.B. https://example.com/index.html)</system:String>
     
     <!-- ApplicationInfo.Name -->
     <system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>
@@ -396,6 +401,7 @@
     <system:String x:Key="String_ApplicationName_Traceroute">Traceroute</system:String>
     <system:String x:Key="String_ApplicationName_DNSLookup">DNS-Lookup</system:String>
     <system:String x:Key="String_ApplicationName_RemoteDesktop">Remote Desktop</system:String>
+    <system:String x:Key="String_ApplicationName_HTTPHeaders">HTTP-Headers</system:String>
     <system:String x:Key="String_ApplicationName_ARPTable">ARP-Tabelle</system:String>
     <system:String x:Key="String_ApplicationName_Lookup">Lookup</system:String>
 
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -82,7 +82,9 @@
     <system:String x:Key="String_Header_Display">Display</system:String>
     <system:String x:Key="String_Header_Filter">Filter</system:String>
     <system:String x:Key="String_Header_ARPTable">ARP Table</system:String>
-    
+    <system:String x:Key="String_Header_Website">Website</system:String>
+    <system:String x:Key="String_Header_Headers">Headers</system:String>
+
     <!-- Normal strings -->    
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
     <system:String x:Key="String_Slogan">A powerful tool for managing networks and troubleshoot network problems!</system:String>
@@ -325,6 +327,7 @@
     <system:String x:Key="String_Button_Refresh">Refresh</system:String>
     <system:String x:Key="String_Button_Reconnect">Reconnect</system:String>
     <system:String x:Key="String_Button_ClearCache">Clear cache</system:String>
+    <system:String x:Key="String_Button_Check">Check</system:String>
     
     <!-- ContextMenuItem.Header -->
     <system:String x:Key="String_ContextMenu_Cut">Cut</system:String>
@@ -360,7 +363,8 @@
     <system:String x:Key="String_Watermark_EamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
     <system:String x:Key="String_Watermark_ExampleSubnet">192.168.178.133/22 or 192.168.178.133/255.255.252.0</system:String>
     <system:String x:Key="String_Watermark_Filter">Filter...</system:String>
-
+    <system:String x:Key="String_Watermark_ExampleWebsiteUri">http(s)://example.com/index.html</system:String>
+    
     <!-- ShowProgress -->
     <system:String x:Key="String_ProgessHeader_ConfigureNetworkInterface">Configure Network Interface</system:String>
     <system:String x:Key="String_Progress_SetStaticIPAddress">Set static IP address and gateway...</system:String>
@@ -385,6 +389,7 @@
     <system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Enter a valid value between 10 and 100!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPAddress">Enter a valid IP address!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidSubnet">Enter a valid subnet (like 192.168.178.133/26)</system:String>
+    <system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Enter a valid website (like https://example.com/index.html)</system:String> 
     
     <!-- ApplicationView.Name -->
     <system:String x:Key="String_ApplicationName_IPScanner">IP Scanner</system:String>
@@ -396,6 +401,7 @@
     <system:String x:Key="String_ApplicationName_Traceroute">Traceroute</system:String>
     <system:String x:Key="String_ApplicationName_DNSLookup">DNS Lookup</system:String>
     <system:String x:Key="String_ApplicationName_RemoteDesktop">Remote Desktop</system:String>
+    <system:String x:Key="String_ApplicationName_HTTPHeaders">HTTP Headers</system:String>
     <system:String x:Key="String_ApplicationName_ARPTable">ARP Table</system:String>
     <system:String x:Key="String_ApplicationName_Lookup">Lookup</system:String>
     
diff --git a/Source/NETworkManager/Validators/HttpAndHttpsUriValidator.cs b/Source/NETworkManager/Validators/HttpAndHttpsUriValidator.cs
@@ -0,0 +1,19 @@
+﻿using NETworkManager.Helpers;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace NETworkManager.Validators
+{
+    public class MACAddressValidator : ValidationRule
+    {
+        public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+        {            
+            if (Regex.IsMatch(value as string, RegexHelper.MACAddressRegex))
+                return ValidationResult.ValidResult;
+
+            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidMACAddress"] as string);
+        }
+    }
+}
diff --git a/Source/NETworkManager/Validators/MACAddressValidator.cs b/Source/NETworkManager/Validators/MACAddressValidator.cs
@@ -6,14 +6,14 @@
 
 namespace NETworkManager.Validators
 {
-    public class MACAddressValidator : ValidationRule
+    public class HttpAndHttpsUriValidator : ValidationRule
     {
         public override ValidationResult Validate(object value, CultureInfo cultureInfo)
         {            
-            if (Regex.IsMatch(value as string, RegexHelper.MACAddressRegex))
+            if (Regex.IsMatch(value as string, RegexHelper.httpAndHttpsUriRegex))
                 return ValidationResult.ValidResult;
 
-            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidMACAddress"] as string);
+            return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidWebsiteUri"] as string);
         }
     }
 }
diff --git a/Source/NETworkManager/ViewModels/Applications/HTTPHeadersViewModel.cs b/Source/NETworkManager/ViewModels/Applications/HTTPHeadersViewModel.cs
diff --git a/Source/NETworkManager/Views/ApplicationViewManager.cs b/Source/NETworkManager/Views/ApplicationViewManager.cs
diff --git a/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml b/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml
diff --git a/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml.cs b/Source/NETworkManager/Views/Applications/HTTPHeadersView.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,8 @@ public static class RegexHelper`
`32`	`32`
`33`	`33`	`// Match a IPv4-Address like 192.168.[50-100].1`
`34`	`34`	`public const string IPv4AddressSpecialRangeRegex = @"^(?:(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?\|" + SpecialRangeRegex + @")\.){3}((?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\|" + SpecialRangeRegex + @")$";`
	`35`	`+`
	`36`	`+ // Test for http\|https uris`
	`37`	`+ public const string httpAndHttpsUriRegex = @"^http(s)?:\/\/([\w-]+.)+[\w-]+(\/[\w- ./?%&=])?$";`
`35`	`38`	`}`
`36`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@`
`6`	`6`
`7`	`7`	`namespace NETworkManager.Validators`
`8`	`8`	`{`
`9`		`- public class MACAddressValidator : ValidationRule`
	`9`	`+ public class HttpAndHttpsUriValidator : ValidationRule`
`10`	`10`	`{`
`11`	`11`	`public override ValidationResult Validate(object value, CultureInfo cultureInfo)`
`12`	`12`	`{`
`13`		`- if (Regex.IsMatch(value as string, RegexHelper.MACAddressRegex))`
	`13`	`+ if (Regex.IsMatch(value as string, RegexHelper.httpAndHttpsUriRegex))`
`14`	`14`	`return ValidationResult.ValidResult;`
`15`	`15`
`16`		`- return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidMACAddress"] as string);`
	`16`	`+ return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidWebsiteUri"] as string);`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`