From 9efb207eb17a9bdd61c66220c1a1a8e4747d385f Mon Sep 17 00:00:00 2001 From: BlackDex Date: Wed, 23 Feb 2022 14:20:20 +0100 Subject: [PATCH] Support v2.26.1 - Added support for v2.26.1 - Hide some more input fields we do not use - Fixed building with npm (The audit fix breaks the build) - Fixed the vaultwarden version json filename. --- Dockerfile | 10 +- package_web_vault.sh | 6 +- patches/v2.26.1.patch | 271 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+), 9 deletions(-) create mode 100644 patches/v2.26.1.patch diff --git a/Dockerfile b/Dockerfile index 1ae0246..9a7b6c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,8 @@ USER node # Can be a tag, release, but prefer a commit hash because it's not changeable # https://github.com/bitwarden/web/commit/$VAULT_VERSION # -# Using https://github.com/bitwarden/web/releases/tag/v2.25.1 -ARG VAULT_VERSION=23b30422d886bd395259cb864a7d83caffe1d099 +# Using https://github.com/bitwarden/web/releases/tag/v2.26.1 +ARG VAULT_VERSION=aa42890fdfbfe603efd6d410d2cbd109f2033db9 RUN git clone https://github.com/bitwarden/web.git /vault WORKDIR /vault @@ -38,13 +38,13 @@ COPY --chown=node:node apply_patches.sh /apply_patches.sh RUN bash /apply_patches.sh # Build -RUN npm ci --legacy-peer-deps -RUN npm audit fix --legacy-peer-deps || true +RUN npm ci +# RUN npm audit fix || true RUN npm run dist:oss:selfhost RUN printf '{"version":"%s"}' \ $(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/dani-garcia/bw_web_builds.git 'v*' | tail -n1 | sed -E 's#.*?refs/tags/v##') \ - > build/bwrs-version.json + > build/vw-version.json # Delete debugging map files, optional # RUN find build -name "*.map" -delete diff --git a/package_web_vault.sh b/package_web_vault.sh index de1919a..d3d3a80 100755 --- a/package_web_vault.sh +++ b/package_web_vault.sh @@ -18,8 +18,6 @@ VAULT_FOLDER=web-vault OUTPUT_FOLDER=builds OUTPUT_NAME="$OUTPUT_FOLDER/bw_web_$VAULT_VERSION.tar.gz" -npm install npm@7 - mkdir -p "$OUTPUT_FOLDER" # If this is the first time, clone the project @@ -47,8 +45,8 @@ git submodule update --recursive --init . ../apply_patches.sh # Build -npm ci --legacy-peer-deps -npm audit fix --legacy-peer-deps || true +npm ci +# npm audit fix || true npm run dist:oss:selfhost # Delete debugging map files, optional diff --git a/patches/v2.26.1.patch b/patches/v2.26.1.patch new file mode 100644 index 0000000..32ccf7a --- /dev/null +++ b/patches/v2.26.1.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 16ccb6ea..52ef9b28 100644 +--- a/jslib/angular/src/components/register.component.ts ++++ b/jslib/angular/src/components/register.component.ts +@@ -30,7 +30,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + formPromise: Promise; + masterPasswordScore: number; + referenceData: ReferenceEventRequest; +- showTerms = true; ++ showTerms = false; + acceptPolicies: boolean = false; + + protected successRoute = "login"; +@@ -49,7 +49,7 @@ export class RegisterComponent extends CaptchaProtectedComponent implements OnIn + protected logService: LogService + ) { + super(environmentService, i18nService, platformUtilsService); +- this.showTerms = !platformUtilsService.isSelfHost(); ++ this.showTerms = false; + } + + async ngOnInit() { +@@ -87,6 +87,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 726a129e..35e62d1b 100644 +--- a/src/app/app.component.ts ++++ b/src/app/app.component.ts +@@ -158,6 +158,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 6ea3deed..944c34cc 100644 +--- a/src/app/layouts/navbar.component.html ++++ b/src/app/layouts/navbar.component.html +@@ -60,7 +60,7 @@ + + {{ "myAccount" | i18n }} + +- ++ + + {{ "getHelp" | i18n }} + +diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts +index f8c83f9e..cfeabb27 100644 +--- a/src/app/organizations/vault/vault.component.ts ++++ b/src/app/organizations/vault/vault.component.ts +@@ -71,11 +71,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 7cd0b25b..2d5756d4 100644 +--- a/src/app/services/services.module.ts ++++ b/src/app/services/services.module.ts +@@ -73,11 +73,23 @@ export function initFactory( + platformUtilsService: PlatformUtilsServiceAbstraction, + cryptoService: CryptoServiceAbstraction + ): Function { ++ 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 5b93c322..958eefa5 100644 +--- a/src/app/vault/vault.component.ts ++++ b/src/app/vault/vault.component.ts +@@ -94,11 +94,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 f914b514..a5cef65f 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 e5958aa4..5eb24d1f 100644 +--- a/src/services/webPlatformUtils.service.ts ++++ b/src/services/webPlatformUtils.service.ts +@@ -243,11 +243,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 {