mirror of
https://github.com/bitwarden/browser
synced 2025-12-30 15:13:32 +00:00
[PS-2251] Implement argon2 kdf (#4468)
* Implement argon2 * Remove argon2 webassembly warning * Replace magic numbers by enum * move packages * cleanup call to argon2 * update call to node argon2 * don't need wasm-eval * revert config changes * Update libs/common/src/enums/kdfType.ts Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com> * Update kdfType.ts * apply DEFAULT_PBKDF2_ITERATIONS * checkIfWasmSupported Co-authored-by: Kyle Spearrin <kyle.spearrin@gmail.com> Co-authored-by: Kyle Spearrin <kspearrin@users.noreply.github.com> Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
This commit is contained in:
@@ -7,7 +7,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service";
|
||||
import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
|
||||
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
||||
import { StateService } from "@bitwarden/common/abstractions/state.service";
|
||||
import { DEFAULT_KDF_ITERATIONS, KdfType } from "@bitwarden/common/enums/kdfType";
|
||||
import { DEFAULT_PBKDF2_ITERATIONS, KdfType } from "@bitwarden/common/enums/kdfType";
|
||||
import { KdfRequest } from "@bitwarden/common/models/request/kdf.request";
|
||||
|
||||
@Component({
|
||||
@@ -20,7 +20,7 @@ export class ChangeKdfComponent implements OnInit {
|
||||
kdf = KdfType.PBKDF2_SHA256;
|
||||
kdfOptions: any[] = [];
|
||||
formPromise: Promise<any>;
|
||||
recommendedKdfIterations = DEFAULT_KDF_ITERATIONS;
|
||||
recommendedKdfIterations = DEFAULT_PBKDF2_ITERATIONS;
|
||||
|
||||
constructor(
|
||||
private apiService: ApiService,
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
},
|
||||
"mx": {
|
||||
"message": "Mx"
|
||||
},
|
||||
},
|
||||
"dr": {
|
||||
"message": "Dr"
|
||||
},
|
||||
|
||||
@@ -79,6 +79,11 @@ const moduleRules = [
|
||||
test: /\.[jt]sx?$/,
|
||||
loader: "@ngtools/webpack",
|
||||
},
|
||||
{
|
||||
test: /\.wasm$/,
|
||||
loader: "base64-loader",
|
||||
type: "javascript/auto",
|
||||
},
|
||||
];
|
||||
|
||||
const plugins = [
|
||||
@@ -223,6 +228,7 @@ const devServer =
|
||||
default-src 'self'
|
||||
;script-src
|
||||
'self'
|
||||
'wasm-unsafe-eval'
|
||||
'sha256-ryoU+5+IUZTuUyTElqkrQGBJXr1brEv6r2CA62WUw8w='
|
||||
https://js.stripe.com
|
||||
https://js.braintreegateway.com
|
||||
@@ -349,13 +355,19 @@ const webpackConfig = {
|
||||
util: require.resolve("util/"),
|
||||
assert: false,
|
||||
url: false,
|
||||
path: false,
|
||||
fs: false,
|
||||
process: false,
|
||||
},
|
||||
},
|
||||
output: {
|
||||
filename: "[name].[contenthash].js",
|
||||
path: path.resolve(__dirname, "build"),
|
||||
},
|
||||
module: { rules: moduleRules },
|
||||
module: {
|
||||
noParse: /\.wasm$/,
|
||||
rules: moduleRules,
|
||||
},
|
||||
plugins: plugins,
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user