From d299dff853ea08e5811048dfadec1dfd0f184d87 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Mon, 12 Aug 2019 17:42:55 -0700
Subject: [PATCH 1/2] Throw NotSupportedException given FileHandleEndPoint

- Kestrel's default socket transport does not support FileHandleEndPoint
- Throw a NotSupportedException instead of a NotImplementedException
---
 .../src/SocketConnectionListener.cs           |  7 ++++++
 .../Transport.Sockets/src/SocketsStrings.resx |  3 +++
 .../SocketTransportFactoryTests.cs            | 25 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportFactoryTests.cs

diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs
index ccdb774674..600d674d98 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs
@@ -62,6 +62,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
                 throw new InvalidOperationException(SocketsStrings.TransportAlreadyBound);
             }
 
+            // Check if EndPoint is a FileHandleEndpoint before attempting to access EndPoint.AddressFamily
+            // since that will throw an NotImplementedException.
+            if (EndPoint is FileHandleEndPoint)
+            {
+                throw new NotSupportedException(SocketsStrings.FileHandleEndPointNotSupported);
+            }
+
             Socket listenSocket;
 
             // Unix domain sockets are unspecified
diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx b/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx
index 52b26c66bc..58c6581609 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx
+++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="FileHandleEndPointNotSupported" xml:space="preserve">
+    <value>The Socket transport does not support FileHandleEndPoints. Consider using the libuv transport instead.</value>
+  </data>
   <data name="OnlyIPEndPointsSupported" xml:space="preserve">
     <value>Only ListenType.IPEndPoint is supported by the Socket Transport. https://go.microsoft.com/fwlink/?linkid=874850</value>
   </data>
diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportFactoryTests.cs b/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportFactoryTests.cs
new file mode 100644
index 0000000000..2ff92f497f
--- /dev/null
+++ b/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportFactoryTests.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Sockets.BindTests
+{
+    public class SocketTransportFactoryTests
+    {
+        [Fact]
+        public async Task ThrowsNotSupportedExceptionWhenBindingToFileHandleEndPoint()
+        {
+            var socketTransportFactory = new SocketTransportFactory(Options.Create(new SocketTransportOptions()), Mock.Of<ILoggerFactory>());
+            await Assert.ThrowsAsync<NotSupportedException>(async () => await socketTransportFactory.BindAsync(new FileHandleEndPoint(0, FileHandleType.Auto)));
+        }
+    }
+}
+

From 4bb8a79efb2afffbfc2bc1ac5d9333b980534f92 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Mon, 12 Aug 2019 19:28:29 -0700
Subject: [PATCH 2/2] Update
 src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx

---
 src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx b/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx
index 58c6581609..5f1475a1cf 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx
+++ b/src/Servers/Kestrel/Transport.Sockets/src/SocketsStrings.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="FileHandleEndPointNotSupported" xml:space="preserve">
-    <value>The Socket transport does not support FileHandleEndPoints. Consider using the libuv transport instead.</value>
+    <value>The Socket transport does not support binding to file handles. Consider using the libuv transport instead.</value>
   </data>
   <data name="OnlyIPEndPointsSupported" xml:space="preserve">
     <value>Only ListenType.IPEndPoint is supported by the Socket Transport. https://go.microsoft.com/fwlink/?linkid=874850</value>
@@ -126,4 +126,4 @@
   <data name="TransportAlreadyBound" xml:space="preserve">
     <value>Transport is already bound.</value>
   </data>
-</root>
\ No newline at end of file
+</root>