Skip to content

WIP: Add UnixSocket to WebCmdlets #18995

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

Closed
CarloToso wants to merge 11 commits into from
Closed

WIP: Add UnixSocket to WebCmdlets #18995

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
79f5f49
Add UnixSocket to WebCmdlets
CarloToso Jan 20, 2023
5e05397
remove commented stuff
CarloToso Jan 21, 2023
890b530
more comments stuff
CarloToso Jan 21, 2023
8f8967c
Merge branch 'master' into WebCmdlets-UnixSockets
CarloToso Feb 1, 2023
4fc3f15
fix tests
CarloToso Feb 4, 2023
4707c46
Fix handler ClientCertificates to fix tests; revert changes in tests
CarloToso Feb 4, 2023
22474d4
revert
CarloToso Feb 4, 2023
d9b1fc7
Merge branch 'master' into WebCmdlets-UnixSockets
CarloToso Feb 9, 2023
be75003
merge
CarloToso Feb 10, 2023
cad64c8
Merge branch 'PowerShell:master' into WebCmdlets-UnixSockets
CarloToso Feb 10, 2023
557fd33
Merge branch 'master' into WebCmdlets-UnixSockets
CarloToso Feb 22, 2023
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
36 changes: 28 additions & 8 deletions ...owerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Net.Sockets;
using System.Security;
using System.Security.Authentication;
using System.Security.Cryptography;
Expand Down Expand Up @@ -350,13 +351,20 @@ public virtual string CustomMethod
}

private string _custommethod;

/// <summary>
/// Gets or sets the PreserveHttpMethodOnRedirect property.
/// </summary>
[Parameter]
public virtual SwitchParameter PreserveHttpMethodOnRedirect { get; set; }

/// <summary>
/// Gets or sets the UnixSocket property.
/// </summary>
[Parameter]
[ValidateNotNullOrEmpty]
public virtual UnixDomainSocketEndPoint UnixSocket { get; set; }

#endregion Method

#region NoProxy
Expand Down Expand Up @@ -946,15 +954,28 @@ internal virtual void PrepareSession()

internal virtual HttpClient GetHttpClient(bool handleRedirect)
{
HttpClientHandler handler = new();
SocketsHttpHandler handler = new();

if (UnixSocket is not null)
{
handler.ConnectCallback = async (context, token) =>
{
Socket socket = new(AddressFamily.Unix, SocketType.Stream, ProtocolType.IP);
UnixDomainSocketEndPoint endpoint = UnixSocket;
await socket.ConnectAsync(endpoint).ConfigureAwait(false);

return new NetworkStream(socket, ownsSocket: false);
};
}

handler.CookieContainer = WebSession.Cookies;
handler.AutomaticDecompression = DecompressionMethods.All;

// Set the credentials used by this request
if (WebSession.UseDefaultCredentials)
{
// The UseDefaultCredentials flag overrides other supplied credentials
handler.UseDefaultCredentials = true;
handler.Credentials = CredentialCache.DefaultCredentials;
}
else if (WebSession.Credentials is not null)
{
Expand All @@ -972,13 +993,12 @@ internal virtual HttpClient GetHttpClient(bool handleRedirect)

if (WebSession.Certificates is not null)
{
handler.ClientCertificates.AddRange(WebSession.Certificates);
handler.SslOptions.ClientCertificates = new X509CertificateCollection(WebSession.Certificates);
}

if (SkipCertificateCheck)
{
handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
handler.ClientCertificateOptions = ClientCertificateOption.Manual;
handler.SslOptions.RemoteCertificateValidationCallback = delegate { return true; };
}

// This indicates GetResponse will handle redirects.
Expand All @@ -991,11 +1011,11 @@ internal virtual HttpClient GetHttpClient(bool handleRedirect)
handler.MaxAutomaticRedirections = WebSession.MaximumRedirection;
}

handler.SslProtocols = (SslProtocols)SslProtocol;
handler.SslOptions.EnabledSslProtocols = (SslProtocols)SslProtocol;

HttpClient httpClient = new(handler);

// Check timeout setting (in seconds instead of milliseconds as in HttpWebRequest)
// Check timeout setting (in seconds)
httpClient.Timeout = TimeoutSec is 0 ? TimeSpan.FromMilliseconds(Timeout.Infinite) : new TimeSpan(0, 0, TimeoutSec);

return httpClient;
Expand Down