Allow gz format for firewall uri rules

Author: jjxtra

IPBan/IPBanMain.cs

@@ -25,6 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using DigitalRuby.IPBanCore;
 
 using System;
+using System.Net;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 

IPBanCore/Core/IPBan/IPBanUriFirewallRule.cs

@@ -25,6 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
@@ -168,7 +169,18 @@ public async Task Update(CancellationToken cancelToken = default)
                         string filePath = Uri.LocalPath;
                         if (File.Exists(filePath))
                         {
-                            await ProcessResult(await File.ReadAllTextAsync(filePath, cancelToken), cancelToken);
+                            string text;
+                            if (filePath.EndsWith(".gz", StringComparison.OrdinalIgnoreCase))
+                            {
+                                using var fs = File.OpenRead(filePath);
+                                var bytes = DecompressBytes(fs);
+                                text = Encoding.UTF8.GetString(bytes);
+                            }
+                            else
+                            {
+                                text = await File.ReadAllTextAsync(filePath, cancelToken);
+                            }
+                            await ProcessResult(text, cancelToken);
                         }
                     }
                     else
@@ -237,5 +249,15 @@ private Task ProcessResult(string text, CancellationToken cancelToken)
 
             return firewall.BlockIPAddresses(RulePrefix, ranges, null, cancelToken);
         }
+
+        private static byte[] DecompressBytes(Stream input)
+        {
+            MemoryStream decompressdStream = new();
+            {
+                using GZipStream gz = new(input, CompressionMode.Decompress, true);
+                gz.CopyTo(decompressdStream);
+            }
+            return decompressdStream.ToArray();
+        }
     }
 }

IPBanCore/Core/Interfaces/IHttpRequestMaker.cs

@@ -24,6 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 using System;
 using System.Collections.Generic;
+using System.IO.Compression;
+using System.IO;
 using System.Net;
 using System.Net.Cache;
 using System.Net.Http;
@@ -107,8 +109,10 @@ public async Task<byte[]> MakeRequestAsync(Uri uri, string postJson = null, IEnu
                     versionAssembly = GetType().Assembly;
                 }
             }
-            HttpRequestMessage msg = new();
-            msg.RequestUri = uri;
+            HttpRequestMessage msg = new()
+            {
+                RequestUri = uri
+            };
             msg.Headers.Add("User-Agent", versionAssembly.GetName().Name);
             if (headers != null)
             {
@@ -135,6 +139,22 @@ public async Task<byte[]> MakeRequestAsync(Uri uri, string postJson = null, IEnu
             {
                 throw new WebException("Request to url " + uri + " failed, status: " + responseMsg.StatusCode + ", response: " + Encoding.UTF8.GetString(response));
             }
+            if (uri.AbsolutePath.EndsWith(".gz", StringComparison.OrdinalIgnoreCase))
+            {
+                try
+                {
+                    // in case response somehow got gzip decompressed already, catch exception and keep response as is
+                    MemoryStream decompressdStream = new();
+                    {
+                        using GZipStream gz = new(new MemoryStream(response), CompressionMode.Decompress, true);
+                        gz.CopyTo(decompressdStream);
+                    }
+                    response = decompressdStream.ToArray();
+                }
+                catch
+                {
+                }
+            }
             return response;
         }
     }