From bdbf4b631634cb46919eb4b76d0033322643dfa1 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 23 Jul 2018 19:33:27 +0000
Subject: [PATCH]

---
 Pages/Contact.cshtml        |  2 +-
 Pages/Contact.cshtml.cs     |  4 +--
 Pages/request.cshtml        |  3 ++-
 Pages/request.cshtml.cs     | 49 ++++++++++++++++++++++++++++++------
 Pages/requestlite.cshtml    |  3 ++-
 Pages/requestlite.cshtml.cs | 50 +++++++++++++++++++++++++++++++------
 6 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/Pages/Contact.cshtml b/Pages/Contact.cshtml
index 0035789..86a790e 100644
--- a/Pages/Contact.cshtml
+++ b/Pages/Contact.cshtml
@@ -100,7 +100,7 @@
 		  <label class="col-md-4 control-label" for="Send"></label>
 		  <div class="col-md-4">
 					<div class="g-recaptcha" data-callback="imNotARobot" data-sitekey="6LcH7GUUAAAAAJIDf_JDZolSv__xN6oqr9Dx79zs"></div>
-			<button id="btnsubmit" type="submit" class="btn btn-info" >Send us your question</button>
+					<button id="btnsubmit" type="submit" class="btn btn-info" >Send us your question</button>
 		  </div>
 		</div>		
   <!-- <div class="row">
diff --git a/Pages/Contact.cshtml.cs b/Pages/Contact.cshtml.cs
index 86627d1..c30e98c 100644
--- a/Pages/Contact.cshtml.cs
+++ b/Pages/Contact.cshtml.cs
@@ -53,8 +53,8 @@ namespace contact.Pages
                         _configuration.GetSection("GoogleReCaptcha:secret").Value
                         ))
             {
-                //ModelState.AddModelError(string.Empty, "You failed the CAPTCHA, stupid robot. Go play some 1x1 on SFs instead.");
-                return StatusCode(400);
+                //Return a fail code that will hopefully take us off the spammers list
+                return StatusCode(500);
             }
 
 
diff --git a/Pages/request.cshtml b/Pages/request.cshtml
index ec7029a..90595ca 100644
--- a/Pages/request.cshtml
+++ b/Pages/request.cshtml
@@ -83,7 +83,8 @@
 		<div class="form-group">
 		  <label class="col-md-4 control-label" for="Send"></label>
 		  <div class="col-md-4">
-			<button type="submit" class="btn btn-info" >Receive 30 day Activation key</button>
+        <div class="g-recaptcha" data-callback="imNotARobot" data-sitekey="6LcH7GUUAAAAAJIDf_JDZolSv__xN6oqr9Dx79zs"></div>
+			  <button id="btnsubmit" type="submit" class="btn btn-info" >Receive 30 day Activation key</button>
 		  </div>
 		</div>		
   <!-- <div class="row">
diff --git a/Pages/request.cshtml.cs b/Pages/request.cshtml.cs
index e0d568c..15ef3d1 100644
--- a/Pages/request.cshtml.cs
+++ b/Pages/request.cshtml.cs
@@ -7,6 +7,11 @@ using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Mail;
 using System.Net;
+//for captcha:
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Configuration;
 
 namespace contact.Pages
 {
@@ -17,7 +22,7 @@ namespace contact.Pages
         public string Name { get; set; }
         [Required]
         public string Company { get; set; }
-         [Required]
+        [Required]
         public string Referrer { get; set; }
         [Required, EmailAddress]
         public string Email { get; set; }
@@ -30,7 +35,11 @@ namespace contact.Pages
         public string Message { get; set; }
         [BindProperty]
         public RequestFormModel Contact { get; set; }
-
+        private readonly IConfiguration _configuration;
+        public RequestModel(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
 
         public ActionResult OnPost()
         {
@@ -38,12 +47,16 @@ namespace contact.Pages
             {
                 return Page();
             }
-            //fuck those Russian spammers
-            if(Contact.Company.ToLowerInvariant()!="google")
-                SendMail();
+            if (!ReCaptchaPassed(
+                        Request.Form["g-recaptcha-response"], // that's how you get it from the Request object
+                        _configuration.GetSection("GoogleReCaptcha:secret").Value
+                        ))
+            {
+               //Return a fail code that will hopefully take us off the spammers list
+                return StatusCode(500);
+            }
 
-            //TODO: go to a successful submit page on the ayanova site            
-            //return Redirect("/confirm.html");//sample quickie page I made up
+            SendMail();            
             return Redirect("https://ayanova.com/confirmed.htm");
         }
 
@@ -100,5 +113,27 @@ namespace contact.Pages
         {
             Message = "Your contact page.";
         }
+
+        public static bool ReCaptchaPassed(string gRecaptchaResponse, string secret)
+        {
+            HttpClient httpClient = new HttpClient();
+            var res = httpClient.GetAsync($"https://www.google.com/recaptcha/api/siteverify?secret={secret}&response={gRecaptchaResponse}").Result;
+            if (res.StatusCode != HttpStatusCode.OK)
+            {
+                // logger.LogError("Error while sending request to ReCaptcha");
+                return false;
+            }
+
+            string JSONres = res.Content.ReadAsStringAsync().Result;
+            dynamic JSONdata = JObject.Parse(JSONres);
+            if (JSONdata.success != "true")
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+
     }
 }
diff --git a/Pages/requestlite.cshtml b/Pages/requestlite.cshtml
index 72d2b5a..141c5a0 100644
--- a/Pages/requestlite.cshtml
+++ b/Pages/requestlite.cshtml
@@ -83,7 +83,8 @@
 		<div class="form-group">
 		  <label class="col-md-4 control-label" for="Send"></label>
 		  <div class="col-md-4">
-			<button type="submit" class="btn btn-info" >Receive 30 day Lite Activation key</button>
+        <div class="g-recaptcha" data-callback="imNotARobot" data-sitekey="6LcH7GUUAAAAAJIDf_JDZolSv__xN6oqr9Dx79zs"></div>
+			  <button id="btnsubmit" type="submit" class="btn btn-info" >Receive 30 day Lite Activation key</button>
 		  </div>
 		</div>		
   <!-- <div class="row">
diff --git a/Pages/requestlite.cshtml.cs b/Pages/requestlite.cshtml.cs
index 7cd779f..a1116de 100644
--- a/Pages/requestlite.cshtml.cs
+++ b/Pages/requestlite.cshtml.cs
@@ -7,6 +7,11 @@ using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Mail;
 using System.Net;
+//for captcha:
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Configuration;
 
 namespace contact.Pages
 {
@@ -17,7 +22,7 @@ namespace contact.Pages
         public string Name { get; set; }
         [Required]
         public string Company { get; set; }
-         [Required]
+        [Required]
         public string Referrer { get; set; }
         [Required, EmailAddress]
         public string Email { get; set; }
@@ -30,7 +35,11 @@ namespace contact.Pages
         public string Message { get; set; }
         [BindProperty]
         public RequestFormModel Contact { get; set; }
-
+        private readonly IConfiguration _configuration;
+        public RequestLiteModel(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
 
         public ActionResult OnPost()
         {
@@ -38,12 +47,17 @@ namespace contact.Pages
             {
                 return Page();
             }
-            //fuck those Russian spammers
-            if(Contact.Company.ToLowerInvariant()!="google")
-                SendMail();
+            if (!ReCaptchaPassed(
+                      Request.Form["g-recaptcha-response"], // that's how you get it from the Request object
+                      _configuration.GetSection("GoogleReCaptcha:secret").Value
+                      ))
+            {
+                //Return a fail code that will hopefully take us off the spammers list
+                return StatusCode(500);
+            }
+
+            SendMail();
 
-            //TODO: go to a successful submit page on the ayanova site            
-            //return Redirect("/confirm.html");//sample quickie page I made up
             return Redirect("https://ayanova.com/confirmed.htm");
         }
 
@@ -100,5 +114,27 @@ namespace contact.Pages
         {
             Message = "Your contact page.";
         }
+
+        public static bool ReCaptchaPassed(string gRecaptchaResponse, string secret)
+        {
+            HttpClient httpClient = new HttpClient();
+            var res = httpClient.GetAsync($"https://www.google.com/recaptcha/api/siteverify?secret={secret}&response={gRecaptchaResponse}").Result;
+            if (res.StatusCode != HttpStatusCode.OK)
+            {
+                // logger.LogError("Error while sending request to ReCaptcha");
+                return false;
+            }
+
+            string JSONres = res.Content.ReadAsStringAsync().Result;
+            dynamic JSONdata = JObject.Parse(JSONres);
+            if (JSONdata.success != "true")
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+
     }
 }