Skip to content
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

Fix UnixDomainSocketBinding default security issue on Windows. #5627

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Fix UnixDomainSocketBinding default security issue on Windows. #5627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions src/System.Private.ServiceModel/tests/Scenarios/Binding/UDS/UDSBindingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,9 @@ public void WindowsAuth()
System.ServiceModel.UnixDomainSocketBinding binding = new UnixDomainSocketBinding(System.ServiceModel.UnixDomainSocketSecurityMode.Transport);
binding.Security.Transport.ClientCredentialType = System.ServiceModel.UnixDomainSocketClientCredentialType.Windows;

var uriBuilder = new UriBuilder()
{
Scheme = "net.uds",
Path = UDS.GetUDSFilePath()
};
var uri = new Uri("net.uds://" + UDS.GetUDSFilePath());
factory = new System.ServiceModel.ChannelFactory<IEchoService>(binding,
new System.ServiceModel.EndpointAddress(uriBuilder.ToString()));
new System.ServiceModel.EndpointAddress(uri));
channel = factory.CreateChannel();
((IChannel)channel).Open();
string result = channel.Echo(testString);
Expand Down
2 changes: 1 addition & 1 deletion ...Model.UnixDomainSocket/src/System/ServiceModel/Channels/UnixDomainSocketChannelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override TChannel OnCreateChannel(EndpointAddress address, Uri via)
{
if(address.Identity == null)
{
var hostIdentity = new DnsEndpointIdentity(address.Uri.Host ?? "localhost");
var hostIdentity = new DnsEndpointIdentity(string.IsNullOrEmpty(address.Uri.Host) ? "localhost" : address.Uri.Host);
var uriBuilder = new UriBuilder(address.Uri);
uriBuilder.Host = null;
address = new EndpointAddress(uriBuilder.Uri, hostIdentity,address.Headers.ToArray());
Expand Down
Loading