SHA256
1
0
forked from pool/bitwarden

Accepting request 1107805 from devel:languages:nodejs

OBS-URL: https://build.opensuse.org/request/show/1107805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bitwarden?expand=0&rev=11
This commit is contained in:
Ana Guerrero 2023-08-30 08:19:59 +00:00 committed by Git OBS Bridge
commit 7532c32ebc
9 changed files with 36 additions and 26 deletions

View File

@ -2,8 +2,8 @@
<service name="obs_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/bitwarden/clients.git</param>
<param name="revision">desktop-v2023.7.1</param>
<param name="version">2023.7.1</param>
<param name="revision">desktop-v2023.8.2</param>
<param name="version">2023.8.2</param>
<param name="filename">bitwarden</param>
<param name="exclude">bitwarden_license/*</param>
<!-- The code in bitwarden_license MUST NOT be included in published tarballs as it is non-redistributable! -->

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d67470ad1dd40c0489f66c0f28b94093a53cd06b9b3dc37287303b44da0a4752
size 18814989

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85fafe92d614c7e23869237facb21dfd3bf089927fdfdbda6fe7a4440c9ba417
size 19154445

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 28 16:21:41 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>
- New upstream release 2023.8.2
* Add SSO with trusted devices
* Add Tailwind support
* Update server selector copy
* Bug fix for selecting self-hosted server
* Bug fix for hidden icons
-------------------------------------------------------------------
Wed Jul 26 20:19:05 UTC 2023 - Bruno Pitrus <brunopitrus@hotmail.com>

View File

@ -1,4 +1,4 @@
name: bitwarden
version: 2023.7.1
mtime: 1690231075
commit: da29dd71b27b21b404c4944e421c8cc3f3dd7a47
version: 2023.8.2
mtime: 1692901872
commit: b403f2bcc79426abb9d8f02c391b7c8158876960

View File

@ -18,7 +18,7 @@
#
Name: bitwarden
Version: 2023.7.1
Version: 2023.8.2
Release: 0
Summary: A secure and free password manager for all of your devices
Group: Productivity/Security

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a19f2868010341ec9f0e608d1b0ed577b2167a7e140fa311abc0b2cf73d1b3a
size 37399397
oid sha256:dbd9e1a88a23435a1d205dcc599f8a1633ef4bd704998fab08ca1cabcebeb4ad
size 37624979

View File

@ -17,7 +17,7 @@
},
"workspaces": [
"apps/*",
@@ -32,52 +31,18 @@
@@ -32,52 +31,19 @@
],
"devDependencies": {
"@angular-devkit/build-angular": "15.2.8",
@ -63,14 +63,14 @@
"@types/zxcvbn": "4.4.1",
- "@typescript-eslint/eslint-plugin": "5.59.8",
- "@typescript-eslint/parser": "5.59.8",
- "autoprefixer": "10.4.14",
"autoprefixer": "10.4.14",
- "base64-loader": "1.0.0",
"buffer": "6.0.3",
- "chromatic": "6.18.0",
"clean-webpack-plugin": "4.0.0",
"concurrently": "8.1.0",
"copy-webpack-plugin": "11.0.0",
@@ -83,62 +47,24 @@
@@ -83,62 +47,25 @@
"css-loader": "6.8.1",
"del": "6.1.1",
"electron": "24.1.1",
@ -104,7 +104,7 @@
"node-ipc": "9.2.1",
- "pkg": "5.8.1",
"postcss": "8.4.24",
- "postcss-loader": "7.3.2",
"postcss-loader": "7.3.2",
- "prettier": "2.8.8",
- "prettier-plugin-tailwindcss": "0.3.0",
- "process": "0.11.10",
@ -188,7 +188,7 @@
- "tailwindcss": "$tailwindcss",
"@storybook/angular": {
"zone.js": "0.12.0"
}
},
--- a/apps/desktop/desktop_native/package.json
+++ b/apps/desktop/desktop_native/package.json
@@ -10,9 +10,6 @@

View File

@ -92,7 +92,7 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri
@@ -52,24 +50,19 @@
memory: number,
parallelism: number
): Promise<ArrayBuffer> {
): Promise<Uint8Array> {
- if (!this.wasmSupported) {
- throw "Webassembly support is required for the Argon2 KDF feature.";
- }
@ -100,7 +100,7 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri
- const passwordArr = new Uint8Array(this.toBuf(password));
- const saltArr = new Uint8Array(this.toBuf(salt));
+ const nodePassword = this.toNodeValue(password);
+ const nodeSalt = this.toNodeBuffer(this.toArrayBuffer(salt));
+ const nodeSalt = this.toNodeBuffer(this.toUint8Buffer(salt));
- const result = await argon2.hash({
- pass: passwordArr,
@ -120,7 +120,7 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri
});
- argon2.unloadRuntime();
- return result.hash;
+ return this.toArrayBuffer(hash);
+ return this.toUint8Buffer(hash);
}
async hkdf(
@ -142,7 +142,7 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri
- } catch {
- return false;
+// from libs/node/src/services/node-crypto-function.service.ts
+ private toNodeValue(value: string | ArrayBuffer): string | Buffer {
+ private toNodeValue(value: string | Uint8Array): string | Buffer {
+ let nodeValue: string | Buffer;
+ if (typeof value === "string") {
+ nodeValue = value;
@ -152,16 +152,16 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri
+ return nodeValue;
+ }
+
+ private toNodeBuffer(value: ArrayBuffer): Buffer {
+ return Buffer.from(new Uint8Array(value) as any);
+ private toNodeBuffer(value: Uint8Array): Buffer {
+ return Buffer.from(value);
+ }
+
+ private toArrayBuffer(value: Buffer | string | ArrayBuffer): ArrayBuffer {
+ let buf: ArrayBuffer;
+ private toUint8Buffer(value: Buffer | string | Uint8Array): Uint8Array {
+ let buf: Uint8Array;
+ if (typeof value === "string") {
+ buf = Utils.fromUtf8ToArray(value).buffer;
+ buf = Utils.fromUtf8ToArray(value);
+ } else {
+ buf = new Uint8Array(value).buffer;
+ buf = value;
}
- return false;
+ return buf;