33// See the LICENSE file in the project root for more information.
44
55#if NET
6+ using System . Diagnostics ;
7+ using System . Net ;
68using System . Security . Claims ;
9+ using System . Security . Cryptography . X509Certificates ;
710using CoreWCF . Configuration ;
811using CoreWCF . Description ;
912using idunno . Authentication . Basic ;
@@ -26,7 +29,7 @@ internal class TestDefinitionHelper
2629 private const int DefaultWebSocketPort = 8083 ;
2730 private const int DefaultWebSocketSPort = 8084 ;
2831
29- private static IDictionary < ServiceSchema , string > BaseAddresses
32+ internal static IDictionary < ServiceSchema , string > BaseAddresses
3033 {
3134 get
3235 {
@@ -57,10 +60,47 @@ private static IDictionary<ServiceSchema, string> BaseAddresses
5760 }
5861
5962#if NET
63+ internal class ServiceTestHostOptions
64+ {
65+ public List < Uri > serviceBaseAddresses = new List < Uri > ( ) ;
66+ public Dictionary < Enum , string > endpointBasePath = new Dictionary < Enum , string > ( ) ;
67+ }
68+
6069 internal static async Task StartHosts ( )
6170 {
6271 bool success = true ;
63- var webHost = WebHost . CreateDefaultBuilder ( )
72+ var serviceTestHostOptionsDict = new Dictionary < string , ServiceTestHostOptions > ( ) ;
73+
74+ var webHost = new WebHostBuilder ( )
75+ . UseKestrel ( options => {
76+ options . Listen ( IPAddress . IPv6Any , new Uri ( BaseAddresses [ ServiceSchema . HTTP ] ) . Port ) ;
77+ options . Listen ( address : IPAddress . IPv6Any , new Uri ( BaseAddresses [ ServiceSchema . HTTPS ] ) . Port , listenOptions =>
78+ {
79+ listenOptions . UseHttps ( httpsOptions =>
80+ {
81+ X509Certificate2 cert = TestHost . CertificateFromFriendlyName ( StoreName . My , StoreLocation . LocalMachine , "WCF Bridge - Machine certificate generated by the CertificateManager" ) ;
82+ httpsOptions . ServerCertificate = cert ;
83+ } ) ;
84+ if ( Debugger . IsAttached )
85+ {
86+ listenOptions . UseConnectionLogging ( ) ;
87+ }
88+ } ) ;
89+ options . Listen ( IPAddress . IPv6Any , new Uri ( BaseAddresses [ ServiceSchema . WS ] ) . Port ) ;
90+ options . Listen ( address : IPAddress . IPv6Any , new Uri ( BaseAddresses [ ServiceSchema . WSS ] ) . Port , listenOptions =>
91+ {
92+ listenOptions . UseHttps ( httpsOptions =>
93+ {
94+ X509Certificate2 cert = TestHost . CertificateFromFriendlyName ( StoreName . My , StoreLocation . LocalMachine , "WCF Bridge - Machine certificate generated by the CertificateManager" ) ;
95+ httpsOptions . ServerCertificate = cert ;
96+ } ) ;
97+ if ( Debugger . IsAttached )
98+ {
99+ listenOptions . UseConnectionLogging ( ) ;
100+ }
101+ } ) ;
102+ } )
103+ //.UseNetTcp(IPAddress.IPv6Any, new Uri(BaseAddresses[ServiceSchema.NETTCP]).Port)
64104 . ConfigureServices ( services =>
65105 {
66106 services . AddAuthentication ( BasicAuthenticationDefaults . AuthenticationScheme )
@@ -100,8 +140,7 @@ internal static async Task StartHosts()
100140 {
101141 foreach ( var serviceTestHost in GetAttributedServiceHostTypes ( ) )
102142 {
103- var serviceBaseAddresses = new List < Uri > ( ) ;
104- var endpointBasePath = new Dictionary < Enum , string > ( ) ;
143+ var serviceTestHostOptions = new ServiceTestHostOptions ( ) ;
105144 foreach ( TestServiceDefinitionAttribute attr in serviceTestHost . GetCustomAttributes ( typeof ( TestServiceDefinitionAttribute ) , false ) )
106145 {
107146 Uri serviceBaseAddress = null ;
@@ -111,9 +150,9 @@ internal static async Task StartHosts()
111150 {
112151 if ( attr . Schema . HasFlag ( schema ) )
113152 {
114- endpointBasePath . Add ( schema , attr . BasePath ) ;
153+ serviceTestHostOptions . endpointBasePath . Add ( schema , attr . BasePath ) ;
115154 serviceBaseAddress = new Uri ( BaseAddresses [ ( ServiceSchema ) schema ] ) ;
116- serviceBaseAddresses . Add ( serviceBaseAddress ) ;
155+ serviceTestHostOptions . serviceBaseAddresses . Add ( serviceBaseAddress ) ;
117156 }
118157 }
119158 }
@@ -132,30 +171,37 @@ internal static async Task StartHosts()
132171 }
133172 }
134173
174+ serviceTestHostOptionsDict . Add ( serviceTestHost . Name , serviceTestHostOptions ) ;
135175 try
136176 {
137177 if ( success )
138178 {
139- var serviceHost = ( ServiceHost ) Activator . CreateInstance ( serviceTestHost , serviceBaseAddresses . ToArray ( ) ) ;
179+ string serviceHostTypeName = serviceTestHost . Name ;
180+ var serviceHost = ( ServiceHost ) Activator . CreateInstance ( serviceTestHost , serviceTestHostOptionsDict [ serviceHostTypeName ] . serviceBaseAddresses . ToArray ( ) ) ;
140181 serviceBuilder . AddService ( serviceHost . ServiceType , options =>
141182 {
142- foreach ( var baseAddress in serviceBaseAddresses )
183+ var localHostTypeName = serviceHostTypeName ;
184+ //options.BaseAddresses.Clear();
185+ foreach ( var baseAddress in serviceTestHostOptionsDict [ localHostTypeName ] . serviceBaseAddresses )
143186 {
144187 if ( ! options . BaseAddresses . Contains ( baseAddress ) )
145188 options . BaseAddresses . Add ( baseAddress ) ;
146189 }
190+
191+ foreach ( var endpoint in serviceHost . Endpoints )
192+ {
193+ Enum schema = ServiceHostHelper . ToServiceSchema ( endpoint . Binding . Scheme ) ;
194+ string basePath = serviceTestHostOptionsDict [ localHostTypeName ] . endpointBasePath [ schema ] ;
195+ string endpointAddress = string . Format ( "{0}/{1}" , basePath , endpoint . Address ) ;
196+ serviceBuilder . AddServiceEndpoint ( serviceHost . ServiceType , endpoint . ContractType , endpoint . Binding , new Uri ( endpointAddress , UriKind . RelativeOrAbsolute ) , null ) ;
197+ }
147198 } ) ;
148- foreach ( var endpoint in serviceHost . Endpoints )
149- {
150- Enum schema = ServiceHostHelper . ToServiceSchema ( endpoint . Binding . Scheme ) ;
151- string basePath = endpointBasePath [ schema ] ;
152- string endpointAddress = string . Format ( "{0}/{1}" , basePath , endpoint . Address ) ;
153- serviceBuilder . AddServiceEndpoint ( serviceHost . ServiceType , endpoint . ContractType , endpoint . Binding , new Uri ( endpointAddress , UriKind . RelativeOrAbsolute ) , null ) ;
154- }
199+
155200 serviceBuilder . ConfigureServiceHostBase ( serviceHost . ServiceType , serviceHostBase =>
156201 {
202+ var localHostTypeName = serviceHostTypeName ;
157203 var smb = serviceHostBase . Description . Behaviors . Find < ServiceMetadataBehavior > ( ) ;
158- if ( serviceBaseAddresses . Where ( uri => uri . Scheme == Uri . UriSchemeHttps ) . Any ( ) )
204+ if ( serviceTestHostOptionsDict [ localHostTypeName ] . serviceBaseAddresses . Where ( uri => uri . Scheme == Uri . UriSchemeHttps ) . Any ( ) )
159205 {
160206 smb . HttpsGetEnabled = true ;
161207 }
0 commit comments