bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-07 19:13:19 +00:00
Code Issues Releases Wiki Activity

normalize passwords

Browse Source
This commit is contained in:
Kyle Spearrin
2018-03-09 22:29:59 -05:00
parent f2b202c714
commit e3eeaddb3e
2 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/App/Services/CryptoService.cs
View File

@@ -424,7 +424,7 @@ namespace Bit.App.Services
throw new ArgumentNullException(nameof(salt));
}
var passwordBytes = Encoding.UTF8.GetBytes(password);
var passwordBytes = Encoding.UTF8.GetBytes(NormalizePassword(password));
var saltBytes = Encoding.UTF8.GetBytes(salt);
var keyBytes = _keyDerivationService.DeriveKey(passwordBytes, saltBytes, 5000);
@@ -449,7 +449,7 @@ namespace Bit.App.Services
throw new ArgumentNullException(nameof(password));
}
var passwordBytes = Encoding.UTF8.GetBytes(password);
var passwordBytes = Encoding.UTF8.GetBytes(NormalizePassword(password));
var hash = _keyDerivationService.DeriveKey(key.Key, passwordBytes, 1);
return hash;
}
@@ -465,5 +465,17 @@ namespace Bit.App.Services
var bytes = Crypto.RandomBytes(512 / 8);
return Encrypt(bytes, key);
}
// Some users like to copy/paste passwords from external files. Sometimes this can lead to two different
// values on mobiles apps vs the web. For example, on Android an EditText will accept a new line character
// (\n), whereas whenever you paste a new line character on the web in a HTML input box it is converted
// to a space ( ). Normalize those values so that they are the same on all platforms.
private string NormalizePassword(string password)
{
return password
.Replace("\r\n", " ") // Windows-style new line => space
.Replace("\n", " ") // New line => space
.Replace(" ", " "); // No-break space (00A0) => space
}
}
}