Unverified Commit 6b20e13f authored by vksampath's avatar vksampath Committed by GitHub

Including SslProtocols in ConfigurationOptions.ToString() (#1408)

* Including SslProtocols in ConfigurationOptions.ToString()

* Removing an unnecessary method and making the code concise (based on code review comments)
Co-authored-by: 's avatarSampath Vuyyuru <sampath.vuyyuru@kincentric.com>
parent fc8dcdea
...@@ -509,6 +509,7 @@ public string ToString(bool includePassword) ...@@ -509,6 +509,7 @@ public string ToString(bool includePassword)
Append(sb, OptionKeys.TieBreaker, tieBreaker); Append(sb, OptionKeys.TieBreaker, tieBreaker);
Append(sb, OptionKeys.WriteBuffer, writeBuffer); Append(sb, OptionKeys.WriteBuffer, writeBuffer);
Append(sb, OptionKeys.Ssl, ssl); Append(sb, OptionKeys.Ssl, ssl);
Append(sb, OptionKeys.SslProtocols, SslProtocols?.ToString().Replace(',', '|'));
Append(sb, OptionKeys.SslHost, sslHost); Append(sb, OptionKeys.SslHost, sslHost);
Append(sb, OptionKeys.HighPrioritySocketThreads, highPrioritySocketThreads); Append(sb, OptionKeys.HighPrioritySocketThreads, highPrioritySocketThreads);
Append(sb, OptionKeys.ConfigChannel, configChannel); Append(sb, OptionKeys.ConfigChannel, configChannel);
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
using System.Net; using System.Net;
using System.Net.Security; using System.Net.Security;
using System.Reflection; using System.Reflection;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks; using System.Threading.Tasks;
using StackExchange.Redis.Tests.Helpers; using StackExchange.Redis.Tests.Helpers;
...@@ -459,5 +460,26 @@ public void SSLParseViaConfig_Issue883_ConfigString() ...@@ -459,5 +460,26 @@ public void SSLParseViaConfig_Issue883_ConfigString()
conn.GetDatabase().Ping(); conn.GetDatabase().Ping();
} }
} }
[Fact]
public void ConfigObject_Issue1407_ToStringIncludesSslProtocols()
{
var sslProtocols = SslProtocols.Tls12 | SslProtocols.Tls;
var sourceOptions = new ConfigurationOptions
{
AbortOnConnectFail = false,
Ssl = true,
SslProtocols = sslProtocols,
ConnectRetry = 3,
ConnectTimeout = 5000,
SyncTimeout = 5000,
DefaultDatabase = 0,
EndPoints = { { "endpoint.test", 6380 } },
Password = "123456"
};
var targetOptions = ConfigurationOptions.Parse(sourceOptions.ToString());
Assert.Equal(sourceOptions.SslProtocols, targetOptions.SslProtocols);
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment