diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.lib/Clients/EmailClient.cs | 7 | ||||
| -rw-r--r-- | src/main.lib/Services/SettingsService.cs | 5 | ||||
| -rw-r--r-- | src/main/settings.json | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/main.lib/Clients/EmailClient.cs b/src/main.lib/Clients/EmailClient.cs index b4ca3d4..a1a111d 100644 --- a/src/main.lib/Clients/EmailClient.cs +++ b/src/main.lib/Clients/EmailClient.cs @@ -28,6 +28,8 @@ namespace PKISharp.WACS.Clients private readonly int? _secureMode; private readonly string _senderName; private readonly string _senderAddress; + private readonly string _computerName; + private readonly string _version; private readonly IEnumerable<string> _receiverAddresses; public EmailClient(ILogService log, ISettingsService settings) @@ -41,6 +43,9 @@ namespace PKISharp.WACS.Clients _secure = _settings.Notification.SmtpSecure; _secureMode = _settings.Notification.SmtpSecureMode; _senderName = _settings.Notification.SenderName; + _computerName = _settings.Notification.ComputerName ?? Environment.MachineName; + _version = Assembly.GetEntryAssembly().GetName().Version.ToString(); + if (string.IsNullOrWhiteSpace(_senderName)) { _senderName = _settings.Client.ClientName; @@ -111,7 +116,7 @@ namespace PKISharp.WACS.Clients message.From.Add(sender); message.To.Add(receiver); var bodyBuilder = new BodyBuilder(); - bodyBuilder.HtmlBody = content + $"<p>Sent by win-acme version {Assembly.GetEntryAssembly().GetName().Version} from {Environment.MachineName}</p>"; + bodyBuilder.HtmlBody = content + $"<p>Sent by win-acme version {_version} from {_computerName}</p>"; message.Body = bodyBuilder.ToMessageBody(); client.Send(message); } diff --git a/src/main.lib/Services/SettingsService.cs b/src/main.lib/Services/SettingsService.cs index 6acb798..ba3df1a 100644 --- a/src/main.lib/Services/SettingsService.cs +++ b/src/main.lib/Services/SettingsService.cs @@ -415,6 +415,11 @@ namespace PKISharp.WACS.Services /// SmtpReceiverAddress have been configured. /// </summary> public bool EmailOnSuccess { get; set; } + /// <summary> + /// Override the computer name that + /// is included in the body of the email + /// </summary> + public string? ComputerName { get; set; } } public class SecuritySettings diff --git a/src/main/settings.json b/src/main/settings.json index 75dad09..e8ebd59 100644 --- a/src/main/settings.json +++ b/src/main/settings.json @@ -43,7 +43,8 @@ "SenderName": null, "SenderAddress": null, "ReceiverAddresses": [], - "EmailOnSuccess": false + "EmailOnSuccess": false, + "ComputerName": null }, "Security": { "RSAKeyBits": 3072, |