From c761cebc1b028bf8d837020ffcb3b180a4b78c82 Mon Sep 17 00:00:00 2001 From: Stefan Melmuk Date: Wed, 6 Mar 2024 04:53:41 +0100 Subject: [PATCH 1/7] update web-vault to v2024.2.4 --- Dockerfile | 4 +- patches/v2024.2.4.patch | 732 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 734 insertions(+), 2 deletions(-) create mode 100644 patches/v2024.2.4.patch diff --git a/Dockerfile b/Dockerfile index bdbcc53..9249dc5 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.1.2 -ARG VAULT_VERSION=a1a5c4b3d3c5787e9517ac30b9b6f344f18fe5e6 +# Using https://github.com/bitwarden/clients/releases/tag/web-v2024.2.4 +ARG VAULT_VERSION=6d90d5aff28f960406845e86aa4a5d11244395ad WORKDIR /vault RUN git -c init.defaultBranch=main init && \ diff --git a/patches/v2024.2.4.patch b/patches/v2024.2.4.patch new file mode 100644 index 0000000..72f6fd8 --- /dev/null +++ b/patches/v2024.2.4.patch @@ -0,0 +1,732 @@ +diff --git a/apps/web/src/app/admin-console/icons/admin-console-logo.ts b/apps/web/src/app/admin-console/icons/admin-console-logo.ts +index 32b2b7a13a..1f1e6827bf 100644 +--- a/apps/web/src/app/admin-console/icons/admin-console-logo.ts ++++ b/apps/web/src/app/admin-console/icons/admin-console-logo.ts +@@ -1,5 +1,11 @@ + import { svgIcon } from "@bitwarden/components"; + + export const AdminConsoleLogo = svgIcon` +- ++ ++ ++ ++ ++ ++ ++ + `; +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 7e50a09087..27ea8f09c9 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 +@@ -105,6 +105,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 8527aa1b17..971d78d8d5 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 f9479a92ce..9a6c489c38 100644 +--- a/apps/web/src/app/app.component.ts ++++ b/apps/web/src/app/app.component.ts +@@ -205,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": +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); +@@ -186,6 +187,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(); +@@ -257,6 +259,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, +@@ -287,6 +290,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( +@@ -427,10 +431,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); +@@ -543,7 +549,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]); + } +@@ -643,7 +649,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { + request.name = this.formGroup.controls.name.value; + request.billingEmail = this.formGroup.controls.billingEmail.value; + 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 { +@@ -673,6 +681,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( +@@ -754,6 +763,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/init.service.ts b/apps/web/src/app/core/init.service.ts +index 899a168479..5bb71b05f6 100644 +--- a/apps/web/src/app/core/init.service.ts ++++ b/apps/web/src/app/core/init.service.ts +@@ -7,10 +7,7 @@ import { NotificationsService as NotificationsServiceAbstraction } from "@bitwar + import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service"; + import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service"; + import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +-import { +- EnvironmentService as EnvironmentServiceAbstraction, +- Urls, +-} from "@bitwarden/common/platform/abstractions/environment.service"; ++import { EnvironmentService as EnvironmentServiceAbstraction } from "@bitwarden/common/platform/abstractions/environment.service"; + import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service"; + import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service"; + import { ConfigService } from "@bitwarden/common/platform/services/config/config.service"; +@@ -38,11 +35,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() }; + await this.environmentService.setUrls(urls); + // Workaround to ignore stateService.activeAccount until process.env.URLS are set + // TODO: Remove this when implementing ticket PM-2637 +diff --git a/apps/web/src/app/core/router.service.ts b/apps/web/src/app/core/router.service.ts +index 5a0d903ba7..d6fedadd38 100644 +--- a/apps/web/src/app/core/router.service.ts ++++ b/apps/web/src/app/core/router.service.ts +@@ -26,7 +26,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 514e5deebd..20165e5061 100644 +--- a/apps/web/src/app/layouts/header/web-header.component.html ++++ b/apps/web/src/app/layouts/header/web-header.component.html +@@ -76,7 +76,12 @@ + + {{ "accountSettings" | i18n }} + +- ++ + + {{ "getHelp" | i18n }} + +diff --git a/apps/web/src/app/layouts/password-manager-logo.ts b/apps/web/src/app/layouts/password-manager-logo.ts +index d93e2d5bb3..e15394f785 100644 +--- a/apps/web/src/app/layouts/password-manager-logo.ts ++++ b/apps/web/src/app/layouts/password-manager-logo.ts +@@ -1,5 +1,11 @@ + import { svgIcon } from "@bitwarden/components"; + + export const PasswordManagerLogo = svgIcon` +- ++ ++ ++ ++ ++ ++ ++ + `; +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 9068f9c071..e051dccc85 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 3593390113..ac78bcb651 100644 +--- a/apps/web/src/app/layouts/user-layout.component.html ++++ b/apps/web/src/app/layouts/user-layout.component.html +@@ -33,9 +33,5 @@ + > + + +- + + +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/settings/settings.component.ts b/apps/web/src/app/settings/settings.component.ts +index c2fd1c77fa..9e116d7f2c 100644 +--- a/apps/web/src/app/settings/settings.component.ts ++++ b/apps/web/src/app/settings/settings.component.ts +@@ -53,14 +53,7 @@ export class SettingsComponent implements OnInit, OnDestroy { + } + + async load() { +- this.premium = await this.stateService.getHasPremiumPersonally(); +- 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.hasFamilySponsorshipAvailable = false; // disable family Sponsorships in Vaultwarden ++ this.hideSubscription = true; // always hide subscriptions in Vaultwarden + } + } +diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts +index 770a862eab..863efc8769 100644 +--- a/apps/web/src/app/shared/loose-components.module.ts ++++ b/apps/web/src/app/shared/loose-components.module.ts +@@ -59,7 +59,6 @@ import { UpdateTempPasswordComponent } from "../auth/update-temp-password.compon + import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; + import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; + import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; +-import { PaymentMethodBannersComponent } from "../components/payment-method-banners/payment-method-banners.component"; + import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; + import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; + import { HeaderModule } from "../layouts/header/header.module"; +@@ -106,7 +105,6 @@ import { SharedModule } from "./shared.module"; + PipesModule, + PasswordCalloutComponent, + DangerZoneComponent, +- PaymentMethodBannersComponent, + LayoutComponent, + NavigationModule, + HeaderModule, +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 @@ + +
+
+- ++ +

+