diff --git a/frontend/src/FirstRun/AuthenticationRequiredModalContent.js b/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
index 9e561eae2..75c527da5 100644
--- a/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
+++ b/frontend/src/FirstRun/AuthenticationRequiredModalContent.js
@@ -34,7 +34,8 @@ function AuthenticationRequiredModalContent(props) {
authenticationMethod,
authenticationRequired,
username,
- password
+ password,
+ passwordConfirmation
} = settings;
const authenticationEnabled = authenticationMethod && authenticationMethod.value !== 'none';
@@ -120,6 +121,18 @@ function AuthenticationRequiredModalContent(props) {
{...password}
/>
+
+
+ {translate('PasswordConfirmation')}
+
+
+
:
null
}
diff --git a/frontend/src/Settings/General/SecuritySettings.js b/frontend/src/Settings/General/SecuritySettings.js
index 9a930b1d5..7234f9298 100644
--- a/frontend/src/Settings/General/SecuritySettings.js
+++ b/frontend/src/Settings/General/SecuritySettings.js
@@ -124,6 +124,7 @@ class SecuritySettings extends Component {
authenticationRequired,
username,
password,
+ passwordConfirmation,
apiKey,
certificateValidation
} = settings;
@@ -193,6 +194,21 @@ class SecuritySettings extends Component {
null
}
+ {
+ authenticationEnabled ?
+
+ {translate('PasswordConfirmation')}
+
+
+ :
+ null
+ }
+
{translate('ApiKey')}
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 62804cae7..9099791e1 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -77,6 +77,7 @@
"AuthenticationMethodHelpTextWarning": "Please select a valid authentication method",
"AuthenticationRequired": "Authentication Required",
"AuthenticationRequiredHelpText": "Change which requests authentication is required for. Do not change unless you understand the risks.",
+ "AuthenticationRequiredPasswordConfirmationHelpTextWarning": "Confirm new password",
"AuthenticationRequiredPasswordHelpTextWarning": "Enter a new password",
"AuthenticationRequiredUsernameHelpTextWarning": "Enter a new username",
"AuthenticationRequiredWarning": "To prevent remote access without authentication, {appName} now requires authentication to be enabled. You can optionally disable authentication from local addresses.",
@@ -376,6 +377,7 @@
"PageSizeHelpText": "Number of items to show on each page",
"Parameters": "Parameters",
"Password": "Password",
+ "PasswordConfirmation": "Password Confirmation",
"Peers": "Peers",
"PendingChangesDiscardChanges": "Discard changes and leave",
"PendingChangesMessage": "You have unsaved changes, are you sure you want to leave this page?",
diff --git a/src/NzbDrone.Core/Validation/Paths/FileExistsValidator.cs b/src/NzbDrone.Core/Validation/Paths/FileExistsValidator.cs
index 5393ce57b..327765537 100644
--- a/src/NzbDrone.Core/Validation/Paths/FileExistsValidator.cs
+++ b/src/NzbDrone.Core/Validation/Paths/FileExistsValidator.cs
@@ -1,4 +1,4 @@
-using FluentValidation.Validators;
+using FluentValidation.Validators;
using NzbDrone.Common.Disk;
namespace NzbDrone.Core.Validation.Paths
diff --git a/src/Prowlarr.Api.V1/Config/HostConfigController.cs b/src/Prowlarr.Api.V1/Config/HostConfigController.cs
index 9e3a82498..427fc8db3 100644
--- a/src/Prowlarr.Api.V1/Config/HostConfigController.cs
+++ b/src/Prowlarr.Api.V1/Config/HostConfigController.cs
@@ -47,6 +47,9 @@ namespace Prowlarr.Api.V1.Config
SharedValidator.RuleFor(c => c.Password).NotEmpty().When(c => c.AuthenticationMethod == AuthenticationType.Basic ||
c.AuthenticationMethod == AuthenticationType.Forms);
+ SharedValidator.RuleFor(c => c.PasswordConfirmation)
+ .Must((resource, p) => IsMatchingPassword(resource)).WithMessage("Must match Password");
+
SharedValidator.RuleFor(c => c.SslPort).ValidPort().When(c => c.EnableSsl);
SharedValidator.RuleFor(c => c.SslPort).NotEqual(c => c.Port).When(c => c.EnableSsl);
@@ -81,6 +84,23 @@ namespace Prowlarr.Api.V1.Config
return cert != null;
}
+ private bool IsMatchingPassword(HostConfigResource resource)
+ {
+ var user = _userService.FindUser();
+
+ if (user != null && user.Password == resource.Password)
+ {
+ return true;
+ }
+
+ if (resource.Password == resource.PasswordConfirmation)
+ {
+ return true;
+ }
+
+ return false;
+ }
+
public override HostConfigResource GetResourceById(int id)
{
return GetHostConfig();
@@ -94,11 +114,10 @@ namespace Prowlarr.Api.V1.Config
resource.Id = 1;
var user = _userService.FindUser();
- if (user != null)
- {
- resource.Username = user.Username;
- resource.Password = user.Password;
- }
+
+ resource.Username = user?.Username ?? string.Empty;
+ resource.Password = user?.Password ?? string.Empty;
+ resource.PasswordConfirmation = string.Empty;
return resource;
}
diff --git a/src/Prowlarr.Api.V1/Config/HostConfigResource.cs b/src/Prowlarr.Api.V1/Config/HostConfigResource.cs
index 35f4eca84..425453913 100644
--- a/src/Prowlarr.Api.V1/Config/HostConfigResource.cs
+++ b/src/Prowlarr.Api.V1/Config/HostConfigResource.cs
@@ -19,6 +19,7 @@ namespace Prowlarr.Api.V1.Config
public bool AnalyticsEnabled { get; set; }
public string Username { get; set; }
public string Password { get; set; }
+ public string PasswordConfirmation { get; set; }
public string LogLevel { get; set; }
public string ConsoleLogLevel { get; set; }
public string Branch { get; set; }