Upgrade all deps update to dotnet8

.github/workflows/publish-executable-on-release.yaml

@@ -15,10 +15,10 @@ jobs:
           result-encoding: string
           script: return context.payload.release.tag_name.substring(1) # remove `v`
       - uses: actions/checkout@v3
-      - name: Setup .Net 6.0
+      - name: Setup .Net 8.0
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '6.0'
+          dotnet-version: '8.0'
       - name: Install dependencies
         run: dotnet restore
       - name: Build WinSocat

.github/workflows/unit-test.yml

@@ -18,10 +18,10 @@ jobs:
     runs-on: windows-latest
     steps:
         - uses: actions/checkout@v3
-        - name: Setup .Net 6.0
+        - name: Setup .Net 8.0
           uses: actions/setup-dotnet@v3
           with:
-            dotnet-version: '6.0'
+            dotnet-version: '8.0'
         - name: Install dependencies
           run: dotnet restore
         - name: Build

.gitignore

@@ -2,4 +2,5 @@
 /winsocat/bin/
 /Tests/obj
 /Tests/bin
+/.vs
 *.user

README.md

@@ -37,6 +37,8 @@ The `address1` can accept `STDIO`, `TCP-LISTEN`, `TCP`, `NPIPE`, `NPIPE-LISTEN`,
 
 The `address2` can accept `STDIO`, `TCP`, `NPIPE`, `EXEC`, `WSL`, `UNIX`, `HVSOCK`, `SP` socket types.
 
+`NPIPE-LISTEN` supports the `ACL=AllowCurrentUser` parameter, in this case, no other user that is connected to the machine can read / write from / to the pipe. The default is `ACL=AllowEveryone`.
+
 ## Examples
 
 * It can bridge standard input/output and tcp connection to address **127.0.0.1** on port **80**.

Tests/AddressElementTest.cs

@@ -13,15 +13,15 @@ public class AddressElementTest
     [TestCase("tag:\'foo \"bar\"\',opt1,opt2")]
     public void ValidInputParseTest(string input)
     {
-        Assert.NotNull(AddressElement.TryParse(input));
+        Assert.That(AddressElement.TryParse(input), Is.Not.Null);
     }
 
     [TestCase("tag:\'foo\"")]
     [TestCase("tag:\"foo bar\'")]
     [TestCase("tag:\'foo \"bar\',opt1, opt2")]
     public void InvalidInputParseTest(string input)
     {
-        Assert.Null(AddressElement.TryParse(input));
+        Assert.That(AddressElement.TryParse(input), Is.Null);
     }
 
     [TestCase("STDIO", ExpectedResult = "STDIO")]

Tests/HyperVListenPiperInfoTest.cs

@@ -25,7 +25,7 @@ public class HyperVListenPiperInfoTest
     public void ValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(HyperVListenPiperInfo.TryParse(element));
+        Assert.That(HyperVListenPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase("HVSOCK-LISTEN:00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000")]
@@ -39,7 +39,7 @@ public void ValidInputParseTest(string input)
     public void CaseInsensitiveValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(HyperVListenPiperInfo.TryParse(element));
+        Assert.That(HyperVListenPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase("STDIO")]
@@ -53,7 +53,7 @@ public void CaseInsensitiveValidInputParseTest(string input)
     public void InvalidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.Null(HyperVListenPiperInfo.TryParse(element));
+        Assert.That(HyperVListenPiperInfo.TryParse(element), Is.Null);
     }
 
     [TestCase("HVSOCK-LISTEN:00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000", ExpectedResult = "00000000-0000-0000-0000-000000000000")]

Tests/HyperVStreamPiperInfoTest.cs

@@ -1,4 +1,5 @@
 using Firejox.App.WinSocat;
+
 namespace APPTest;
 
 public class HyperVStreamPiperInfoTest
@@ -24,7 +25,7 @@ public class HyperVStreamPiperInfoTest
     public void ValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(HyperVStreamPiperInfo.TryParse(element));
+        Assert.That(HyperVStreamPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase("HVSOCK:00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000")]
@@ -38,7 +39,7 @@ public void ValidInputParseTest(string input)
     public void CaseInsensitiveValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(HyperVStreamPiperInfo.TryParse(element));
+        Assert.That(HyperVStreamPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase("STDIO")]
@@ -52,7 +53,7 @@ public void CaseInsensitiveValidInputParseTest(string input)
     public void InvalidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.Null(HyperVStreamPiperInfo.TryParse(element));
+        Assert.That(HyperVStreamPiperInfo.TryParse(element), Is.Null);
     }
 
     [TestCase("HVSOCK:00000000-0000-0000-0000-000000000000:00000000-0000-0000-0000-000000000000", ExpectedResult = "00000000-0000-0000-0000-000000000000")]

Tests/NamedPipeListenPiperInfoTest.cs

@@ -5,35 +5,57 @@ namespace APPTest;
 public class NamedPipeListenPiperInfoTest
 {
     [TestCase("NPIPE-LISTEN:fooPipe")]
+    [TestCase("NPIPE-LISTEN:fooPipe,ACL=AllowEveryone")]
+    [TestCase("NPIPE-LISTEN:fooPipe,ACL=AllowCurrentUser")]
     public void VaildInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(Firejox.App.WinSocat.NamedPipeListenPiperInfo.TryParse(element));
+        Assert.That(NamedPipeListenPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase("NPIPE-LISTEN:fooPipe")]
     [TestCase("npipe-listen:fooPipe")]
     public void CaseInsensitiveValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(Firejox.App.WinSocat.NamedPipeListenPiperInfo.TryParse(element));
+        Assert.That(NamedPipeListenPiperInfo.TryParse(element), Is.Not.Null);
     }
-    
+
     [TestCase("STDIO")]
     [TestCase("TCP:127.0.0.1:80")]
     [TestCase("TCP-LISTEN:127.0.0.1:80")]
     [TestCase("NPIPE:fooServer:barPipe")]
+    [TestCase("NPIPE:fooServer:barPipe")]
+    [TestCase("NPIPE:fooServer:barPipe")]
     [TestCase(@"EXEC:'C:\Foo.exe bar'")]
     public void InvalidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.Null(Firejox.App.WinSocat.NamedPipeListenPiperInfo.TryParse(element));
-    }
-
-    [TestCase("NPIPE-LISTEN:fooPipe", ExpectedResult = "fooPipe")]
-    public string PipePatternMatchTest(string input)
+        Assert.That(NamedPipeListenPiperInfo.TryParse(element), Is.Null);
+    }
+
+    [TestCase("NPIPE-LISTEN:fooPipe")]
+    [TestCase("NPIPE-LISTEN:fooPipe,ACL=AllowEveryone")]
+    [TestCase("NPIPE-LISTEN:fooPipe,ACL=AllowCurrentUser")]
+    public void PipePatternMatchTest(string input)
     {
-        var element = AddressElement.TryParse(input);
-        return Firejox.App.WinSocat.NamedPipeListenPiperInfo.TryParse(element).PipeName;
+        // Case 1 - Default ACL
+        var element = AddressElement.TryParse("NPIPE-LISTEN:fooPipe");
+        var parsed = NamedPipeListenPiperInfo.TryParse(element);
+        Assert.That(parsed.PipeName, Is.EqualTo("fooPipe"));
+        Assert.That(parsed.ACL, Is.EqualTo("AllowEveryone"));
+
+        // Case 2 - AllowEveryone ACL
+        element = AddressElement.TryParse("NPIPE-LISTEN:fooPipe,ACL=AllowEveryone");
+        parsed = NamedPipeListenPiperInfo.TryParse(element);
+        Assert.That(parsed.PipeName, Is.EqualTo("fooPipe"));
+        Assert.That(parsed.ACL, Is.EqualTo("AllowEveryone"));
+
+        // Case 3 - AllowCurrentUser ACL
+        element = AddressElement.TryParse("NPIPE-LISTEN:fooPipe,ACL=AllowCurrentUser");
+        parsed = NamedPipeListenPiperInfo.TryParse(element);
+        Assert.That(parsed.PipeName, Is.EqualTo("fooPipe"));
+        Assert.That(parsed.ACL, Is.EqualTo("AllowCurrentUser"));
+
     }
-}
+}

Tests/NamedPipeListenPiperStrategyTest.cs

@@ -52,14 +52,16 @@ public void EchoPiperTest()
 
             writer.WriteLine("Foo");
             writer.Flush();
-            
-            StringAssert.AreEqualIgnoringCase("Foo", reader.ReadLine());
+
+            Assert.That(reader.ReadLine(), Is.EqualTo("Foo").IgnoreCase);
         }
     }
 
     [TearDown]
     public void CleanUp()
     {
         _source.Cancel();
+        _source.Dispose();
     }
+
 }

Tests/NamedPipeStreamPiperInfoTest.cs

@@ -9,27 +9,27 @@ public class NamedPipeStreamPiperInfoTest
    [TestCase("NPIPE:barPipe")]
    public void ValidInputParseTest(string input)
    {
-      var element = AddressElement.TryParse(input);
-      Assert.NotNull(Firejox.App.WinSocat.NamedPipeStreamPiperInfo.TryParse(element));
+      var element = AddressElement.TryParse(input);
+      Assert.That(NamedPipeStreamPiperInfo.TryParse(element), Is.Not.Null);
    }
 
    [TestCase("NPIPE:fooServer:barPipe")]
    [TestCase("npipe:fooServer:barPipe")]
    public void CaseInsensitiveValidInputParseTest(string input)
    {
-      var element = AddressElement.TryParse(input);
-      Assert.NotNull(Firejox.App.WinSocat.NamedPipeStreamPiperInfo.TryParse(element));
+      var element = AddressElement.TryParse(input);
+      Assert.That(NamedPipeStreamPiperInfo.TryParse(element), Is.Not.Null);
    }
 
    [TestCase("STDIO")]
    [TestCase("TCP:127.0.0.1:80")]
    [TestCase("TCP-LISTEN:127.0.0.1:80")]
-   [TestCase("NPIPE-LISTEN:fooPipe")] 
+   [TestCase("NPIPE-LISTEN:fooPipe")]
    [TestCase(@"EXEC:'C:\Foo.exe bar'")]
    public void InvalidInputParseTest(string input)
    {
-      var element = AddressElement.TryParse(input);
-      Assert.Null(Firejox.App.WinSocat.NamedPipeStreamPiperInfo.TryParse(element));
+      var element = AddressElement.TryParse(input);
+        Assert.That(NamedPipeStreamPiperInfo.TryParse(element), Is.Null);
    }
 
    [TestCase("NPIPE:fooServer:barPipe", ExpectedResult = "fooServer")]

Tests/PiperStrategyTest.cs

@@ -104,7 +104,7 @@ public void EchoPiperTest()
         _writeStream.Seek(0, SeekOrigin.Begin);
         var reader = new StreamReader(_writeStream);
 
-        StringAssert.AreEqualIgnoringCase("Foo", reader.ReadToEnd());
+        Assert.That(reader.ReadToEnd(), Is.EqualTo("Foo").IgnoreCase);
     }
 
     [Test]
@@ -149,10 +149,10 @@ public void TcpStreamPiperTest()
         serverThread.Join();
 
         _writeStream.Seek(0, SeekOrigin.Begin);
-        var reader = new StreamReader(_writeStream);
-        
-        StringAssert.AreEqualIgnoringCase("Foo", tcs.Task.Result);
-        StringAssert.AreEqualIgnoringCase("Bar", reader.ReadToEnd());
+        var reader = new StreamReader(_writeStream);
+
+        Assert.That(tcs.Task.Result, Is.EqualTo("Foo").IgnoreCase);
+        Assert.That(reader.ReadToEnd(), Is.EqualTo("Bar").IgnoreCase);
     }
 
     [Test]
@@ -188,8 +188,9 @@ public void NamedPipeStreamPiperTest()
 
         _writeStream.Seek(0, SeekOrigin.Begin);
         var reader = new StreamReader(_writeStream);
-        StringAssert.AreEqualIgnoringCase("Bar", reader.ReadToEnd());
-        StringAssert.AreEqualIgnoringCase("Foo", tcs.Task.Result);
+
+        Assert.That(reader.ReadToEnd(), Is.EqualTo("Bar").IgnoreCase);
+        Assert.That(tcs.Task.Result, Is.EqualTo("Foo").IgnoreCase);
     }
 
     [Test]
@@ -241,14 +242,16 @@ public void UnixSocketStreamPiperTest()
         _strategy.Execute(factory);
 
         _writeStream.Seek(0, SeekOrigin.Begin);
-        var reader = new StreamReader(_writeStream);
-        StringAssert.AreEqualIgnoringCase("Bar", reader.ReadToEnd());
-        StringAssert.AreEqualIgnoringCase("Foo", tcs.Task.Result);
+        var reader = new StreamReader(_writeStream);
+
+        Assert.That(reader.ReadToEnd(), Is.EqualTo("Bar").IgnoreCase);
+        Assert.That(tcs.Task.Result, Is.EqualTo("Foo").IgnoreCase);
     }
 
     [TearDown]
     public void CleanUp()
     {
         _writeStream.Dispose();
+        _writer.Dispose();
     }
 }

Tests/ProcPiperInfoTest.cs

@@ -10,15 +10,15 @@ public class ProcPiperInfoTest
     public void ValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(Firejox.App.WinSocat.ProcPiperInfo.TryParse(element));
+        Assert.That(ProcPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase(@"EXEC:C:\Foo.exe bar")]
     [TestCase(@"exec:C:\Foo.exe bar")]
     public void CaseInsensitiveValidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.NotNull(Firejox.App.WinSocat.ProcPiperInfo.TryParse(element));
+        Assert.That(ProcPiperInfo.TryParse(element), Is.Not.Null);
     }
 
     [TestCase("STDIO")]
@@ -29,7 +29,7 @@ public void CaseInsensitiveValidInputParseTest(string input)
     public void InvalidInputParseTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        Assert.Null(Firejox.App.WinSocat.ProcPiperInfo.TryParse(element));
+        Assert.That(ProcPiperInfo.TryParse(element), Is.Null);
     }
 
     [TestCase(@"EXEC:C:\Foo.exe bar", ExpectedResult = @"C:\Foo.exe")]
@@ -38,14 +38,14 @@ public void InvalidInputParseTest(string input)
     public string FileNamePatternMatchTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        return Firejox.App.WinSocat.ProcPiperInfo.TryParse(element).FileName;
+        return ProcPiperInfo.TryParse(element).FileName;
     }
 
     [TestCase(@"EXEC:C:\Foo.exe bar1 bar2", ExpectedResult = "bar1 bar2")]
     [TestCase(@"EXEC:""C:\foo\space dir\bar.exe"" arg1 arg2", ExpectedResult = @"arg1 arg2")]
     public string ArgumentPatternMatchTest(string input)
     {
         var element = AddressElement.TryParse(input);
-        return Firejox.App.WinSocat.ProcPiperInfo.TryParse(element).Arguments;
+        return ProcPiperInfo.TryParse(element).Arguments;
     }
 }