Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 45 additions & 0 deletions jslib-patches/salt.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
Submodule jslib contains modified content
diff --git i/@bitwarden/jslib/src/models/response/preloginResponse.ts w/@bitwarden/jslib/src/models/response/preloginResponse.ts
index fcbd4cb2..483e0f0d 100644
--- i/@bitwarden/jslib/src/models/response/preloginResponse.ts
+++ w/@bitwarden/jslib/src/models/response/preloginResponse.ts
@@ -5,10 +5,12 @@ import { KdfType } from '../../enums/kdfType';
export class PreloginResponse extends BaseResponse {
kdf: KdfType;
kdfIterations: number;
+ salt?: string; // Cozy customization

constructor(response: any) {
super(response);
this.kdf = this.getResponseProperty('Kdf');
this.kdfIterations = this.getResponseProperty('KdfIterations');
+ this.salt = this.getResponseProperty('Salt'); // Cozy customization
}
}
diff --git i/@bitwarden/jslib/src/services/auth.service.ts w/@bitwarden/jslib/src/services/auth.service.ts
index 10048d0c..c6c7adc2 100644
--- i/@bitwarden/jslib/src/services/auth.service.ts
+++ w/@bitwarden/jslib/src/services/auth.service.ts
@@ -238,18 +238,21 @@ export class AuthService implements AuthServiceAbstraction {
email = email.trim().toLowerCase();
let kdf: KdfType = null;
let kdfIterations: number = null;
+ let salt: string = null;
try {
const preloginResponse = await this.apiService.postPrelogin(new PreloginRequest(email));
if (preloginResponse != null) {
kdf = preloginResponse.kdf;
kdfIterations = preloginResponse.kdfIterations;
+ salt = preloginResponse.salt;
}
} catch (e) {
if (e == null || e.statusCode !== 404) {
throw e;
}
}
- return this.cryptoService.makeKey(masterPassword, email, kdf, kdfIterations);
+ // Cozy customization; used salt from backend
+ return this.cryptoService.makeKey(masterPassword, salt, kdf, kdfIterations);
}

authingWithApiKey(): boolean {
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"browser": "transpiled/index.js",
"main": "transpiled/index.node.js",
"scripts": {
"setup:submodule": "git submodule init && git submodule update",
"setup:submodule": "git submodule init && git submodule update && git apply jslib-patches/salt.diff",
"setup": "yarn run setup:submodule",
"build:jslib:backup": "mv ./node_modules ./node_modules.back",
"build:jslib:restore": "mv ./node_modules.back ./node_modules",
Expand Down
Loading