c.reprompt === CipherRepromptType.None);
+ cipher = ciphers[0];
} else {
const ciphers = await this.cipherService.getAllDecrypted();
cipher = ciphers.find((c) => c.id === id);
diff --git a/apps/browser/src/autofill/content/autofill.js b/apps/browser/src/autofill/content/autofill.js
index 1833c09e159..2f3857d3fa8 100644
--- a/apps/browser/src/autofill/content/autofill.js
+++ b/apps/browser/src/autofill/content/autofill.js
@@ -986,13 +986,18 @@
styleTimeout = 200;
/**
- * Fll an element `el` using the value `op` from the fill script
+ * Fill an element `el` using the value `op` from the fill script
* @param {HTMLElement} el
* @param {string} op
*/
function fillTheElement(el, op) {
var shouldCheck;
if (el && null !== op && void 0 !== op && !(el.disabled || el.a || el.readOnly)) {
+ const tabURLChanged = !fillScript.savedUrls?.some(url => url.startsWith(window.location.origin))
+ // Check to make sure the page location didn't change
+ if (tabURLChanged) {
+ return;
+ }
switch (markTheFilling && el.form && !el.form.opfilled && (el.form.opfilled = true),
el.type ? el.type.toLowerCase() : null) {
case 'checkbox':
diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts
index 5fc4b76c4ca..e6a629cfc9d 100644
--- a/apps/browser/src/autofill/services/autofill.service.spec.ts
+++ b/apps/browser/src/autofill/services/autofill.service.spec.ts
@@ -75,7 +75,7 @@ describe("AutofillService", () => {
const autofillV1Script = "autofill.js";
const autofillV2Script = "autofill-init.js";
const defaultAutofillScripts = ["autofiller.js", "notificationBar.js", "contextMenuHandler.js"];
- const defaultExecuteScriptOptions = { allFrames: true, runAt: "document_start" };
+ const defaultExecuteScriptOptions = { runAt: "document_start" };
let tabMock: chrome.tabs.Tab;
let sender: chrome.runtime.MessageSender;
@@ -91,11 +91,13 @@ describe("AutofillService", () => {
[autofillV1Script, ...defaultAutofillScripts].forEach((scriptName) => {
expect(BrowserApi.executeScriptInTab).toHaveBeenCalledWith(tabMock.id, {
file: `content/${scriptName}`,
+ frameId: sender.frameId,
...defaultExecuteScriptOptions,
});
});
expect(BrowserApi.executeScriptInTab).not.toHaveBeenCalledWith(tabMock.id, {
file: `content/${autofillV2Script}`,
+ frameId: sender.frameId,
...defaultExecuteScriptOptions,
});
});
diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index dc2a4918c3b..fcf4dffd4aa 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -62,7 +62,7 @@ export default class AutofillService implements AutofillServiceInterface {
for (const injectedScript of injectedScripts) {
await BrowserApi.executeScriptInTab(sender.tab.id, {
file: `content/${injectedScript}`,
- allFrames: true,
+ frameId: sender.frameId,
runAt: "document_start",
});
}
diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
index 828d768ca25..0ab74875fbf 100644
--- a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
+++ b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts
@@ -108,6 +108,7 @@ describe("InsertAutofillContentService", () => {
jest.spyOn(insertAutofillContentService as any, "fillingWithinSandboxedIframe");
jest.spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill");
jest.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill");
+ jest.spyOn(insertAutofillContentService as any, "tabURLChanged");
jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
insertAutofillContentService.fillForm(fillScript);
@@ -119,6 +120,7 @@ describe("InsertAutofillContentService", () => {
expect(
insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
).not.toHaveBeenCalled();
+ expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
});
@@ -128,6 +130,7 @@ describe("InsertAutofillContentService", () => {
.mockReturnValue(true);
jest.spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill");
jest.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill");
+ jest.spyOn(insertAutofillContentService as any, "tabURLChanged");
jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
insertAutofillContentService.fillForm(fillScript);
@@ -139,6 +142,7 @@ describe("InsertAutofillContentService", () => {
expect(
insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
).not.toHaveBeenCalled();
+ expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
});
@@ -150,6 +154,7 @@ describe("InsertAutofillContentService", () => {
.spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill")
.mockReturnValue(true);
jest.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill");
+ jest.spyOn(insertAutofillContentService as any, "tabURLChanged");
jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
insertAutofillContentService.fillForm(fillScript);
@@ -159,6 +164,7 @@ describe("InsertAutofillContentService", () => {
expect(
insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
).not.toHaveBeenCalled();
+ expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
});
@@ -172,6 +178,7 @@ describe("InsertAutofillContentService", () => {
jest
.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill")
.mockReturnValue(true);
+ jest.spyOn(insertAutofillContentService as any, "tabURLChanged").mockReturnValue(false);
jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
insertAutofillContentService.fillForm(fillScript);
@@ -181,6 +188,31 @@ describe("InsertAutofillContentService", () => {
expect(
insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
).toHaveBeenCalled();
+ expect(insertAutofillContentService["tabURLChanged"]).not.toHaveBeenCalled();
+ expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
+ });
+
+ it("returns early if the page location origin does not match against any of the cipher saved URLs", () => {
+ jest
+ .spyOn(insertAutofillContentService as any, "fillingWithinSandboxedIframe")
+ .mockReturnValue(false);
+ jest
+ .spyOn(insertAutofillContentService as any, "userCancelledInsecureUrlAutofill")
+ .mockReturnValue(false);
+ jest
+ .spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill")
+ .mockReturnValue(false);
+ jest.spyOn(insertAutofillContentService as any, "tabURLChanged").mockReturnValue(true);
+ jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
+
+ insertAutofillContentService.fillForm(fillScript);
+
+ expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).toHaveBeenCalled();
+ expect(insertAutofillContentService["userCancelledInsecureUrlAutofill"]).toHaveBeenCalled();
+ expect(
+ insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
+ ).toHaveBeenCalled();
+ expect(insertAutofillContentService["tabURLChanged"]).toHaveBeenCalled();
expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled();
});
@@ -194,6 +226,7 @@ describe("InsertAutofillContentService", () => {
jest
.spyOn(insertAutofillContentService as any, "userCancelledUntrustedIframeAutofill")
.mockReturnValue(false);
+ jest.spyOn(insertAutofillContentService as any, "tabURLChanged").mockReturnValue(false);
jest.spyOn(insertAutofillContentService as any, "runFillScriptAction");
insertAutofillContentService.fillForm(fillScript);
@@ -203,6 +236,7 @@ describe("InsertAutofillContentService", () => {
expect(
insertAutofillContentService["userCancelledUntrustedIframeAutofill"]
).toHaveBeenCalled();
+ expect(insertAutofillContentService["tabURLChanged"]).toHaveBeenCalled();
expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenCalledTimes(3);
expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith(
1,
diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.ts
index 89f644ba6be..4e47e73704b 100644
--- a/apps/browser/src/autofill/services/insert-autofill-content.service.ts
+++ b/apps/browser/src/autofill/services/insert-autofill-content.service.ts
@@ -38,7 +38,8 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
!fillScript.script?.length ||
this.fillingWithinSandboxedIframe() ||
this.userCancelledInsecureUrlAutofill(fillScript.savedUrls) ||
- this.userCancelledUntrustedIframeAutofill(fillScript)
+ this.userCancelledUntrustedIframeAutofill(fillScript) ||
+ this.tabURLChanged(fillScript.savedUrls)
) {
return;
}
@@ -46,6 +47,16 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf
fillScript.script.forEach(this.runFillScriptAction);
}
+ /**
+ * Determines if the page URL no longer matches one of the cipher's savedURL domains
+ * @param {string[] | null} savedUrls
+ * @returns {boolean}
+ * @private
+ */
+ private tabURLChanged(savedUrls?: AutofillScript["savedUrls"]): boolean {
+ return savedUrls && !savedUrls.some((url) => url.startsWith(window.location.origin));
+ }
+
/**
* Identifies if the execution of this script is happening
* within a sandboxed iframe.
diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json
index a0a9548c7f3..0f21a10a84f 100644
--- a/apps/browser/src/manifest.json
+++ b/apps/browser/src/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_extName__",
"short_name": "__MSG_appName__",
- "version": "2023.8.3",
+ "version": "2023.9.1",
"description": "__MSG_extDesc__",
"default_locale": "en",
"author": "Bitwarden Inc.",
diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json
index af8700066f5..b02d7aec847 100644
--- a/apps/browser/src/manifest.v3.json
+++ b/apps/browser/src/manifest.v3.json
@@ -3,7 +3,7 @@
"minimum_chrome_version": "102.0",
"name": "__MSG_extName__",
"short_name": "__MSG_appName__",
- "version": "2023.8.3",
+ "version": "2023.9.1",
"description": "__MSG_extDesc__",
"default_locale": "en",
"author": "Bitwarden Inc.",
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index d8143859e8f..5ad5ea17317 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -213,7 +213,10 @@ export class BrowserApi {
chrome.windows.create({ url, focused, type });
}
+ // Keep track of all the events registered in a Safari popup so we can remove
+ // them when the popup gets unloaded, otherwise we cause a memory leak
private static registeredMessageListeners: any[] = [];
+ private static registeredStorageChangeListeners: any[] = [];
static messageListener(
name: string,
@@ -232,21 +235,38 @@ export class BrowserApi {
}
);
- // Keep track of all the events registered in a Safari popup so we can remove
- // them when the popup gets unloaded, otherwise we cause a memory leak
if (BrowserApi.isSafariApi && !BrowserApi.isBackgroundPage(window)) {
BrowserApi.registeredMessageListeners.push(callback);
-
- // The MDN recommend using 'visibilitychange' but that event is fired any time the popup window is obscured as well
- // 'pagehide' works just like 'unload' but is compatible with the back/forward cache, so we prefer using that one
- window.onpagehide = () => {
- for (const callback of BrowserApi.registeredMessageListeners) {
- chrome.runtime.onMessage.removeListener(callback);
- }
- };
+ BrowserApi.setupUnloadListeners();
}
}
+ static storageChangeListener(
+ callback: Parameters
[0]
+ ) {
+ chrome.storage.onChanged.addListener(callback);
+
+ if (BrowserApi.isSafariApi && !BrowserApi.isBackgroundPage(window)) {
+ BrowserApi.registeredStorageChangeListeners.push(callback);
+ BrowserApi.setupUnloadListeners();
+ }
+ }
+
+ // Setup the event to destroy all the listeners when the popup gets unloaded in Safari, otherwise we get a memory leak
+ private static setupUnloadListeners() {
+ // The MDN recommend using 'visibilitychange' but that event is fired any time the popup window is obscured as well
+ // 'pagehide' works just like 'unload' but is compatible with the back/forward cache, so we prefer using that one
+ window.onpagehide = () => {
+ for (const callback of BrowserApi.registeredMessageListeners) {
+ chrome.runtime.onMessage.removeListener(callback);
+ }
+
+ for (const callback of BrowserApi.registeredStorageChangeListeners) {
+ chrome.storage.onChanged.removeListener(callback);
+ }
+ };
+ }
+
static messageListener$() {
return new Observable((subscriber) => {
const handler = (message: unknown) => {
diff --git a/apps/browser/src/platform/services/browser-state.service.ts b/apps/browser/src/platform/services/browser-state.service.ts
index 5e356e7fbe8..ec6851beb8f 100644
--- a/apps/browser/src/platform/services/browser-state.service.ts
+++ b/apps/browser/src/platform/services/browser-state.service.ts
@@ -14,6 +14,7 @@ import { Account } from "../../models/account";
import { BrowserComponentState } from "../../models/browserComponentState";
import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState";
import { BrowserSendComponentState } from "../../models/browserSendComponentState";
+import { BrowserApi } from "../browser/browser-api";
import { browserSession, sessionSync } from "../decorators/session-sync-observable";
import { BrowserStateService as StateServiceAbstraction } from "./abstractions/browser-state.service";
@@ -56,7 +57,7 @@ export class BrowserStateService
// the background page that can get out of sync. We need to work out the
// best way to handle caching with multiple instances of the state service.
if (useAccountCache) {
- chrome.storage.onChanged.addListener((changes, namespace) => {
+ BrowserApi.storageChangeListener((changes, namespace) => {
if (namespace === "local") {
for (const key of Object.keys(changes)) {
if (key !== "accountActivity" && this.accountDiskCache.value[key]) {
diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts
index d5a50687734..b666f55fc9d 100644
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -62,7 +62,6 @@ import { PrivateModeWarningComponent } from "./components/private-mode-warning.c
import { SetPinComponent } from "./components/set-pin.component";
import { UserVerificationComponent } from "./components/user-verification.component";
import { ServicesModule } from "./services/services.module";
-import { AboutComponent } from "./settings/about.component";
import { AutofillComponent } from "./settings/autofill.component";
import { ExcludedDomainsComponent } from "./settings/excluded-domains.component";
import { FoldersComponent } from "./settings/folders.component";
@@ -152,7 +151,6 @@ import "../platform/popup/locales";
ViewCustomFieldsComponent,
RemovePasswordComponent,
VaultSelectComponent,
- AboutComponent,
Fido2Component,
HelpAndFeedbackComponent,
AutofillComponent,
diff --git a/apps/browser/src/popup/scss/environment.scss b/apps/browser/src/popup/scss/environment.scss
index 1ac0f4240bd..f6adba86c2e 100644
--- a/apps/browser/src/popup/scss/environment.scss
+++ b/apps/browser/src/popup/scss/environment.scss
@@ -51,15 +51,11 @@ html.browser_safari {
color: $text-muted;
line-height: 25px;
font-weight: 400;
- padding-left: 5px;
+ padding-left: 15px;
- label {
+ span {
font-weight: 600;
- }
-
- a,
- a label:hover {
- cursor: pointer;
+ font-size: $font-size-small;
}
}
@@ -91,7 +87,3 @@ html.browser_safari {
}
}
}
-
-.environment-selector-padding {
- padding-left: 10px;
-}
diff --git a/apps/browser/src/popup/scss/popup.scss b/apps/browser/src/popup/scss/popup.scss
index 7d718b86645..0d7e4281386 100644
--- a/apps/browser/src/popup/scss/popup.scss
+++ b/apps/browser/src/popup/scss/popup.scss
@@ -12,3 +12,4 @@
@import "environment.scss";
@import "pages.scss";
@import "@angular/cdk/overlay-prebuilt.css";
+@import "../../../../../libs/components/src/multi-select/scss/bw.theme";
diff --git a/apps/browser/src/popup/settings/about.component.html b/apps/browser/src/popup/settings/about.component.html
index 24fea4eb9da..b68f592492f 100644
--- a/apps/browser/src/popup/settings/about.component.html
+++ b/apps/browser/src/popup/settings/about.component.html
@@ -1,52 +1,46 @@
-
-
+
+
+
+
diff --git a/apps/browser/src/popup/settings/about.component.ts b/apps/browser/src/popup/settings/about.component.ts
index 459dd7850fa..c0c9012f341 100644
--- a/apps/browser/src/popup/settings/about.component.ts
+++ b/apps/browser/src/popup/settings/about.component.ts
@@ -1,25 +1,29 @@
+import { CommonModule } from "@angular/common";
import { Component } from "@angular/core";
import { Observable } from "rxjs";
+import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction";
import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
+import { ButtonModule, DialogModule } from "@bitwarden/components";
import { BrowserApi } from "../../platform/browser/browser-api";
@Component({
- selector: "app-about",
templateUrl: "about.component.html",
+ standalone: true,
+ imports: [CommonModule, JslibModule, DialogModule, ButtonModule],
})
export class AboutComponent {
- serverConfig$: Observable
;
+ protected serverConfig$: Observable = this.configService.serverConfig$;
- year = new Date().getFullYear();
- version = BrowserApi.getApplicationVersion();
- isCloud: boolean;
+ protected year = new Date().getFullYear();
+ protected version = BrowserApi.getApplicationVersion();
+ protected isCloud = this.environmentService.isCloud();
- constructor(configService: ConfigServiceAbstraction, environmentService: EnvironmentService) {
- this.serverConfig$ = configService.serverConfig$;
- this.isCloud = environmentService.isCloud();
- }
+ constructor(
+ private configService: ConfigServiceAbstraction,
+ private environmentService: EnvironmentService
+ ) {}
}
diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts
index efeb6aba6d2..c2699ce498e 100644
--- a/apps/browser/src/popup/settings/settings.component.ts
+++ b/apps/browser/src/popup/settings/settings.component.ts
@@ -482,7 +482,7 @@ export class SettingsComponent implements OnInit {
}
about() {
- this.modalService.open(AboutComponent);
+ this.dialogService.open(AboutComponent);
}
async fingerprint() {
diff --git a/apps/browser/src/tools/popup/generator/generator.component.html b/apps/browser/src/tools/popup/generator/generator.component.html
index 5c9c7492014..13d35b6cd7a 100644
--- a/apps/browser/src/tools/popup/generator/generator.component.html
+++ b/apps/browser/src/tools/popup/generator/generator.component.html
@@ -75,7 +75,7 @@
-