From d79d625f22b05eb44535961f634c5d1bc485931a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 10:27:21 -0400 Subject: [PATCH 01/11] New package: python3-darkdetect-0.6.0 --- srcpkgs/python3-darkdetect/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-darkdetect/template diff --git a/srcpkgs/python3-darkdetect/template b/srcpkgs/python3-darkdetect/template new file mode 100644 index 000000000000..b9e0f32190c9 --- /dev/null +++ b/srcpkgs/python3-darkdetect/template @@ -0,0 +1,18 @@ +# Template file for 'python3-darkdetect' +pkgname=python3-darkdetect +version=0.6.0 +revision=1 +wrksrc="darkdetect-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +short_desc="Detect OS Dark Mode from Python" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="http://github.com/albertosottile/darkdetect" +distfiles="${PYPI_SITE}/d/darkdetect/darkdetect-${version}.tar.gz" +checksum=7993275b537b4579ba2eee7673b0b95783f99c7ddb82a9f90dc077a379b427f1 +make_check=no # no tests included + +post_install() { + vlicense LICENSE +} From 67e324a1bfec49262a7ab8c77b479361cd9f8054 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 10:22:37 -0400 Subject: [PATCH 02/11] New package: python3-gaphas-3.6.0 --- srcpkgs/python3-gaphas/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-gaphas/template diff --git a/srcpkgs/python3-gaphas/template b/srcpkgs/python3-gaphas/template new file mode 100644 index 000000000000..b4fb4dca7968 --- /dev/null +++ b/srcpkgs/python3-gaphas/template @@ -0,0 +1,16 @@ +# Template file for 'python3-gaphas' +pkgname=python3-gaphas +version=3.6.0 +revision=1 +wrksrc="gaphas-${version}" +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" +depends="python3-gobject python3-cairo" +checkdepends="python3-pytest xvfb-run gtk4 $depends" +short_desc="GTK+ diagramming widget library for Python" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://gaphas.readthedocs.io" +distfiles="https://github.com/gaphor/gaphas/archive/${version}.tar.gz" +checksum=96f1be036cf5155dc15508257acf3663cd3ec12154f6ce5011aead10e80c40d1 +make_check_pre="xvfb-run" From cc9364bcc2c0bccc6324b2e81dde5de8dcba357e Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 11:17:26 -0400 Subject: [PATCH 03/11] New package: python3-flit_scm-1.5.0 --- .../patches/relax_version_constraints.patch | 39 +++++++++++++++++++ srcpkgs/python3-flit_scm/template | 19 +++++++++ 2 files changed, 58 insertions(+) create mode 100644 srcpkgs/python3-flit_scm/patches/relax_version_constraints.patch create mode 100644 srcpkgs/python3-flit_scm/template diff --git a/srcpkgs/python3-flit_scm/patches/relax_version_constraints.patch b/srcpkgs/python3-flit_scm/patches/relax_version_constraints.patch new file mode 100644 index 000000000000..658d1e950276 --- /dev/null +++ b/srcpkgs/python3-flit_scm/patches/relax_version_constraints.patch @@ -0,0 +1,39 @@ +From ccbb547dea83e13799946b6bf639ea1c678e3ed0 Mon Sep 17 00:00:00 2001 +From: Padraic Fanning +Date: Sat, 21 May 2022 22:18:50 -0400 +Subject: [PATCH] Relax version constraints + +This resolves #5. +--- + pyproject.toml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index e331fb4..08dcf6e 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -18,8 +18,8 @@ classifiers = [ + "Topic :: Software Development :: Build Tools", + ] + dependencies = [ +- "flit-core==3.5.0", +- "setuptools_scm==6.4.2", ++ "flit-core~=3.5", ++ "setuptools_scm~=6.4", + "tomli>=2,<3", + ] + dynamic = ["version"] +@@ -33,8 +33,8 @@ repository = "https://gitlab.com/WillDaSilva/flit_scm" + + [build-system] + requires = [ +- "flit-core==3.5.0", +- "setuptools_scm==6.4.2", ++ "flit-core~=3.5", ++ "setuptools_scm~=6.4", + "tomli>=2,<3", + ] + build-backend = "flit_scm:buildapi" +-- +GitLab + diff --git a/srcpkgs/python3-flit_scm/template b/srcpkgs/python3-flit_scm/template new file mode 100644 index 000000000000..64049c3d278e --- /dev/null +++ b/srcpkgs/python3-flit_scm/template @@ -0,0 +1,19 @@ +# Template file for 'python3-flit_scm' +pkgname=python3-flit_scm +version=1.5.0 +revision=1 +wrksrc="flit_scm-${version}" +build_style=python3-pep517 +hostmakedepends="python3-flit_core python3-setuptools_scm python3-tomli" +depends="$hostmakedepends" +short_desc="Setuptools_scm to version, flit to build - PEP 518 build backend" +maintainer="Joel Beckmeyer " +license="MIT" +homepage="https://gitlab.com/WillDaSilva/flit_scm" +distfiles="${PYPI_SITE}/f/flit_scm/flit_scm-${version}.tar.gz" +checksum=fd0c704375b4424152caced0584cebe4131ccdc236a239dd1a055a80ee935f70 +make_check=no # no tests specified + +post_install() { + vlicense LICENSE +} From 7719290c014015ae9e1f9fbff72d30c0e141ba0f Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 11:23:14 -0400 Subject: [PATCH 04/11] New package: python3-exceptiongroup-1.0.0rc7 --- srcpkgs/python3-exceptiongroup/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-exceptiongroup/template diff --git a/srcpkgs/python3-exceptiongroup/template b/srcpkgs/python3-exceptiongroup/template new file mode 100644 index 000000000000..c45d77549236 --- /dev/null +++ b/srcpkgs/python3-exceptiongroup/template @@ -0,0 +1,19 @@ +# Template file for 'python3-exceptiongroup' +pkgname=python3-exceptiongroup +version=1.0.0rc7 +revision=1 +wrksrc="exceptiongroup-${version}" +build_style=python3-pep517 +hostmakedepends="python3-flit_scm" +short_desc="Backport of PEP 654 (exception groups)" +maintainer="Joel Beckmeyer " +license="MIT,PSF-2.0" +homepage="https://github.com/agronholm/exceptiongroup" +changelog="https://raw.githubusercontent.com/agronholm/exceptiongroup/main/CHANGES.rst" +distfiles="${PYPI_SITE}/e/exceptiongroup/exceptiongroup-${version}.tar.gz" +checksum=2019e6e9d6ef84ff65c5c7c451b75802c662d53bcb124abf47ad118d39f9a1ca +make_check=no # no tests included + +post_install() { + vlicense LICENSE +} From 87f214fd315edf19f456622b2d639e74c01eabe9 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 09:55:02 -0400 Subject: [PATCH 05/11] New package: python3-generic-1.1.0 --- srcpkgs/python3-generic/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/python3-generic/template diff --git a/srcpkgs/python3-generic/template b/srcpkgs/python3-generic/template new file mode 100644 index 000000000000..a5bc6b73d197 --- /dev/null +++ b/srcpkgs/python3-generic/template @@ -0,0 +1,19 @@ +# Template file for 'python3-generic' +pkgname=python3-generic +version=1.1.0 +revision=1 +wrksrc="generic-${version}" +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" +depends="python3-exceptiongroup" +checkdepends="python3-pytest $depends" +short_desc="Generic programming library for Python" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause-Modification" +homepage="https://generic.readthedocs.io" +distfiles="https://github.com/gaphor/generic/archive/${version}.tar.gz" +checksum=8628d1bce4044e7664c149f785d7ad17a388e96c648ee09aef39d73578d52943 + +post_install() { + vlicense LICENSE.txt +} From aef9d8f77b73d608868da6c645b97d5f67041cdf Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 11:42:45 -0400 Subject: [PATCH 06/11] New package: python3-tinycss2-1.1.1 --- srcpkgs/python3-tinycss2/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/python3-tinycss2/template diff --git a/srcpkgs/python3-tinycss2/template b/srcpkgs/python3-tinycss2/template new file mode 100644 index 000000000000..b9e72e405974 --- /dev/null +++ b/srcpkgs/python3-tinycss2/template @@ -0,0 +1,23 @@ +# Template file for 'python3-tinycss2' +pkgname=python3-tinycss2 +version=1.1.1 +revision=1 +wrksrc=tinycss2-${version} +build_style=python3-pep517 +hostmakedepends="python3-flit_core python3-webencodings" +depends="python3-webencodings" +checkdepends="python3-pytest" +short_desc="Tiny CSS parser" +maintainer="Joel Beckmeyer " +license="BSD-3-Clause" +homepage="https://www.courtbouillon.org/tinycss2" +distfiles="${PYPI_SITE}/t/tinycss2/tinycss2-${version}.tar.gz" +checksum=b2e44dd8883c360c35dd0d1b5aad0b610e5156c2cb3b33434634e539ead9d8bf + +pre_check() { + vsed -e '/addopts/d' -i pyproject.toml +} + +post_install() { + vlicense LICENSE +} From be26f887f8e338056df271d0fd130b9a05208235 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 12:52:48 -0400 Subject: [PATCH 07/11] New package: python3-xdoctest-1.0.0 --- srcpkgs/python3-xdoctest/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-xdoctest/template diff --git a/srcpkgs/python3-xdoctest/template b/srcpkgs/python3-xdoctest/template new file mode 100644 index 000000000000..ac7d1445b08d --- /dev/null +++ b/srcpkgs/python3-xdoctest/template @@ -0,0 +1,16 @@ +# Template file for 'python3-xdoctest' +pkgname=python3-xdoctest +version=1.0.0 +revision=1 +wrksrc="xdoctest-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-six" +checkdepends="python3-pytest $depends" +short_desc="Doctest with AST instead of REGEX (with pytest plugin integration)" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://github.com/Erotemic/xdoctest" +distfiles="https://github.com/gaphor/xdoctest/archive/${version}.tar.gz" +distfiles="${PYPI_SITE}/x/xdoctest/xdoctest-${version}.tar.gz" +checksum=7ebba7e71457e6e7cf86c463699575e52b1c9cc32ee2ee5e72256d6cd3aaeb2d From a76987dc8b472905677fa1d98d2630071deb0980 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 23 May 2022 10:39:17 -0400 Subject: [PATCH 08/11] New package: gaphor-2.10.0 --- srcpkgs/gaphor/template | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/gaphor/template diff --git a/srcpkgs/gaphor/template b/srcpkgs/gaphor/template new file mode 100644 index 000000000000..6f14aa39aa6e --- /dev/null +++ b/srcpkgs/gaphor/template @@ -0,0 +1,22 @@ +# Template file for 'gaphor' +pkgname=gaphor +version=2.10.0 +revision=1 +wrksrc="gaphor-${version}" +build_style=python3-pep517 +hostmakedepends="python3-poetry-core" +depends="python3-cairo python3-gobject python3-gaphas python3-generic + python3-tinycss2 python3-jedi python3-darkdetect" +checkdepends="python3-pytest python3-pytest-timeout python3-hypothesis xvfb-run + gtksourceview4 python3-Sphinx $depends" +short_desc="Simple modeling tool written in Python" +maintainer="Joel Beckmeyer " +license="Apache-2.0" +homepage="https://gaphor.org" +distfiles="https://github.com/gaphor/gaphor/archive/${version}.tar.gz" +checksum=cb2255f9fb31e367999a9e07d6ac814551f34c6d2fb3ffcce5aa5764bc2ffe7f +make_check_pre="xvfb-run" + +pre_check() { + vsed -e '/addopts/d' -i pyproject.toml +} From 7db1146cac880214c346041fec430ab171d0ecaf Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 23 May 2022 09:42:51 -0500 Subject: [PATCH 09/11] python3-httpcore: update to 0.15.0. --- srcpkgs/python3-httpcore/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template index 99d7b420fe7c..5491bf7c0cd0 100644 --- a/srcpkgs/python3-httpcore/template +++ b/srcpkgs/python3-httpcore/template @@ -1,6 +1,6 @@ # Template file for 'python3-httpcore' pkgname=python3-httpcore -version=0.14.7 +version=0.15.0 revision=1 wrksrc="httpcore-$version" build_style=python3-module @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://www.encode.io/httpcore/" changelog="https://raw.githubusercontent.com/encode/httpcore/master/CHANGELOG.md" distfiles="https://github.com/encode/httpcore/archive/refs/tags/$version.tar.gz" -checksum=7f5736b3d1a2382d3b137c8f77d19229f3742789447ef1c1a55bb95918c02277 +checksum=e5458b6342fb6a0cdd58b86c1336516b90ad8879dedc24a9667f9fdf7b4081ea make_check=no # at least trustme python module is not packaged post_install() { From 8ad68450189b94a720835f694bb422113e67717b Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sat, 26 Mar 2022 20:55:52 -0400 Subject: [PATCH 10/11] New package: vaultwarden-web-2.28.1 --- srcpkgs/vaultwarden-web/patches/v2.28.0.patch | 271 ++++++++++++++++++ srcpkgs/vaultwarden-web/template | 34 +++ 2 files changed, 305 insertions(+) create mode 100644 srcpkgs/vaultwarden-web/patches/v2.28.0.patch create mode 100644 srcpkgs/vaultwarden-web/template diff --git a/srcpkgs/vaultwarden-web/patches/v2.28.0.patch b/srcpkgs/vaultwarden-web/patches/v2.28.0.patch new file mode 100644 index 000000000000..77ae1affb2b4 --- /dev/null +++ b/srcpkgs/vaultwarden-web/patches/v2.28.0.patch @@ -0,0 +1,271 @@ +Submodule jslib contains modified content +diff --git a/jslib/angular/src/components/register.component.ts b/jslib/angular/src/components/register.component.ts +index d4b99e17..c1626200 100644 +--- a/jslib/angular/src/components/register.component.ts ++++ b/jslib/angular/src/components/register.component.ts +@@ -28,7 +28,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + formPromise: Promise; + masterPasswordScore: number; + referenceData: ReferenceEventRequest; +- showTerms = true; ++ showTerms = false; + acceptPolicies = false; + + protected successRoute = "login"; +@@ -47,7 +47,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + protected logService: LogService + ) { + super(environmentService, i18nService, platformUtilsService); +- this.showTerms = !platformUtilsService.isSelfHost(); ++ this.showTerms = false; + } + + async ngOnInit() { +@@ -85,6 +85,15 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + } + + async submit() { ++ if (typeof crypto.subtle === 'undefined') { ++ this.platformUtilsService.showToast( ++ "error", ++ "This browser requires HTTPS to use the web vault", ++ "Check the Vaultwarden wiki for details on how to enable it" ++ ); ++ return; ++ } ++ + if (!this.acceptPolicies && this.showTerms) { + this.platformUtilsService.showToast( + "error", +diff --git a/src/404.html b/src/404.html +index 6cf5e363..54d11495 100644 +--- a/src/404.html ++++ b/src/404.html +@@ -42,11 +42,10 @@ + +

+

+- You can return to the web vault, check our +- status page or +- contact us. ++ You can return to the web vault, or ++ contact us. +

+ +-
© Copyright 2022 Bitwarden, Inc.
++
© Copyright 2022 Bitwarden, Inc. (Powered by Vaultwarden)
+ + +diff --git a/src/app/app.component.ts b/src/app/app.component.ts +index cd94408f..56bc4bdb 100644 +--- a/src/app/app.component.ts ++++ b/src/app/app.component.ts +@@ -159,6 +159,10 @@ export class AppComponent implements OnDestroy, OnInit { + break; + } + case "showToast": ++ if (typeof message.text === "string" && typeof crypto.subtle === 'undefined') { ++ message.title="This browser requires HTTPS to use the web vault"; ++ message.text="Check the Vaultwarden wiki for details on how to enable it"; ++ } + this.showToast(message); + break; + case "setFullWidth": +diff --git a/src/app/layouts/footer.component.html b/src/app/layouts/footer.component.html +index 8601e123..22a0248b 100644 +--- a/src/app/layouts/footer.component.html ++++ b/src/app/layouts/footer.component.html +@@ -1,6 +1,6 @@ +
+
+-
© {{ year }}, Bitwarden Inc.
++
© {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
+
+
+ {{ "versionNumber" | i18n: version }} +diff --git a/src/app/layouts/frontend-layout.component.html b/src/app/layouts/frontend-layout.component.html +index 479302d3..84930683 100644 +--- a/src/app/layouts/frontend-layout.component.html ++++ b/src/app/layouts/frontend-layout.component.html +@@ -1,5 +1,5 @@ + +
+- © {{ year }}, Bitwarden Inc.
++ © {{ year }}, Bitwarden Inc. (Powered by Vaultwarden)
+ {{ "versionNumber" | i18n: version }} +
+diff --git a/src/app/layouts/navbar.component.html b/src/app/layouts/navbar.component.html +index c03c2bdf..a074e0c2 100644 +--- a/src/app/layouts/navbar.component.html ++++ b/src/app/layouts/navbar.component.html +@@ -65,7 +65,7 @@ + + +diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts +index ea7d683e..2b534e05 100644 +--- a/src/app/organizations/vault/vault.component.ts ++++ b/src/app/organizations/vault/vault.component.ts +@@ -68,11 +68,7 @@ export class VaultComponent implements OnInit, OnDestroy { + ) {} + + ngOnInit() { +- this.trashCleanupWarning = this.i18nService.t( +- this.platformUtilsService.isSelfHost() +- ? "trashCleanupWarningSelfHosted" +- : "trashCleanupWarning" +- ); ++ this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); + this.route.parent.params.pipe(first()).subscribe(async (params) => { + this.organization = await this.organizationService.get(params.organizationId); + this.groupingsComponent.organization = this.organization; +diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html +index 19bc107b..7e1dbcc7 100644 +--- a/src/app/send/access.component.html ++++ b/src/app/send/access.component.html +@@ -137,15 +137,6 @@ +
+

+ {{ "sendAccessTaglineProductDesc" | i18n }}
+- {{ "sendAccessTaglineLearnMore" | i18n }} +- Bitwarden Send +- {{ "sendAccessTaglineOr" | i18n }} +- {{ +- "sendAccessTaglineSignUp" | i18n +- }} +- {{ "sendAccessTaglineTryToday" | i18n }} +

+
+
+diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts +index c8e95320..88f5240c 100644 +--- a/src/app/services/services.module.ts ++++ b/src/app/services/services.module.ts +@@ -65,11 +65,23 @@ export function initFactory( + platformUtilsService: PlatformUtilsServiceAbstraction, + cryptoService: CryptoServiceAbstraction + ): () => void { ++ function getBaseUrl() { ++ // If the base URL is `https://vaultwarden.example.com/base/path/`, ++ // `window.location.href` should have one of the following forms: ++ // ++ // - `https://vaultwarden.example.com/base/path/` ++ // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]` ++ // ++ // We want to get to just `https://vaultwarden.example.com/base/path`. ++ let baseUrl = window.location.href; ++ baseUrl = baseUrl.replace(/#.*/, ''); // Strip off `#` and everything after. ++ baseUrl = baseUrl.replace(/\/+$/, ''); // Trim any trailing `/` chars. ++ return baseUrl; ++ } + return async () => { + await stateService.init(); + +- const urls = process.env.URLS as Urls; +- urls.base ??= window.location.origin; ++ const urls = {base: getBaseUrl()}; + environmentService.setUrls(urls); + + setTimeout(() => notificationsService.init(), 3000); +diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts +index c3730bfa..3fab9245 100644 +--- a/src/app/vault/vault.component.ts ++++ b/src/app/vault/vault.component.ts +@@ -91,11 +91,7 @@ export class VaultComponent implements OnInit, OnDestroy { + async ngOnInit() { + this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); + this.showBrowserOutdated = window.navigator.userAgent.indexOf("MSIE") !== -1; +- this.trashCleanupWarning = this.i18nService.t( +- this.platformUtilsService.isSelfHost() +- ? "trashCleanupWarningSelfHosted" +- : "trashCleanupWarning" +- ); ++ this.trashCleanupWarning = this.i18nService.t('trashCleanupWarningSelfHosted'); + + this.route.queryParams.pipe(first()).subscribe(async (params) => { + await this.syncService.fullSync(false); +diff --git a/src/scss/styles.scss b/src/scss/styles.scss +index d2678ac8..fb467a7e 100644 +--- a/src/scss/styles.scss ++++ b/src/scss/styles.scss +@@ -56,3 +56,55 @@ + @import "./plugins"; + @import "./tables"; + @import "./toasts"; ++ ++ ++/**** START Vaultwarden CHANGES ****/ ++/* This combines all selectors extending it into one */ ++%vw-hide { display: none !important; } ++ ++/* This allows searching for the combined style in the browsers dev-tools (look into the head tag) */ ++#vw-hide, head { @extend %vw-hide; } ++ ++/* Hide any link pointing to billing */ ++a[href$="/settings/billing"] { @extend %vw-hide; } ++ ++/* Hide any link pointing to subscriptions */ ++a[href$="/settings/subscription"] { @extend %vw-hide; } ++ ++/* Hide any link pointing to Sponsored Families */ ++a[href$="/settings/sponsored-families"] { @extend %vw-hide; } ++ ++/* Hide the `Enterprise Single Sign-On` button on the login page */ ++a[href$="/sso"] { @extend %vw-hide; } ++ ++/* Hide the info box that advertises Bitwarden Send */ ++app-send-info.d-block { @extend %vw-hide; } ++ ++/* Hide Two-Factor menu in Organization settings */ ++app-org-settings a[href$="/settings/two-factor"] { @extend %vw-hide; } ++ ++/* Hide organization plans */ ++app-organization-plans > form > div.form-check { @extend %vw-hide; } ++app-organization-plans > form > h2.mt-5 { @extend %vw-hide; } ++ ++/* Hide the `This account is owned by a business` checkbox and label */ ++#ownedBusiness, label[for^=ownedBusiness] { @extend %vw-hide; } ++ ++/* Hide External Id field for Collections */ ++app-collection-add-edit form div.form-group:nth-child(2) { @extend %vw-hide; } ++ ++/* Hide the radio button and label for the `Custom` org user type */ ++#userTypeCustom, label[for^=userTypeCustom] { @extend %vw-hide; } ++ ++/* Hide the warning that policy config is moving to Business Portal */ ++app-org-policies > app-callout { @extend %vw-hide; } ++ ++/* Hide Business Name and Identifier */ ++app-org-account form div.form-group:nth-child(3) { display: none; } ++app-org-account form div.form-group:nth-child(4) { display: none; } ++ ++/* Hide Tax Info and Form in Organization settings */ ++app-org-account > div.secondary-header:nth-child(3) { @extend %vw-hide; } ++app-org-account > div.secondary-header:nth-child(3) + p { @extend %vw-hide; } ++app-org-account > div.secondary-header:nth-child(3) + p + form { @extend %vw-hide; } ++/**** END Vaultwarden CHANGES ****/ +diff --git a/src/services/webPlatformUtils.service.ts b/src/services/webPlatformUtils.service.ts +index 0c9b56fa..297d4bc5 100644 +--- a/src/services/webPlatformUtils.service.ts ++++ b/src/services/webPlatformUtils.service.ts +@@ -238,11 +238,11 @@ export class WebPlatformUtilsService implements PlatformUtilsService { + } + + isDev(): boolean { +- return process.env.NODE_ENV === "development"; ++ return false; + } + + isSelfHost(): boolean { +- return process.env.ENV.toString() === "selfhosted"; ++ return false; + } + + copyToClipboard(text: string, options?: any): void | boolean { diff --git a/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template new file mode 100644 index 000000000000..3f825f076fcb --- /dev/null +++ b/srcpkgs/vaultwarden-web/template @@ -0,0 +1,34 @@ +# Template file for 'vaultwarden-web' +pkgname=vaultwarden-web +version=2.28.1 +revision=1 +wrksrc="web-${version}" +_jslib_commit=e595c0548ed1a481dbd024ec66975e3a453bd471 +hostmakedepends="git nodejs" +short_desc="Web vault builds for vaultwarden" +maintainer="Joel Beckmeyer " +license="GPL-3.0-or-later" +homepage="https://github.com/dani-garcia/bw_web_builds" +distfiles="https://github.com/bitwarden/web/archive/v${version}.tar.gz + https://github.com/bitwarden/jslib/archive/${_jslib_commit}.tar.gz" +checksum="143a32842219e3a25f9a91cc29c4595a177e4a7915938938f3d4c2776b19bb0e + 604a3696fccf315fedeeda2a2547eee88f74b8067ba21ed58717173820719f62" + +post_extract() { + pwd + rmdir jslib + mv ../jslib-* jslib +} + +do_configure() { + npm ci --ignore-scripts +} + +do_build() { + npm run dist:oss:selfhost +} + +do_install() { + vmkdir usr/share/webapps/vaultwarden-web + vcopy build/* usr/share/webapps/vaultwarden-web +} From e3be989dff0892efe86a2644c44653b19465b026 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 17 Feb 2022 13:25:21 -0500 Subject: [PATCH 11/11] New package: vaultwarden-1.25.0 --- srcpkgs/vaultwarden/files/vaultwarden/log/run | 1 + srcpkgs/vaultwarden/files/vaultwarden/run | 6 ++ srcpkgs/vaultwarden/patches/Cargo.toml.patch | 25 ++++++ srcpkgs/vaultwarden/patches/config.patch | 41 +++++++++ .../dashmap_available_parallelism.patch | 31 +++++++ .../vaultwarden/patches/format_strings.patch | 89 +++++++++++++++++++ srcpkgs/vaultwarden/template | 33 +++++++ 7 files changed, 226 insertions(+) create mode 120000 srcpkgs/vaultwarden/files/vaultwarden/log/run create mode 100644 srcpkgs/vaultwarden/files/vaultwarden/run create mode 100644 srcpkgs/vaultwarden/patches/Cargo.toml.patch create mode 100644 srcpkgs/vaultwarden/patches/config.patch create mode 100644 srcpkgs/vaultwarden/patches/dashmap_available_parallelism.patch create mode 100644 srcpkgs/vaultwarden/patches/format_strings.patch create mode 100644 srcpkgs/vaultwarden/template diff --git a/srcpkgs/vaultwarden/files/vaultwarden/log/run b/srcpkgs/vaultwarden/files/vaultwarden/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/vaultwarden/files/vaultwarden/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/vaultwarden/files/vaultwarden/run b/srcpkgs/vaultwarden/files/vaultwarden/run new file mode 100644 index 000000000000..ff5d0c6af46d --- /dev/null +++ b/srcpkgs/vaultwarden/files/vaultwarden/run @@ -0,0 +1,6 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +ENV_FILE=${ENV_FILE:-/etc/vaultwarden.conf} +export ENV_FILE + +exec chpst -u _vaultwarden:_vaultwarden vaultwarden diff --git a/srcpkgs/vaultwarden/patches/Cargo.toml.patch b/srcpkgs/vaultwarden/patches/Cargo.toml.patch new file mode 100644 index 000000000000..bdd64d443e21 --- /dev/null +++ b/srcpkgs/vaultwarden/patches/Cargo.toml.patch @@ -0,0 +1,25 @@ +diff --git a/Cargo.toml b/Cargo.toml +index e9dc2aa..e3736f2 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -3,7 +3,7 @@ name = "vaultwarden" + version = "1.0.0" + authors = ["Daniel García "] + edition = "2021" +-rust-version = "1.60" ++rust-version = "1.57" + resolver = "2" + + repository = "https://github.com/dani-garcia/vaultwarden" +@@ -154,10 +154,10 @@ mimalloc = { version = "0.1.29", features = ["secure"], default-features = false + # that wasn't previously supported (https://github.com/zslayton/cron/pull/64). + # 2022-05-04: Forked/Updated the job_scheduler again use the latest dependencies and some fixes. + job_scheduler = { git = 'https://github.com/BlackDex/job_scheduler', rev = '9100fc596a083fd9c0b560f8f11f108e0a19d07e' } ++dashmap = { path = './dashmap' } + + # Strip debuginfo from the release builds + # Also enable thin LTO for some optimizations + [profile.release] +-strip = "debuginfo" + lto = "thin" + patch.crates-io.dashmap = { path = './dashmap' } diff --git a/srcpkgs/vaultwarden/patches/config.patch b/srcpkgs/vaultwarden/patches/config.patch new file mode 100644 index 000000000000..c71af0eb1b12 --- /dev/null +++ b/srcpkgs/vaultwarden/patches/config.patch @@ -0,0 +1,41 @@ +diff --git a/.env.template b/.env.template +index 6af6b53..18b7f98 100644 +--- a/.env.template ++++ b/.env.template +@@ -5,7 +5,7 @@ + ## in the admin interface. Those overrides are stored within DATA_FOLDER/config.json . + + ## Main data folder +-# DATA_FOLDER=data ++DATA_FOLDER=/var/lib/vaultwarden + + ## Database URL + ## When using SQLite, this is the path to the DB file, default to %DATA_FOLDER%/db.sqlite3 +@@ -46,8 +46,8 @@ + # ICON_CACHE_NEGTTL=259200 + + ## Web vault settings +-# WEB_VAULT_FOLDER=web-vault/ +-# WEB_VAULT_ENABLED=true ++# WEB_VAULT_FOLDER=/usr/share/webapps/vaultwarden-web ++WEB_VAULT_ENABLED=false + + ## Enables websocket notifications + # WEBSOCKET_ENABLED=false +@@ -103,7 +103,7 @@ + + ## Logging to file + ## It's recommended to also set 'ROCKET_CLI_COLORS=off' +-# LOG_FILE=/path/to/log ++# LOG_FILE=/var/log/vaultwarden.log + + ## Logging to Syslog + ## This requires extended logging +@@ -291,6 +291,7 @@ + # ROCKET_PORT=80 # Defaults to 80 in the Docker images, or 8000 otherwise. + # ROCKET_WORKERS=10 + # ROCKET_TLS={certs="/path/to/certs.pem",key="/path/to/key.pem"} ++ROCKET_LIMITS={json=10485760} + + ## Mail specific settings, set SMTP_HOST and SMTP_FROM to enable the mail service. + ## To make sure the email links are pointing to the correct host, set the DOMAIN variable. diff --git a/srcpkgs/vaultwarden/patches/dashmap_available_parallelism.patch b/srcpkgs/vaultwarden/patches/dashmap_available_parallelism.patch new file mode 100644 index 000000000000..8601dac8b4ea --- /dev/null +++ b/srcpkgs/vaultwarden/patches/dashmap_available_parallelism.patch @@ -0,0 +1,31 @@ +commit 1008b24de43aabaaa87d35171d588d09aba0865d +Author: Joel Beckmeyer +Date: Mon May 23 13:04:15 2022 -0400 + + Use `num_cpus` in place of `std::thread::available_parallelism` + +diff --git a/dashmap/Cargo.toml b/dashmap/Cargo.toml +index 5786133..bc1f076 100644 +--- a/dashmap/Cargo.toml ++++ b/dashmap/Cargo.toml +@@ -16,6 +16,7 @@ categories = ["concurrency", "algorithms", "data-structures"] + raw-api = [] + + [dependencies] ++num_cpus = "1.13.1" + lock_api = "0.4.7" + hashbrown = { version = "0.12.0", default-features = false } + serde = { version = "1.0.136", optional = true, features = ["derive"] } +diff --git a/dashmap/src/lib.rs b/src/lib.rs +index 627b513..4b8875a 100644 +--- a/dashmap/src/lib.rs ++++ b/src/lib.rs +@@ -52,7 +52,7 @@ cfg_if! { + pub(crate) type HashMap = hashbrown::HashMap, S>; + + fn default_shard_amount() -> usize { +- (std::thread::available_parallelism().map_or(1, usize::from) * 4).next_power_of_two() ++ (num_cpus::get() * 4).next_power_of_two() + } + + fn ncb(shard_amount: usize) -> usize { diff --git a/srcpkgs/vaultwarden/patches/format_strings.patch b/srcpkgs/vaultwarden/patches/format_strings.patch new file mode 100644 index 000000000000..a20ab1ca812b --- /dev/null +++ b/srcpkgs/vaultwarden/patches/format_strings.patch @@ -0,0 +1,89 @@ +diff --git a/src/api/icons.rs b/src/api/icons.rs +index 71c4899..75e45ee 100644 +--- a/src/api/icons.rs ++++ b/src/api/icons.rs +@@ -60,7 +60,7 @@ static CLIENT: Lazy = Lazy::new(|| { + match client.build() { + Ok(client) => client, + Err(e) => { +- error!("Possible trust-dns error, trying with trust-dns disabled: '{e}'"); ++ error!("Possible trust-dns error, trying with trust-dns disabled: '{}'", e); + get_reqwest_client_builder() + .cookie_provider(cookie_store) + .timeout(Duration::from_secs(CONFIG.icon_download_timeout())) +@@ -454,7 +454,7 @@ async fn get_favicons_node( + } + } else if tag.name == TAG_BASE && tag.attributes.contains_key(ATTR_HREF) { + let href = std::str::from_utf8(tag.attributes.get(ATTR_HREF).unwrap()).unwrap_or_default(); +- debug!("Found base href: {href}"); ++ debug!("Found base href: {}", href); + base_url = match base_url.join(href) { + Ok(inner_url) => inner_url, + _ => url.clone(), +@@ -503,8 +503,8 @@ struct IconUrlResult { + /// ``` + async fn get_icon_url(domain: &str) -> Result { + // Default URL with secure and insecure schemes +- let ssldomain = format!("https://{domain}"); +- let httpdomain = format!("http://{domain}"); ++ let ssldomain = format!("https://{}", domain); ++ let httpdomain = format!("http://{}", domain); + + // First check the domain as given during the request for both HTTPS and HTTP. + let resp = match get_page(&ssldomain).or_else(|_| get_page(&httpdomain)).await { +@@ -522,20 +522,20 @@ async fn get_icon_url(domain: &str) -> Result { + base = domain_parts.next_back().unwrap() + ); + if is_valid_domain(&base_domain).await { +- let sslbase = format!("https://{base_domain}"); +- let httpbase = format!("http://{base_domain}"); +- debug!("[get_icon_url]: Trying without subdomains '{base_domain}'"); ++ let sslbase = format!("https://{}", base_domain); ++ let httpbase = format!("http://{}", base_domain); ++ debug!("[get_icon_url]: Trying without subdomains '{}'", base_domain); + + sub_resp = get_page(&sslbase).or_else(|_| get_page(&httpbase)).await; + } + + // When the domain is not an IP, and has less then 2 dots, try to add www. infront of it. + } else if is_ip.is_err() && domain.matches('.').count() < 2 { +- let www_domain = format!("www.{domain}"); ++ let www_domain = format!("www.{}", domain); + if is_valid_domain(&www_domain).await { +- let sslwww = format!("https://{www_domain}"); +- let httpwww = format!("http://{www_domain}"); +- debug!("[get_icon_url]: Trying with www. prefix '{www_domain}'"); ++ let sslwww = format!("https://{}", www_domain); ++ let httpwww = format!("http://{}", www_domain); ++ debug!("[get_icon_url]: Trying with www. prefix '{}'", www_domain); + + sub_resp = get_page(&sslwww).or_else(|_| get_page(&httpwww)).await; + } +@@ -567,10 +567,10 @@ async fn get_icon_url(domain: &str) -> Result { + get_favicons_node(dom, &mut iconlist, &url).await; + } else { + // Add the default favicon.ico to the list with just the given domain +- iconlist.push(Icon::new(35, format!("{ssldomain}/favicon.ico"))); +- iconlist.push(Icon::new(40, format!("{ssldomain}/apple-touch-icon.png"))); +- iconlist.push(Icon::new(35, format!("{httpdomain}/favicon.ico"))); +- iconlist.push(Icon::new(40, format!("{httpdomain}/apple-touch-icon.png"))); ++ iconlist.push(Icon::new(35, format!("{}/favicon.ico", ssldomain))); ++ iconlist.push(Icon::new(40, format!("{}/apple-touch-icon.png", ssldomain))); ++ iconlist.push(Icon::new(35, format!("{}/favicon.ico", httpdomain))); ++ iconlist.push(Icon::new(40, format!("{}/apple-touch-icon.png", httpdomain))); + } + + // Sort the iconlist by priority +diff --git a/src/util.rs b/src/util.rs +index de61a35..d8cc111 100644 +--- a/src/util.rs ++++ b/src/util.rs +@@ -619,7 +619,7 @@ pub fn get_reqwest_client() -> Client { + match get_reqwest_client_builder().build() { + Ok(client) => client, + Err(e) => { +- error!("Possible trust-dns error, trying with trust-dns disabled: '{e}'"); ++ error!("Possible trust-dns error, trying with trust-dns disabled: '{}'", e); + get_reqwest_client_builder().trust_dns(false).build().expect("Failed to build client") + } + } diff --git a/srcpkgs/vaultwarden/template b/srcpkgs/vaultwarden/template new file mode 100644 index 000000000000..965cf510465f --- /dev/null +++ b/srcpkgs/vaultwarden/template @@ -0,0 +1,33 @@ +# Template file for 'vaultwarden' +pkgname=vaultwarden +version=1.25.0 +revision=1 +build_style=cargo +configure_args="--features sqlite,mysql,postgresql" +hostmakedepends="pkg-config" +makedepends="openssl-devel libmysqlclient-devel postgresql-libs-devel + sqlite-devel" +short_desc="Unofficial Bitwarden compatible server written in Rust" +maintainer="Joel Beckmeyer " +license="GPL-3.0-or-later" +homepage="https://github.com/dani-garcia/vaultwarden" +# Need to patch dashmap to be 1.57 compatible, can be removed when Rust >=1.59 +# in repo, otherwise bump dashmap version if it changes in Cargo.lock +distfiles="https://github.com/dani-garcia/vaultwarden/archive/${version}.tar.gz + https://github.com/xacrimon/dashmap/archive/v5.3.3.tar.gz>dashmap-${version}.tar.gz" +checksum="5391f60b3afa9b66cad03cc19903ccc5ad229cbfde142041c7f910d60fd2d2cf + 687847d079c6dabac7d6b2bc4954a75278465a3591e5e501d5a0e01b14175e47" + +system_accounts="_vaultwarden" +_vaultwarden_homedir="/var/lib/vaultwarden" + +make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden" + +post_extract() { + mv ../dashmap-* dashmap +} + +post_install() { + vsconf .env.template vaultwarden.conf + vsv vaultwarden +}