Merge pull request #456 from justcoding121/master

Beta

Author: justcoding121

PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
 Doneness:
 - [ ] Build is okay - I made sure that this change is building successfully.
 - [ ] No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of. 
-- [ ] Branching - If this is not a hotfix, I am making this request against develop branch 
+- [ ] Branching - If this is not a hotfix, I am making this request against master branch 

Titanium.Web.Proxy.sln.DotSettings

@@ -23,6 +23,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=a4ab2e69_002D4d9c_002D4345_002Dbcd1_002D5541dacf5d38/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Method (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="METHOD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=dda2ffa1_002D435c_002D4111_002D88eb_002D1a7c93c382f0/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="Property (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="PROPERTY" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>

Titanium.Web.Proxy/Helpers/Network.cs

@@ -21,44 +21,52 @@ internal static bool IsLocalIpAddress(IPAddress address)
 
             // get local IP addresses
             var localIPs = Dns.GetHostAddresses(Dns.GetHostName());
-            
+
             // test if any host IP equals to any local IP or to localhost
             return localIPs.Contains(address);
         }
 
         internal static bool IsLocalIpAddress(string hostName)
         {
-            bool isLocalhost = false;
+            hostName = hostName.ToLower();
 
-            var localhost = Dns.GetHostEntry("127.0.0.1");
-            if (hostName == localhost.HostName)
+            if (hostName == "127.0.0.1"
+                || hostName == "localhost")
             {
-                var hostEntry = Dns.GetHostEntry(hostName);
-                isLocalhost = hostEntry.AddressList.Any(IPAddress.IsLoopback);
+                return true;
             }
 
-            if (!isLocalhost)
+            var localhostDnsName = Dns.GetHostName().ToLower();
+
+            //if hostname matches current machine DNS name
+            if (hostName == localhostDnsName)
+            {
+                return true;
+            }
+
+            var isLocalhost = false;
+            IPHostEntry hostEntry = null;
+
+            //check if parsable to an IP Address
+            if (IPAddress.TryParse(hostName, out var ipAddress))
             {
-                localhost = Dns.GetHostEntry(Dns.GetHostName());
+                hostEntry = Dns.GetHostEntry(localhostDnsName);
+                isLocalhost = hostEntry.AddressList.Any(x => x.Equals(ipAddress));
+            }
 
-                if (IPAddress.TryParse(hostName, out var ipAddress))
+            if (!isLocalhost)
+            {
+                try
                 {
-                    isLocalhost = localhost.AddressList.Any(x => x.Equals(ipAddress));
+                    hostEntry = Dns.GetHostEntry(hostName);
+                    isLocalhost = hostEntry.AddressList.Any(x => hostEntry.AddressList.Any(x.Equals));
                 }
-
-                if (!isLocalhost)
+                catch (SocketException)
                 {
-                    try
-                    {
-                        var hostEntry = Dns.GetHostEntry(hostName);
-                        isLocalhost = localhost.AddressList.Any(x => hostEntry.AddressList.Any(x.Equals));
-                    }
-                    catch (SocketException)
-                    {
-                    }
                 }
             }
 
+
             return isLocalhost;
         }
     }

Titanium.Web.Proxy/Http2/Hpack/Decoder.cs

@@ -173,7 +173,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
                         break;
 
                     case State.ReadMaxDynamicTableSize:
-                        int maxSize = DecodeULE128(input);
+                        int maxSize = decodeULE128(input);
                         if (maxSize == -1)
                         {
                             return;
@@ -190,7 +190,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
                         break;
 
                     case State.ReadIndexedHeader:
-                        int headerIndex = DecodeULE128(input);
+                        int headerIndex = decodeULE128(input);
                         if (headerIndex == -1)
                         {
                             return;
@@ -208,7 +208,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
 
                     case State.ReadIndexedHeaderName:
                         // Header Name matches an entry in the Header Table
-                        int nameIndex = DecodeULE128(input);
+                        int nameIndex = decodeULE128(input);
                         if (nameIndex == -1)
                         {
                             return;
@@ -272,7 +272,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
 
                     case State.ReadLiteralHeaderNameLength:
                         // Header Name is a Literal String
-                        nameLength = DecodeULE128(input);
+                        nameLength = decodeULE128(input);
                         if (nameLength == -1)
                         {
                             return;
@@ -388,7 +388,7 @@ public void Decode(BinaryReader input, IHeaderListener headerListener)
 
                     case State.ReadLiteralHeaderValueLength:
                         // Header Value is a Literal String
-                        valueLength = DecodeULE128(input);
+                        valueLength = decodeULE128(input);
                         if (valueLength == -1)
                         {
                             return;
@@ -612,7 +612,7 @@ private string ReadStringLiteral(BinaryReader input, int length)
         }
 
         // Unsigned Little Endian Base 128 Variable-Length Integer Encoding
-        private static int DecodeULE128(BinaryReader input)
+        private static int decodeULE128(BinaryReader input)
         {
             long markedPosition = input.BaseStream.Position;
             int result = 0;