lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ReCaptchaPartDriver always returns a shape (#8292)

Browse Source 
* We changed when ReCaptchaPartDriver verifies whether it's being executed on the Admin side, moving the test from the driver's execution to the shape's, so that the ShapeType is available to other features and services that process the driver's output (e.g. for placement)

* store the first validation of recaptcha to avoid failing if the driver runs again in a single request
This commit is contained in:
Matteo Piovanelli
2019-12-05 21:06:53 +01:00
committed by Sébastien Ros
parent a67b3cfa00
commit 104d18aa06
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Orchard.Web/Modules/Orchard.AntiSpam/Drivers/ReCaptchaPartDriver.cs
View File

@@ -13,6 +13,7 @@ using Orchard.Logging;
using Orchard.UI.Admin;
using Orchard.UI.Notify;
using Orchard.Services;
using System.Collections.Generic;
namespace Orchard.AntiSpam.Drivers {
public class ReCaptchaPartDriver : ContentPartDriver<ReCaptchaPart> {
@@ -35,14 +36,16 @@ namespace Orchard.AntiSpam.Drivers {
public Localizer T { get; set; }
public ILogger Logger { get; set; }
protected override DriverResult Editor(ReCaptchaPart part, dynamic shapeHelper) {
var workContext = _workContextAccessor.GetContext();
// don't display the part in the admin
if (AdminFilter.IsApplied(workContext.HttpContext.Request.RequestContext)) {
return null;
}
// we want to be returning a shape even when it should display nothing, because
// other features may need the Shape's type, or some other of its properties
return ContentShape("Parts_ReCaptcha_Fields", () => {
var workContext = _workContextAccessor.GetContext();
// don't display the part in the admin
if (AdminFilter.IsApplied(workContext.HttpContext.Request.RequestContext)) {
return null;
}
var settings = workContext.CurrentSite.As<ReCaptchaSettingsPart>();
if (settings.TrustAuthenticatedUsers && workContext.CurrentUser != null) {
@@ -73,7 +76,7 @@ namespace Orchard.AntiSpam.Drivers {
var context = workContext.HttpContext;
try {
var result = ExecuteValidateRequest(
var result = ValidateRequest(//ExecuteValidateRequest(
settings.PrivateKey,
context.Request.ServerVariables["REMOTE_ADDR"],
context.Request.Form["g-recaptcha-response"]
@@ -104,13 +107,27 @@ namespace Orchard.AntiSpam.Drivers {
return Editor(part, shapeHelper);
}
private static string ExecuteValidateRequest(string privateKey, string remoteip, string response) {
var postData = String.Format(CultureInfo.InvariantCulture,
// temporarily save <postData, response> pairs, to prevent sending the same exact request
// more than once in a single Request.
private Dictionary<string, string> ValidationResponse;
private string ValidateRequest(string privateKey, string remoteip, string response) {
if (ValidationResponse == null) {
ValidationResponse = new Dictionary<string, string>();
}
var postData = string.Format(CultureInfo.InvariantCulture,
"secret={0}&response={1}&remoteip={2}",
privateKey,
response,
remoteip
);
if (!ValidationResponse.ContainsKey(postData)) {
ValidationResponse.Add(postData, ExecuteValidateRequest(postData));
}
return ValidationResponse[postData];
}
private static string ExecuteValidateRequest(string postData) {
WebRequest request = WebRequest.Create(ReCaptchaSecureUrl + "?" + postData);
request.Method = "GET";
@@ -123,5 +140,6 @@ namespace Orchard.AntiSpam.Drivers {
}
}
}
}
}