Skip to content

Improve error for Keyguard iframe with unexpected src #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sisou wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improve error for Keyguard iframe with unexpected src #397

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef854ce
Improve error for Keyguard iframe with unexpected src
sisou Mar 30, 2020
289745c
Refactor IFrameRequestBehavior to use a promise for the iframe and cl…
sisou Apr 17, 2020
cb5fffe
Add private CI for Gitlab
curdbecker Jun 13, 2020
778b529
Migrate nginx config from private config into public one
curdbecker Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions client/src/RequestBehavior.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,14 @@ export class IFrameRequestBehavior extends RequestBehavior {
}

public async request(endpoint: string, command: KeyguardCommand, args: any[]): Promise<any> {
if (this._iframe && this._iframe.src !== `${endpoint}${IFrameRequestBehavior.IFRAME_PATH_SUFFIX}`) {
throw new Error('Keyguard iframe is already opened with another endpoint');
if (this._iframe
&& this._iframe.src
&& this._iframe.src !== `${endpoint}${IFrameRequestBehavior.IFRAME_PATH_SUFFIX}`
) {
const openedSrc = this._iframe.src;
const expectedSrc = `${endpoint}${IFrameRequestBehavior.IFRAME_PATH_SUFFIX}`;
Comment thread
sisou marked this conversation as resolved.
Outdated
throw new Error('Keyguard iframe is already opened with another endpoint' +
`(opened: ${openedSrc}, expected: ${expectedSrc}`);
Comment thread
sisou marked this conversation as resolved.
Outdated
}

const origin = RequestBehavior.getAllowedOrigin(endpoint);
Expand Down