Add localization, optimization, better error handling

.gitignore

@@ -1,3 +1,5 @@
 bin/
 obj/
-.idea
+.idea
+.DS_Store
+*.DotSettings.user

YandexKeyExtractor/Decryptor.cs

@@ -5,20 +5,28 @@
 
 namespace YandexKeyExtractor;
 
-public static class Decryptor
+internal static class Decryptor
 {
+	private const int maxStackallocSize = 4096;
+
 	public static string? Decrypt(string encryptedText, string password)
 	{
 		var base64Text = NormalizeBase64(encryptedText);
 
-		ReadOnlySpan<byte> textBytes = Convert.FromBase64String(base64Text).AsSpan();
+		var textBytes = Convert.FromBase64String(base64Text);
 
 		const byte SaltLength = 16;
-		var textData = textBytes[..^SaltLength];
-		var textSalt = textBytes[^SaltLength..];
+		var textData = textBytes.AsSpan()[..^SaltLength];
+		var salt = textBytes[^SaltLength..];
 
 		var generatedPassword = SCrypt.ComputeDerivedKey(
-			Encoding.UTF8.GetBytes(password), textSalt.ToArray(), 32768, 20, 1, null, 32
+			Encoding.UTF8.GetBytes(password),
+			salt,
+			cost: 32768,
+			blockSize: 20,
+			parallel: 1,
+			maxThreads: null,
+			derivedKeyLength: 32
 		);
 
 		using XSalsa20Poly1305 secureBox = new(generatedPassword);
@@ -27,8 +35,9 @@ public static class Decryptor
 		var nonce = textData[..NonceLength];
 		var dataWithMac = textData[NonceLength..];
 
-
-		var message = dataWithMac.Length <= 4096 ? stackalloc byte[dataWithMac.Length] : new byte[dataWithMac.Length];
+		var message = dataWithMac.Length <= maxStackallocSize
+			? stackalloc byte[dataWithMac.Length]
+			: new byte[dataWithMac.Length];
 
 		const byte MacLength = 16;
 		var data = dataWithMac[MacLength..];
@@ -41,11 +50,27 @@ public static class Decryptor
 
 	private static string NormalizeBase64(string encryptedText)
 	{
-		return encryptedText.Replace('-', '+').Replace('_', '/') + (encryptedText.Length % 4) switch
+		var suffixLength = (encryptedText.Length % 4) switch
 		{
-			2 => "==",
-			3 => "=",
-			_ => ""
+			2 => 2,
+			3 => 1,
+			_ => 0
 		};
+
+		var newLength = encryptedText.Length + suffixLength;
+		var normalized = newLength <= maxStackallocSize / sizeof(char)
+			? stackalloc char[newLength]
+			: new char[newLength];
+
+		encryptedText.CopyTo(normalized);
+		normalized.Replace('-', '+');
+		normalized.Replace('_', '/');
+
+		if (suffixLength > 0)
+		{
+			normalized[^suffixLength..].Fill('=');
+		}
+
+		return new string(normalized);
 	}
 }

YandexKeyExtractor/Exceptions/InvalidTrackIdException.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace YandexKeyExtractor.Exceptions;
+
+public class InvalidTrackIdException : Exception
+{
+	public InvalidTrackIdException() : base("Invalid track ID.")
+	{
+	}
+}

YandexKeyExtractor/Exceptions/NoValidBackupException.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace YandexKeyExtractor.Exceptions;
+
+public class NoValidBackupException : Exception
+{
+	public NoValidBackupException() : base(Localization.NoValidBackup)
+	{
+	}
+}

YandexKeyExtractor/Exceptions/ResponseFailedException.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace YandexKeyExtractor.Exceptions;
+
+public class ResponseFailedException : Exception
+{
+	public string ResponseName { get; }
+	public string? Status { get; }
+	public IReadOnlyCollection<string>? Errors { get; }
+
+	public ResponseFailedException(string responseName) : base($"{responseName} failed.")
+	{
+		ResponseName = responseName;
+	}
+
+	public ResponseFailedException(string responseName, string? status, IReadOnlyCollection<string>? errors) : this(responseName)
+	{
+		Status = status;
+		Errors = errors;
+	}
+}

YandexKeyExtractor/Models/BackupInfo.cs

@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace YandexKeyExtractor.Models;
+
+public class BackupInfo
+{
+	[JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
+	[JsonPropertyName("updated")]
+	public uint Updated { get; set; }
+}

YandexKeyExtractor/Models/BackupInfoResponse.cs

@@ -6,11 +6,4 @@ public class BackupInfoResponse : StatusResponse
 {
 	[JsonPropertyName("backup_info")]
 	public BackupInfo? Info { get; set; }
-
-	public class BackupInfo
-	{
-		[JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
-		[JsonPropertyName("updated")]
-		public uint Updated { get; set; }
-	}
 }

YandexKeyExtractor/Models/CountryResponse.cs

@@ -1,9 +1,10 @@
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace YandexKeyExtractor.Models;
 
 public class CountryResponse : StatusResponse
 {
 	[JsonPropertyName("country")]
-	public string[]? Country { get; set; }
+	public IReadOnlyCollection<string>? Country { get; set; }
 }

YandexKeyExtractor/Models/PhoneNumberInfo.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace YandexKeyExtractor.Models;
+
+public class PhoneNumberInfo
+{
+	[JsonPropertyName("e164")]
+	public string? StandardizedNumber { get; set; }
+}

YandexKeyExtractor/Models/PhoneNumberResponse.cs

@@ -6,10 +6,4 @@ public class PhoneNumberResponse : StatusResponse
 {
 	[JsonPropertyName("number")]
 	public PhoneNumberInfo? PhoneNumber { get; set; }
-
-	public class PhoneNumberInfo
-	{
-		[JsonPropertyName("e164")]
-		public string? StandardizedNumber { get; set; }
-	}
 }

YandexKeyExtractor/Models/SourceGenerationContext.cs

@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace YandexKeyExtractor.Models;
+
+[JsonSerializable(typeof(BackupInfoResponse))]
+[JsonSerializable(typeof(BackupResponse))]
+[JsonSerializable(typeof(CountryResponse))]
+[JsonSerializable(typeof(PhoneNumberResponse))]
+[JsonSerializable(typeof(StatusResponse))]
+[JsonSerializable(typeof(TrackResponse))]
+[JsonSourceGenerationOptions(DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+public partial class SourceGenerationContext : JsonSerializerContext
+{
+}

YandexKeyExtractor/Models/StatusResponse.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace YandexKeyExtractor.Models;
@@ -8,7 +9,7 @@ public class StatusResponse
 	public string? Status { get; set; }
 
 	[JsonPropertyName("errors")]
-	public string[]? Errors { get; set; }
+	public IReadOnlyCollection<string>? Errors { get; set; }
 
 	public bool IsSuccess => Status == "ok";
 }

YandexKeyExtractor/Program.cs

@@ -1,65 +1,85 @@
 using System;
+using System.Globalization;
 using System.IO;
+using System.Threading.Tasks;
 using YandexKeyExtractor;
+using YandexKeyExtractor.Exceptions;
 
-Console.WriteLine("Initializing...");
-using var handler = WebHandler.Create();
+CultureInfo.CurrentCulture = CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("ru-RU");
+Console.WriteLine(Localization.Initializing);
+using var handler = new WebHandler();
 
-var country = await handler.TryGetCountry();
-
-PromptInput(out var phoneNumber, "phone number");
-
-phoneNumber = phoneNumber.TrimStart('+');
-var phone = await handler.GetPhoneNumberInfo(phoneNumber, country);
-
-var trackID = await handler.SendSMSCodeAndGetTrackID(phone, country);
-if (string.IsNullOrEmpty(trackID))
+string backup;
+try
 {
-	return;
-}
-
-PromptInput(out var smsCode, "SMS code");
-
-if (!await handler.CheckCode(smsCode, trackID))
+	backup = await RetrieveBackup(handler);
+} catch (ResponseFailedException e)
 {
-	return;
-}
+	if (e.Status == null)
+	{
+		Console.WriteLine(Localization.ResponseFailed, e.ResponseName);
+	} else
+	{
+		Console.WriteLine(Localization.ResponseFailedWithDetails, e.Status, e.ResponseName, string.Join(", ", e.Errors ?? []));
+	}
 
-if (!await handler.ValidateBackupInfo(phone, trackID, country))
-{
 	return;
-}
-
-var backup = await handler.GetBackupData(phone, trackID);
-if (string.IsNullOrEmpty(backup))
+} catch (NoValidBackupException)
 {
+	Console.WriteLine(Localization.NoValidBackup);
+
 	return;
+} catch (Exception e)
+{
+	Console.WriteLine(Localization.UnknownErrorOccurred, e.Message);
+
+	throw;
 }
 
-PromptInput(out var backupPassword, "backup password");
+PromptInput(out var backupPassword, Localization.BackupPasswordVariableName);
 
-Console.WriteLine("Decrypting...");
+Console.WriteLine(Localization.Decrypting);
 var message = Decryptor.Decrypt(backup, backupPassword);
 if (string.IsNullOrEmpty(message))
 {
-	Console.WriteLine("Decryption failed! Most likely the password is wrong");
+	Console.WriteLine(Localization.DecryptionFailed);
 
 	return;
 }
 
-Console.WriteLine("Successfully decrypted!");
 await File.WriteAllTextAsync("result.txt", message);
-Console.WriteLine($"Written {message.Split('\n').Length} authenticators to the file (result.txt)");
+Console.WriteLine(Localization.Success, message.AsSpan().Count('\n') + 1);
 
 return;
 
-static void PromptInput(out string result, string argumentName = "")
+static async Task<string> RetrieveBackup(WebHandler handler)
+{
+	var country = await handler.TryGetCountry() ?? "ru";
+
+	PromptInput(out var phoneNumber, Localization.PhoneNumberVariableName);
+
+	phoneNumber = phoneNumber.TrimStart('+');
+	var phone = await handler.GetPhoneNumberInfo(phoneNumber, country);
+
+	var trackID = await handler.SendSMSCodeAndGetTrackID(phone, country);
+
+	PromptInput(out var smsCode, Localization.SmsCodeVariableName);
+
+	await handler.CheckCode(smsCode, trackID);
+	await handler.ValidateBackupInfo(phone, trackID, country);
+
+	var backup = await handler.GetBackupData(phone, trackID);
+
+	return backup;
+}
+
+static void PromptInput(out string result, string argumentName)
 {
-	Console.WriteLine($"Enter {argumentName}:");
+	Console.WriteLine(Localization.PromptVariable, argumentName.ToLower(CultureInfo.CurrentCulture));
 	var input = Console.ReadLine();
 	while (string.IsNullOrEmpty(input))
 	{
-		Console.WriteLine($"{argumentName} is invalid, try again:");
+		Console.WriteLine(Localization.InvalidVariableValue, argumentName);
 		input = Console.ReadLine();
 	}