From 74908914759b1e2b935ed9eb09a4f4a06526ba1b4a9baea9435b4b21e1252b65 Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Sun, 23 Jul 2023 19:35:19 +0000 Subject: [PATCH] Accepting request 1100207 from home:dziobian:gulgul-ultron:19 - New upstream release 2023.7.0 * Login with device enabled for self-host * Added new forwarder (Forward Email) * Add collection name to title attribute * Define card brand according to its number OBS-URL: https://build.opensuse.org/request/show/1100207 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/bitwarden?expand=0&rev=21 --- _service | 4 +- bitwarden-2023.5.1.obscpio | 3 -- bitwarden-2023.7.0.obscpio | 3 ++ bitwarden.changes | 8 ++++ bitwarden.obsinfo | 6 +-- bitwarden.spec | 2 +- node-vendor.tar.zst | 4 +- remove-unnecessary-deps.patch | 90 ++++++++++++++++++++--------------- use-node-argon2.patch | 12 +++-- vendor.tar.zst | 4 +- 10 files changed, 79 insertions(+), 57 deletions(-) delete mode 100644 bitwarden-2023.5.1.obscpio create mode 100644 bitwarden-2023.7.0.obscpio diff --git a/_service b/_service index 0e05278..4bd7e91 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git https://github.com/bitwarden/clients.git - desktop-v2023.5.1 - 2023.5.1 + desktop-v2023.7.0 + 2023.7.0 bitwarden bitwarden_license/* diff --git a/bitwarden-2023.5.1.obscpio b/bitwarden-2023.5.1.obscpio deleted file mode 100644 index 16571ab..0000000 --- a/bitwarden-2023.5.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03fe7151ad279e53ba010475fedb835cde6101e24c109de1ebf52d123ec81f5a -size 19033613 diff --git a/bitwarden-2023.7.0.obscpio b/bitwarden-2023.7.0.obscpio new file mode 100644 index 0000000..5866670 --- /dev/null +++ b/bitwarden-2023.7.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfd78be453a7f6dc6a5321c45fec9430132dd8ab508728c5e1427aa76edf99a0 +size 18812941 diff --git a/bitwarden.changes b/bitwarden.changes index 67b3c43..c57fc97 100644 --- a/bitwarden.changes +++ b/bitwarden.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jul 23 14:53:28 UTC 2023 - Bruno Pitrus +- New upstream release 2023.7.0 + * Login with device enabled for self-host + * Added new forwarder (Forward Email) + * Add collection name to title attribute + * Define card brand according to its number + ------------------------------------------------------------------- Thu Jun 22 17:00:22 UTC 2023 - Bruno Pitrus - New upstream release 2023.5.1 diff --git a/bitwarden.obsinfo b/bitwarden.obsinfo index d2511f3..a1e6507 100644 --- a/bitwarden.obsinfo +++ b/bitwarden.obsinfo @@ -1,4 +1,4 @@ name: bitwarden -version: 2023.5.1 -mtime: 1687386703 -commit: e1b8d2fb0c6f2dff5a668e3aa2ce13246f5e3b4b +version: 2023.7.0 +mtime: 1689194107 +commit: 67a5b8236480b0af7401fd8608a93c58b0d40731 diff --git a/bitwarden.spec b/bitwarden.spec index 75b9c9f..c127a02 100644 --- a/bitwarden.spec +++ b/bitwarden.spec @@ -18,7 +18,7 @@ # Name: bitwarden -Version: 2023.5.1 +Version: 2023.7.0 Release: 0 Summary: A secure and free password manager for all of your devices Group: Productivity/Security diff --git a/node-vendor.tar.zst b/node-vendor.tar.zst index aaf7e91..e98332f 100644 --- a/node-vendor.tar.zst +++ b/node-vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d31eeff091e6981ab98b2663b8a35c0edf90b19ddb4d2be19a480185b9d19bd4 -size 38063799 +oid sha256:3a19f2868010341ec9f0e608d1b0ed577b2167a7e140fa311abc0b2cf73d1b3a +size 37399397 diff --git a/remove-unnecessary-deps.patch b/remove-unnecessary-deps.patch index 6f5926c..6382edf 100644 --- a/remove-unnecessary-deps.patch +++ b/remove-unnecessary-deps.patch @@ -8,7 +8,16 @@ "lint": "eslint . --cache --cache-strategy content && prettier --check .", "lint:fix": "eslint . --cache --cache-strategy content --fix", "lint:clear": "rimraf .eslintcache", -@@ -32,53 +31,18 @@ +@@ -25,7 +24,7 @@ + "storybook": "ng run components:storybook", + "build-storybook": "ng run components:build-storybook", + "build-storybook:ci": "ng run components:build-storybook --webpack-stats-json", +- "postinstall": "patch-package" ++ "postinstall": "true" + }, + "workspaces": [ + "apps/*", +@@ -32,52 +31,18 @@ ], "devDependencies": { "@angular-devkit/build-angular": "15.2.8", @@ -18,52 +27,51 @@ - "@angular/cli": "15.2.8", "@angular/compiler-cli": "15.2.9", - "@angular/elements": "15.2.9", -- "@compodoc/compodoc": "1.1.19", +- "@compodoc/compodoc": "1.1.21", - "@electron/notarize": "1.2.3", - "@electron/rebuild": "3.2.13", "@fluffy-spoon/substitute": "1.208.0", "@ngtools/webpack": "15.2.8", -- "@storybook/addon-a11y": "6.5.16", -- "@storybook/addon-actions": "6.5.16", -- "@storybook/addon-essentials": "6.5.16", -- "@storybook/addon-links": "6.5.16", -- "@storybook/angular": "6.5.16", -- "@storybook/builder-webpack5": "6.5.16", -- "@storybook/manager-webpack5": "6.5.16", +- "@storybook/addon-a11y": "7.0.18", +- "@storybook/addon-actions": "7.0.18", +- "@storybook/addon-essentials": "7.0.18", +- "@storybook/addon-links": "7.0.18", +- "@storybook/angular": "7.0.18", - "@types/argon2-browser": "1.18.1", -- "@types/chrome": "0.0.235", +- "@types/chrome": "0.0.237", "@types/duo_web_sdk": "2.7.1", - "@types/firefox-webext-browser": "111.0.1", - "@types/inquirer": "8.2.6", - "@types/jest": "29.5.1", + "@types/jest": "29.5.2", - "@types/jquery": "3.5.16", - "@types/jsdom": "21.1.1", - "@types/koa": "2.13.6", - "@types/koa__multer": "2.0.4", -- "@types/koa__router": "8.0.11", +- "@types/koa__router": "12.0.0", - "@types/koa-bodyparser": "4.3.7", - "@types/koa-json": "2.0.20", - "@types/lowdb": "1.0.11", "@types/lunr": "2.3.4", - "@types/node": "18.16.9", -- "@types/node-fetch": "2.6.3", + "@types/node": "18.16.16", +- "@types/node-fetch": "2.6.4", "@types/node-forge": "1.3.2", "@types/node-ipc": "9.2.0", "@types/papaparse": "5.3.7", - "@types/proper-lockfile": "4.1.2", +- "@types/react": "16.14.42", - "@types/retry": "0.12.2", "@types/zxcvbn": "4.4.1", -- "@typescript-eslint/eslint-plugin": "5.59.5", -- "@typescript-eslint/parser": "5.59.5", +- "@typescript-eslint/eslint-plugin": "5.59.8", +- "@typescript-eslint/parser": "5.59.8", - "autoprefixer": "10.4.14", - "base64-loader": "1.0.0", "buffer": "6.0.3", -- "chromatic": "6.17.4", +- "chromatic": "6.18.0", "clean-webpack-plugin": "4.0.0", - "concurrently": "8.0.1", + "concurrently": "8.1.0", "copy-webpack-plugin": "11.0.0", -@@ -83,59 +47,24 @@ - "css-loader": "6.7.3", +@@ -83,62 +47,24 @@ + "css-loader": "6.8.1", "del": "6.1.1", "electron": "24.1.1", - "electron-builder": "^23.6.0", @@ -71,13 +79,13 @@ - "electron-reload": "2.0.0-alpha.1", "electron-store": "8.1.0", "electron-updater": "5.3.0", -- "eslint": "8.40.0", +- "eslint": "8.42.0", - "eslint-config-prettier": "8.8.0", - "eslint-import-resolver-typescript": "3.5.5", - "eslint-plugin-import": "2.27.5", - "eslint-plugin-rxjs": "5.0.3", - "eslint-plugin-rxjs-angular": "2.0.1", -- "eslint-plugin-tailwindcss": "3.11.0", +- "eslint-plugin-tailwindcss": "3.12.1", - "gulp": "4.0.2", - "gulp-filter": "7.0.0", - "gulp-if": "3.0.0", @@ -92,43 +100,46 @@ "jest-mock-extended": "3.0.4", - "jest-preset-angular": "13.1.1", - "lint-staged": "13.2.2", - "mini-css-extract-plugin": "2.7.5", + "mini-css-extract-plugin": "2.7.6", "node-ipc": "9.2.1", - "pkg": "5.8.1", - "postcss": "8.4.23", -- "postcss-loader": "7.3.0", + "postcss": "8.4.24", +- "postcss-loader": "7.3.2", - "prettier": "2.8.8", -- "prettier-plugin-tailwindcss": "0.2.8", +- "prettier-plugin-tailwindcss": "0.3.0", - "process": "0.11.10", +- "react": "18.2.0", +- "react-dom": "18.2.0", "regedit": "^3.0.3", +- "remark-gfm": "3.0.1", "rimraf": "5.0.1", "sass": "1.62.1", - "sass-loader": "13.2.2", -- "storybook-addon-designs": "6.3.1", -- "style-loader": "3.3.2", + "sass-loader": "13.3.1", +- "storybook": "7.0.18", +- "style-loader": "3.3.3", - "tailwindcss": "3.3.2", - "ts-jest": "29.1.0", - "ts-loader": "9.4.2", + "ts-loader": "9.4.3", "tsconfig-paths-webpack-plugin": "4.0.1", - "type-fest": "2.19.0", "typescript": "4.9.5", - "url": "0.11.0", - "util": "0.12.5", - "wait-on": "7.0.1", - "webpack": "5.82.1", -- "webpack-cli": "5.1.1", + "webpack": "5.85.0", +- "webpack-cli": "5.1.3", - "webpack-dev-server": "4.15.0", - "webpack-node-externals": "3.0.0" -+ "webpack-cli": "5.1.1" ++ "webpack-cli": "5.1.3" }, "dependencies": { "@angular/animations": "15.2.9", -@@ -148,53 +76,25 @@ +@@ -148,54 +76,25 @@ "@angular/platform-browser": "15.2.9", "@angular/platform-browser-dynamic": "15.2.9", "@angular/router": "15.2.9", - "@koa/multer": "3.0.2", -- "@koa/router": "10.1.1", +- "@koa/router": "12.0.0", "@microsoft/signalr": "6.0.16", "@microsoft/signalr-protocol-msgpack": "6.0.16", - "@ng-select/ng-select": "10.0.4", @@ -136,7 +147,7 @@ - "argon2-browser": "1.18.0", "big-integer": "1.6.51", - "bootstrap": "4.6.0", -- "braintree-web-drop-in": "1.37.0", +- "braintree-web-drop-in": "1.38.0", - "bufferutil": "4.0.7", - "chalk": "4.1.2", "commander": "7.2.0", @@ -147,7 +158,7 @@ - "https-proxy-agent": "5.0.1", - "inquirer": "8.2.5", - "jquery": "3.7.0", -- "jsdom": "16.7.0", +- "jsdom": "22.1.0", - "jszip": "3.10.1", - "koa": "2.14.2", - "koa-bodyparser": "4.4.0", @@ -162,6 +173,7 @@ "nord": "0.2.1", - "open": "8.4.2", "papaparse": "5.4.1", +- "patch-package": "6.5.1", - "popper.js": "1.16.1", - "proper-lockfile": "4.1.2", - "qrious": "4.0.2", @@ -174,9 +186,9 @@ }, "overrides": { - "tailwindcss": "$tailwindcss", - "react": "18.2.0", "@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 @@ @@ -184,7 +196,7 @@ "author": "", "license": "GPL-3.0", - "devDependencies": { -- "@napi-rs/cli": "2.15.2" +- "@napi-rs/cli": "2.16.1" - }, "napi": { "name": "desktop_native", diff --git a/use-node-argon2.patch b/use-node-argon2.patch index 0ebf18e..9ba8854 100644 --- a/use-node-argon2.patch +++ b/use-node-argon2.patch @@ -2,11 +2,12 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri --- bitwarden/apps/desktop/webpack.main.js.old 2023-02-15 19:02:44.000000000 +0100 +++ bitwarden/apps/desktop/webpack.main.js 2023-02-18 18:42:54.917063925 +0100 -@@ -73,7 +73,6 @@ +@@ -73,8 +73,6 @@ "./src/package.json", { from: "./src/images", to: "images" }, { from: "./src/locales", to: "locales" }, - "../../node_modules/argon2-browser/dist/argon2.wasm", +- "../../node_modules/argon2-browser/dist/argon2-simd.wasm", ], }), new EnvironmentPlugin({ @@ -66,14 +67,14 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri "@bitwarden/desktop-native": "file:../desktop_native" } } ---- bitwarden/libs/common/src/services/webCryptoFunction.service.ts.old 2023-02-15 19:02:44.000000000 +0100 -+++ bitwarden/libs/common/src/services/webCryptoFunction.service.ts 2023-02-18 18:52:00.173567051 +0100 +--- bitwarden/libs/common/src/platform/services/web-crypto-function.service.ts.old 2023-02-15 19:02:44.000000000 +0100 ++++ bitwarden/libs/common/src/platform/services/web-crypto-function.service.ts 2023-02-18 18:52:00.173567051 +0100 @@ -1,4 +1,4 @@ -import * as argon2 from "argon2-browser"; +import * as argon2 from "argon2"; import * as forge from "node-forge"; - import { CryptoFunctionService } from "../abstractions/cryptoFunction.service"; + import { Utils } from "../../platform/misc/utils"; @@ -9,13 +9,11 @@ export class WebCryptoFunctionService implements CryptoFunctionService { private crypto: Crypto; @@ -88,7 +89,7 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri } async pbkdf2( -@@ -52,23 +50,19 @@ +@@ -52,24 +50,19 @@ memory: number, parallelism: number ): Promise { @@ -117,6 +118,7 @@ Use node-argon2 instead of browser-argon2 as the second needs webassembly/emscri - type: argon2.ArgonType.Argon2id, + type: argon2.argon2id, }); +- argon2.unloadRuntime(); - return result.hash; + return this.toArrayBuffer(hash); } diff --git a/vendor.tar.zst b/vendor.tar.zst index 0d94436..80bce4c 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23244cf2d4d51766c3e55f12dc1c13f7c05ddd7da52e2dc76cabf861cfa64f97 -size 30689456 +oid sha256:b79e6f59a66edd033448a997089281745dbff06331d4411cd39da5138eb42a22 +size 33297496