Stone_Red/Decho
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/Decho.git synced 2026-09-06 07:46:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add retry prompt for wrong passphrase when unlocking encrypted channels

Browse Source
This commit is contained in:
Stone_Red
2026-07-19 19:24:01 +02:00
parent 41cb57f126
commit ccbeb94aee
2 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Decho/Services/ChannelService.cs
+4 -11
View File
@@ -37,18 +37,11 @@ internal sealed class ChannelService : IChannelService
if (isEncrypted && !HasChannelKey(serverUrl, channelName) && password is not null) if (isEncrypted && !HasChannelKey(serverUrl, channelName) && password is not null)
{ {
try ChannelJoinResult unlockResult = await UnlockRoomKeyAsync(
serverUrl, channelName, password, crypto!.EncryptionSalt!, result.WrappedRoomKey ?? "");
if (unlockResult.History.Count > 0)
{ {
ChannelJoinResult unlockResult = await UnlockRoomKeyAsync( result = unlockResult;
serverUrl, channelName, password, crypto!.EncryptionSalt!, result.WrappedRoomKey ?? "");
if (unlockResult.History.Count > 0)
{
result = unlockResult;
}
}
catch (Exception ex)
{
Debug.WriteLine($"Unlock failed: {ex.Message}");
} }
} }
src/Decho/ViewModels/MainWindowViewModel.cs
+43 -23
View File
@@ -235,32 +235,46 @@ public sealed class MainWindowViewModel : ViewModelBase
return; return;
} }
ChannelCryptoDto? crypto = await ChannelService.GetChannelCryptoAsync(serverUrl, channelName); string? promptMessage = null;
bool isEncrypted = crypto is not null && crypto.IsEncrypted; while (true)
if (isEncrypted && !ChannelService.HasChannelKey(serverUrl, channelName) && password is null)
{ {
password = await ShowPromptWindowAsync("Unlock Channel", "Enter the passphrase to unlock messages:", "Unlock"); try
if (string.IsNullOrEmpty(password))
{ {
ChannelCryptoDto? crypto = await ChannelService.GetChannelCryptoAsync(serverUrl, channelName);
bool isEncrypted = crypto is not null && crypto.IsEncrypted;
if (isEncrypted && !ChannelService.HasChannelKey(serverUrl, channelName) && password is null)
{
password = await ShowPromptWindowAsync("Unlock Channel", promptMessage ?? "Enter the passphrase to unlock messages:", "Unlock");
if (string.IsNullOrEmpty(password))
{
return;
}
}
ChannelJoinResult result = await ChannelService.JoinWithCryptoAsync(serverUrl, channelName, password);
EnsureChannelInList(serverUrl, channelName);
ChannelModel? channelModel = FindChannel(serverUrl, channelName);
if (channelModel is not null)
{
ChannelViewModel? channelVm = Sidebar.GetServer(serverUrl)?.Channels
.FirstOrDefault(c => c.Name == channelName);
if (channelVm is not null)
{
foreach (MessageModel msg in result.History)
{
channelVm.AddMessage(msg);
}
}
}
return; return;
} }
} catch (InvalidOperationException ex) when (ex.Message == "Wrong passphrase")
ChannelJoinResult result = await ChannelService.JoinWithCryptoAsync(serverUrl, channelName, password);
EnsureChannelInList(serverUrl, channelName);
ChannelModel? channelModel = FindChannel(serverUrl, channelName);
if (channelModel is not null)
{
ChannelViewModel? channelVm = Sidebar.GetServer(serverUrl)?.Channels
.FirstOrDefault(c => c.Name == channelName);
if (channelVm is not null)
{ {
foreach (MessageModel msg in result.History) password = null;
{ promptMessage = "Wrong passphrase - try again.";
channelVm.AddMessage(msg);
}
} }
} }
}; };
@@ -1050,6 +1064,7 @@ public sealed class MainWindowViewModel : ViewModelBase
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
string? password = null; string? password = null;
string? promptMessage = null;
while (true) while (true)
{ {
try try
@@ -1057,9 +1072,9 @@ public sealed class MainWindowViewModel : ViewModelBase
ChannelCryptoDto? crypto = await ChannelService.GetChannelCryptoAsync(serverUrl, channel.Name); ChannelCryptoDto? crypto = await ChannelService.GetChannelCryptoAsync(serverUrl, channel.Name);
bool isEncrypted = crypto is not null && crypto.IsEncrypted; bool isEncrypted = crypto is not null && crypto.IsEncrypted;
if (isEncrypted && !ChannelService.HasChannelKey(serverUrl, channel.Name) && password is null) if (isEncrypted && !ChannelService.HasChannelKey(serverUrl, channel.Name))
{ {
string? passphrase = await ShowPromptWindowAsync("Unlock Channel", "Enter the passphrase to unlock messages:", "Unlock"); string? passphrase = await ShowPromptWindowAsync("Unlock Channel", promptMessage ?? "Enter the passphrase to unlock messages:", "Unlock");
if (string.IsNullOrEmpty(passphrase)) if (string.IsNullOrEmpty(passphrase))
{ {
Avalonia.Threading.Dispatcher.UIThread.Post(() => Avalonia.Threading.Dispatcher.UIThread.Post(() =>
@@ -1121,6 +1136,11 @@ public sealed class MainWindowViewModel : ViewModelBase
password = pwd; password = pwd;
} }
catch (InvalidOperationException ex) when (ex.Message == "Wrong passphrase")
{
password = null;
promptMessage = "Wrong passphrase - try again.";
}
catch catch
{ {
Avalonia.Threading.Dispatcher.UIThread.Post(() => Avalonia.Threading.Dispatcher.UIThread.Post(() =>