make use of ports in SPN optional (dotnet#57159)

* make port optional in SPN * fix tests * feedback from review * Update src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/AuthenticationHelper.NtAuth.cs Co-authored-by: Stephen Toub <[email protected]> * fix build Co-authored-by: Stephen Toub <[email protected]> Conflicts: src/libraries/Common/tests/System/Net/EnterpriseTests/EnterpriseTestConfiguration.cs src/libraries/Common/tests/System/Net/EnterpriseTests/setup/apacheweb/apache2.conf src/libraries/Common/tests/System/Net/EnterpriseTests/setup/apacheweb/run.sh src/libraries/Common/tests/System/Net/EnterpriseTests/setup/docker-compose.yml src/libraries/System.Net.Http/tests/EnterpriseTests/HttpClientAuthenticationTest.cs
criteo-forks · Sep 15, 2021 · 21c260b · 21c260b
1 parent dd8a7a5
commit 21c260b
Show file tree

Hide file tree

Showing 7 changed files with 683 additions and 14 deletions.
diff --git a/src/libraries/Common/tests/System/Net/EnterpriseTests/EnterpriseTestConfiguration.cs b/src/libraries/Common/tests/System/Net/EnterpriseTests/EnterpriseTestConfiguration.cs
@@ -6,8 +6,11 @@ namespace System.Net.Test.Common
     public static class EnterpriseTestConfiguration
     {
         public const string Realm = "LINUX.CONTOSO.COM";
-        public const string NegotiateAuthWebServer = "http://apacheweb.linux.contoso.com";
-        public const string AlternativeService = "http://altweb.linux.contoso.com:8080";
+        public const string NegotiateAuthWebServer = "http://apacheweb.linux.contoso.com/auth/kerberos/";
+        public const string NegotiateAuthWebServerNotDefaultPort = "http://apacheweb.linux.contoso.com:8081/auth/kerberos/";
+        public const string AlternativeService = "http://altweb.linux.contoso.com:8080/auth/kerberos/";
+        public const string NtlmAuthWebServer = "http://apacheweb.linux.contoso.com:8080/auth/ntlm/";
+        public const string DigestAuthWebServer = "http://apacheweb.linux.contoso.com/auth/digest/";
 
         public static bool Enabled => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_RUNTIME_ENTERPRISETESTS_ENABLED"));
         public static NetworkCredential ValidNetworkCredentials => new NetworkCredential("user1", "password");