github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-12 08:16:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'DotNetCore' of https://github.com/tidusjar/Ombi into DotNetCore

Browse source
This commit is contained in:
tidusjar 2017-10-13 21:41:58 +01:00
commit 1a44cf596c
7 changed files with 56 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi.Api.Radarr/Models/MovieResponse.cs
View file

@ -32,8 +32,8 @@ namespace Ombi.Api.Radarr.Models
public List<object> tags { get; set; }
public string added { get; set; }
public Ratings ratings { get; set; }
public List<string> alternativeTitles { get; set; }
//public List<string> alternativeTitles { get; set; }
public int qualityProfileId { get; set; }
public int id { get; set; }
}
}
}

36
src/Ombi.Notifications/GenericEmailProvider.cs
View file

@ -47,10 +47,30 @@ namespace Ombi.Notifications
message.From.Add(new MailboxAddress(settings.SenderAddress, settings.SenderAddress));
message.To.Add(new MailboxAddress(model.To, model.To));
using (var client = new SmtpClient())
{
client.Connect(settings.Host, settings.Port); // Let MailKit figure out the correct SecureSocketOptions.
if (settings.DisableCertificateChecking)
{
// Disable validation of the certificate associated with the SMTP service
// Helpful when the TLS certificate is not in the certificate store of the server
// Does carry the risk of man in the middle snooping
client.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
}
if (settings.DisableTLS)
{
// Does not attempt to use either TLS or SSL
// Helpful when MailKit finds a TLS certificate, but it unable to use it
client.Connect(settings.Host, settings.Port, MailKit.Security.SecureSocketOptions.None);
}
else
{
client.Connect(settings.Host, settings.Port); // Let MailKit figure out the correct SecureSocketOptions.
}
// Note: since we don't have an OAuth2 token, disable
// the XOAUTH2 authentication mechanism.
client.AuthenticationMechanisms.Remove("XOAUTH2");
@ -92,7 +112,19 @@ namespace Ombi.Notifications
using (var client = new SmtpClient())
{
client.Connect(settings.Host, settings.Port); // Let MailKit figure out the correct SecureSocketOptions.
if (settings.DisableCertificateChecking)
{
client.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
}
if (settings.DisableTLS)
{
client.Connect(settings.Host, settings.Port, MailKit.Security.SecureSocketOptions.None);
}
else
{
client.Connect(settings.Host, settings.Port); // Let MailKit figure out the correct SecureSocketOptions.
}
// Note: since we don't have an OAuth2 token, disable
// the XOAUTH2 authentication mechanism.

2
src/Ombi.Settings/Settings/Models/Notifications/EmailNotificationSettings.cs
View file

@ -11,5 +11,7 @@
public string Username { get; set; }
public bool Authentication { get; set; }
public string AdminEmail { get; set; }
public bool DisableTLS { get; set; }
public bool DisableCertificateChecking { get; set; }
}
}

2
src/Ombi/ClientApp/app/interfaces/INotificationSettings.ts
View file

@ -13,6 +13,8 @@ export interface IEmailNotificationSettings extends INotificationSettings {
username: string;
authentication: boolean;
adminEmail: string;
disableTLS: boolean;
disableCertificateChecking: boolean;
notificationTemplates: INotificationTemplates[];
}

12
src/Ombi/ClientApp/app/settings/notifications/emailnotification.component.html
View file

@ -18,6 +18,18 @@
<input type="checkbox" id="Authentication" formControlName="authentication"><label for="Authentication">Enable SMTP Authentication</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="disableTLS" formControlName="disableTLS"><label for="disableTLS">Disable TLS/SSL</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="disableCertificateChecking" formControlName="disableCertificateChecking"><label for="disableCertificateChecking">Disable Certificate Checking</label>
</div>
</div>
<div class="form-group">
<label for="host" class="control-label">SMTP Host</label>

2
src/Ombi/ClientApp/app/settings/notifications/emailnotification.component.ts
View file

@ -35,6 +35,8 @@ export class EmailNotificationComponent implements OnInit {
senderName: [x.senderName],
username: [x.username],
adminEmail: [x.adminEmail, [Validators.required, Validators.email]],
disableTLS: [x.disableTLS],
disableCertificateChecking: [x.disableCertificateChecking],
});
if (x.authentication) {

4
src/Ombi/ClientApp/app/usermanagement/updatedetails.component.html
View file

@ -41,7 +41,7 @@
<div *ngIf="form.get('emailAddress').hasError('email')">Email address format is incorrect</div>
<div *ngIf="form.get('password').hasError('required')">The Password is required</div>
<div *ngIf="form.get('confirmNewPassword').hasError('required')">The Confirm New Password is required</div>
<div *ngIf="form.get('currentPassword').hasError('required')">Your current passowrd is required</div>
<div *ngIf="form.get('currentPassword').hasError('required')">Your current password is required</div>
</div>
</div>
</div>
</div>