Merge changes from main

haga-rak · Apr 15, 2024 · b5b0645 · b5b0645
2 parents 0df9823 + b67a47f
commit b5b0645
Show file tree

Hide file tree

Showing 43 changed files with 538 additions and 94 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
@@ -6,12 +6,13 @@
 
 [![Fluxzy.Core](https://img.shields.io/nuget/v/Fluxzy.Core.svg?label=Fluxzy.Core&logo=nuget)](https://www.nuget.org/packages/Fluxzy.Core)
 [![Fluxzy.Core](https://img.shields.io/nuget/v/Fluxzy.Core.svg?label=Fluxzy.Core.Pcap&logo=nuget)](https://www.nuget.org/packages/Fluxzy.Core.Pcap)
+[![Docker Image Version](https://img.shields.io/docker/v/fluxzy/fluxzy?label=docker&color=7155ab)](https://hub.docker.com/r/fluxzy/fluxzy)
 [![build](https://github.com/haga-rak/fluxzy.core/actions/workflows/ci.yml/badge.svg)](https://github.com/haga-rak/fluxzy.core/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/haga-rak/fluxzy.core/graph/badge.svg?token=AD5R7Q1FHJ)](https://codecov.io/gh/haga-rak/fluxzy.core)
 [![gitter](https://img.shields.io/badge/docs-latest-b36567)](https://docs.fluxzy.io/documentation/core/introduction.html)
 
 
-[Features](#1-features) | [Quick usage (.NET)](#2-quick-usage) | [Quick usage (CLI)](#sample-usage) | [Documentation](https://docs.fluxzy.io/documentation/core/introduction.html) | [Build](#3-build) | [License](LICENSE.md) | [Releases](https://github.com/haga-rak/fluxzy.core/releases)
+[Features](#1-features) | [Quick usage (.NET)](#2-quick-usage) | [Quick usage (CLI)](#sample-usage)  | [Quick usage (Docker)](#run-with-docker) | [Documentation](https://docs.fluxzy.io/documentation/core/introduction.html) | [Build](#3-build) | [License](LICENSE.md) | [Releases](https://github.com/haga-rak/fluxzy.core/releases)
 
 </div>
 
@@ -131,9 +132,6 @@ More examples are available at [docs.fluxzy.io](https://docs.fluxzy.io/documenta
 
 ### 2.2 Fluxzy CLI
 
-
-### Download CLI
-
 | Fluxzy CLI | Version |
 | --- | --- |
 | Windows |   [![win32](https://fluxzy.io/misc/badge/cli/Windows32)  ![win64](https://fluxzy.io/misc/badge/cli/Windows64)      ![winArm64](https://fluxzy.io/misc/badge/cli/WindowsArm64)](https://www.fluxzy.io/download#cli)     | 
@@ -206,6 +204,19 @@ More command and options are available, including [exporting to HAR](https://www
 
 By default, fluxzy will bind to `127.0.0.1:44344`.
 
+### Run with docker
+
+The CLI can be run from a [docker image](https://hub.docker.com/r/fluxzy/fluxzy).
+
+```bash
+docker run -it -p 43444:43444 fluxzy/fluxzy:latest start
+```
+
+To test: 
+
+```bash
+curl -x 127.0.0.1:44344 https://www.fluxzy.io
+```
 
 ## 3. Build
 

diff --git a/build/Fluxzy.Build/Fluxzy.Build.csproj b/build/Fluxzy.Build/Fluxzy.Build.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Bullseye" Version="4.2.1" />
-    <PackageReference Include="Octokit" Version="9.1.0" />
-    <PackageReference Include="SimpleExec" Version="11.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Bullseye" Version="4.2.1" />
+    <PackageReference Include="Octokit" Version="10.0.0" />
+    <PackageReference Include="SimpleExec" Version="11.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
+</Project>
diff --git a/codecov.yml b/codecov.yml
@@ -38,4 +38,5 @@ ignore:
   - "src/Fluxzy.Core/Clients/H2Logger.cs"
   - "src/Fluxzy.Core/Clients/H1Logger.cs"
   - "src/Fluxzy.Core/Misc/Streams/DebugFileStream.cs"
+  - "src/Fluxzy/ArgsHelper.cs"
   - "src/Fluxzy.Core/Misc/Traces/**"
diff --git a/examples/Samples.No002.Filtering/Samples.No002.Filtering.csproj b/examples/Samples.No002.Filtering/Samples.No002.Filtering.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No003.RawCapture/Samples.No003.RawCapture.csproj b/examples/Samples.No003.RawCapture/Samples.No003.RawCapture.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core.Pcap" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core.Pcap" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No004.BasicAlterations/Samples.No004.BasicAlterations.csproj b/examples/Samples.No004.BasicAlterations/Samples.No004.BasicAlterations.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...rations_FromConfigurationFile/Samples.No005.BasicAlterations_FromConfigurationFile.csproj b/...rations_FromConfigurationFile/Samples.No005.BasicAlterations_FromConfigurationFile.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No006.CaptureOsTraffic/Samples.No006.CaptureOsTraffic.csproj b/examples/Samples.No006.CaptureOsTraffic/Samples.No006.CaptureOsTraffic.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No008.ForcingHttpVersion/Samples.No008.ForcingHttpVersion.csproj b/examples/Samples.No008.ForcingHttpVersion/Samples.No008.ForcingHttpVersion.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No009.InjectCodeSnippet/Samples.No009.InjectCodeSnippet.csproj b/examples/Samples.No009.InjectCodeSnippet/Samples.No009.InjectCodeSnippet.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No010.MockResponse/Samples.No010.MockResponse.csproj b/examples/Samples.No010.MockResponse/Samples.No010.MockResponse.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No011.AddRequestCookie/Samples.No011.AddRequestCookie.csproj b/examples/Samples.No011.AddRequestCookie/Samples.No011.AddRequestCookie.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No012.AddResponseCookie/Samples.No012.AddResponseCookie.csproj b/examples/Samples.No012.AddResponseCookie/Samples.No012.AddResponseCookie.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/examples/Samples.No013.ModifyHeaders/Samples.No013.ModifyHeaders.csproj b/examples/Samples.No013.ModifyHeaders/Samples.No013.ModifyHeaders.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageReference Include="Fluxzy.Core" Version="1.22.12" />
+    <PackageReference Include="Fluxzy.Core" Version="1.23.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Fluxzy.Core.Pcap.Cli/Fluxzy - Backup.Interop.Pcap.Cli.csproj b/src/Fluxzy.Core.Pcap.Cli/Fluxzy - Backup.Interop.Pcap.Cli.csproj
diff --git a/src/Fluxzy.Core.Pcap/Pcapng/Merge/EnhancedBlockReader.cs b/src/Fluxzy.Core.Pcap/Pcapng/Merge/EnhancedBlockReader.cs
@@ -8,7 +8,7 @@ namespace Fluxzy.Core.Pcap.Pcapng.Merge
     internal class EnhancedBlockReader : SleepyStreamBlockReader
     {
         private readonly PcapBlockWriter _blockWriter;
-        private readonly byte[] _defaultBuffer = new byte[1024 * 4];
+        private readonly byte[] _defaultBuffer = new byte[FluxzySharedSetting.PcapEnhancedBlockMaxLength];
 
         public EnhancedBlockReader(PcapBlockWriter blockWriter,
             StreamLimiter streamLimiter, IStreamSource streamFactory)

diff --git a/src/Fluxzy.Core/Certificates/Certificate.cs b/src/Fluxzy.Core/Certificates/Certificate.cs
@@ -135,7 +135,7 @@ public X509Certificate2 GetX509Certificate()
 
             switch (RetrieveMode) {
                 case CertificateRetrieveMode.FluxzyDefault:
-                    return _cachedCertificate = FluxzySecurity.BuiltinCertificate;
+                    return _cachedCertificate = FluxzySecurityParams.Current.BuiltinCertificate;
 
                 case CertificateRetrieveMode.FromUserStoreSerialNumber: {
                     using var store = new X509Store(StoreName.My,

diff --git a/src/Fluxzy.Core/Certificates/CertificateAuthorityManager.cs b/src/Fluxzy.Core/Certificates/CertificateAuthorityManager.cs
@@ -19,7 +19,7 @@ public abstract class CertificateAuthorityManager
         /// <returns></returns>
         public virtual void DumpDefaultCertificate(Stream stream)
         {
-            FluxzySecurity.BuiltinCertificate.ExportToPem(stream);
+            FluxzySecurityParams.Current.BuiltinCertificate.ExportToPem(stream);
         }
 
         /// <summary>
@@ -58,7 +58,7 @@ public virtual void DumpDefaultCertificate(Stream stream)
         /// <returns></returns>
         public virtual ValueTask<bool> InstallDefaultCertificate()
         {
-            return InstallCertificate(FluxzySecurity.BuiltinCertificate);
+            return InstallCertificate(FluxzySecurityParams.Current.BuiltinCertificate);
         }
 
         /// <summary>

diff --git a/src/Fluxzy.Core/Certificates/FluxzySecurity.cs b/src/Fluxzy.Core/Certificates/FluxzySecurity.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
+using Fluxzy.Core;
 
 namespace Fluxzy.Certificates
 {
@@ -14,17 +15,30 @@ namespace Fluxzy.Certificates
     ///
     ///  For the two first cases, if the PKCS12 file has a password, it must be specified in the environment variable FLUXZY_ROOT_CERTIFICATE_PASSWORD
     /// </summary>
-    internal static class FluxzySecurity
+    internal class FluxzySecurity
     {
-        static FluxzySecurity()
+        public static readonly string DefaultCertificatePath = "%appdata%/.fluxzy/rootca.pfx";
+        private readonly string _certificatePath;
+        private readonly EnvironmentProvider _environmentProvider;
+
+        public FluxzySecurity(string certificatePath, EnvironmentProvider environmentProvider)
         {
+            _certificatePath = certificatePath;
+            _environmentProvider = environmentProvider;
             BuiltinCertificate = GetDefaultCertificate();
+
+            if (!BuiltinCertificate.HasPrivateKey)
+            {
+                throw new ArgumentException("The built-in certificate must have a private key");
+            }
         }
-
-        private static X509Certificate2 GetDefaultCertificate()
+
+        public X509Certificate2 BuiltinCertificate { get; }
+
+        private X509Certificate2 GetDefaultCertificate()
         {
-            var certificatePath = Environment.GetEnvironmentVariable("FLUXZY_ROOT_CERTIFICATE");
-            var certificatePassword = Environment.GetEnvironmentVariable("FLUXZY_ROOT_CERTIFICATE_PASSWORD");
+            var certificatePath = _environmentProvider.GetEnvironmentVariable("FLUXZY_ROOT_CERTIFICATE");
+            var certificatePassword = _environmentProvider.GetEnvironmentVariable("FLUXZY_ROOT_CERTIFICATE_PASSWORD");
 
             if (certificatePath != null) {
                 if (!File.Exists(certificatePath)) {
@@ -33,7 +47,7 @@ private static X509Certificate2 GetDefaultCertificate()
             }
             else
             {
-                var defaultPath = Environment.ExpandEnvironmentVariables("%appdata%/.fluxzy/rootca.pfx");
+                var defaultPath = _environmentProvider.ExpandEnvironmentVariables(_certificatePath);
 
                 if (File.Exists(defaultPath))
                 {
@@ -54,8 +68,19 @@ private static X509Certificate2 GetDefaultCertificate()
             return new X509Certificate2(FileStore.Fluxzy, "youshallnotpass");
         }
 
-        public static X509Certificate2 BuiltinCertificate { get; }
+        public static void SetDefaultCertificateForUser(
+            byte[] certificateContent,
+            EnvironmentProvider environmentProvider, 
+            string certificatePath)
+        {
+            var certificateFileInfo = new FileInfo(environmentProvider.ExpandEnvironmentVariables(certificatePath));
+            var certificateDirectory = certificateFileInfo.Directory;
 
-        public static string DefaultThumbPrint => BuiltinCertificate.Thumbprint!;
+            if (certificateDirectory != null) {
+                Directory.CreateDirectory(certificateDirectory.FullName);
+            }
+
+            File.WriteAllBytes(certificateFileInfo.FullName, certificateContent);
+        }
     }
 }
diff --git a/src/Fluxzy.Core/Certificates/FluxzySecurityParams.cs b/src/Fluxzy.Core/Certificates/FluxzySecurityParams.cs
@@ -0,0 +1,12 @@
+// Copyright 2021 - Haga Rakotoharivelo - https://github.com/haga-rak
+
+using Fluxzy.Core;
+
+namespace Fluxzy.Certificates
+{
+    internal class FluxzySecurityParams
+    {
+        public static FluxzySecurity Current { get; } = new FluxzySecurity(FluxzySecurity.DefaultCertificatePath, new SystemEnvironmentProvider());
+
+    }
+}
diff --git a/...ockering/DictionaryEnvironmentProvider.cs → ...ore/Core/DictionaryEnvironmentProvider.cs b/...ockering/DictionaryEnvironmentProvider.cs → ...ore/Core/DictionaryEnvironmentProvider.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Fluxzy.Cli.Dockering
+namespace Fluxzy.Core
 {
     internal class DictionaryEnvironmentProvider : EnvironmentProvider
     {

diff --git a/src/Fluxzy/Dockering/EnvironmentProvider.cs → src/Fluxzy.Core/Core/EnvironmentProvider.cs b/src/Fluxzy/Dockering/EnvironmentProvider.cs → src/Fluxzy.Core/Core/EnvironmentProvider.cs
@@ -2,10 +2,23 @@
 
 using System;
 
-namespace Fluxzy.Cli.Dockering
+namespace Fluxzy.Core
 {
-    internal abstract class EnvironmentProvider
+    public abstract class EnvironmentProvider
     {
+        public virtual string ExpandEnvironmentVariables(string original)
+        {
+            // Find with regex matching %variablename% and replace everything with GetEnvironmentVariable
+            // Warning, this implementation is meant for testing purposes only and may be invalid in some cases
+
+            var regex = new System.Text.RegularExpressions.Regex("%([^%]+)%");
+
+            return regex.Replace(original, match => {
+                var variableName = match.Groups[1].Value;
+                return GetEnvironmentVariable(variableName) ?? match.Value;
+            });
+        }
+
         public virtual bool EnvironmentVariableActive(string name)
         {
             var variableValue = GetEnvironmentVariable(name);

diff --git a/src/Fluxzy.Core/Core/ExchangeSourceProviderHelper.cs b/src/Fluxzy.Core/Core/ExchangeSourceProviderHelper.cs
@@ -8,7 +8,7 @@ internal static class ExchangeSourceProviderHelper
     {
         public static ExchangeSourceProvider GetSourceProvider(FluxzySetting setting,
             SecureConnectionUpdater secureConnectionUpdater, 
-            IIdProvider idProvider, ICertificateProvider? certificateProvider, 
+            IIdProvider idProvider, ICertificateProvider certificateProvider, 
             ProxyAuthenticationMethod proxyAuthenticationMethod)
         {
             if (!setting.ReverseMode)