Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-28 04:08:47 +02:00
Code Issues Projects Releases Wiki Activity

Used url from sender window in getting matching logins

Browse Source
This commit is contained in:
gbubemismith 2023-10-10 18:49:40 -04:00
parent 68da3d9efd
commit ee7844d6b1
No known key found for this signature in database
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/platform/popup/abstractions/browser-popout-window.service.ts
View File

@ -11,7 +11,7 @@ interface BrowserPopoutWindowService {
): Promise<void>;
closePasswordRepromptPrompt(): Promise<void>;
openFido2Popout(
senderWindowId: number,
senderWindow: chrome.tabs.Tab,
promptData: {
sessionId: string;
senderTabId: number;

18
apps/browser/src/platform/popup/browser-popout-window.service.ts
View File

@ -50,7 +50,7 @@ class BrowserPopoutWindowService implements BrowserPopupWindowServiceInterface {
}
async openFido2Popout(
senderWindowId: number,
senderWindow: chrome.tabs.Tab,
{
sessionId,
senderTabId,
@ -68,12 +68,18 @@ class BrowserPopoutWindowService implements BrowserPopupWindowServiceInterface {
"?uilocation=popout" +
`&sessionId=${sessionId}` +
`&fallbackSupported=${fallbackSupported}` +
`&senderTabId=${senderTabId}`;
`&senderTabId=${senderTabId}` +
`&senderUrl=${encodeURIComponent(senderWindow.url)}`;
return await this.openSingleActionPopout(senderWindowId, promptWindowPath, "fido2Popout", {
width: 200,
height: 500,
});
return await this.openSingleActionPopout(
senderWindow.windowId,
promptWindowPath,
"fido2Popout",
{
width: 200,
height: 500,
}
);
}
async closeFido2Popout(): Promise<void> {

2
apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts
View File

@ -333,7 +333,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi
)
);
const popoutId = await this.browserPopoutWindowService.openFido2Popout(this.tab.windowId, {
const popoutId = await this.browserPopoutWindowService.openFido2Popout(this.tab, {
sessionId: this.sessionId,
senderTabId: this.tab.id,
fallbackSupported: this.fallbackSupported,

5
apps/browser/src/vault/popup/components/fido2/fido2.component.ts
View File

@ -89,6 +89,7 @@ export class Fido2Component implements OnInit, OnDestroy {
map((queryParamMap) => ({
sessionId: queryParamMap.get("sessionId"),
senderTabId: queryParamMap.get("senderTabId"),
senderUrl: queryParamMap.get("senderUrl"),
}))
);
@ -97,7 +98,7 @@ export class Fido2Component implements OnInit, OnDestroy {
concatMap(async ([queryParams, message]) => {
this.sessionId = queryParams.sessionId;
this.senderTabId = queryParams.senderTabId;
this.url = queryParams.senderUrl;
// For a 'NewSessionCreatedRequest', abort if it doesn't belong to the current session.
if (
message.type === "NewSessionCreatedRequest" &&
@ -145,8 +146,6 @@ export class Fido2Component implements OnInit, OnDestroy {
concatMap(async (message) => {
switch (message.type) {
case "ConfirmNewCredentialRequest": {
const activeTabs = await BrowserApi.getActiveTabs();
this.url = activeTabs[0].url;
const equivalentDomains = this.settingsService.getEquivalentDomains(this.url);
this.ciphers = (await this.cipherService.getAllDecrypted()).filter(