fixes https bindings

gislikonrad · gislikonrad · commit 60194b03934d · 2018-05-17T14:02:41.000Z
diff --git a/Samples/Simple/Properties/launchSettings.json b/Samples/Simple/Properties/launchSettings.json
@@ -4,26 +4,26 @@
     "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:61276/",
-      "sslPort": 0
+      "sslPort": 44395
     }
   },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "launchUrl": "wcf/echo",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "Simple": {
-      "commandName": "Project",
+      "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "api/values",
+      "launchUrl": "wcf/echo",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:61277/"
     }
   }
-}
+}
diff --git a/Samples/Simple/Startup.cs b/Samples/Simple/Startup.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IdentityModel.Tokens;
 using System.Linq;
 using System.Net.Security;
 using System.ServiceModel;
@@ -31,8 +32,19 @@ public void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            app.UseWcfService<EchoWcfService, IEchoContract>("/wcf/echo");
+            app.UseWcfService<EchoWcfService>("/wcf/echo", builder =>
+            {
+                builder.AddServiceEndpoint<IEchoContract>(CreateBinding());
+            });
             app.UseMvc();
         }
+
+        private Binding CreateBinding()
+        {
+            var binding = new WS2007HttpBinding(SecurityMode.TransportWithMessageCredential);
+            binding.Security.Message.EstablishSecurityContext = false;
+            return binding;
+        }
+
     }
 }
diff --git a/Solid.AspNetCore.Extensions.Wcf.Tests/BehaviorTestFixture.cs b/Solid.AspNetCore.Extensions.Wcf.Tests/BehaviorTestFixture.cs
@@ -4,7 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.ServiceModel;
+using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -13,11 +15,14 @@ namespace Solid.AspNetCore.Extensions.Wcf.Tests
     public class BehaviorTestFixture : IDisposable
     {
         private IInstanceTestService _singleton;
-
+        static BehaviorTestFixture()
+        {
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+        }
         public BehaviorTestFixture()
         {
             TestingServer = new TestingServerBuilder()
-                .AddAspNetCoreHostFactory()
+                .AddAspNetCoreHostFactory(Scheme.Https)
                 .AddStartup<BehaviorTestStartup>()
                 .Build();
         }
@@ -29,7 +34,7 @@ public IInstanceTestService GetService(string username, string password)
             if (_singleton == null)
             {
                 var url = new Uri(TestingServer.BaseAddress, "singleton");
-                var binding = new WS2007HttpBinding(SecurityMode.Message);
+                var binding = new WS2007HttpBinding(SecurityMode.TransportWithMessageCredential);                
                 binding.Security.Message.ClientCredentialType = MessageCredentialType.UserName;
                 binding.Security.Message.EstablishSecurityContext = false;
                 var endpoint = new EndpointAddress(url);
diff --git a/Solid.AspNetCore.Extensions.Wcf.Tests/Host/BehaviorTestStartup.cs b/Solid.AspNetCore.Extensions.Wcf.Tests/Host/BehaviorTestStartup.cs
@@ -30,7 +30,7 @@ static BehaviorTestStartup()
 
         public void ConfigureServices(IServiceCollection services)
         {
-            var binding = new WS2007HttpBinding(SecurityMode.Message);
+            var binding = new WS2007HttpBinding(SecurityMode.TransportWithMessageCredential);
             binding.Security.Message.ClientCredentialType = MessageCredentialType.UserName;
             binding.Security.Message.EstablishSecurityContext = false;
             services.AddLogging(builder =>
@@ -42,7 +42,14 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<UserNamePasswordValidator>(MockUserNamePasswordValidator.Object);
             services.AddSingleton<IServiceBehavior, UserNamePasswordValidatorBehavior>();
             services.AddSingleton<IServiceBehavior, OutputBehavior>();
-            services.AddWcfServiceWithMetadata<SingletonService>().AddDefaultBinding(binding);
+            services
+                .AddWcfService<SingletonService>(wcf => 
+                    wcf.WithServiceMetadataBehavior(behavior =>
+                    {
+                        behavior.HttpsGetEnabled = true;
+                        behavior.MetadataExporter.PolicyVersion = PolicyVersion.Policy15;
+                    }))
+                .AddDefaultBinding(binding);
         }
 
         public void Configure(IApplicationBuilder builder)
diff --git a/Solid.AspNetCore.Extensions.Wcf.Tests/Solid.AspNetCore.Extensions.Wcf.Tests.csproj b/Solid.AspNetCore.Extensions.Wcf.Tests/Solid.AspNetCore.Extensions.Wcf.Tests.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="Moq" Version="4.8.2" />
-    <PackageReference Include="Solid.Testing.AspNetCore" Version="1.0.16" />
+    <PackageReference Include="Solid.Testing.AspNetCore" Version="1.1.3-beta" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
diff --git a/Solid.AspNetCore.Extensions.Wcf/Factories/DefaultMessageFactory.cs b/Solid.AspNetCore.Extensions.Wcf/Factories/DefaultMessageFactory.cs
@@ -32,7 +32,7 @@ public Task<Message> CreateMessageAsync(HttpContext http, BindingContext binding
                 message.Properties.Via = request.GetRequestUri();
             if (message.Headers.Action == null)
                 message.Headers.Action = request.Headers["SOAPAction"].Select(s => s.Trim('"')).FirstOrDefault();
-
+            
             return Task.FromResult(message);
         }
 
diff --git a/Solid.AspNetCore.Extensions.Wcf/Providers/ServiceHostProvider.cs b/Solid.AspNetCore.Extensions.Wcf/Providers/ServiceHostProvider.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Solid.AspNetCore.Extensions.Wcf.Abstractions;
 using Solid.AspNetCore.Extensions.Wcf.Builders;
@@ -45,6 +46,9 @@ public ServiceHostProvider(
 
         private ServiceHost Initialize()
         {
+            var config = _provider.GetService<IConfiguration>();
+            var https = config["HTTPS_PORT"] != null;
+
             var baseAddresses = _baseAddresses.GetBaseAddressesFor<TService>();
             var singleton = default(TService);
             if(typeof(TService).GetServiceLifetime() == ServiceLifetime.Singleton)
diff --git a/Solid.AspNetCore.Extensions.Wcf/ServiceModel/Channels/AspNetCore/AspNetCoreTransportBindingElement.cs b/Solid.AspNetCore.Extensions.Wcf/ServiceModel/Channels/AspNetCore/AspNetCoreTransportBindingElement.cs
@@ -9,7 +9,7 @@
 
 namespace Solid.AspNetCore.Extensions.Wcf.ServiceModel.Channels.AspNetCore
 {
-    internal class AspNetCoreTransportBindingElement : TransportBindingElement
+    internal class AspNetCoreTransportBindingElement : HttpTransportBindingElement
     {
         internal IMessageFactory MessageFactory { get; }
 
@@ -26,21 +26,16 @@ public AspNetCoreTransportBindingElement(string scheme, IAspNetCoreHandler handl
             _loggerFactory = loggerFactory;
         }
 
-        protected AspNetCoreTransportBindingElement(string scheme, IAspNetCoreHandler handler, IMessageFactory factory, ILoggerFactory loggerFactory, TransportBindingElement elementToBeCloned) 
-            : base(elementToBeCloned)
-        {
-            Scheme = scheme;
-            Handler = handler;
-            MessageFactory = factory;
-
-            _loggerFactory = loggerFactory;
-        }
-
         public override string Scheme { get; }
 
         public override BindingElement Clone()
         {
-            return new AspNetCoreTransportBindingElement(Scheme, Handler, MessageFactory, _loggerFactory, this);
+            return new AspNetCoreTransportBindingElement(Scheme, Handler, MessageFactory, _loggerFactory);
+        }
+
+        public override bool CanBuildChannelFactory<TChannel>(BindingContext context)
+        {
+            return false;
         }
 
         public override bool CanBuildChannelListener<TChannel>(BindingContext context)
diff --git a/Solid.AspNetCore.Extensions.Wcf/Services/BindingSanitizer.cs b/Solid.AspNetCore.Extensions.Wcf/Services/BindingSanitizer.cs
@@ -8,16 +8,20 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Solid.AspNetCore.Extensions.Wcf.ServiceModel.Channels.AspNetCore;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server.Features;
 
 namespace Solid.AspNetCore.Extensions.Wcf.Services
 {
     internal class BindingSanitizer : IBindingSanitizer
     {
         private IServiceProvider _services;
+        private IServer _server;
 
-        public BindingSanitizer(IServiceProvider services)
+        public BindingSanitizer(IServiceProvider services, IServer server)
         {
             _services = services;
+            _server = server;
         }
 
         public Binding SanitizeBinding(Binding binding)
@@ -37,19 +41,52 @@ public Binding SanitizeBinding(Binding binding)
         }
 
         private void Replace<TTransport>(CustomBinding custom)
-            where TTransport : TransportBindingElement
+            where TTransport : HttpTransportBindingElement
         {
             var current = custom.Elements.OfType<TTransport>().FirstOrDefault();
-            if (current != null)
-            {
-                custom.Elements.Remove(current);
-                //custom.Elements.Add(new HttpTransportBindingElement());
-                var handler = _services.GetService<IAspNetCoreHandler>();
-                var factory = _services.GetService<IMessageFactory>();
-                var loggerFactory = _services.GetService<ILoggerFactory>();
-                var aspNetCore = new AspNetCoreTransportBindingElement(current.Scheme, handler, factory, loggerFactory);
-                custom.Elements.Add(aspNetCore);
-            }
+            if (current == null) return;
+            if (current is AspNetCoreTransportBindingElement) return;
+
+            custom.Elements.Remove(current);
+            //custom.Elements.Add(new HttpTransportBindingElement());
+            var handler = _services.GetService<IAspNetCoreHandler>();
+            var factory = _services.GetService<IMessageFactory>();
+            var loggerFactory = _services.GetService<ILoggerFactory>();
+            var scheme = GetScheme(current);
+            var aspNetCore = new AspNetCoreTransportBindingElement(scheme, handler, factory, loggerFactory);
+
+            aspNetCore.AllowCookies = current.AllowCookies;
+            aspNetCore.AuthenticationScheme = current.AuthenticationScheme;
+            aspNetCore.BypassProxyOnLocal = current.BypassProxyOnLocal;
+            aspNetCore.DecompressionEnabled = current.DecompressionEnabled;
+            aspNetCore.ExtendedProtectionPolicy = current.ExtendedProtectionPolicy;
+            aspNetCore.HostNameComparisonMode = current.HostNameComparisonMode;
+            aspNetCore.KeepAliveEnabled = current.KeepAliveEnabled;
+            aspNetCore.ManualAddressing = current.ManualAddressing;
+            aspNetCore.MaxBufferPoolSize = current.MaxBufferPoolSize;
+            aspNetCore.MaxBufferSize = current.MaxBufferSize;
+            aspNetCore.MaxPendingAccepts = current.MaxPendingAccepts;
+            aspNetCore.MaxReceivedMessageSize = current.MaxReceivedMessageSize;
+            aspNetCore.MessageHandlerFactory = current.MessageHandlerFactory;
+            aspNetCore.ProxyAddress = current.ProxyAddress;
+            aspNetCore.ProxyAuthenticationScheme = current.ProxyAuthenticationScheme;
+            aspNetCore.Realm = current.Realm;
+            aspNetCore.RequestInitializationTimeout = current.RequestInitializationTimeout;
+            aspNetCore.TransferMode = current.TransferMode;
+            aspNetCore.UnsafeConnectionNtlmAuthentication = current.UnsafeConnectionNtlmAuthentication;
+            aspNetCore.UseDefaultWebProxy = current.UseDefaultWebProxy;
+            aspNetCore.WebSocketSettings = current.WebSocketSettings;
+
+            custom.Elements.Add(aspNetCore);
+        }
+
+        private string GetScheme(HttpTransportBindingElement original)
+        {
+            var feature = _server.Features[typeof(IServerAddressesFeature)] as IServerAddressesFeature;
+            var addresses = feature.Addresses.Select(s => new Uri(s));
+
+            if (addresses.Any(u => u.Scheme == "https")) return original.Scheme;
+            return "http";
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public Task<Message> CreateMessageAsync(HttpContext http, BindingContext binding`
`32`	`32`	`message.Properties.Via = request.GetRequestUri();`
`33`	`33`	`if (message.Headers.Action == null)`
`34`	`34`	`message.Headers.Action = request.Headers["SOAPAction"].Select(s => s.Trim('"')).FirstOrDefault();`
`35`		`-`
	`35`	`+`
`36`	`36`	`return Task.FromResult(message);`
`37`	`37`	`}`
`38`	`38`