Throw IOException when SslStream is not authenticated or disposed.

Azure · Jun 2, 2022 · 9f78add · 9f78add
1 parent facbd01
commit 9f78add
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/Microsoft.Azure.Amqp.Android/Microsoft.Azure.Amqp.Android.csproj b/Microsoft.Azure.Amqp.Android/Microsoft.Azure.Amqp.Android.csproj
@@ -14,8 +14,7 @@
     <FileAlignment>512</FileAlignment>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <NoWarn>CS1734,CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/TcpTransportListener.cs b/Microsoft.Azure.Amqp/Amqp/Transport/TcpTransportListener.cs
@@ -77,6 +77,7 @@ protected override void OnListen()
             for (int i = 0; i < addresses.Count; ++i)
             {
                 this.listenSockets[i] = new Socket(addresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp) { NoDelay = true };
+                this.listenSockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, 1);
                 this.listenSockets[i].Bind(new IPEndPoint(addresses[i], this.transportSettings.Port));
                 this.listenSockets[i].Listen(this.transportSettings.TcpBacklog);
 

diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/TlsTransport.cs b/Microsoft.Azure.Amqp/Amqp/Transport/TlsTransport.cs
@@ -4,6 +4,7 @@
 namespace Microsoft.Azure.Amqp.Transport
 {
     using System;
+    using System.IO;
     using System.Net.Security;
     using System.Security.Cryptography.X509Certificates;
     using Microsoft.Azure.Amqp.X509;
@@ -78,7 +79,20 @@ public override bool WriteAsync(TransportAsyncCallbackArgs args)
                 }
             }
 
-            IAsyncResult result = this.sslStream.BeginWrite(buffer.Array, buffer.Offset, buffer.Count, onWriteComplete, this);
+            IAsyncResult result;
+            try
+            {
+                result = this.sslStream.BeginWrite(buffer.Array, buffer.Offset, buffer.Count, onWriteComplete, this);
+            }
+            catch (ObjectDisposedException ode)
+            {
+                throw new IOException($"Transport '{this}' is closed", ode);
+            }
+            catch (InvalidOperationException ioe)
+            {
+                throw new IOException($"Transport '{this}' is valid for write operations.", ioe);
+            }
+
             bool completedSynchronously = result.CompletedSynchronously;
             if (completedSynchronously)
             {
@@ -94,7 +108,20 @@ public override bool ReadAsync(TransportAsyncCallbackArgs args)
             Fx.Assert(args.Buffer != null, "must have buffer to read");
             Fx.Assert(this.readState.Args == null, "Cannot read when a read is still in progress");
             this.readState.Args = args;
-            IAsyncResult result = this.sslStream.BeginRead(args.Buffer, args.Offset, args.Count, onReadComplete, this);
+            IAsyncResult result;
+            try
+            {
+                result = this.sslStream.BeginRead(args.Buffer, args.Offset, args.Count, onReadComplete, this);
+            }
+            catch (ObjectDisposedException ode)
+            {
+                throw new IOException($"Transport '{this}' is closed", ode);
+            }
+            catch (InvalidOperationException ioe)
+            {
+                throw new IOException($"Transport '{this}' is valid for read operations.", ioe);
+            }
+
             bool completedSynchronously = result.CompletedSynchronously;
             if (completedSynchronously)
             {
@@ -252,6 +279,11 @@ void HandleOperationComplete(IAsyncResult result, bool write, bool syncComplete)
             }
             catch (Exception exception) when (!Fx.IsFatal(exception))
             {
+                if (exception is InvalidOperationException)
+                {
+                    exception = new IOException($"Transport '{this}' is valid for IO operations.", exception);
+                }
+
                 args.Exception = exception;
             }
 

diff --git a/Microsoft.Azure.Amqp/Properties/Version.cs b/Microsoft.Azure.Amqp/Properties/Version.cs
@@ -3,4 +3,4 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyInformationalVersion("2.5.10")]
+[assembly: AssemblyInformationalVersion("2.5.12")]
diff --git a/test/Test.Microsoft.Amqp.Android/Test.Microsoft.Amqp.Android.csproj b/test/Test.Microsoft.Amqp.Android/Test.Microsoft.Amqp.Android.csproj
@@ -18,8 +18,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>