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

Adding ServerCertificateValidationCallback Option #39

Closed
wants to merge 1 commit into from
Closed

Adding ServerCertificateValidationCallback Option #39

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
24 changes: 17 additions & 7 deletions src/Serilog.Sinks.Email/LoggerConfigurationEmailExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using Serilog.Formatting.Display;
using Serilog.Sinks.Email;
using Serilog.Formatting;
using System.Net.Security;

namespace Serilog
{
Expand All @@ -43,6 +44,7 @@ public static class LoggerConfigurationEmailExtensions
/// <param name="period">The time to wait between checking for event batches.</param>
/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
/// <param name="mailSubject">The subject, can be a plain string or a template such as {Timestamp} [{Level}] occurred.</param>
/// <param name="serverCertificateValidationCallback">Option to add callback for certificate validation on client Connect</param>
/// <returns>Logger configuration, allowing configuration to continue.</returns>
/// <exception cref="ArgumentNullException">A required parameter is null.</exception>
public static LoggerConfiguration Email(
Expand All @@ -54,7 +56,8 @@ public static LoggerConfiguration Email(
int batchPostingLimit = EmailSink.DefaultBatchPostingLimit,
TimeSpan? period = null,
IFormatProvider formatProvider = null,
string mailSubject = EmailConnectionInfo.DefaultSubject)
string mailSubject = EmailConnectionInfo.DefaultSubject,
RemoteCertificateValidationCallback serverCertificateValidationCallback = null)
{
if (loggerConfiguration == null) throw new ArgumentNullException("loggerConfiguration");
if (fromEmail == null) throw new ArgumentNullException("fromEmail");
Expand All @@ -64,7 +67,8 @@ public static LoggerConfiguration Email(
{
FromEmail = fromEmail,
ToEmail = toEmail,
EmailSubject = mailSubject
EmailSubject = mailSubject,
ServerCertificateValidationCallback = serverCertificateValidationCallback
};

return Email(loggerConfiguration, connectionInfo, outputTemplate, restrictedToMinimumLevel, batchPostingLimit, period, formatProvider);
Expand All @@ -85,6 +89,7 @@ public static LoggerConfiguration Email(
/// <param name="period">The time to wait between checking for event batches.</param>
/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
/// <param name="mailSubject">The subject, can be a plain string or a template such as {Timestamp} [{Level}] occurred.</param>
/// <param name="serverCertificateValidationCallback">Option to add callback for certificate validation on client Connect</param>
/// <returns>Logger configuration, allowing configuration to continue.</returns>
/// <exception cref="ArgumentNullException">A required parameter is null.</exception>
public static LoggerConfiguration Email(
Expand All @@ -98,7 +103,8 @@ public static LoggerConfiguration Email(
int batchPostingLimit = EmailSink.DefaultBatchPostingLimit,
TimeSpan? period = null,
IFormatProvider formatProvider = null,
string mailSubject = EmailConnectionInfo.DefaultSubject)
string mailSubject = EmailConnectionInfo.DefaultSubject,
RemoteCertificateValidationCallback serverCertificateValidationCallback = null)
{
if (loggerConfiguration == null) throw new ArgumentNullException("loggerConfiguration");
if (fromEmail == null) throw new ArgumentNullException("fromEmail");
Expand All @@ -110,7 +116,8 @@ public static LoggerConfiguration Email(
ToEmail = toEmail,
MailServer = mailServer,
NetworkCredentials = networkCredential,
EmailSubject = mailSubject
EmailSubject = mailSubject,
ServerCertificateValidationCallback = serverCertificateValidationCallback
};

return Email(loggerConfiguration, connectionInfo, outputTemplate, restrictedToMinimumLevel, batchPostingLimit, period, formatProvider);
Expand All @@ -131,6 +138,7 @@ public static LoggerConfiguration Email(
/// <param name="period">The time to wait between checking for event batches.</param>
/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
/// <param name="mailSubject">The subject, can be a plain string or a template such as {Timestamp} [{Level}] occurred.</param>
/// <param name="serverCertificateValidationCallback">Option to add callback for certificate validation on client Connect</param>
/// <returns>Logger configuration, allowing configuration to continue.</returns>
/// <exception cref="ArgumentNullException">A required parameter is null.</exception>
public static LoggerConfiguration Email(
Expand All @@ -144,19 +152,21 @@ public static LoggerConfiguration Email(
int batchPostingLimit = EmailSink.DefaultBatchPostingLimit,
TimeSpan? period = null,
IFormatProvider formatProvider = null,
string mailSubject = EmailConnectionInfo.DefaultSubject)
string mailSubject = EmailConnectionInfo.DefaultSubject,
RemoteCertificateValidationCallback serverCertificateValidationCallback = null)
{
if (loggerConfiguration == null) throw new ArgumentNullException("loggerConfiguration");
if (fromEmail == null) throw new ArgumentNullException("fromEmail");
if (toEmails == null) throw new ArgumentNullException("toEmails");

var connectionInfo = new EmailConnectionInfo
{
FromEmail = fromEmail,
ToEmail = string.Join(";", toEmails),
MailServer = mailServer,
NetworkCredentials = networkCredential,
EmailSubject = mailSubject
EmailSubject = mailSubject,
ServerCertificateValidationCallback = serverCertificateValidationCallback
};

return Email(loggerConfiguration, connectionInfo, outputTemplate, restrictedToMinimumLevel, batchPostingLimit, period, formatProvider, mailSubject);
Expand Down