From 656f0f29a8297ce00040f814baf7a2eca393b6be Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 17 Apr 2024 08:16:12 +0200 Subject: [PATCH] update web-vault to v2024.4.1 --- Dockerfile | 4 +- patches/v2024.4.1.patch | 835 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 837 insertions(+), 2 deletions(-) create mode 100644 patches/v2024.4.1.patch diff --git a/Dockerfile b/Dockerfile index 8435a0d..34268ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,8 +26,8 @@ USER node # Can be a tag, release, but prefer a commit hash because it's not changeable # https://github.com/bitwarden/clients/commit/${VAULT_VERSION} # -# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.3.1 -ARG VAULT_VERSION=60e47aff88024ba9aad1a4ed7b63690b968bf7fc +# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.4.1 +ARG VAULT_VERSION=ceffa2064213ce2ffbcbe69853e6285391bfffa0 WORKDIR /vault RUN git -c init.defaultBranch=main init && \ diff --git a/patches/v2024.4.1.patch b/patches/v2024.4.1.patch new file mode 100644 index 0000000..8aaf005 --- /dev/null +++ b/patches/v2024.4.1.patch @@ -0,0 +1,835 @@ +diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html +index 6029cfd833..04324b7d19 100644 +--- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html ++++ b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html +@@ -12,7 +12,7 @@ + + + +- {{ "billingEmail" | i18n }} ++ {{ "email" | i18n }} + + + +diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts +index b1a84c22f3..b52f4c7cb2 100644 +--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts ++++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts +@@ -121,6 +121,7 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy { + } + + canShowBillingTab(organization: Organization): boolean { ++ return false; // disable billing tab in Vaultwarden + return canAccessBillingTab(organization); + } + +diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts +index 7abee6b0d0..2e3b789b23 100644 +--- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts ++++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts +@@ -68,13 +68,6 @@ const routes: Routes = [ + (m) => m.OrganizationReportingModule, + ), + }, +- { +- path: "billing", +- loadChildren: () => +- import("../../billing/organizations/organization-billing.module").then( +- (m) => m.OrganizationBillingModule, +- ), +- }, + ], + }, + ]; +diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html +index 7035b976ca..44b24584ae 100644 +--- a/apps/web/src/app/admin-console/organizations/settings/account.component.html ++++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html +@@ -17,7 +17,7 @@ + + + +- {{ "billingEmail" | i18n }} ++ {{ "email" | i18n }} + + + +diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts +index b218e680e3..07e5dc36c3 100644 +--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts ++++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts +@@ -99,7 +99,7 @@ export class AccountComponent { + ) {} + + async ngOnInit() { +- this.selfHosted = this.platformUtilsService.isSelfHost(); ++ this.selfHosted = false; // set to false so we can rename organizations + + this.route.params + .pipe( +@@ -204,6 +204,7 @@ export class AccountComponent { + } + + submitCollectionManagement = async () => { ++ return; // flexible collections are not supported by Vaultwarden + // Early exit if self-hosted + if (this.selfHosted) { + return; +diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts +index 628875f04a..e0247b16aa 100644 +--- a/apps/web/src/app/app.component.ts ++++ b/apps/web/src/app/app.component.ts +@@ -4,7 +4,7 @@ import { DomSanitizer } from "@angular/platform-browser"; + import { NavigationEnd, Router } from "@angular/router"; + import * as jq from "jquery"; + import { IndividualConfig, ToastrService } from "ngx-toastr"; +-import { Subject, switchMap, takeUntil, timer } from "rxjs"; ++import { Subject, takeUntil } from "rxjs"; + + import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; + import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; +@@ -14,7 +14,6 @@ import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin- + import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; + import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; + import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +-import { PaymentMethodWarningsServiceAbstraction as PaymentMethodWarningService } from "@bitwarden/common/billing/abstractions/payment-method-warnings-service.abstraction"; + import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; + import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; + import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +@@ -46,7 +45,6 @@ import { + + const BroadcasterSubscriptionId = "AppComponent"; + const IdleTimeout = 60000 * 10; // 10 minutes +-const PaymentMethodWarningsRefresh = 60000; // 1 Minute + + @Component({ + selector: "app-root", +@@ -57,7 +55,6 @@ export class AppComponent implements OnDestroy, OnInit { + private idleTimer: number = null; + private isIdle = false; + private destroy$ = new Subject(); +- private paymentMethodWarningsRefresh$ = timer(0, PaymentMethodWarningsRefresh); + + constructor( + @Inject(DOCUMENT) private document: Document, +@@ -87,7 +84,6 @@ export class AppComponent implements OnDestroy, OnInit { + private dialogService: DialogService, + private biometricStateService: BiometricStateService, + private stateEventRunnerService: StateEventRunnerService, +- private paymentMethodWarningService: PaymentMethodWarningService, + private organizationService: InternalOrganizationServiceAbstraction, + ) {} + +@@ -209,6 +205,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 "convertAccountToKeyConnector": +@@ -242,21 +242,6 @@ export class AppComponent implements OnDestroy, OnInit { + new DisableSendPolicy(), + new SendOptionsPolicy(), + ]); +- +- this.paymentMethodWarningsRefresh$ +- .pipe( +- switchMap(() => this.organizationService.memberOrganizations$), +- switchMap( +- async (organizations) => +- await Promise.all( +- organizations.map((organization) => +- this.paymentMethodWarningService.update(organization.id), +- ), +- ), +- ), +- takeUntil(this.destroy$), +- ) +- .subscribe(); + } + + ngOnDestroy() { +@@ -276,7 +261,6 @@ export class AppComponent implements OnDestroy, OnInit { + this.collectionService.clear(userId), + this.passwordGenerationService.clear(), + this.biometricStateService.logout(userId as UserId), +- this.paymentMethodWarningService.clear(), + ]); + + await this.stateEventRunnerService.handleEvent("logout", userId as UserId); +diff --git a/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.html b/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.html +index 4690a4e63a..9d297671d2 100644 +--- a/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.html ++++ b/apps/web/src/app/auth/emergency-access/accept/accept-emergency.component.html +@@ -1,6 +1,6 @@ +
+
+- ++ +

+

+ {{ "loading" | i18n }} + +- ++ +

{{ "uploadLicenseFileOrg" | i18n }}

+
+
+@@ -28,7 +28,7 @@ + (ngSubmit)="submit()" + [appApiAction]="formPromise" + ngNativeValidate +- *ngIf="!loading && !selfHosted && this.passwordManagerPlans && this.secretsManagerPlans" ++ *ngIf="!loading" + class="tw-pt-6" + > + !!plan.PasswordManager); +@@ -190,6 +191,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + this.plan = providerDefaultPlan.type; + this.product = providerDefaultPlan.product; + } ++ end of asking /api/plans in Vaultwarden */ + + if (!this.createOrganization) { + this.upgradeFlowPrefillForm(); +@@ -261,6 +263,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + } + + get selectableProducts() { ++ return null; // there are no products to select in Vaultwarden + if (this.acceptingSponsorship) { + const familyPlan = this.passwordManagerPlans.find( + (plan) => plan.type === PlanType.FamiliesAnnually, +@@ -291,6 +294,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + } + + get selectablePlans() { ++ return null; // no plans to select in Vaultwarden + const selectedProductType = this.formGroup.controls.product.value; + const result = + this.passwordManagerPlans?.filter( +@@ -431,10 +435,12 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + } + + get planOffersSecretsManager() { ++ return false; // no support for secrets manager in Vaultwarden + return this.selectedSecretsManagerPlan != null; + } + + changedProduct() { ++ return; // no choice of products in Vaultwarden + const selectedPlan = this.selectablePlans[0]; + + this.setPlanType(selectedPlan.type); +@@ -547,7 +553,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + const orgKeys = await this.cryptoService.makeKeyPair(orgKey[1]); + + if (this.selfHosted) { +- orgId = await this.createSelfHosted(key, collectionCt, orgKeys); ++ orgId = await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]); + } else { + orgId = await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]); + } +@@ -648,7 +654,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + request.billingEmail = this.formGroup.controls.billingEmail.value; + request.initiationPath = "New organization creation in-product"; + request.keys = new OrganizationKeysRequest(orgKeys[0], orgKeys[1].encryptedString); ++ request.planType = PlanType.Free; // always select the free plan in Vaultwarden + ++ /* there is no plan to select in Vaultwarden + if (this.selectedPlan.type === PlanType.Free) { + request.planType = PlanType.Free; + } else { +@@ -678,6 +686,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + + // Secrets Manager + this.buildSecretsManagerRequest(request); ++ end plan selection and no support for secret manager in Vaultwarden */ + + if (this.hasProvider) { + const providerRequest = new ProviderOrganizationCreateRequest( +@@ -759,6 +768,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + } + + private upgradeFlowPrefillForm() { ++ return; // Vaultwarden only supports free plan + if (this.acceptingSponsorship) { + this.formGroup.controls.product.setValue(ProductType.Families); + this.changedProduct(); +diff --git a/apps/web/src/app/core/router.service.ts b/apps/web/src/app/core/router.service.ts +index caebb22733..b64392a944 100644 +--- a/apps/web/src/app/core/router.service.ts ++++ b/apps/web/src/app/core/router.service.ts +@@ -45,7 +45,7 @@ export class RouterService { + .subscribe((event: NavigationEnd) => { + this.currentUrl = event.url; + +- let title = i18nService.t("bitWebVault"); ++ let title = "Vaultwarden Web"; + + if (this.currentUrl.includes("/sm/")) { + title = i18nService.t("bitSecretsManager"); +diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts +index 02c7c29e34..9fd100024a 100644 +--- a/apps/web/src/app/core/web-platform-utils.service.ts ++++ b/apps/web/src/app/core/web-platform-utils.service.ts +@@ -133,14 +133,17 @@ export class WebPlatformUtilsService implements PlatformUtilsService { + } + + isDev(): boolean { ++ return false; // treat Vaultwarden as production ready + return process.env.NODE_ENV === "development"; + } + + isSelfHost(): boolean { ++ return true; // treat Vaultwarden as self hosted + return WebPlatformUtilsService.isSelfHost(); + } + + static isSelfHost(): boolean { ++ return true; // treat Vaultwarden as self hosted + return process.env.ENV.toString() === "selfhosted"; + } + +diff --git a/apps/web/src/app/layouts/frontend-layout.component.html b/apps/web/src/app/layouts/frontend-layout.component.html +index 72f0f1f1da..cea0867131 100644 +--- a/apps/web/src/app/layouts/frontend-layout.component.html ++++ b/apps/web/src/app/layouts/frontend-layout.component.html +@@ -1,6 +1,11 @@ + +
+- +- © {{ year }} Bitwarden Inc.
++ Vaultwarden Web
+ {{ "versionNumber" | i18n: version }} ++

++
++ A modified version of the Bitwarden® Web Vault for Vaultwarden (an unofficial rewrite of the ++ Bitwarden® server).
++ Vaultwarden is not associated with the Bitwarden® project nor Bitwarden Inc. ++
+
+diff --git a/apps/web/src/app/layouts/header/web-header.component.html b/apps/web/src/app/layouts/header/web-header.component.html +index e1cda607c0..6584689e68 100644 +--- a/apps/web/src/app/layouts/header/web-header.component.html ++++ b/apps/web/src/app/layouts/header/web-header.component.html +@@ -78,7 +78,12 @@ + + {{ "accountSettings" | i18n }} + +- ++ + + {{ "getHelp" | i18n }} + +diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html +index f038fafecc..62029ee870 100644 +--- a/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html ++++ b/apps/web/src/app/layouts/product-switcher/product-switcher-content.component.html +@@ -29,7 +29,7 @@ + + +
+ {{ "moreFromBitwarden" | i18n }} +diff --git a/apps/web/src/app/layouts/user-layout.component.html b/apps/web/src/app/layouts/user-layout.component.html +index 15a01fa07b..719b9ba7f3 100644 +--- a/apps/web/src/app/layouts/user-layout.component.html ++++ b/apps/web/src/app/layouts/user-layout.component.html +@@ -35,8 +35,5 @@ + + + +- + + +diff --git a/apps/web/src/app/layouts/user-layout.component.ts b/apps/web/src/app/layouts/user-layout.component.ts +index fea0352867..1f8d6296d8 100644 +--- a/apps/web/src/app/layouts/user-layout.component.ts ++++ b/apps/web/src/app/layouts/user-layout.component.ts +@@ -1,7 +1,7 @@ + import { CommonModule } from "@angular/common"; + import { Component, OnInit } from "@angular/core"; + import { RouterModule } from "@angular/router"; +-import { Observable, combineLatest, concatMap } from "rxjs"; ++import { Observable, of } from "rxjs"; + + import { JslibModule } from "@bitwarden/angular/jslib.module"; + import { ApiService } from "@bitwarden/common/abstractions/api.service"; +@@ -13,8 +13,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl + import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; + import { IconModule, LayoutComponent, NavigationModule } from "@bitwarden/components"; + +-import { PaymentMethodWarningsModule } from "../billing/shared"; +- + import { PasswordManagerLogo } from "./password-manager-logo"; + import { ToggleWidthComponent } from "./toggle-width.component"; + +@@ -29,7 +27,6 @@ import { ToggleWidthComponent } from "./toggle-width.component"; + LayoutComponent, + IconModule, + NavigationModule, +- PaymentMethodWarningsModule, + ToggleWidthComponent, + ], + }) +@@ -57,26 +54,7 @@ export class UserLayoutComponent implements OnInit { + + await this.syncService.fullSync(false); + +- this.hasFamilySponsorshipAvailable$ = this.organizationService.canManageSponsorships$; +- +- // We want to hide the subscription menu for organizations that provide premium. +- // Except if the user has premium personally or has a billing history. +- this.showSubscription$ = combineLatest([ +- this.billingAccountProfileStateService.hasPremiumPersonally$, +- this.billingAccountProfileStateService.hasPremiumFromAnyOrganization$, +- ]).pipe( +- concatMap(async ([hasPremiumPersonally, hasPremiumFromOrg]) => { +- const isCloud = !this.platformUtilsService.isSelfHost(); +- +- let billing = null; +- if (isCloud) { +- // TODO: We should remove the need to call this! +- billing = await this.apiService.getUserBillingHistory(); +- } +- +- const cloudAndBillingHistory = isCloud && !billing?.hasNoHistory; +- return hasPremiumPersonally || !hasPremiumFromOrg || cloudAndBillingHistory; +- }), +- ); ++ this.hasFamilySponsorshipAvailable$ = of(false); // disable family Sponsorships in Vaultwarden ++ this.showSubscription$ = of(false); // always hide subscriptions in Vaultwarden + } + } +diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts +index e5c2f353c0..845d8b86ab 100644 +--- a/apps/web/src/app/oss-routing.module.ts ++++ b/apps/web/src/app/oss-routing.module.ts +@@ -222,13 +222,6 @@ const routes: Routes = [ + component: DomainRulesComponent, + data: { titleId: "domainRules" }, + }, +- { +- path: "subscription", +- loadChildren: () => +- import("./billing/individual/individual-billing.module").then( +- (m) => m.IndividualBillingModule, +- ), +- }, + { + path: "emergency-access", + children: [ +diff --git a/apps/web/src/app/platform/web-environment.service.ts b/apps/web/src/app/platform/web-environment.service.ts +index c2eb37eea5..2b5ac93392 100644 +--- a/apps/web/src/app/platform/web-environment.service.ts ++++ b/apps/web/src/app/platform/web-environment.service.ts +@@ -27,8 +27,17 @@ export class WebEnvironmentService extends DefaultEnvironmentService { + super(stateProvider, accountService); + + // The web vault always uses the current location as the base url +- const urls = process.env.URLS as Urls; +- urls.base ??= this.win.location.origin; ++ // 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 = this.win.location.href; ++ baseUrl = baseUrl.replace(/#.*/, ""); // Strip off `#` and everything after. ++ baseUrl = baseUrl.replace(/\/+$/, ""); // Trim any trailing `/` chars. ++ const urls = { base: baseUrl }; + + // Find the region + const domain = Utils.getDomain(this.win.location.href); +diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts +index 586f207962..863efc8769 100644 +--- a/apps/web/src/app/shared/loose-components.module.ts ++++ b/apps/web/src/app/shared/loose-components.module.ts +@@ -58,7 +58,6 @@ import { UpdatePasswordComponent } from "../auth/update-password.component"; + import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; + import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; + import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; +-import { PaymentMethodWarningsModule } from "../billing/shared"; + import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; + import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; + import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; +@@ -111,7 +110,6 @@ import { SharedModule } from "./shared.module"; + HeaderModule, + OrganizationLayoutComponent, + UserLayoutComponent, +- PaymentMethodWarningsModule, + ], + declarations: [ + AcceptFamilySponsorshipComponent, +diff --git a/apps/web/src/app/tools/send/access.component.html b/apps/web/src/app/tools/send/access.component.html +index 6fef7d361d..1deb1164ff 100644 +--- a/apps/web/src/app/tools/send/access.component.html ++++ b/apps/web/src/app/tools/send/access.component.html +@@ -2,7 +2,7 @@ +
+- ++ +
+

View Send

+
+@@ -66,19 +66,6 @@ +
+

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

+
+
+diff --git a/apps/web/src/index.html b/apps/web/src/index.html +index c3a2c03ed9..1a326771a6 100644 +--- a/apps/web/src/index.html ++++ b/apps/web/src/index.html +@@ -5,7 +5,7 @@ + + + +- Bitwarden Web Vault ++ Vaultwarden Web + + + +@@ -17,7 +17,7 @@ + +
+
+- ++ +

+