[CAPTCHA] Replace ReCAPTCHA with Turnstile

.github/workflows/deploy_qa.yml

@@ -2,8 +2,7 @@ name: "Deploy Update to QA Server"
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
 
 permissions:
   contents: read

.vscode/settings.json

@@ -73,7 +73,6 @@
     "piptools",
     "Prenoun",
     "Preverb",
-    "recaptcha",
     "reportgenerator",
     "sched",
     "signup",

Backend.Tests/Controllers/UserControllerTests.cs

@@ -35,7 +35,7 @@ public void Setup()
             _userRepo = new UserRepositoryMock();
             _permissionService = new PermissionServiceMock(_userRepo);
             _userController = new UserController(_userRepo, _permissionService,
-                new EmailServiceMock(), new PasswordResetServiceMock());
+                new CaptchaServiceMock(), new EmailServiceMock(), new PasswordResetServiceMock());
         }
 
         private static User RandomUser()

Backend.Tests/Mocks/CaptchaServiceMock.cs

@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using BackendFramework.Interfaces;
+
+namespace Backend.Tests.Mocks
+{
+    sealed internal class CaptchaServiceMock : ICaptchaService
+    {
+        public Task<bool> VerifyToken(string token)
+        {
+            return Task.FromResult(true);
+        }
+    }
+}

Backend/Contexts/CaptchaContext.cs

@@ -0,0 +1,21 @@
+using System.Diagnostics.CodeAnalysis;
+using BackendFramework.Interfaces;
+using Microsoft.Extensions.Options;
+
+namespace BackendFramework.Contexts
+{
+    [ExcludeFromCodeCoverage]
+    public class CaptchaContext : ICaptchaContext
+    {
+        public bool CaptchaEnabled { get; }
+        public string? CaptchaSecretKey { get; }
+        public string? CaptchaVerifyUrl { get; }
+
+        public CaptchaContext(IOptions<Startup.Settings> options)
+        {
+            CaptchaEnabled = options.Value.CaptchaEnabled;
+            CaptchaSecretKey = options.Value.CaptchaSecretKey;
+            CaptchaVerifyUrl = options.Value.CaptchaVerifyUrl;
+        }
+    }
+}

Backend/Contexts/EmailContext.cs

@@ -7,6 +7,7 @@ namespace BackendFramework.Contexts
     [ExcludeFromCodeCoverage]
     public class EmailContext : IEmailContext
     {
+        public bool EmailEnabled { get; }
         public string? SmtpServer { get; }
         public int SmtpPort { get; }
         public string? SmtpUsername { get; }
@@ -16,6 +17,7 @@ public class EmailContext : IEmailContext
 
         public EmailContext(IOptions<Startup.Settings> options)
         {
+            EmailEnabled = options.Value.EmailEnabled;
             SmtpServer = options.Value.SmtpServer;
             SmtpPort = options.Value.SmtpPort ?? IEmailContext.InvalidPort;
             SmtpUsername = options.Value.SmtpUsername;

Backend/Controllers/UserController.cs

@@ -18,19 +18,30 @@ namespace BackendFramework.Controllers
     public class UserController : Controller
     {
         private readonly IUserRepository _userRepo;
+        private readonly ICaptchaService _captchaService;
         private readonly IEmailService _emailService;
         private readonly IPasswordResetService _passwordResetService;
         private readonly IPermissionService _permissionService;
 
         public UserController(IUserRepository userRepo, IPermissionService permissionService,
-            IEmailService emailService, IPasswordResetService passwordResetService)
+            ICaptchaService captchaService, IEmailService emailService, IPasswordResetService passwordResetService)
         {
             _userRepo = userRepo;
+            _captchaService = captchaService;
             _emailService = emailService;
             _passwordResetService = passwordResetService;
             _permissionService = permissionService;
         }
 
+        /// <summary> Verifies a CAPTCHA token </summary>
+        [AllowAnonymous]
+        [HttpGet("captcha/{token}", Name = "VerifyCaptchaToken")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<IActionResult> VerifyCaptchaToken(string token)
+        {
+            return await _captchaService.VerifyToken(token) ? Ok() : BadRequest();
+        }
+
         /// <summary> Sends a password reset request </summary>
         [AllowAnonymous]
         [HttpPost("forgot", Name = "ResetPasswordRequest")]

Backend/Interfaces/ICaptchaContext.cs

@@ -0,0 +1,9 @@
+namespace BackendFramework.Interfaces
+{
+    public interface ICaptchaContext
+    {
+        bool CaptchaEnabled { get; }
+        string? CaptchaSecretKey { get; }
+        string? CaptchaVerifyUrl { get; }
+    }
+}

Backend/Interfaces/ICaptchaService.cs

@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace BackendFramework.Interfaces
+{
+    public interface ICaptchaService
+    {
+        Task<bool> VerifyToken(string token);
+    }
+}

Backend/Interfaces/IEmailContext.cs

@@ -6,6 +6,7 @@ public interface IEmailContext
         /// This is value is set if the user does not supply an SMTP port number.
         public const int InvalidPort = -1;
 
+        bool EmailEnabled { get; }
         string? SmtpServer { get; }
         int SmtpPort { get; }
         string? SmtpUsername { get; }

Backend/Properties/launchSettings.json

@@ -14,7 +14,11 @@
       "launchBrowser": true,
       "launchUrl": "v1",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "COMBINE_CAPTCHA_REQUIRED": "true",
+        "COMBINE_CAPTCHA_SECRET_KEY": "1x0000000000000000000000000000000AA",
+        "COMBINE_CAPTCHA_VERIFY_URL": "https://challenges.cloudflare.com/turnstile/v0/siteverify",
+        "COMBINE_JWT_SECRET_KEY": "0123456789abcdefghijklmnopqrstuvwxyz"
       }
     },
     "BackendFramework": {
@@ -23,7 +27,11 @@
       "launchUrl": "v1/",
       "environmentVariables": {
         "Key": "Value",
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "COMBINE_CAPTCHA_REQUIRED": "true",
+        "COMBINE_CAPTCHA_SECRET_KEY": "1x0000000000000000000000000000000AA",
+        "COMBINE_CAPTCHA_VERIFY_URL": "https://challenges.cloudflare.com/turnstile/v0/siteverify",
+        "COMBINE_JWT_SECRET_KEY": "0123456789abcdefghijklmnopqrstuvwxyz"
       },
       "applicationUrl": "http://localhost:5000",
       "hotReloadProfile": "aspnetcore"

Backend/Services/CaptchaService.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
+using System.Threading.Tasks;
+using BackendFramework.Interfaces;
+
+namespace BackendFramework.Services
+{
+    [ExcludeFromCodeCoverage]
+    public class CaptchaService : ICaptchaService
+    {
+        private readonly ICaptchaContext _captchaContext;
+
+        public CaptchaService(ICaptchaContext captchaContext)
+        {
+            _captchaContext = captchaContext;
+        }
+
+        public async Task<bool> VerifyToken(string token)
+        {
+            if (!_captchaContext.CaptchaEnabled)
+            {
+                throw new CaptchaNotEnabledException();
+            }
+
+            var secret = _captchaContext.CaptchaSecretKey;
+            var verifyUrl = _captchaContext.CaptchaVerifyUrl;
+            if (string.IsNullOrEmpty(secret) || string.IsNullOrEmpty(verifyUrl))
+            {
+                return false;
+            }
+            var httpContent = new FormUrlEncodedContent(new Dictionary<string, string>{
+               {"response", token},
+               {"secret", secret},
+            });
+            using var result = await new HttpClient().PostAsync(verifyUrl, httpContent);
+            var contentString = await result.Content.ReadAsStringAsync();
+            return contentString.Contains("\"success\":true");
+        }
+
+        private sealed class CaptchaNotEnabledException : Exception { }
+    }
+}

Backend/Services/EmailService.cs

@@ -1,6 +1,7 @@
+using System;
 using System.Diagnostics.CodeAnalysis;
-using BackendFramework.Interfaces;
 using System.Threading.Tasks;
+using BackendFramework.Interfaces;
 using MimeKit;
 
 namespace BackendFramework.Services
@@ -17,6 +18,11 @@ public EmailService(IEmailContext emailContext)
 
         public async Task<bool> SendEmail(MimeMessage message)
         {
+            if (!_emailContext.EmailEnabled)
+            {
+                throw new EmailNotEnabledException();
+            }
+
             using var client = new MailKit.Net.Smtp.SmtpClient();
 
             await client.ConnectAsync(_emailContext.SmtpServer, _emailContext.SmtpPort);
@@ -33,5 +39,7 @@ public async Task<bool> SendEmail(MimeMessage message)
             await client.DisconnectAsync(true);
             return true;
         }
+
+        private sealed class EmailNotEnabledException : Exception { }
     }
 }

Backend/Startup.cs

@@ -39,8 +39,12 @@ public class Settings
         {
             public const int DefaultPasswordResetExpireTime = 15;
 
+            public bool CaptchaEnabled { get; set; }
+            public string? CaptchaSecretKey { get; set; }
+            public string? CaptchaVerifyUrl { get; set; }
             public string ConnectionString { get; set; }
             public string CombineDatabase { get; set; }
+            public bool EmailEnabled { get; set; }
             public string? SmtpServer { get; set; }
             public int? SmtpPort { get; set; }
             public string? SmtpUsername { get; set; }
@@ -51,23 +55,32 @@ public class Settings
 
             public Settings()
             {
+                CaptchaEnabled = true;
                 ConnectionString = "";
                 CombineDatabase = "";
+                EmailEnabled = false;
                 PassResetExpireTime = DefaultPasswordResetExpireTime;
             }
         }
 
         private sealed class EnvironmentNotConfiguredException : Exception { }
 
-        private string? CheckedEnvironmentVariable(string name, string? defaultValue, string error = "")
+        private string? CheckedEnvironmentVariable(string name, string? defaultValue, string error = "", bool info = false)
         {
             var contents = Environment.GetEnvironmentVariable(name);
             if (contents is not null)
             {
                 return contents;
             }
 
-            _logger.LogError("Environment variable: {Name} is not defined. {Error}", name, error);
+            if (info)
+            {
+                _logger.LogInformation("Environment variable: {Name} is not defined. {Error}", name, error);
+            }
+            else
+            {
+                _logger.LogError("Environment variable: {Name} is not defined. {Error}", name, error);
+            }
             return defaultValue;
         }
 
@@ -153,31 +166,56 @@ public void ConfigureServices(IServiceCollection services)
                     options.CombineDatabase = Configuration["MongoDB:CombineDatabase"]
                         ?? throw new EnvironmentNotConfiguredException();
 
+                    options.CaptchaEnabled = bool.Parse(CheckedEnvironmentVariable(
+                        "COMBINE_CAPTCHA_REQUIRED",
+                        "true",
+                        "CAPTCHA should be explicitly required or not required.")!);
+                    if (options.CaptchaEnabled)
+                    {
+                        options.CaptchaSecretKey = CheckedEnvironmentVariable(
+                            "COMBINE_CAPTCHA_SECRET_KEY",
+                            null,
+                            "CAPTCHA secret key required.");
+                        options.CaptchaVerifyUrl = CheckedEnvironmentVariable(
+                            "COMBINE_CAPTCHA_VERIFY_URL",
+                            null,
+                            "CAPTCHA verification URL required.");
+                    }
+
                     const string emailServiceFailureMessage = "Email services will not work.";
-                    options.SmtpServer = CheckedEnvironmentVariable(
-                        "COMBINE_SMTP_SERVER",
-                        null,
-                        emailServiceFailureMessage);
-                    options.SmtpPort = int.Parse(CheckedEnvironmentVariable(
-                        "COMBINE_SMTP_PORT",
-                        IEmailContext.InvalidPort.ToString(),
-                        emailServiceFailureMessage)!);
-                    options.SmtpUsername = CheckedEnvironmentVariable(
-                        "COMBINE_SMTP_USERNAME",
-                        null,
-                        emailServiceFailureMessage);
-                    options.SmtpPassword = CheckedEnvironmentVariable(
-                        "COMBINE_SMTP_PASSWORD",
-                        null,
-                        emailServiceFailureMessage);
-                    options.SmtpAddress = CheckedEnvironmentVariable(
-                        "COMBINE_SMTP_ADDRESS",
-                        null,
-                        emailServiceFailureMessage);
-                    options.SmtpFrom = CheckedEnvironmentVariable(
-                        "COMBINE_SMTP_FROM",
-                        null,
-                        emailServiceFailureMessage);
+                    options.EmailEnabled = bool.Parse(CheckedEnvironmentVariable(
+                        "COMBINE_EMAIL_ENABLED",
+                        "false",
+                        emailServiceFailureMessage,
+                        true)!);
+                    if (options.EmailEnabled)
+                    {
+                        options.SmtpServer = CheckedEnvironmentVariable(
+                            "COMBINE_SMTP_SERVER",
+                            null,
+                            emailServiceFailureMessage);
+                        options.SmtpPort = int.Parse(CheckedEnvironmentVariable(
+                            "COMBINE_SMTP_PORT",
+                            IEmailContext.InvalidPort.ToString(),
+                            emailServiceFailureMessage)!);
+                        options.SmtpUsername = CheckedEnvironmentVariable(
+                            "COMBINE_SMTP_USERNAME",
+                            null,
+                            emailServiceFailureMessage);
+                        options.SmtpPassword = CheckedEnvironmentVariable(
+                            "COMBINE_SMTP_PASSWORD",
+                            null,
+                            emailServiceFailureMessage);
+                        options.SmtpAddress = CheckedEnvironmentVariable(
+                            "COMBINE_SMTP_ADDRESS",
+                            null,
+                            emailServiceFailureMessage);
+                        options.SmtpFrom = CheckedEnvironmentVariable(
+                            "COMBINE_SMTP_FROM",
+                            null,
+                            emailServiceFailureMessage);
+                    }
+
                     options.PassResetExpireTime = int.Parse(CheckedEnvironmentVariable(
                         "COMBINE_PASSWORD_RESET_EXPIRE_TIME",
                         Settings.DefaultPasswordResetExpireTime.ToString(),
@@ -190,6 +228,10 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<IBannerContext, BannerContext>();
             services.AddTransient<IBannerRepository, BannerRepository>();
 
+            // CAPTCHA types
+            services.AddTransient<ICaptchaContext, CaptchaContext>();
+            services.AddTransient<ICaptchaService, CaptchaService>();
+
             // Email types
             services.AddTransient<IEmailContext, EmailContext>();
             services.AddTransient<IEmailService, EmailService>();