From 8c48ae89ef229c293d233f0e30d755df81d564e5 Mon Sep 17 00:00:00 2001
From: Maxim Lipnin <v-maxlip@microsoft.com>
Date: Fri, 16 Oct 2020 20:56:47 +0300
Subject: [PATCH] Modify System.Net.HttpListener to throw PNSE at assembly
 level on browser (#43401)

---
 src/libraries/System.Net.HttpListener/Directory.Build.props      | 1 +
 .../System.Net.HttpListener/ref/System.Net.HttpListener.cs       | 9 +--------
 src/libraries/System.Net.HttpListener/src/Resources/Strings.resx | 3 +++
 .../System.Net.HttpListener/src/System.Net.HttpListener.csproj   | 5 +++--
 .../System.Net.HttpListener/src/System/Net/HttpListener.cs       | 2 --
 .../src/System/Net/HttpListenerRequest.cs                        | 3 ---
 .../src/System/Net/Managed/HttpListenerRequest.Managed.cs        | 3 ---
 .../src/System/Net/Managed/HttpListenerResponse.Managed.cs       | 4 ----
 .../src/System/Net/Windows/HttpListenerRequest.Windows.cs        | 3 ---
 .../src/System/Net/Windows/HttpListenerResponse.Windows.cs       | 4 ----
 src/libraries/System.Net.HttpListener/tests/AssemblyInfo.cs      | 6 ++++++
 .../tests/System.Net.HttpListener.Tests.csproj                   | 2 ++
 12 files changed, 16 insertions(+), 29 deletions(-)
 create mode 100644 src/libraries/System.Net.HttpListener/tests/AssemblyInfo.cs

diff --git a/src/libraries/System.Net.HttpListener/Directory.Build.props b/src/libraries/System.Net.HttpListener/Directory.Build.props
index 1db5968..4784967 100644
--- a/src/libraries/System.Net.HttpListener/Directory.Build.props
+++ b/src/libraries/System.Net.HttpListener/Directory.Build.props
@@ -3,5 +3,6 @@
   <PropertyGroup>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
+    <UnsupportedOSPlatforms>browser</UnsupportedOSPlatforms>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs
index cdca2d9..b9bf091 100644
--- a/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs
+++ b/src/libraries/System.Net.HttpListener/ref/System.Net.HttpListener.cs
@@ -13,7 +13,7 @@ namespace System.Net
         public System.Net.AuthenticationSchemes AuthenticationSchemes { get { throw null; } set { } }
         public System.Net.AuthenticationSchemeSelector? AuthenticationSchemeSelectorDelegate { get { throw null; } set { } }
         public System.Security.Authentication.ExtendedProtection.ServiceNameCollection DefaultServiceNames { get { throw null; } }
-        public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get { throw null; } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] set { } }
+        public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get { throw null; } set { } }
         [System.Diagnostics.CodeAnalysis.DisallowNullAttribute]
         public System.Net.HttpListener.ExtendedProtectionSelector? ExtendedProtectionSelectorDelegate { get { throw null; } set { } }
         public bool IgnoreWriteExceptions { get { throw null; } set { } }
@@ -87,17 +87,14 @@ namespace System.Net
         public string HttpMethod { get { throw null; } }
         public System.IO.Stream InputStream { get { throw null; } }
         public bool IsAuthenticated { get { throw null; } }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public bool IsLocal { get { throw null; } }
         public bool IsSecureConnection { get { throw null; } }
         public bool IsWebSocketRequest { get { throw null; } }
         public bool KeepAlive { get { throw null; } }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public System.Net.IPEndPoint LocalEndPoint { get { throw null; } }
         public System.Version ProtocolVersion { get { throw null; } }
         public System.Collections.Specialized.NameValueCollection QueryString { get { throw null; } }
         public string? RawUrl { get { throw null; } }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public System.Net.IPEndPoint RemoteEndPoint { get { throw null; } }
         public System.Guid RequestTraceIdentifier { get { throw null; } }
         public string? ServiceName { get { throw null; } }
@@ -105,7 +102,6 @@ namespace System.Net
         public System.Uri? Url { get { throw null; } }
         public System.Uri? UrlReferrer { get { throw null; } }
         public string UserAgent { get { throw null; } }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public string UserHostAddress { get { throw null; } }
         public string UserHostName { get { throw null; } }
         public string[]? UserLanguages { get { throw null; } }
@@ -129,14 +125,11 @@ namespace System.Net
         public bool SendChunked { get { throw null; } set { } }
         public int StatusCode { get { throw null; } set { } }
         public string StatusDescription { get { throw null; } set { } }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public void Abort() { }
         public void AddHeader(string name, string value) { }
         public void AppendCookie(System.Net.Cookie cookie) { }
         public void AppendHeader(string name, string value) { }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public void Close() { }
-        [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")]
         public void Close(byte[] responseEntity, bool willBlock) { }
         public void CopyFrom(System.Net.HttpListenerResponse templateResponse) { }
         public void Redirect(string url) { }
diff --git a/src/libraries/System.Net.HttpListener/src/Resources/Strings.resx b/src/libraries/System.Net.HttpListener/src/Resources/Strings.resx
index f9747a6..c9c146f 100644
--- a/src/libraries/System.Net.HttpListener/src/Resources/Strings.resx
+++ b/src/libraries/System.Net.HttpListener/src/Resources/Strings.resx
@@ -389,4 +389,7 @@
   <data name="net_WebSockets_InvalidState" xml:space="preserve">
     <value>The WebSocket is in an invalid state ('{0}') for this operation. Valid states are: '{1}'</value>
   </data>
+  <data name="SystemNetHttpListener_PlatformNotSupported" xml:space="preserve">
+    <value>System.Net.HttpListener is not supported on this platform.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
index 476f598..c0af10c 100644
--- a/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
+++ b/src/libraries/System.Net.HttpListener/src/System.Net.HttpListener.csproj
@@ -4,6 +4,7 @@
     <ForceManagedImplementation>false</ForceManagedImplementation>
     <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
     <Nullable>enable</Nullable>
+    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsBrowser)' == 'true'">SR.SystemNetHttpListener_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
@@ -33,7 +34,7 @@
     <Reference Include="System.Threading" />
     <Reference Include="System.Threading.Overlapped" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
     <Compile Include="System\Net\BoundaryType.cs" />
     <Compile Include="System\Net\EntitySendFormat.cs" />
     <Compile Include="System\Net\HttpListenerPrefixCollection.cs" />
@@ -247,7 +248,7 @@
     <Compile Include="$(CommonPath)Interop\Windows\SspiCli\SSPIWrapper.cs"
              Link="Common\Interop\Windows\SspiCli\SSPIWrapper.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true' or '$(ForceManagedImplementation)' == 'true'">
+  <ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(ForceManagedImplementation)' == 'true'">
     <Compile Include="System\Net\Managed\HttpEndPointListener.cs" />
     <Compile Include="System\Net\Managed\HttpEndPointManager.cs" />
     <Compile Include="System\Net\Managed\HttpConnection.cs" />
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/HttpListener.cs b/src/libraries/System.Net.HttpListener/src/System/Net/HttpListener.cs
index d40826b..b391474 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/HttpListener.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/HttpListener.cs
@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.Versioning;
 using System.Security.Authentication.ExtendedProtection;
 using System.Text;
 using System.Threading.Tasks;
@@ -82,7 +81,6 @@ namespace System.Net
         public ExtendedProtectionPolicy ExtendedProtectionPolicy
         {
             get => _extendedProtectionPolicy;
-            [UnsupportedOSPlatform("browser")]
             set
             {
                 CheckDisposed();
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/HttpListenerRequest.cs b/src/libraries/System.Net.HttpListener/src/System/Net/HttpListenerRequest.cs
index a431ed6..4540239 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/HttpListenerRequest.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/HttpListenerRequest.cs
@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Net.WebSockets;
 using System.Reflection;
-using System.Runtime.Versioning;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading.Tasks;
@@ -111,7 +110,6 @@ namespace System.Net
 
         public string? ContentType => Headers[HttpKnownHeaderNames.ContentType];
 
-        [UnsupportedOSPlatform("browser")]
         public bool IsLocal => LocalEndPoint!.Address.Equals(RemoteEndPoint!.Address);
 
         public bool IsWebSocketRequest
@@ -208,7 +206,6 @@ namespace System.Net
 
         public string UserAgent => Headers[HttpKnownHeaderNames.UserAgent]!;
 
-        [UnsupportedOSPlatform("browser")]
         public string UserHostAddress => LocalEndPoint!.ToString();
 
         public string UserHostName => Headers[HttpKnownHeaderNames.Host]!;
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerRequest.Managed.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerRequest.Managed.cs
index a29021d..cdcda58 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerRequest.Managed.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerRequest.Managed.cs
@@ -35,7 +35,6 @@ using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Runtime.Versioning;
 using System.Security.Authentication.ExtendedProtection;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
@@ -375,10 +374,8 @@ namespace System.Net
 
         public bool IsSecureConnection => _context.Connection.IsSecure;
 
-        [UnsupportedOSPlatform("browser")]
         public IPEndPoint? LocalEndPoint => _context.Connection.LocalEndPoint;
 
-        [UnsupportedOSPlatform("browser")]
         public IPEndPoint? RemoteEndPoint => _context.Connection.RemoteEndPoint;
 
         public Guid RequestTraceIdentifier { get; } = Guid.NewGuid();
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs
index 4de98bf..2a8fc6e 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/Managed/HttpListenerResponse.Managed.cs
@@ -31,7 +31,6 @@
 
 using System.Globalization;
 using System.IO;
-using System.Runtime.Versioning;
 using System.Text;
 
 namespace System.Net
@@ -94,7 +93,6 @@ namespace System.Net
 
         private void Dispose() => Close(true);
 
-        [UnsupportedOSPlatform("browser")]
         public void Close()
         {
             if (Disposed)
@@ -103,7 +101,6 @@ namespace System.Net
             Close(false);
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Abort()
         {
             if (Disposed)
@@ -118,7 +115,6 @@ namespace System.Net
             _httpContext!.Connection.Close(force);
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Close(byte[] responseEntity, bool willBlock)
         {
             CheckDisposed();
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerRequest.Windows.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerRequest.Windows.cs
index b49eb2c..c3b038a 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerRequest.Windows.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerRequest.Windows.cs
@@ -7,7 +7,6 @@ using System.Globalization;
 using System.IO;
 using System.Net.WebSockets;
 using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using System.Security;
 using System.Security.Authentication.ExtendedProtection;
 using System.Security.Cryptography;
@@ -289,7 +288,6 @@ namespace System.Net
             }
         }
 
-        [UnsupportedOSPlatform("browser")]
         public IPEndPoint RemoteEndPoint
         {
             get
@@ -303,7 +301,6 @@ namespace System.Net
             }
         }
 
-        [UnsupportedOSPlatform("browser")]
         public IPEndPoint LocalEndPoint
         {
             get
diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerResponse.Windows.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerResponse.Windows.cs
index 40d72e8..0c4b36a 100644
--- a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerResponse.Windows.cs
+++ b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListenerResponse.Windows.cs
@@ -8,7 +8,6 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Runtime.Versioning;
 using Microsoft.Win32.SafeHandles;
 
 namespace System.Net
@@ -96,7 +95,6 @@ namespace System.Net
             }
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Abort()
         {
             if (Disposed)
@@ -108,7 +106,6 @@ namespace System.Net
             HttpListenerContext.Abort();
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Close()
         {
             try
@@ -121,7 +118,6 @@ namespace System.Net
             }
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Close(byte[] responseEntity, bool willBlock)
         {
             CheckDisposed();
diff --git a/src/libraries/System.Net.HttpListener/tests/AssemblyInfo.cs b/src/libraries/System.Net.HttpListener/tests/AssemblyInfo.cs
new file mode 100644
index 0000000..be691ca
--- /dev/null
+++ b/src/libraries/System.Net.HttpListener/tests/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Xunit;
+
+[assembly: SkipOnMono("System.Net.HttpListener is not supported on wasm", TestPlatforms.Browser)]
\ No newline at end of file
diff --git a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
index 3d8ebf1..2cb8e45 100644
--- a/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
+++ b/src/libraries/System.Net.HttpListener/tests/System.Net.HttpListener.Tests.csproj
@@ -3,8 +3,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StringResourcesPath>../src/Resources/Strings.resx</StringResourcesPath>
     <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX</TargetFrameworks>
+    <IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
     <Compile Include="GetContextHelper.cs" />
     <Compile Include="HttpListenerFactory.cs" />
     <Compile Include="HttpListenerAuthenticationTests.cs" />
-- 
2.7.4