From 6fb8c77302499c50e2ab0493370701c405caeee4 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Sat, 26 Mar 2022 20:55:52 -0400 Subject: [PATCH 1/2] New package: vaultwarden-web-2022.6.2 --- .../vaultwarden-web/patches/v2022.6.0.patch | 311 ++++++++++++++++++ srcpkgs/vaultwarden-web/template | 30 ++ srcpkgs/vaultwarden-web/update | 2 + 3 files changed, 343 insertions(+) create mode 100644 srcpkgs/vaultwarden-web/patches/v2022.6.0.patch create mode 100644 srcpkgs/vaultwarden-web/template create mode 100644 srcpkgs/vaultwarden-web/update diff --git a/srcpkgs/vaultwarden-web/patches/v2022.6.0.patch b/srcpkgs/vaultwarden-web/patches/v2022.6.0.patch new file mode 100644 index 000000000000..1466ec8e82ac --- /dev/null +++ b/srcpkgs/vaultwarden-web/patches/v2022.6.0.patch @@ -0,0 +1,311 @@ +diff --git a/apps/web/src/404.html b/apps/web/src/404.html +index 6cf5e363d..54d11495c 100644 +--- a/apps/web/src/404.html ++++ b/apps/web/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/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts +index 6c462a73e..4a9aeb936 100644 +--- a/apps/web/src/app/app.component.ts ++++ b/apps/web/src/app/app.component.ts +@@ -169,6 +169,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/apps/web/src/app/layouts/footer.component.html b/apps/web/src/app/layouts/footer.component.html +index 98836bfd5..a5356be72 100644 +--- a/apps/web/src/app/layouts/footer.component.html ++++ b/apps/web/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/apps/web/src/app/layouts/frontend-layout.component.html b/apps/web/src/app/layouts/frontend-layout.component.html +index d737bc9f0..8db146fe9 100644 +--- a/apps/web/src/app/layouts/frontend-layout.component.html ++++ b/apps/web/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/apps/web/src/app/layouts/navbar.component.html b/apps/web/src/app/layouts/navbar.component.html +index edc5d34d6..f6ae1a323 100644 +--- a/apps/web/src/app/layouts/navbar.component.html ++++ b/apps/web/src/app/layouts/navbar.component.html +@@ -69,7 +69,7 @@ + + {{ "accountSettings" | i18n }} + +- ++ + + {{ "getHelp" | i18n }} + +diff --git a/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts b/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts +index 47a0f433c..5c4de87bf 100644 +--- a/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts ++++ b/apps/web/src/app/modules/vault/modules/individual-vault/individual-vault.component.ts +@@ -94,11 +94,7 @@ export class IndividualVaultComponent 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/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts b/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts +index 451e9ca50..0ce25610e 100644 +--- a/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts ++++ b/apps/web/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts +@@ -81,11 +81,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy { + ) {} + + ngOnInit() { +- this.trashCleanupWarning = this.i18nService.t( +- this.platformUtilsService.isSelfHost() +- ? "trashCleanupWarningSelfHosted" +- : "trashCleanupWarning" +- ); ++ this.trashCleanupWarning = this.i18nService.t("trashCleanupWarningSelfHosted"); + this.route.parent.params.subscribe(async (params: any) => { + this.organization = await this.organizationService.get(params.organizationId); + this.vaultFilterComponent.organization = this.organization; +diff --git a/apps/web/src/app/send/access.component.html b/apps/web/src/app/send/access.component.html +index b58186102..bfcbc352b 100644 +--- a/apps/web/src/app/send/access.component.html ++++ b/apps/web/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/apps/web/src/app/services/init.service.ts b/apps/web/src/app/services/init.service.ts +index eacfea977..c2f810338 100644 +--- a/apps/web/src/app/services/init.service.ts ++++ b/apps/web/src/app/services/init.service.ts +@@ -36,11 +36,23 @@ export class InitService { + ) {} + + init() { ++ 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 this.stateService.init(); + +- const urls = process.env.URLS as Urls; +- urls.base ??= this.win.location.origin; ++ const urls = {base: getBaseUrl()}; + this.environmentService.setUrls(urls); + + setTimeout(() => this.notificationsService.init(), 3000); +diff --git a/apps/web/src/app/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts +index f0559b8dc..b728e3601 100644 +--- a/apps/web/src/app/settings/settings.component.ts ++++ b/apps/web/src/app/settings/settings.component.ts +@@ -55,10 +55,6 @@ export class SettingsComponent implements OnInit, OnDestroy { + this.hasFamilySponsorshipAvailable = await this.organizationService.canManageSponsorships(); + const hasPremiumFromOrg = await this.stateService.getHasPremiumFromOrganization(); + let billing = null; +- if (!this.selfHosted) { +- billing = await this.apiService.getUserBillingHistory(); +- } +- this.hideSubscription = +- !this.premium && hasPremiumFromOrg && (this.selfHosted || billing?.hasNoHistory); ++ this.hideSubscription = true; + } + } +diff --git a/apps/web/src/app/settings/user-billing-history.component.ts b/apps/web/src/app/settings/user-billing-history.component.ts +index ae26862d0..69ff16a07 100644 +--- a/apps/web/src/app/settings/user-billing-history.component.ts ++++ b/apps/web/src/app/settings/user-billing-history.component.ts +@@ -39,7 +39,7 @@ export class UserBillingHistoryComponent implements OnInit { + return; + } + this.loading = true; +- this.billing = await this.apiService.getUserBillingHistory(); ++ this.billing = null; + this.loading = false; + } + +diff --git a/apps/web/src/app/vault/add-edit.component.html b/apps/web/src/app/vault/add-edit.component.html +index 37410ea59..8c9e1a6f4 100644 +--- a/apps/web/src/app/vault/add-edit.component.html ++++ b/apps/web/src/app/vault/add-edit.component.html +@@ -182,7 +182,7 @@ +
+
+ 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/apps/web/src/services/webPlatformUtils.service.ts b/apps/web/src/services/webPlatformUtils.service.ts +index 755600a15..25f4561e1 100644 +--- a/apps/web/src/services/webPlatformUtils.service.ts ++++ b/apps/web/src/services/webPlatformUtils.service.ts +@@ -240,11 +240,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/libs/angular/src/components/register.component.ts b/libs/angular/src/components/register.component.ts +index d4b99e17a..c16262007 100644 +--- a/libs/angular/src/components/register.component.ts ++++ b/libs/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/srcpkgs/vaultwarden-web/template b/srcpkgs/vaultwarden-web/template new file mode 100644 index 000000000000..d3012d8ec418 --- /dev/null +++ b/srcpkgs/vaultwarden-web/template @@ -0,0 +1,30 @@ +# Template file for 'vaultwarden-web' +pkgname=vaultwarden-web +version=2022.6.2 +revision=1 +wrksrc="clients-web-v${version}" +hostmakedepends="git nodejs" +short_desc="Web vault builds for vaultwarden" +maintainer="Joel Beckmeyer " +license="GPL-3.0-or-later" +# patches need to be pulled from +# https://github.com/dani-garcia/bw_web_builds/tree/master/patches into the +# patches directory +homepage="https://github.com/dani-garcia/bw_web_builds" +distfiles="https://github.com/bitwarden/clients/archive/web-v${version}.tar.gz" +checksum=0b1e78787b1336abe4e4cb932927e1c6e7967dde566eee9586bedc7638636358 + +do_configure() { + npm ci --ignore-scripts +} + +do_build() { + cd apps/web + npm run dist:oss:selfhost +} + +do_install() { + cd apps/web + vmkdir usr/share/webapps/vaultwarden-web + vcopy build/* usr/share/webapps/vaultwarden-web +} diff --git a/srcpkgs/vaultwarden-web/update b/srcpkgs/vaultwarden-web/update new file mode 100644 index 000000000000..7d10386dd670 --- /dev/null +++ b/srcpkgs/vaultwarden-web/update @@ -0,0 +1,2 @@ +pkgname=bw_web +site="https://github.com/dani-garcia/bw_web_builds/releases" From 3d5f6277e045663f07ecc6d79e2d053e5b8ea78d Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 17 Feb 2022 13:25:21 -0500 Subject: [PATCH 2/2] New package: vaultwarden-1.25.2 --- srcpkgs/vaultwarden/files/vaultwarden/log/run | 1 + srcpkgs/vaultwarden/files/vaultwarden/run | 6 +++ srcpkgs/vaultwarden/patches/config.patch | 41 +++++++++++++++++++ srcpkgs/vaultwarden/template | 25 +++++++++++ 4 files changed, 73 insertions(+) create mode 120000 srcpkgs/vaultwarden/files/vaultwarden/log/run create mode 100644 srcpkgs/vaultwarden/files/vaultwarden/run create mode 100644 srcpkgs/vaultwarden/patches/config.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/config.patch b/srcpkgs/vaultwarden/patches/config.patch new file mode 100644 index 000000000000..54aa626ad1cf --- /dev/null +++ b/srcpkgs/vaultwarden/patches/config.patch @@ -0,0 +1,41 @@ +diff --git a/.env.template b/.env.template +index 66a0434..cebac33 100644 +--- a/.env.template ++++ b/.env.template +@@ -10,7 +10,7 @@ + ## vaultwarden. + + ## 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 +@@ -61,8 +61,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 +@@ -117,7 +117,7 @@ + # LOG_TIMESTAMP_FORMAT="%Y-%m-%d %H:%M:%S.%3f" + + ## Logging to file +-# LOG_FILE=/path/to/log ++# LOG_FILE=/var/log/vaultwarden.log + + ## Logging to Syslog + ## This requires extended logging +@@ -340,6 +340,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/template b/srcpkgs/vaultwarden/template new file mode 100644 index 000000000000..5d46f1b4f867 --- /dev/null +++ b/srcpkgs/vaultwarden/template @@ -0,0 +1,25 @@ +# Template file for 'vaultwarden' +pkgname=vaultwarden +version=1.25.2 +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" +distfiles="https://github.com/dani-garcia/vaultwarden/archive/${version}.tar.gz" +checksum=f4afc2d8aa7aa59dd1ae16497b6a7f9b412ff426a24868e3081054e611d4824d + +system_accounts="_vaultwarden" +_vaultwarden_homedir="/var/lib/vaultwarden" + +make_dirs="/var/lib/vaultwarden 0750 _vaultwarden _vaultwarden" + +post_install() { + vsconf .env.template vaultwarden.conf + vsv vaultwarden +}