Skip to content

Commit

Permalink
Mark some System.Net.HttpListener APIs as unsupported on browser (#42063
Browse files Browse the repository at this point in the history
)

* Mark some System.Net.HttpListener APIs as unsupported on browser

* FIx windows builds

* Fix windows builds

* Remove browser annotations from the properties with windows-specific setters.

* Mark only setter of ExtendedProtectionPolicy

* Remove another redundant annotation
  • Loading branch information
MaximLipnin authored Sep 14, 2020
1 parent 57e12e5 commit b147bbe
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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; } set { } }
public System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy ExtendedProtectionPolicy { get { throw null; } [System.Runtime.Versioning.UnsupportedOSPlatformAttribute("browser")] set { } }
[System.Diagnostics.CodeAnalysis.DisallowNullAttribute]
public System.Net.HttpListener.ExtendedProtectionSelector? ExtendedProtectionSelectorDelegate { get { throw null; } set { } }
public bool IgnoreWriteExceptions { get { throw null; } set { } }
Expand Down Expand Up @@ -87,21 +87,25 @@ 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; } }
Expand All @@ -125,11 +129,14 @@ 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) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System.Collections;
using System.Diagnostics.CodeAnalysis;
using System.Runtime.Versioning;
using System.Security.Authentication.ExtendedProtection;
using System.Text;
using System.Threading.Tasks;
Expand Down Expand Up @@ -81,6 +82,7 @@ public AuthenticationSchemes AuthenticationSchemes
public ExtendedProtectionPolicy ExtendedProtectionPolicy
{
get => _extendedProtectionPolicy;
[UnsupportedOSPlatform("browser")]
set
{
CheckDisposed();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
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;
Expand Down Expand Up @@ -110,6 +111,7 @@ public Encoding ContentEncoding

public string? ContentType => Headers[HttpKnownHeaderNames.ContentType];

[UnsupportedOSPlatform("browser")]
public bool IsLocal => LocalEndPoint!.Address.Equals(RemoteEndPoint!.Address);

public bool IsWebSocketRequest
Expand Down Expand Up @@ -206,6 +208,7 @@ public NameValueCollection QueryString

public string UserAgent => Headers[HttpKnownHeaderNames.UserAgent]!;

[UnsupportedOSPlatform("browser")]
public string UserHostAddress => LocalEndPoint!.ToString();

public string UserHostName => Headers[HttpKnownHeaderNames.Host]!;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
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;
Expand Down Expand Up @@ -373,8 +374,10 @@ 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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

using System.Globalization;
using System.IO;
using System.Runtime.Versioning;
using System.Text;

namespace System.Net
Expand Down Expand Up @@ -92,6 +93,7 @@ public int StatusCode

private void Dispose() => Close(true);

[UnsupportedOSPlatform("browser")]
public void Close()
{
if (Disposed)
Expand All @@ -100,6 +102,7 @@ public void Close()
Close(false);
}

[UnsupportedOSPlatform("browser")]
public void Abort()
{
if (Disposed)
Expand All @@ -114,6 +117,7 @@ private void Close(bool force)
_httpContext!.Connection.Close(force);
}

[UnsupportedOSPlatform("browser")]
public void Close(byte[] responseEntity, bool willBlock)
{
CheckDisposed();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
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;
Expand Down Expand Up @@ -288,6 +289,7 @@ public bool HasEntityBody
}
}

[UnsupportedOSPlatform("browser")]
public IPEndPoint RemoteEndPoint
{
get
Expand All @@ -301,6 +303,7 @@ public IPEndPoint RemoteEndPoint
}
}

[UnsupportedOSPlatform("browser")]
public IPEndPoint LocalEndPoint
{
get
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Text;
using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.Versioning;
using Microsoft.Win32.SafeHandles;

namespace System.Net
Expand Down Expand Up @@ -95,6 +96,7 @@ public Version ProtocolVersion
}
}

[UnsupportedOSPlatform("browser")]
public void Abort()
{
if (Disposed)
Expand All @@ -106,6 +108,7 @@ public void Abort()
HttpListenerContext.Abort();
}

[UnsupportedOSPlatform("browser")]
public void Close()
{
try
Expand All @@ -118,6 +121,7 @@ public void Close()
}
}

[UnsupportedOSPlatform("browser")]
public void Close(byte[] responseEntity, bool willBlock)
{
CheckDisposed();
Expand Down

0 comments on commit b147bbe

Please sign in to comment.