Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-30 13:03:53 +01:00
Code Issues Projects Releases Wiki Activity

outdated browser and edge checks for pbkdf2

Browse Source
This commit is contained in:
Kyle Spearrin 2017-07-09 00:23:26 -04:00
parent b9cbc1546c
commit 204ee72926
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/global/mainController.js
View File

@ -8,6 +8,7 @@ angular
vm.usingControlSidebar = vm.openControlSidebar = false; vm.usingControlSidebar = vm.openControlSidebar = false;
vm.searchVaultText = null; vm.searchVaultText = null;
vm.version = appSettings.version; vm.version = appSettings.version;
vm.outdatedBrowser = navigator.userAgent.indexOf('MSIE') !== -1;
$scope.currentYear = new Date().getFullYear(); $scope.currentYear = new Date().getFullYear();
@ -94,6 +95,10 @@ angular
}); });
}; };
$scope.updateBrowser = function () {
$window.open('https://browser-update.org/update.html', '_blank');
};
// Append dropdown menu somewhere else // Append dropdown menu somewhere else
var bodyScrollbarWidth, var bodyScrollbarWidth,
appendedDropdownMenu, appendedDropdownMenu,

4
src/app/services/cryptoService.js
View File

@ -235,7 +235,7 @@ angular
}; };
_service.makeKey = function (password, salt) { _service.makeKey = function (password, salt) {
if (!$window.cryptoShimmed) { if (!$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) {
return pbkdf2WC(password, salt, 5000, 256).then(function (keyBuf) { return pbkdf2WC(password, salt, 5000, 256).then(function (keyBuf) {
return new SymmetricCryptoKey(bufToB64(keyBuf), true); return new SymmetricCryptoKey(bufToB64(keyBuf), true);
}); });
@ -301,7 +301,7 @@ angular
throw 'Invalid parameters.'; throw 'Invalid parameters.';
} }
if (!$window.cryptoShimmed) { if (!$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) {
var keyBuf = key.getBuffers(); var keyBuf = key.getBuffers();
return pbkdf2WC(new Uint8Array(keyBuf.key), password, 1, 256).then(function (hashBuf) { return pbkdf2WC(new Uint8Array(keyBuf.key), password, 1, 256).then(function (hashBuf) {
return bufToB64(hashBuf); return bufToB64(hashBuf);

5
src/app/views/userLayout.html
View File

@ -147,6 +147,11 @@
</aside> </aside>
<div class="content-wrapper"> <div class="content-wrapper">
<div class="alert alert-danger alert-notification" ng-if="main.outdatedBrowser" ng-click="updateBrowser()">
<h4><i class="fa fa-warning fa-fw"></i> Update Your Browser</h4>
You are using an unsupported web browser. The web vault may not function properly.
<u>Update your browser now</u>.
</div>
<div class="alert alert-warning alert-notification" ng-click="updateKey()" ng-if="!main.usingEncKey"> <div class="alert alert-warning alert-notification" ng-click="updateKey()" ng-if="!main.usingEncKey">
<h4><i class="fa fa-key fa-fw"></i> Update Your Encryption Key</h4> <h4><i class="fa fa-key fa-fw"></i> Update Your Encryption Key</h4>
You are currently using an outdated encryption scheme. You are currently using an outdated encryption scheme.