Account improvements

UT4MasterServer.Common/Enums/AccountFlags.cs

@@ -72,5 +72,10 @@ public enum AccountFlags
 	/// </summary>
 	ACL_Maintenance = 0x1000,
 
+	/// <summary>
+	/// Flag to determine if email was verified
+	/// </summary>
+	EmailVerified = 0x2000,
+
 	/// NOTE: if you add more flags, make sure to update <see cref="AccountFlagsHelper"/> checks.
 }

UT4MasterServer.Common/Exceptions/AwsSesClientException.cs

@@ -0,0 +1,13 @@
+namespace UT4MasterServer.Common.Exceptions;
+
+[Serializable]
+public sealed class AwsSesClientException : Exception
+{
+	public AwsSesClientException(string message) : base(message)
+	{
+	}
+
+	public AwsSesClientException(string message, Exception innerException) : base(message, innerException)
+	{
+	}
+}

UT4MasterServer.Common/Exceptions/EmailVerificationException.cs

@@ -0,0 +1,14 @@
+namespace UT4MasterServer.Common.Exceptions;
+
+[Serializable]
+public sealed class EmailVerificationException : Exception
+{
+	public EmailVerificationException(string message) : base(message)
+	{
+	}
+
+	public EmailVerificationException(string message, Exception innerException) : base(message, innerException)
+	{
+	}
+}
+

UT4MasterServer.Common/Exceptions/NotFoundException.cs

@@ -0,0 +1,13 @@
+namespace UT4MasterServer.Common.Exceptions;
+
+[Serializable]
+public sealed class NotFoundException : Exception
+{
+	public NotFoundException(string message) : base(message)
+	{
+	}
+
+	public NotFoundException(string message, Exception innerException) : base(message, innerException)
+	{
+	}
+}

UT4MasterServer.Common/Exceptions/RateLimitExceededException.cs

@@ -0,0 +1,13 @@
+namespace UT4MasterServer.Common.Exceptions;
+
+[Serializable]
+public sealed class RateLimitExceededException : Exception
+{
+	public RateLimitExceededException(string message) : base(message)
+	{
+	}
+
+	public RateLimitExceededException(string message, Exception innerException) : base(message, innerException)
+	{
+	}
+}

UT4MasterServer.Common/Helpers/AccountFlagsHelper.cs

@@ -16,6 +16,7 @@ public static bool IsACLFlag(AccountFlags flag)
 			AccountFlags.ACL_CloudStorageAnnouncements |
 			AccountFlags.ACL_CloudStorageRulesets |
 			AccountFlags.ACL_CloudStorageChallenges |
-			AccountFlags.ACL_Maintenance);
+			AccountFlags.ACL_Maintenance |
+			AccountFlags.EmailVerified);
 	}
 }

UT4MasterServer.Common/Helpers/ValidationHelper.cs

@@ -6,6 +6,7 @@ public static class ValidationHelper
 {
 	private static readonly Regex regexEmail;
 	private static readonly List<string> disallowedUsernameWords;
+	private static readonly List<string> disallowedEmailDomains;
 
 	static ValidationHelper()
 	{
@@ -17,6 +18,99 @@ static ValidationHelper()
 			"shit", "fuck", "bitch", "slut", "sex", "cum",
 			"nigger", "hitler", "nazi"
 		};
+		disallowedEmailDomains = new List<string>
+		{
+			"yopmail.com",
+			"maildrop.cc",
+			"dispostable.com",
+			"guerrillamail.com",
+			"mailinator.com",
+			"tempr.email",
+			"discard.email",
+			"discardmail.com",
+			"discardmail.de",
+			"spambog.com",
+			"spambog.de",
+			"spambog.ru",
+			"0815.ru",
+			"knol-power.nl",
+			"freundin.ru",
+			"smashmail.de",
+			"s0ny.net",
+			"1mail.x24hr.com",
+			"from.onmypc.info",
+			"now.mefound.com",
+			"mowgli.jungleheart.com",
+			"cr.cloudns.asia",
+			"tls.cloudns.asia",
+			"msft.cloudns.asia",
+			"b.cr.cloudns.asia",
+			"ssl.tls.cloudns.asia",
+			"sweetxxx.de",
+			"dvd.dns-cloud.net",
+			"dvd.dnsabr.com",
+			"bd.dns-cloud.net",
+			"yx.dns-cloud.net",
+			"shit.dns-cloud.net",
+			"shit.dnsabr.com",
+			"eu.dns-cloud.net",
+			"eu.dnsabr.com",
+			"asia.dnsabr.com",
+			"8.dnsabr.com",
+			"pw.8.dnsabr.com",
+			"mm.8.dnsabr.com",
+			"23.8.dnsabr.com",
+			"pw.epac.to",
+			"postheo.de",
+			"sexy.camdvr.org",
+			"888.dns-cloud.net",
+			"adult-work.info",
+			"trap-mail.de",
+			"m.cloudns.cl",
+			"t.woeishyang.com",
+			"pflege-schoene-haut.de",
+			"streamboost.xyz",
+			"okmail.p-e.kr",
+			"hotbird.giize.com",
+			"as10.dnsfree.com",
+			"mehr-bitcoin.de",
+			"a1b2.cloudns.ph",
+			"wacamole.soynashi.tk",
+			"temp69.email",
+			"secure.okay.email.safeds.tk",
+			"tajba.com",
+			"web.run.place",
+			"tempr-mail.line.pm",
+			"spam.ceo",
+			"healthydevelopimmune.com",
+			"infobisnisdigital.com",
+			"winayabeauty.com",
+			"nxyl.eu",
+			"edukansassu12a.cf",
+			"mail.checkermaker.me",
+			"mailcatch.com",
+			"emailondeck.com",
+			"mailnesia.com",
+			"superrito.com",
+			"armyspy.com",
+			"cuvox.de",
+			"dayrep.com",
+			"einrot.com",
+			"fleckens.hu",
+			"gustr.com",
+			"jourrapide.com",
+			"rhyta.com",
+			"superrito.com",
+			"teleworm.us",
+			"mintemail.com",
+			"bbitq.com",
+			"iucake.com",
+			"gufum.com",
+			"boxmail.lol",
+			"nfstripss.com",
+			"dropjar.com",
+			"33mail.com",
+		};
 	}
 
 	public static bool ValidateEmail(string email)
@@ -26,7 +120,14 @@ public static bool ValidateEmail(string email)
 			return false;
 		}
 
-		return regexEmail.IsMatch(email);
+		if (!regexEmail.IsMatch(email))
+			return false;
+
+		var emailDomain = email.ToLower().Split('@')[1];
+		if (disallowedEmailDomains.Contains(emailDomain))
+			return false;
+
+		return true;
 	}
 
 	public static bool ValidateUsername(string username)

UT4MasterServer.Models/DTO/Request/SendEmailRequest.cs

@@ -0,0 +1,9 @@
+namespace UT4MasterServer.Models.DTO.Request;
+
+public sealed class SendEmailRequest
+{
+	public string From { get; set; } = string.Empty;
+	public List<string> To { get; set; } = new();
+	public string Subject { get; set; } = string.Empty;
+	public string Body { get; set; } = string.Empty;
+}

UT4MasterServer.Models/Database/Account.cs

@@ -69,6 +69,18 @@ public class Account
 	[BsonElement("Flags")]
 	public AccountFlags Flags { get; set; } = 0;
 
+	[BsonIgnoreIfNull]
+	public string? VerificationLinkGUID { get; set; }
+
+	[BsonIgnoreIfNull]
+	public DateTime? VerificationLinkExpiration { get; set; }
+
+	[BsonIgnoreIfNull]
+	public string? ResetLinkGUID { get; set; }
+
+	[BsonIgnoreIfNull]
+	public DateTime? ResetLinkExpiration { get; set; }
+
 	[BsonIgnore]
 	public float Level
 	{

UT4MasterServer.Models/Settings/AWSSettings.cs

@@ -0,0 +1,8 @@
+namespace UT4MasterServer.Models.Settings;
+
+public sealed class AWSSettings
+{
+	public string AccessKey { get; set; } = string.Empty;
+	public string SecretKey { get; set; } = string.Empty;
+	public string RegionName { get; set; } = string.Empty;
+}

UT4MasterServer.Models/Settings/ApplicationSettings.cs

@@ -1,4 +1,4 @@
-namespace UT4MasterServer.Models.Settings;
+namespace UT4MasterServer.Models.Settings;
 
 public sealed class ApplicationSettings
 {
@@ -11,10 +11,22 @@ public sealed class ApplicationSettings
 	public bool AllowPasswordGrantType { get; set; } = false;
 
 	/// <summary>
-	/// Used just to redirect users to correct domain when UT4UU is being used.
+	/// Used for URL generation when sending activation link, reset links, etc.
+	/// </summary>
+	public string WebsiteScheme { get; set; } = string.Empty;
+
+	/// <summary>
+	/// Used for
+	/// - email verification links
+	/// - reset password links
 	/// </summary>
 	public string WebsiteDomain { get; set; } = string.Empty;
 
+	/// <summary>
+	/// Used for URL generation when sending activation link, reset links, etc.
+	/// </summary>
+	public int WebsitePort { get; set; } = -1;
+
 	/// <summary>
 	/// File containing a list of trusted proxy servers (one per line).
 	/// This file is loaded only once when program starts and it add values to <see cref="ProxyServers"/>.
@@ -30,4 +42,10 @@ public sealed class ApplicationSettings
 	/// IP addresses of trusted proxy servers.
 	/// </summary>
 	public List<string> ProxyServers { get; set; } = new List<string>();
+
+	/// <summary>
+	/// No-reply email that will be used for activation links, reset password links, etc
+	/// </summary>
+	/// <example>no-reply@example.com</example>
+	public string NoReplyEmail { get; set; } = string.Empty;
 }

UT4MasterServer.Services/Hosted/ApplicationBackgroundService.cs

@@ -72,6 +72,9 @@ private void DoWork(object? state)
 				logger.LogInformation("Background task deleted {DeleteCount} stale game servers.", deleteCount);
 			}
 
+			var cleanupService = scope.ServiceProvider.GetRequiredService<CleanupService>();
+			await cleanupService.RemoveNonVerifiedAccountsAsync();
+
 			await DeleteOldStatisticsAsync(scope);
 			await MergeOldStatisticsAsync(scope);
 		});

UT4MasterServer.Services/Hosted/ApplicationStartupService.cs

@@ -1,38 +1,31 @@
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using UT4MasterServer.Models.Settings;
 using UT4MasterServer.Services.Scoped;
 
 namespace UT4MasterServer.Services.Hosted;
 
 public sealed class ApplicationStartupService : IHostedService
 {
 	private readonly ILogger<ApplicationStartupService> logger;
-	private readonly AccountService accountService;
-	private readonly StatisticsService statisticsService;
-	private readonly CloudStorageService cloudStorageService;
-	private readonly ClientService clientService;
-	private readonly RatingsService ratingsService;
-
-	public ApplicationStartupService(
-		ILogger<ApplicationStartupService> logger,
-		ILogger<StatisticsService> statsLogger,
-		IOptions<ApplicationSettings> settings,
-		ILogger<CloudStorageService> cloudStorageLogger,
-		ILogger<RatingsService> ratingsLogger)
+	private readonly IServiceProvider serviceProvider;
+
+	public ApplicationStartupService(ILogger<ApplicationStartupService> logger, IServiceProvider serviceProvider)
 	{
 		this.logger = logger;
-		var db = new DatabaseContext(settings);
-		accountService = new AccountService(db, settings);
-		statisticsService = new StatisticsService(statsLogger, db);
-		cloudStorageService = new CloudStorageService(db, cloudStorageLogger);
-		clientService = new ClientService(db);
-		ratingsService = new RatingsService(ratingsLogger, db);
+		this.serviceProvider = serviceProvider;
 	}
 
 	public async Task StartAsync(CancellationToken cancellationToken)
 	{
+		using var scope = serviceProvider.CreateScope();
+
+		var accountService = scope.ServiceProvider.GetRequiredService<AccountService>();
+		var statisticsService = scope.ServiceProvider.GetRequiredService<StatisticsService>();
+		var ratingsService = scope.ServiceProvider.GetRequiredService<RatingsService>();
+		var cloudStorageService = scope.ServiceProvider.GetRequiredService<CloudStorageService>();
+		var clientService = scope.ServiceProvider.GetRequiredService<ClientService>();
+
 		logger.LogInformation("Configuring MongoDB indexes.");
 		await accountService.CreateIndexesAsync();
 		await statisticsService.CreateIndexesAsync();

UT4MasterServer.Services/Interfaces/IEmailService.cs

@@ -0,0 +1,7 @@
+namespace UT4MasterServer.Services.Interfaces;
+
+public interface IEmailService
+{
+	Task SendTextEmailAsync(string fromAddress, List<string> toAddresses, string subject, string body);
+	Task SendHTMLEmailAsync(string fromAddress, List<string> toAddresses, string subject, string body);
+}