Skip to content

Add ssl API added between preview 7 and 8 #4860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gewarren merged 3 commits into from
Sep 16, 2020
Merged

Add ssl API added between preview 7 and 8 #4860

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8d1289
Add ssl API added between preview 7 and 8
Sep 16, 2020
ba345f8
Apply suggestions from code review
aik-jahoda Sep 16, 2020
4fb4f93
Update xml/System.Net.Security/SslStream.xml
gewarren Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions xml/System.Net.Http/WinHttpHandler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,8 @@ When this property is set to `true`, all HTTP redirect responses from the server
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<value>To be added.</value>
<summary>Gets or sets a value that indicates whether additional HTTP/2 connections can be established to the same server when the maximum of concurrent streams is reached on all existing connections.</summary>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<value>If <see langword="true" />, additional HTTP/2 connection can be created. Otherwise, if <see langword="false" />, no additional HTTP/2 connection can be created.</value>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down
20 changes: 13 additions & 7 deletions xml/System.Net.Security/ServerOptionsSelectionCallback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,18 @@
<ReturnType>System.Threading.Tasks.ValueTask&lt;System.Net.Security.SslServerAuthenticationOptions&gt;</ReturnType>
</ReturnValue>
<Docs>
<param name="stream">To be added.</param>
<param name="clientHelloInfo">To be added.</param>
<param name="state">To be added.</param>
<param name="cancellationToken">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<param name="stream">The TLS stream on which the authentication happens.</param>
<param name="clientHelloInfo">Represents an information from the Client Hello message.</param>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<param name="state">The information that was passed when registering the callback.</param>
<param name="cancellationToken">The token to monitor for cancellation requests.</param>
<summary>The asynchronous callback to select session properties based on name requested by client.</summary>
Copy link
Copy Markdown
Contributor

@gewarren gewarren Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<summary>The asynchronous callback to select session properties based on name requested by client.</summary>
<summary>Represents the asynchronous callback method that will select session properties based on name requested by client.</summary>
Suggested change
<summary>The asynchronous callback to select session properties based on name requested by client.</summary>
<summary>The asynchronous callback to select session properties based on the name requested by the client.</summary>

<returns>A server authentication property bag.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

This delegate provides authentication properties during the server authenticaton as an asynchronous operation.

]]></format>
</remarks>
</Docs>
</Type>
6 changes: 3 additions & 3 deletions xml/System.Net.Security/SslClientHelloInfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<summary>The host server specified by the client.</summary>
Copy link
Copy Markdown
Member

@wfurt wfurt Sep 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would change that to "The host server specified by the client in Server Name extension (SNI). If the extension is not present this returns empty string.

<value>To be added.</value>
<remarks>To be added.</remarks>
</Docs>
Expand All @@ -61,8 +61,8 @@
<ReturnType>System.Security.Authentication.SslProtocols</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<value>To be added.</value>
<summary>Gets or sets the TLS/SSL protocols offered by client.</summary>
Copy link
Copy Markdown
Member

@wfurt wfurt Sep 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There really should not be setter. Both properties are readonly.

<value>One of the values defined in the <see cref="T:System.Security.Authentication.SslProtocols" /> enumeration.</value>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Net.Security/SslServerAuthenticationOptions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
<ReturnType>System.Net.Security.SslStreamCertificateContext</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<summary>Gets or sets the server certificate context.</summary>
<value>To be added.</value>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<remarks>To be added.</remarks>
</Docs>
Expand Down
37 changes: 29 additions & 8 deletions xml/System.Net.Security/SslStream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@
]]></format>
</remarks>
<exception cref="T:System.ArgumentNullException">
Either <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificateSelectionCallback" /> or <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificate" /> is <see langword="null" /> and <see cref="T:System.Net.Security.LocalCertificateSelectionCallback" /> is not set in the <see langword="SslStream" /> constructor.</exception>
Either <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificateSelectionCallback" /> or <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificate" /> or <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificateContext" > is <see langword="null" /> and <see cref="T:System.Net.Security.LocalCertificateSelectionCallback" /> is not set in the <see langword="SslStream" /> constructor.</exception>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<exception cref="T:System.ArgumentNullException">
<paramref name="sslServerAuthenticationOptions" /> is <see langword="null" />.</exception>
<exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed and left this object in an unusable state.</exception>
Expand Down Expand Up @@ -1438,12 +1438,33 @@
<Parameter Name="cancellationToken" Type="System.Threading.CancellationToken" Index="2" FrameworkAlternate="net-5.0" />
</Parameters>
<Docs>
<param name="optionsCallback">To be added.</param>
<param name="state">To be added.</param>
<param name="cancellationToken">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<param name="optionsCallback">Gets or sets the ServerOptionsSelectionCallback callback.</param>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<param name="state">The state object passed as state parameter of <see cref="T:System.Net.Security.ServerOptionsSelectionCallback" /> when the callback provided in <paramref name="optionsCallback" /> is invoked.</param>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<param name="cancellationToken">The token to monitor for cancellation requests.</param>
<summary>Called by servers to authenticate the server and optionally the client in a client-server connection as an asynchronous operation. The authentication process uses information returned by the <paramref name="optionsCallback" />.</summary>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<returns>The task object representing the asynchronous operation.</returns>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks

If the authentication fails, you receive a <xref:System.Security.Authentication.AuthenticationException>, and this <xref:System.Net.Security.SslStream> is no longer useable. You should close this object and remove all references to it so that it can be collected by the garbage collector.

]]></format>
</remarks>
<exception cref="T:System.ArgumentNullException">
Either <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificateSelectionCallback" /> or <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificate" /> or <see cref="P:System.Net.Security.SslServerAuthenticationOptions.ServerCertificateContext" > is <see langword="null" /> and <see cref="T:System.Net.Security.LocalCertificateSelectionCallback" /> is not set in the <see langword="SslStream" /> constructor.</exception>
Comment thread
gewarren marked this conversation as resolved.
Outdated
<exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed and left this object in an unusable state.</exception>
<exception cref="T:System.InvalidOperationException">Authentication has already occurred.

-or-

Client authentication using this <see cref="T:System.Net.Security.SslStream" /> was tried previously.

-or-

Authentication is already in progress.</exception>
<exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
</Docs>
</Member>
<Member MemberName="AuthenticateAsServerAsync">
Expand Down Expand Up @@ -4346,7 +4367,7 @@ This property gets the cipher suite that is going to be used in the communicatio
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<summary>Gets or sets the name of the server the client is trying to connect to. That name is used for server certificate validation. It can be a DNS name or an IP address.</summary>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<value>To be added.</value>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<remarks>To be added.</remarks>
</Docs>
Expand Down
13 changes: 7 additions & 6 deletions xml/System.Net.Security/SslStreamCertificateContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</Base>
<Interfaces />
<Docs>
<summary>To be added.</summary>
<summary>Represents a set of certificates used for building a certificate chain.</summary>
Copy link
Copy Markdown
Member

@wfurt wfurt Sep 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add note that the certificates are normalized and if something is missing in constructed X509Chain, SslStream will try to resolve them - either by searching certificates stores or by fetching them via network if allowed.

<remarks>To be added.</remarks>
</Docs>
<Members>
Expand All @@ -38,12 +38,13 @@
<Parameter Name="offline" Type="System.Boolean" />
</Parameters>
<Docs>
<param name="target">To be added.</param>
<param name="additionalCertificates">To be added.</param>
<param name="offline">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<param name="target">Server certificate.</param>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<param name="additionalCertificates">Certificates used for build chain.</param>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<param name="offline">Specify whether the missing certificates can be downloaded.</param>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<summary>Try to build the certificate chain from provided certificates.</summary>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<returns>The SslStreamCertificateContext witch certificate chain created.</returns>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
<remarks>To be added.</remarks>
<exception cref="T:System.NotSupportedException">The <paramref name="target" /> don't have associated private key.</exception>
Comment thread
aik-jahoda marked this conversation as resolved.
Outdated
</Docs>
</Member>
</Members>
Expand Down