JDM170/YandexKeyExtractor
1
0
Fork 0
mirror of https://github.com/ezhevita/YandexKeyExtractor synced 2025-08-16 19:40:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

update to .net 8

Browse Source
This commit is contained in:
Vita Chumakova
2024-01-18 18:44:00 +04:00
parent 532fc0c4aa
commit 5aae0c893d
6 changed files with 267 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.editorconfig Normal file
View File

@@ -0,0 +1,6 @@
[*.cs]
max_line_length = 130
charset = utf-8
insert_final_newline = true
indent_style = tab
trim_trailing_whitespace = true

4
.github/workflows/dotnet.yml vendored
View File

@@ -15,14 +15,14 @@ jobs:
with: with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }} dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
- name: Publish generic - name: Publish generic
run: dotnet publish -c Release -o out/generic -p:UseAppHost=false run: dotnet publish YandexKeyExtractor/YandexKeyExtractor.csproj -c Release -o out/generic -p:UseAppHost=false
- name: Upload generic artifacts - name: Upload generic artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: ${{ github.event.repository.name }} name: ${{ github.event.repository.name }}
path: out/generic path: out/generic
- name: Publish Windows version - name: Publish Windows version
run: dotnet publish -c Release -o out/win -p:PublishSingleFile=true -p:PublishTrimmed=true -r win-x64 run: dotnet publish YandexKeyExtractor/YandexKeyExtractor.csproj -c Release -o out/win -p:PublishSingleFile=true -p:PublishTrimmed=true -r win-x64
- name: Upload Windows artifacts - name: Upload Windows artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:

46
YandexKeyExtractor/Decryptor.cs
View File

@@ -3,41 +3,49 @@ using System.Text;
using CryptSharp.Utility; using CryptSharp.Utility;
using NaCl; using NaCl;
namespace YandexKeyExtractor { namespace YandexKeyExtractor;
public static class Decryptor {
public static string? Decrypt(string encryptedText, string password) { public static class Decryptor
string base64Text = NormalizeBase64(encryptedText); {
public static string? Decrypt(string encryptedText, string password)
{
var base64Text = NormalizeBase64(encryptedText);
ReadOnlySpan<byte> textBytes = Convert.FromBase64String(base64Text).AsSpan(); ReadOnlySpan<byte> textBytes = Convert.FromBase64String(base64Text).AsSpan();
const byte saltLength = 16; const byte SaltLength = 16;
ReadOnlySpan<byte> textData = textBytes[..^saltLength]; var textData = textBytes[..^SaltLength];
ReadOnlySpan<byte> textSalt = textBytes[^saltLength..]; var textSalt = textBytes[^SaltLength..];
byte[]? generatedPassword = SCrypt.ComputeDerivedKey(Encoding.UTF8.GetBytes(password), textSalt.ToArray(), 32768, 20, 1, null, 32); var generatedPassword = SCrypt.ComputeDerivedKey(
Encoding.UTF8.GetBytes(password), textSalt.ToArray(), 32768, 20, 1, null, 32
);
using XSalsa20Poly1305 secureBox = new(generatedPassword); using XSalsa20Poly1305 secureBox = new(generatedPassword);
const byte nonceLength = 24; const byte NonceLength = 24;
ReadOnlySpan<byte> nonce = textData[..nonceLength]; var nonce = textData[..NonceLength];
ReadOnlySpan<byte> dataWithMac = textData[nonceLength..]; var dataWithMac = textData[NonceLength..];
Span<byte> message = dataWithMac.Length <= 4096 ? stackalloc byte[dataWithMac.Length] : new byte[dataWithMac.Length]; var message = dataWithMac.Length <= 4096 ? stackalloc byte[dataWithMac.Length] : new byte[dataWithMac.Length];
const byte macLength = 16; const byte MacLength = 16;
ReadOnlySpan<byte> data = dataWithMac[macLength..]; var data = dataWithMac[MacLength..];
ReadOnlySpan<byte> mac = dataWithMac[..macLength]; var mac = dataWithMac[..MacLength];
return secureBox.TryDecrypt(message, data, mac, nonce) ? new string(Encoding.UTF8.GetString(message).TrimEnd('\0')) : null; return secureBox.TryDecrypt(message, data, mac, nonce)
? new string(Encoding.UTF8.GetString(message).TrimEnd('\0'))
: null;
} }
private static string NormalizeBase64(string encryptedText) { private static string NormalizeBase64(string encryptedText)
return encryptedText.Replace('-', '+').Replace('_', '/') + (encryptedText.Length % 4) switch { {
return encryptedText.Replace('-', '+').Replace('_', '/') + (encryptedText.Length % 4) switch
{
2 => "==", 2 => "==",
3 => "=", 3 => "=",
_ => "" _ => ""
}; };
} }
}
} }

64
YandexKeyExtractor/Program.cs
View File

@@ -1,65 +1,61 @@
using System; using System;
using System.IO; using System.IO;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading.Tasks; using YandexKeyExtractor;
namespace YandexKeyExtractor { Console.WriteLine("Initializing...");
internal static class Program { using var handler = WebHandler.Create();
private static async Task Main() {
Console.WriteLine("Initializing...");
using WebHandler handler = WebHandler.Create();
string country = await handler.TryGetCountry().ConfigureAwait(false); var country = await handler.TryGetCountry();
PromptInput(out string phoneNumber, nameof(phoneNumber)); PromptInput(out var phoneNumber);
phoneNumber = phoneNumber.TrimStart('+'); phoneNumber = phoneNumber.TrimStart('+');
string phone = await handler.GetPhoneNumberInfo(phoneNumber, country).ConfigureAwait(false); var phone = await handler.GetPhoneNumberInfo(phoneNumber, country);
string? trackID = await handler.SendSMSCodeAndGetTrackID(phone, country).ConfigureAwait(false); var trackID = await handler.SendSMSCodeAndGetTrackID(phone, country);
if (string.IsNullOrEmpty(trackID)) { if (string.IsNullOrEmpty(trackID)) {
return; return;
} }
PromptInput(out string smsCode, nameof(smsCode)); PromptInput(out var smsCode);
if (!await handler.CheckCode(smsCode, trackID).ConfigureAwait(false)) { if (!await handler.CheckCode(smsCode, trackID)) {
return; return;
} }
if (!await handler.ValidateBackupInfo(phone, trackID, country).ConfigureAwait(false)) { if (!await handler.ValidateBackupInfo(phone, trackID, country)) {
return; return;
} }
string? backup = await handler.GetBackupData(phone, trackID).ConfigureAwait(false); var backup = await handler.GetBackupData(phone, trackID);
if (string.IsNullOrEmpty(backup)) { if (string.IsNullOrEmpty(backup)) {
return; return;
} }
PromptInput(out string backupPassword, nameof(backupPassword)); PromptInput(out var backupPassword);
Console.WriteLine("Decrypting..."); Console.WriteLine("Decrypting...");
string? message = Decryptor.Decrypt(backup, backupPassword); var message = Decryptor.Decrypt(backup, backupPassword);
if (string.IsNullOrEmpty(message)) { if (string.IsNullOrEmpty(message)) {
Console.WriteLine("Decryption failed!"); Console.WriteLine("Decryption failed!");
return; return;
} }
Console.WriteLine("Successfully decrypted!"); Console.WriteLine("Successfully decrypted!");
await File.WriteAllTextAsync("result.txt", message).ConfigureAwait(false); await File.WriteAllTextAsync("result.txt", message);
Console.WriteLine($"Written {message.Split('\n').Length} authenticators to result file"); Console.WriteLine($"Written {message.Split('\n').Length} authenticators to result file");
}
private static void PromptInput(out string result, [CallerArgumentExpression("result")] string argumentName = "") { return;
static void PromptInput(out string result, [CallerArgumentExpression("result")] string argumentName = "") {
Console.WriteLine($"Enter {argumentName}:"); Console.WriteLine($"Enter {argumentName}:");
string? input = Console.ReadLine(); var input = Console.ReadLine();
while (string.IsNullOrEmpty(input)) { while (string.IsNullOrEmpty(input)) {
Console.WriteLine($"{argumentName} is invalid, try again:"); Console.WriteLine($"{argumentName} is invalid, try again:");
input = Console.ReadLine(); input = Console.ReadLine();
} }
result = input; result = input;
}
}
} }

123
YandexKeyExtractor/WebHandler.cs
View File

@@ -11,37 +11,44 @@ using Flurl.Http;
using Flurl.Serialization.TextJson; using Flurl.Serialization.TextJson;
using YandexKeyExtractor.Models; using YandexKeyExtractor.Models;
namespace YandexKeyExtractor { namespace YandexKeyExtractor;
public sealed class WebHandler : IDisposable {
public sealed class WebHandler : IDisposable
{
private WebHandler(IFlurlClient client) => Client = client; private WebHandler(IFlurlClient client) => Client = client;
private IFlurlClient Client { get; } private IFlurlClient Client { get; }
public void Dispose() { public void Dispose()
{
Client.Dispose(); Client.Dispose();
} }
public async Task<bool> CheckCode(string? smsCode, string? trackID) { public async Task<bool> CheckCode(string? smsCode, string? trackID)
StatusResponse? checkCodeResponse = await Client.Request("/bundle/yakey_backup/check_code/") {
var checkCodeResponse = await Client.Request("/bundle/yakey_backup/check_code/")
.PostUrlEncodedAsync( .PostUrlEncodedAsync(
new { new
{
code = smsCode, code = smsCode,
track_id = trackID track_id = trackID
} }
) )
.ReceiveJson<StatusResponse?>() .ReceiveJson<StatusResponse?>();
.ConfigureAwait(false);
return ValidateResponse(checkCodeResponse, nameof(checkCodeResponse)); return ValidateResponse(checkCodeResponse, nameof(checkCodeResponse));
} }
public static WebHandler Create() { public static WebHandler Create()
JsonSerializerOptions jsonSettings = new() { {
JsonSerializerOptions jsonSettings = new()
{
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
}; };
IFlurlClient? client = new FlurlClient( var client = new FlurlClient(
new HttpClient { new HttpClient
DefaultRequestHeaders = { UserAgent = { new ProductInfoHeaderValue("okhttp", "2.7.5") } }, {
DefaultRequestHeaders = {UserAgent = {new ProductInfoHeaderValue("okhttp", "2.7.5")}},
BaseAddress = new Uri("https://registrator.mobile.yandex.net/1/") BaseAddress = new Uri("https://registrator.mobile.yandex.net/1/")
} }
).Configure(settings => settings.WithTextJsonSerializer(jsonSettings)); ).Configure(settings => settings.WithTextJsonSerializer(jsonSettings));
@@ -49,22 +56,25 @@ namespace YandexKeyExtractor {
return new WebHandler(client); return new WebHandler(client);
} }
public async Task<string?> GetBackupData(string phone, string? trackID) { public async Task<string?> GetBackupData(string phone, string? trackID)
BackupResponse? backupResponse = await Client.Request("/bundle/yakey_backup/download") {
var backupResponse = await Client.Request("/bundle/yakey_backup/download")
.PostUrlEncodedAsync( .PostUrlEncodedAsync(
new { new
{
number = phone, number = phone,
track_id = trackID track_id = trackID
} }
) )
.ReceiveJson<BackupResponse?>() .ReceiveJson<BackupResponse?>();
.ConfigureAwait(false);
if (!ValidateResponse(backupResponse, nameof(backupResponse))) { if (!ValidateResponse(backupResponse, nameof(backupResponse)))
{
return null; return null;
} }
if (string.IsNullOrEmpty(backupResponse.Backup)) { if (string.IsNullOrEmpty(backupResponse.Backup))
{
Console.WriteLine("Fatal error - Couldn't find valid backup!"); Console.WriteLine("Fatal error - Couldn't find valid backup!");
return null; return null;
@@ -73,41 +83,45 @@ namespace YandexKeyExtractor {
return backupResponse.Backup; return backupResponse.Backup;
} }
public async Task<string> GetPhoneNumberInfo(string? phoneNumber, string country) { public async Task<string> GetPhoneNumberInfo(string? phoneNumber, string country)
PhoneNumberResponse? phoneNumberResponse = await Client.Request("/bundle/validate/phone_number/") {
var phoneNumberResponse = await Client.Request("/bundle/validate/phone_number/")
.PostUrlEncodedAsync( .PostUrlEncodedAsync(
new { new
{
phone_number = phoneNumber, phone_number = phoneNumber,
country country
} }
).ReceiveJson<PhoneNumberResponse?>() ).ReceiveJson<PhoneNumberResponse?>();
.ConfigureAwait(false);
ValidateResponse(phoneNumberResponse, nameof(phoneNumberResponse)); ValidateResponse(phoneNumberResponse, nameof(phoneNumberResponse));
string phone = phoneNumberResponse?.PhoneNumber?.StandardizedNumber ?? '+' + phoneNumber; var phone = phoneNumberResponse?.PhoneNumber?.StandardizedNumber ?? '+' + phoneNumber;
return phone; return phone;
} }
public async Task<string?> SendSMSCodeAndGetTrackID(string phone, string country) { public async Task<string?> SendSMSCodeAndGetTrackID(string phone, string country)
TrackResponse? trackResponse = await Client.Request("/bundle/yakey_backup/send_code/") {
var trackResponse = await Client.Request("/bundle/yakey_backup/send_code/")
.PostUrlEncodedAsync( .PostUrlEncodedAsync(
new { new
{
display_language = "en", display_language = "en",
number = phone, number = phone,
country country
} }
) )
.ReceiveJson<TrackResponse?>() .ReceiveJson<TrackResponse?>();
.ConfigureAwait(false);
if (!ValidateResponse(trackResponse, nameof(trackResponse))) { if (!ValidateResponse(trackResponse, nameof(trackResponse)))
{
return null; return null;
} }
string? trackID = trackResponse.TrackID; var trackID = trackResponse.TrackID;
if (string.IsNullOrEmpty(trackID)) { if (string.IsNullOrEmpty(trackID))
{
Console.WriteLine("Track ID is empty!"); Console.WriteLine("Track ID is empty!");
return null; return null;
@@ -116,36 +130,39 @@ namespace YandexKeyExtractor {
return trackID; return trackID;
} }
public async Task<string> TryGetCountry() { public async Task<string> TryGetCountry()
CountryResponse? countryResponse = await Client.Request("/suggest/country") {
var countryResponse = await Client.Request("/suggest/country")
.GetAsync() .GetAsync()
.ReceiveJson<CountryResponse?>() .ReceiveJson<CountryResponse?>();
.ConfigureAwait(false);
ValidateResponse(countryResponse, nameof(countryResponse)); ValidateResponse(countryResponse, nameof(countryResponse));
string country = countryResponse?.Country?.FirstOrDefault() ?? "ru"; var country = countryResponse?.Country?.FirstOrDefault() ?? "ru";
return country; return country;
} }
public async Task<bool> ValidateBackupInfo(string phone, string? trackID, string country) { public async Task<bool> ValidateBackupInfo(string phone, string? trackID, string country)
BackupInfoResponse? backupInfoResponse = await Client.Request("/bundle/yakey_backup/info/") {
var backupInfoResponse = await Client.Request("/bundle/yakey_backup/info/")
.PostUrlEncodedAsync( .PostUrlEncodedAsync(
new { new
{
number = phone, number = phone,
track_id = trackID, track_id = trackID,
country country
} }
) )
.ReceiveJson<BackupInfoResponse?>() .ReceiveJson<BackupInfoResponse?>();
.ConfigureAwait(false);
if (!ValidateResponse(backupInfoResponse, nameof(backupInfoResponse))) { if (!ValidateResponse(backupInfoResponse, nameof(backupInfoResponse)))
{
return false; return false;
} }
if (backupInfoResponse.Info?.Updated == null) { if (backupInfoResponse.Info?.Updated == null)
{
Console.WriteLine("Fatal error - Couldn't find valid backup!"); Console.WriteLine("Fatal error - Couldn't find valid backup!");
return false; return false;
@@ -155,16 +172,21 @@ namespace YandexKeyExtractor {
} }
private static bool ValidateResponse<T>([NotNullWhen(true)] T? response, [CallerArgumentExpression("response")] string responseName = "") where T : StatusResponse { private static bool ValidateResponse<T>([NotNullWhen(true)] T? response,
if (response == null) { [CallerArgumentExpression("response")] string responseName = "") where T : StatusResponse
{
if (response == null)
{
Console.WriteLine(responseName + " failed!"); Console.WriteLine(responseName + " failed!");
return false; return false;
} }
if (!response.IsSuccess) { if (!response.IsSuccess)
{
Console.WriteLine(responseName + $" failed with error {response.Status}!"); Console.WriteLine(responseName + $" failed with error {response.Status}!");
if (response.Errors != null) { if (response.Errors != null)
{
Console.WriteLine("Errors: " + string.Join(',', response.Errors)); Console.WriteLine("Errors: " + string.Join(',', response.Errors));
} }
@@ -173,5 +195,4 @@ namespace YandexKeyExtractor {
return true; return true;
} }
}
} }

6
YandexKeyExtractor/YandexKeyExtractor.csproj
View File

@@ -5,7 +5,7 @@
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<!-- Trimming features --> <!-- Trimming features -->
@@ -19,10 +19,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CryptSharpStandard" Version="1.0.0" /> <PackageReference Include="CryptSharpStandard" Version="1.0.0" />
<PackageReference Include="Flurl.Http" Version="3.2.4" /> <PackageReference Include="Flurl.Http" Version="3.2.4" />
<PackageReference Include="Flurl.Serialization.TextJson" Version="3.1.0" /> <PackageReference Include="Flurl.Serialization.TextJson" Version="3.1.0" />