Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Account/Login - Add new validator for captcha

support6773a1e78031
diff --git a/src/Core/Grand.Infrastructure/Models/ICaptchaValidModel.cs b/src/Core/Grand.Infrastructure/Models/ICaptchaValidModel.cs
new file mode 100644
index 000000000..c1c6b3c93
--- /dev/null
+++ b/src/Core/Grand.Infrastructure/Models/ICaptchaValidModel.cs
@@ -0,0 +1,13 @@
+namespace Grand.Infrastructure.Models;
+
+public interface ICaptchaValidModel
+{
+
+ public string ReCaptchaChallengeField { get; set; }
+
+ public string ReCaptchaResponseField { get; set; }
+
+ public string ReCaptchaResponseValue { get; set; }
+
+ public string ReCaptchaResponse { get; set; }
+}
diff --git a/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs
index 461484a44..e7aedd399 100644
--- a/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs
+++ b/src/Web/Grand.Web.Common/TagHelpers/GenerateCaptchaTagHelper.cs
@@ -44,7 +44,7 @@ namespace Grand.Web.Common.TagHelpers
var captchaControl = new GoogleRecaptchaControl(_captchaSettings.ReCaptchaVersion)
{
Theme = _captchaSettings.ReCaptchaTheme,
- Id = "g-recaptcha-response-value-" + Guid.NewGuid().ToString("N"),
+ Id = "g-recaptcha-response-value",
PublicKey = _captchaSettings.ReCaptchaPublicKey,
Language = _captchaSettings.ReCaptchaLanguage
};
diff --git a/src/Web/Grand.Web/Controllers/AccountController.cs b/src/Web/Grand.Web/Controllers/AccountController.cs
index aced5c3f5..45e4f6369 100644
--- a/src/Web/Grand.Web/Controllers/AccountController.cs
+++ b/src/Web/Grand.Web/Controllers/AccountController.cs
@@ -97,22 +97,11 @@ namespace Grand.Web.Controllers
//available even when navigation is not allowed
[PublicStore(true)]
[ClosedStore(true)]
- [ValidateCaptcha]
[AutoValidateAntiforgeryToken]
- public virtual async Task<IActionResult> Login(LoginModel model, string returnUrl, bool captchaValid)
+ public virtual async Task<IActionResult> Login(LoginModel model, string returnUrl)
{
- //validate CAPTCHA
- if (_captchaSettings.Enabled && _captchaSettings.ShowOnLoginPage && !captchaValid)
- {
- ModelState.AddModelError("", _captchaSettings.GetWrongCaptchaMessage(_translationService));
- }
-
if (ModelState.IsValid)
{
- if (_customerSettings.UsernamesEnabled && model.Username != null)
- {
- model.Username = model.Username.Trim();
- }
var loginResult = await _customerManagerService.LoginCustomer(_customerSettings.UsernamesEnabled ? model.Username : model.Email, model.Password);
switch (loginResult)
{
diff --git a/src/Web/Grand.Web/Models/Common/CaptchaModel.cs b/src/Web/Grand.Web/Models/Common/CaptchaModel.cs
new file mode 100644
index 000000000..d062ea39d
--- /dev/null
+++ b/src/Web/Grand.Web/Models/Common/CaptchaModel.cs
@@ -0,0 +1,11 @@
+using Grand.Infrastructure.Models;
+
+namespace Grand.Web.Models.Common;
+
+public record CaptchaModel : ICaptchaValidModel
+{
+ public string ReCaptchaChallengeField { get; set; }
+ public string ReCaptchaResponseField { get; set; }
+ public string ReCaptchaResponseValue { get; set; }
+ public string ReCaptchaResponse { get; set; }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Models/Customer/LoginModel.cs b/src/Web/Grand.Web/Models/Customer/LoginModel.cs
index a0df8bc71..2c529dda6 100644
--- a/src/Web/Grand.Web/Models/Customer/LoginModel.cs
+++ b/src/Web/Grand.Web/Models/Customer/LoginModel.cs
@@ -1,5 +1,6 @@
using Grand.Infrastructure.ModelBinding;
using Grand.Infrastructure.Models;
+using Grand.Web.Models.Common;
using System.ComponentModel.DataAnnotations;
namespace Grand.Web.Models.Customer
@@ -22,8 +23,7 @@ namespace Grand.Web.Models.Customer
[GrandResourceDisplayName("Account.Login.Fields.RememberMe")]
public bool RememberMe { get; set; }
-
public bool DisplayCaptcha { get; set; }
-
+ public ICaptchaValidModel Captcha { get; set; } = new CaptchaModel();
}
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Validators/Common/CaptchaValidator.cs b/src/Web/Grand.Web/Validators/Common/CaptchaValidator.cs
new file mode 100644
index 000000000..68afeacd5
--- /dev/null
+++ b/src/Web/Grand.Web/Validators/Common/CaptchaValidator.cs
@@ -0,0 +1,82 @@
+using FluentValidation;
+using Grand.Infrastructure.Models;
+using Grand.Infrastructure.Validators;
+using Grand.Web.Common.Security.Captcha;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Primitives;
+
+namespace Grand.Web.Validators.Common;
+
+public class CaptchaValidator : BaseGrandValidator<ICaptchaValidModel>
+{
+ private readonly IHttpContextAccessor _contextAccessor;
+ private readonly GoogleReCaptchaValidator _googleReCaptchaValidator;
+
+ #region Constants
+
+ private const string ChallengeFieldKey = "recaptcha_challenge_field";
+ private const string ResponseFieldKey = "recaptcha_response_field";
+ private const string GResponseFieldKeyV3 = "g-recaptcha-response-value";
+ private const string GResponseFieldKeyV2 = "g-recaptcha-response";
+
+ #endregion
+ public CaptchaValidator(IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validators,
+ IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator
+ ) : base(validators)
+ {
+ _contextAccessor = contextAccessor;
+ _googleReCaptchaValidator = googleReCaptchaValidator;
+
+ RuleFor(x => x).CustomAsync(async (x, context, _) =>
+ {
+ var result = await ValidateCaptcha(x);
+ if (!result.isValid)
+ {
+ context.AddFailure(result.error);
+ }
+ });
+ }
+
+ private async Task<(bool isValid, string error)> ValidateCaptcha(ICaptchaValidModel captcha)
+ {
+ var isValid = false;
+ string captchaChallengeValue;
+ string captchaResponseValue;
+ string gCaptchaResponseValue;
+ if (_contextAccessor.HttpContext!.Request.HasJsonContentType())
+ {
+ captchaChallengeValue = captcha.ReCaptchaChallengeField;
+ captchaResponseValue = captcha.ReCaptchaResponseField;
+ gCaptchaResponseValue = captcha.ReCaptchaResponseValue;
+ if (string.IsNullOrEmpty(gCaptchaResponseValue))
+ gCaptchaResponseValue = captcha.ReCaptchaResponse;
+ }
+ else
+ {
+ var form = await _contextAccessor.HttpContext!.Request.ReadFormAsync();
+ captchaChallengeValue = form[ChallengeFieldKey];
+ captchaResponseValue = form[ResponseFieldKey];
+ gCaptchaResponseValue = string.Empty;
+ foreach (var item in form.Keys)
+ {
+ if (item.Contains(GResponseFieldKeyV3))
+ gCaptchaResponseValue = form[item];
+ }
+
+ if (string.IsNullOrEmpty(gCaptchaResponseValue))
+ gCaptchaResponseValue = form[GResponseFieldKeyV2];
+ }
+
+ if ((StringValues.IsNullOrEmpty(captchaChallengeValue) ||
+ StringValues.IsNullOrEmpty(captchaResponseValue)) &&
+ string.IsNullOrEmpty(gCaptchaResponseValue)) return (false, "Captcha response value is null");
+ //Captcha validate request
+ var recaptchaResponse = await _googleReCaptchaValidator.Validate(
+ !StringValues.IsNullOrEmpty(captchaResponseValue)
+ ? captchaResponseValue.ToString()
+ : gCaptchaResponseValue);
+ isValid = recaptchaResponse.IsValid;
+
+ return isValid ? (true, string.Empty) : (false, string.Join(',', recaptchaResponse.ErrorCodes));
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
index c6a857ce0..a2e536a91 100644
--- a/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
+++ b/src/Web/Grand.Web/Validators/Customer/LoginValidator.cs
@@ -1,8 +1,12 @@
using FluentValidation;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Domain.Customers;
+using Grand.Infrastructure.Models;
using Grand.Infrastructure.Validators;
+using Grand.Web.Common.Security.Captcha;
using Grand.Web.Models.Customer;
+using Grand.Web.Validators.Common;
+using Microsoft.AspNetCore.Http;
namespace Grand.Web.Validators.Customer
{
@@ -10,19 +14,31 @@ namespace Grand.Web.Validators.Customer
{
public LoginValidator(
IEnumerable<IValidatorConsumer<LoginModel>> validators,
- ITranslationService translationService, CustomerSettings customerSettings)
+ IEnumerable<IValidatorConsumer<ICaptchaValidModel>> validatorsCaptcha,
+ ITranslationService translationService, CustomerSettings customerSettings, CaptchaSettings captchaSettings,
+ IHttpContextAccessor contextAccessor, GoogleReCaptchaValidator googleReCaptchaValidator)
: base(validators)
{
if (!customerSettings.UsernamesEnabled)
{
- RuleFor(x => x.Email).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Email.Required"));
- RuleFor(x => x.Password).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));
+ RuleFor(x => x.Email).NotEmpty()
+ .WithMessage(translationService.GetResource("Account.Login.Fields.Email.Required"));
+ RuleFor(x => x.Password).NotEmpty()
+ .WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));
RuleFor(x => x.Email).EmailAddress().WithMessage(translationService.GetResource("Common.WrongEmail"));
}
else
{
- RuleFor(x => x.Username).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.UserName.Required"));
- RuleFor(x => x.Password).NotEmpty().WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));
+ RuleFor(x => x.Username).NotEmpty()
+ .WithMessage(translationService.GetResource("Account.Login.Fields.UserName.Required"));
+ RuleFor(x => x.Password).NotEmpty()
+ .WithMessage(translationService.GetResource("Account.Login.Fields.Password.Required"));
+ }
+
+ if (captchaSettings.Enabled && captchaSettings.ShowOnLoginPage)
+ {
+ RuleFor(x => x.Captcha).NotNull().WithMessage(translationService.GetResource("Account.Captcha.Required"));;
+ RuleFor(x => x.Captcha).SetValidator(new CaptchaValidator(validatorsCaptcha,contextAccessor, googleReCaptchaValidator));
}
}
}
diff --git a/src/Web/Grand.Web/Views/Account/Login.cshtml b/src/Web/Grand.Web/Views/Account/Login.cshtml
index 9f524b74f..39174eaa4 100644
--- a/src/Web/Grand.Web/Views/Account/Login.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Login.cshtml
@@ -24,7 +24,7 @@
</h3>
</div>
<div class="card-body">
- <div asp-validation-summary="ModelOnly" class="message-error w-100 alert alert-danger pb-0 text-center">@Loc["Account.Login.Unsuccessful"]</div>
+ <div asp-validation-summary="All" class="message-error w-100 pb-0 text-center"></div>
<div class="col-12 form-group mb-0">
@if (Model.UsernamesEnabled)
{