[release/5.0] Modify System.Net.HttpListener to throw PNSE at assembly level on browser (#43523)

github-actions[bot] · MaximLipnin · web-flow · commit 46c9477895d6 · 2020-10-19T19:43:53.000-05:00
* Modify System.Net.HttpListener to throw PNSE at assembly level on browser

* Fix build

Co-authored-by: Maxim Lipnin &lt;v-maxlip@microsoft.com&gt;
diff --git 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>
diff --git 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 @@ public HttpListener() { }
         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,25 +87,21 @@ internal HttpListenerRequest() { }
         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; } }
         public System.Net.TransportContext TransportContext { get { throw null; } }
         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 @@ internal HttpListenerResponse() { }
         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
@@ -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>
diff --git 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
@@ -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 @@ public AuthenticationSchemes AuthenticationSchemes
         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
@@ -7,7 +7,6 @@
 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 @@ public Encoding ContentEncoding
 
         public string? ContentType => Headers[HttpKnownHeaderNames.ContentType];
 
-        [UnsupportedOSPlatform("browser")]
         public bool IsLocal => LocalEndPoint!.Address.Equals(RemoteEndPoint!.Address);
 
         public bool IsWebSocketRequest
@@ -208,7 +206,6 @@ public NameValueCollection QueryString
 
         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
@@ -34,7 +34,6 @@
 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;
@@ -374,10 +373,8 @@ public Stream InputStream
 
         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
@@ -30,7 +30,6 @@
 
 using System.Globalization;
 using System.IO;
-using System.Runtime.Versioning;
 using System.Text;
 
 namespace System.Net
@@ -93,7 +92,6 @@ public int StatusCode
 
         private void Dispose() => Close(true);
 
-        [UnsupportedOSPlatform("browser")]
         public void Close()
         {
             if (Disposed)
@@ -102,7 +100,6 @@ public void Close()
             Close(false);
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Abort()
         {
             if (Disposed)
@@ -117,7 +114,6 @@ private void Close(bool force)
             _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
@@ -7,7 +7,6 @@
 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 @@ public bool HasEntityBody
             }
         }
 
-        [UnsupportedOSPlatform("browser")]
         public IPEndPoint RemoteEndPoint
         {
             get
@@ -303,7 +301,6 @@ public IPEndPoint RemoteEndPoint
             }
         }
 
-        [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
@@ -8,7 +8,6 @@
 using System.Text;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Runtime.Versioning;
 using Microsoft.Win32.SafeHandles;
 
 namespace System.Net
@@ -96,7 +95,6 @@ public Version ProtocolVersion
             }
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Abort()
         {
             if (Disposed)
@@ -108,7 +106,6 @@ public void Abort()
             HttpListenerContext.Abort();
         }
 
-        [UnsupportedOSPlatform("browser")]
         public void Close()
         {
             try
@@ -121,7 +118,6 @@ public void Close()
             }
         }
 
-        [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
@@ -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)]
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
@@ -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" />

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`using System.Collections;`
`5`	`5`	`using System.Diagnostics.CodeAnalysis;`
`6`		`-using System.Runtime.Versioning;`
`7`	`6`	`using System.Security.Authentication.ExtendedProtection;`
`8`	`7`	`using System.Text;`
`9`	`8`	`using System.Threading.Tasks;`
`@@ -82,7 +81,6 @@ public AuthenticationSchemes AuthenticationSchemes`
`82`	`81`	`public ExtendedProtectionPolicy ExtendedProtectionPolicy`
`83`	`82`	`{`
`84`	`83`	`get => _extendedProtectionPolicy;`
`85`		`- [UnsupportedOSPlatform("browser")]`
`86`	`84`	`set`
`87`	`85`	`{`
`88`	`86`	`CheckDisposed();`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`
`31`	`31`	`using System.Globalization;`
`32`	`32`	`using System.IO;`
`33`		`-using System.Runtime.Versioning;`
`34`	`33`	`using System.Text;`
`35`	`34`
`36`	`35`	`namespace System.Net`
`@@ -93,7 +92,6 @@ public int StatusCode`
`93`	`92`
`94`	`93`	`private void Dispose() => Close(true);`
`95`	`94`
`96`		`- [UnsupportedOSPlatform("browser")]`
`97`	`95`	`public void Close()`
`98`	`96`	`{`
`99`	`97`	`if (Disposed)`
`@@ -102,7 +100,6 @@ public void Close()`
`102`	`100`	`Close(false);`
`103`	`101`	`}`
`104`	`102`
`105`		`- [UnsupportedOSPlatform("browser")]`
`106`	`103`	`public void Abort()`
`107`	`104`	`{`
`108`	`105`	`if (Disposed)`
`@@ -117,7 +114,6 @@ private void Close(bool force)`
`117`	`114`	`_httpContext!.Connection.Close(force);`
`118`	`115`	`}`
`119`	`116`
`120`		`- [UnsupportedOSPlatform("browser")]`
`121`	`117`	`public void Close(byte[] responseEntity, bool willBlock)`
`122`	`118`	`{`
`123`	`119`	`CheckDisposed();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System.IO;`
`8`	`8`	`using System.Net.WebSockets;`
`9`	`9`	`using System.Runtime.InteropServices;`
`10`		`-using System.Runtime.Versioning;`
`11`	`10`	`using System.Security;`
`12`	`11`	`using System.Security.Authentication.ExtendedProtection;`
`13`	`12`	`using System.Security.Cryptography;`
`@@ -289,7 +288,6 @@ public bool HasEntityBody`
`289`	`288`	`}`
`290`	`289`	`}`
`291`	`290`
`292`		`- [UnsupportedOSPlatform("browser")]`
`293`	`291`	`public IPEndPoint RemoteEndPoint`
`294`	`292`	`{`
`295`	`293`	`get`
`@@ -303,7 +301,6 @@ public IPEndPoint RemoteEndPoint`
`303`	`301`	`}`
`304`	`302`	`}`
`305`	`303`
`306`		`- [UnsupportedOSPlatform("browser")]`
`307`	`304`	`public IPEndPoint LocalEndPoint`
`308`	`305`	`{`
`309`	`306`	`get`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using System.Text;`
`9`	`9`	`using System.ComponentModel;`
`10`	`10`	`using System.Diagnostics;`
`11`		`-using System.Runtime.Versioning;`
`12`	`11`	`using Microsoft.Win32.SafeHandles;`
`13`	`12`
`14`	`13`	`namespace System.Net`
`@@ -96,7 +95,6 @@ public Version ProtocolVersion`
`96`	`95`	`}`
`97`	`96`	`}`
`98`	`97`
`99`		`- [UnsupportedOSPlatform("browser")]`
`100`	`98`	`public void Abort()`
`101`	`99`	`{`
`102`	`100`	`if (Disposed)`
`@@ -108,7 +106,6 @@ public void Abort()`
`108`	`106`	`HttpListenerContext.Abort();`
`109`	`107`	`}`
`110`	`108`
`111`		`- [UnsupportedOSPlatform("browser")]`
`112`	`109`	`public void Close()`
`113`	`110`	`{`
`114`	`111`	`try`
`@@ -121,7 +118,6 @@ public void Close()`
`121`	`118`	`}`
`122`	`119`	`}`
`123`	`120`
`124`		`- [UnsupportedOSPlatform("browser")]`
`125`	`121`	`public void Close(byte[] responseEntity, bool willBlock)`
`126`	`122`	`{`
`127`	`123`	`CheckDisposed();`