Use async method in honeypot service

Author: usercode

src/AspNetCore.Honeypot/Extensions.cs

@@ -9,11 +9,8 @@ namespace AspNetCore.Honeypot;
 public static class Extensions
 {
     /// <summary>
-    /// AddHoneypot
+    /// Adds honeypot services.
     /// </summary>
-    /// <param name="services"></param>
-    /// <param name="options"></param>
-    /// <returns></returns>
     public static IServiceCollection AddHoneypot(this IServiceCollection services, Action<HoneypotOptions>? options = null)
     {
         if (options != null)
@@ -27,14 +24,12 @@ public static IServiceCollection AddHoneypot(this IServiceCollection services, A
     }
 
     /// <summary>
-    /// IsHoneypotTrapped
+    /// Is honepot triggered?
     /// </summary>
-    /// <param name="httpContext"></param>
-    /// <returns></returns>
-    public static bool IsHoneypotTrapped(this HttpContext httpContext)
+    public static async Task<bool> IsHoneypotTriggeredAsync(this HttpContext httpContext)
     {
         HoneypotService service = httpContext.RequestServices.GetRequiredService<HoneypotService>();
 
-        return service.IsTrapped(httpContext);
+        return await service.IsTriggeredAsync(httpContext);
     }
 }

src/AspNetCore.Honeypot/HoneypotAttribute.cs

@@ -9,15 +9,15 @@ namespace AspNetCore.Honeypot;
 /// </summary>
 public class HoneypotAttribute : ActionFilterAttribute
 {
-    public override void OnActionExecuting(ActionExecutingContext context)
+    public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
     {
-        base.OnActionExecuting(context);
+        bool triggered = await context.HttpContext.IsHoneypotTriggeredAsync();
 
-        bool isTrapped = context.HttpContext.IsHoneypotTrapped();
-
-        if (isTrapped == true)
+        if (triggered == true)
         {
             context.Result = new ContentResult() { Content = "bot detection", ContentType = "text/plain", StatusCode = StatusCodes.Status200OK };
         }
+
+        await base.OnActionExecutionAsync(context, next);
     }
 }

src/AspNetCore.Honeypot/HoneypotOptions.cs

@@ -6,29 +6,29 @@
 public class HoneypotOptions
 {
     /// <summary>
-    /// EnableFieldCheck
+    /// Is field check enabled?
     /// </summary>
     public bool IsFieldCheckEnabled { get; set; } = true;
 
     /// <summary>
-    /// EnableTimeCheck
+    /// Is time check enabled?
     /// </summary>
     public bool IsTimeCheckEnabled { get; set; } = true;
 
     /// <summary>
-    /// PrefixFieldName
+    /// Prefix for fields.
     /// </summary>
     public string PrefixFieldName { get; set; } = "hp_";
 
     /// <summary>
-    /// TimeFieldName
+    /// Prefix for time fields.
     /// </summary>
     public string TimeFieldName { get; set; } = "_time";
 
     /// <summary>
-    /// MinTimeDuration
+    /// Minimal time for user response.
     /// </summary>
-    public TimeSpan MinTimeDuration { get; set; } = TimeSpan.FromSeconds(1);
+    public TimeSpan MinResponseTime { get; set; } = TimeSpan.FromSeconds(1);
 
     internal bool IsFieldName(string name)
     {

src/AspNetCore.Honeypot/HoneypotService.cs

@@ -9,7 +9,7 @@ namespace AspNetCore.Honeypot;
 /// </summary>
 class HoneypotService
 {
-    public const string HttpContextItemName = "AspNetCore.Honeypot.IsHoneypotTrapped";
+    public const string HttpContextItemName = "AspNetCore.Honeypot.IsHoneypotTriggered";
 
     public HoneypotService(IOptions<HoneypotOptions> options)
     {
@@ -22,42 +22,51 @@ public HoneypotService(IOptions<HoneypotOptions> options)
     private HoneypotOptions Options { get; }
 
     /// <summary>
-    /// IsTrapped
+    /// Is honeypot triggered?
     /// </summary>
-    public bool IsTrapped(HttpContext httpContext)
+    public async Task<bool> IsTriggeredAsync(HttpContext httpContext)
     {
         if (httpContext.Items.TryGetValue(HttpContextItemName, out object? value) == false)
         {
-            bool trapped = false;
+            bool triggered = false;
 
             if (httpContext.Request.HasFormContentType == false)
             {
-                trapped = true;
+                triggered = true;
             }
 
-            if (trapped == false && Options.IsFieldCheckEnabled)
+            IFormCollection form = await httpContext.Request.ReadFormAsync();
+
+            if (triggered == false && Options.IsFieldCheckEnabled)
             {
                 //check fields
-                trapped = httpContext.Request.Form.Any(x => Options.IsFieldName(x.Key) && x.Value.Any(v => string.IsNullOrEmpty(v) == false));
+                triggered = form.Any(x => Options.IsFieldName(x.Key) && x.Value.Any(v => string.IsNullOrEmpty(v) == false));
             }
 
-            if (trapped == false && Options.IsTimeCheckEnabled)
+            if (triggered == false && Options.IsTimeCheckEnabled)
             {
                 //check time
-                if (httpContext.Request.Form.TryGetValue(Options.TimeFieldName, out StringValues timeValues))
+                if (form.TryGetValue(Options.TimeFieldName, out StringValues timeValues))
                 {
-                    if (timeValues.Any())
+                    if (timeValues.Count > 0 && timeValues[0] is string timeValue)
                     {
-                        TimeSpan diff = DateTime.UtcNow - new DateTime(long.Parse(timeValues.First()), DateTimeKind.Utc);
+                        if (long.TryParse(timeValue, out long time))
+                        {
+                            TimeSpan diff = DateTime.UtcNow - new DateTime(time, DateTimeKind.Utc);
 
-                        trapped = diff < Options.MinTimeDuration;
+                            triggered = diff < Options.MinResponseTime;
+                        }
+                        else
+                        {
+                            triggered = true; //time field doesn't contain long value.
+                        }
                     }
                 }
             }
 
-            httpContext.Items.Add(HttpContextItemName, trapped);
+            httpContext.Items.Add(HttpContextItemName, triggered);
 
-            return trapped;
+            return triggered;
         }
         else
         {