From aabcc2737f7be43f1b2ea086fd02a2252d2c4f4d Mon Sep 17 00:00:00 2001 From: BlackDex Date: Wed, 29 Jun 2022 15:49:38 +0200 Subject: [PATCH] Update web-vault to v2022.6.0 Updated the web-vault to the latest released version. This version is also using the new repo `bitwarden/clients` instead of the old `bitwarden/web`. All files have been changed where needed. --- Dockerfile | 17 +- patches/v2022.6.0.patch | 311 +++++++++++++++++++++++++++++++++ scripts/.script_env | 2 +- scripts/build_web_vault.sh | 6 +- scripts/checkout_web_vault.sh | 3 +- scripts/generate_patch_file.sh | 2 +- scripts/tar_web_vault.sh | 11 +- 7 files changed, 335 insertions(+), 17 deletions(-) create mode 100644 patches/v2022.6.0.patch diff --git a/Dockerfile b/Dockerfile index 4959bd6..2f68de4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,14 +23,13 @@ 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/v2022.5.2 -ARG VAULT_VERSION=b7cee309ba120aa4aa454be1c7690dbdfc38491f +# Using https://github.com/bitwarden/web/releases/tag/v2022.6.0 +ARG VAULT_VERSION=bb5f9311a776b94a33bcf0a7bff44cd87a2fcc92 -RUN git clone https://github.com/bitwarden/web.git /vault +RUN git clone https://github.com/bitwarden/clients.git /vault WORKDIR /vault -RUN git -c advice.detachedHead=false checkout "${VAULT_VERSION}" && \ - git submodule update --recursive --init --force +RUN git -c advice.detachedHead=false checkout "${VAULT_VERSION}" COPY --chown=node:node patches /patches COPY --chown=node:node scripts/apply_patches.sh /apply_patches.sh @@ -40,6 +39,10 @@ RUN bash /apply_patches.sh # Build RUN npm ci RUN npm audit fix || true + +# Switch to the web apps folder +WORKDIR /vault/apps/web + RUN npm run dist:oss:selfhost RUN printf '{"version":"%s"}' \ @@ -57,7 +60,7 @@ RUN tar -czvf "bw_web_vault.tar.gz" web-vault --owner=0 --group=0 # The result is included both uncompressed and as a tar.gz, to be able to use it in the docker images and the github releases directly FROM scratch # hadolint ignore=DL3010 -COPY --from=build /vault/bw_web_vault.tar.gz /bw_web_vault.tar.gz -COPY --from=build /vault/web-vault /web-vault +COPY --from=build /vault/apps/web/bw_web_vault.tar.gz /bw_web_vault.tar.gz +COPY --from=build /vault/apps/web/web-vault /web-vault # Added so docker create works, can't actually run a scratch image CMD [""] diff --git a/patches/v2022.6.0.patch b/patches/v2022.6.0.patch new file mode 100644 index 0000000..1466ec8 --- /dev/null +++ b/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/scripts/.script_env b/scripts/.script_env index 1041e02..f20e153 100644 --- a/scripts/.script_env +++ b/scripts/.script_env @@ -12,5 +12,5 @@ function get_web_vault_version { if [[ -z "${VAULT_VERSION}" ]]; then VAULT_VERSION=$(git rev-parse HEAD) fi - echo "${VAULT_VERSION}" + echo "${VAULT_VERSION#web-}" } diff --git a/scripts/build_web_vault.sh b/scripts/build_web_vault.sh index 766fa5d..a862ef6 100755 --- a/scripts/build_web_vault.sh +++ b/scripts/build_web_vault.sh @@ -13,15 +13,16 @@ trap 'handle_error $LINENO $?' ERR # shellcheck source=.script_env . "${BASEDIR}/.script_env" -pushd "${VAULT_FOLDER}" - # Show used versions node --version npm --version # Build +pushd "${VAULT_FOLDER}" npm ci npm audit fix || true + +pushd apps/web npm run dist:oss:selfhost # Delete debugging map files, optional @@ -33,3 +34,4 @@ printf '{"version":"%s"}' \ > build/vw-version.json popd +popd diff --git a/scripts/checkout_web_vault.sh b/scripts/checkout_web_vault.sh index df70a10..5b1a416 100755 --- a/scripts/checkout_web_vault.sh +++ b/scripts/checkout_web_vault.sh @@ -21,7 +21,7 @@ fi if [ ! -d "${VAULT_FOLDER}" ]; then # If this is the first time, clone the project - git clone https://github.com/bitwarden/web.git "${VAULT_FOLDER}" + git clone https://github.com/bitwarden/clients.git "${VAULT_FOLDER}" else # If there already is a checked-out repo, lets clean it up first. pushd "${VAULT_FOLDER}" @@ -42,6 +42,5 @@ git pull origin master # Checkout the branch we want git -c advice.detachedHead=false checkout "${VAULT_VERSION}" -git submodule update --recursive --init --force popd diff --git a/scripts/generate_patch_file.sh b/scripts/generate_patch_file.sh index b41bc6d..1d8ad1d 100755 --- a/scripts/generate_patch_file.sh +++ b/scripts/generate_patch_file.sh @@ -16,7 +16,7 @@ trap 'handle_error $LINENO $?' ERR pushd "${VAULT_FOLDER}" VAULT_VERSION=$(get_web_vault_version) -# Check if the vault versions starts with 20 +# Check if the vault versions starts with 20 and isn't a 40 char hash if [[ ${VAULT_VERSION} = 20* ]] && [ ${#VAULT_VERSION} -ne 40 ]; then VAULT_VERSION="v${VAULT_VERSION}" fi diff --git a/scripts/tar_web_vault.sh b/scripts/tar_web_vault.sh index 6c84102..25583d9 100755 --- a/scripts/tar_web_vault.sh +++ b/scripts/tar_web_vault.sh @@ -13,15 +13,18 @@ trap 'handle_error $LINENO $?' ERR # shellcheck source=.script_env . "${BASEDIR}/.script_env" -mkdir -pv "${OUTPUT_FOLDER}" +mkdir -pv "${BASEDIR}/../${OUTPUT_FOLDER}" -pushd "${VAULT_FOLDER}" +pushd "${VAULT_FOLDER}/apps/web" VAULT_VERSION=$(get_web_vault_version) -OUTPUT_NAME="${OUTPUT_FOLDER}/bw_web_${VAULT_VERSION}.tar.gz" +OUTPUT_NAME="${OUTPUT_FOLDER}/bw_web_${VAULT_VERSION}" mv build web-vault -tar -czvf "../${OUTPUT_NAME}" web-vault --owner=0 --group=0 +# Tar the web-vault +tar -czvf "${BASEDIR}/../${OUTPUT_NAME}.tar.gz" web-vault --owner=0 --group=0 +# Copy the web-vault +cp -dpr web-vault "${BASEDIR}/../${OUTPUT_NAME}" mv web-vault build popd