Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(auth_service): legacy wallet bip39 validation #18

Merged
merged 2 commits into from
Dec 20, 2024
Merged

fix(auth_service): legacy wallet bip39 validation #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4a5c1
verify bip39 validation for all login types
takenagain Dec 20, 2024
fc855cf
Update auth_service.dart
takenagain Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/komodo_defi_framework/app_build/build_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"coins": {
"fetch_at_build_enabled": true,
"update_commit_on_build": true,
"bundled_coins_repo_commit": "d7906da4ab0283ea7dcd22d8b5157a8a46eac0f2",
"bundled_coins_repo_commit": "642abea7172b81db24b16bffc13783b9a0e400f5",
"coins_repo_api_url": "https://api.github.com/repos/KomodoPlatform/coins",
"coins_repo_content_url": "https://komodoplatform.github.io/coins",
"coins_repo_branch": "master",
Expand Down
5 changes: 4 additions & 1 deletion packages/komodo_defi_local_auth/lib/src/auth/auth_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,12 @@ class KdfAuthService implements IAuthService {
}

final storedUser = await _secureStorage.getUser(walletName);
if (storedUser == null) {
throw AuthException.notFound();
}

// If we know this is not a BIP39 seed, don't allow HD mode
if (storedUser?.isBip39Seed == false &&
if (!storedUser.isBip39Seed &&
options.derivationMethod == DerivationMethod.hdWallet) {
throw AuthException(
'Cannot use HD mode with non-BIP39 seed',
Expand Down
30 changes: 20 additions & 10 deletions packages/komodo_defi_local_auth/lib/src/auth/auth_service_auth_extension.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ extension KdfAuthServiceAuthExtension on KdfAuthService {

// For HD wallets, verify BIP39 compatibility if not already verified
if (currentUser.isHd && !currentUser.isBip39Seed) {
currentUser = await _verifyBip39Compatibility(config, currentUser);
currentUser = await _verifyBip39Compatibility(
walletPassword: config.walletPassword,
currentUser,
);
}

return currentUser;
Expand Down Expand Up @@ -60,11 +63,18 @@ extension KdfAuthServiceAuthExtension on KdfAuthService {
);
await _secureStorage.saveUser(currentUser);

if (currentUser.isHd && !currentUser.isBip39Seed) {
// Verify BIP39 compatibility for HD wallets after registration
// if verification fails, the user can still log into the wallet in legacy
// mode.
currentUser = await _verifyBip39Compatibility(config, currentUser);
try {
currentUser = await _verifyBip39Compatibility(
walletPassword: config.walletPassword,
currentUser,
);
} on AuthException {
if (currentUser.isHd && !currentUser.isBip39Seed) {
// Verify BIP39 compatibility for HD wallets after registration
// if verification fails, the user can still log into the wallet in legacy
// mode.
rethrow;
}
}

return currentUser;
Expand All @@ -78,9 +88,9 @@ extension KdfAuthServiceAuthExtension on KdfAuthService {
/// so any atomic requirements need to be handled by the calling function.
/// Throws [AuthException] if the seed is not a valid BIP39 seed phrase.
Future<KdfUser> _verifyBip39Compatibility(
KdfStartupConfig config,
KdfUser currentUser,
) async {
KdfUser currentUser, {
required String? walletPassword,
}) async {
var updatedUser = currentUser.copyWith();
bool isBip39;

Expand All @@ -90,7 +100,7 @@ extension KdfAuthServiceAuthExtension on KdfAuthService {
// [getActiveUser] function (or any others). It simply
final plaintext = await _getMnemonic(
encrypted: false,
walletPassword: config.walletPassword,
walletPassword: walletPassword,
);

if (plaintext.plaintextMnemonic == null) {
Expand Down
4 changes: 0 additions & 4 deletions packages/komodo_defi_sdk/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,10 +738,6 @@ class _KomodoAppState extends State<KomodoApp> {
return 'Please enter a ${fieldName ?? 'value'}.';
}

if (input.contains(RegExp('[<>&]'))) {
return "Invalid password: contains '<', '>', or '&'";
}

return null;
}

Expand Down
Loading