1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00

[PM-3577] Refactor Electron iframes (#6221)

This commit is contained in:
Oscar Hinton
2023-09-07 18:32:45 +02:00
committed by GitHub
parent 0448910806
commit 0e04f35b04
9 changed files with 48 additions and 15 deletions

View File

@@ -44,7 +44,11 @@
</div> </div>
</div> </div>
<div class="box-content-row" [hidden]="!showCaptcha()"> <div class="box-content-row" [hidden]="!showCaptcha()">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe
id="hcaptcha_iframe"
height="80"
sandbox="allow-scripts allow-same-origin"
></iframe>
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">

View File

@@ -120,7 +120,9 @@
</div> </div>
</div> </div>
</div> </div>
<div [hidden]="!showCaptcha()"><iframe id="hcaptcha_iframe" height="80"></iframe></div> <div [hidden]="!showCaptcha()">
<iframe id="hcaptcha_iframe" height="80" sandbox="allow-scripts allow-same-origin"></iframe>
</div>
<div class="box last" *ngIf="showTerms"> <div class="box last" *ngIf="showTerms">
<div class="box-content"> <div class="box-content">
<div <div

View File

@@ -87,7 +87,7 @@
</ng-container> </ng-container>
<ng-container *ngIf="selectedProviderType === providerType.WebAuthn && !webAuthnNewTab"> <ng-container *ngIf="selectedProviderType === providerType.WebAuthn && !webAuthnNewTab">
<div id="web-authn-frame"> <div id="web-authn-frame">
<iframe id="webauthn_iframe"></iframe> <iframe id="webauthn_iframe" sandbox="allow-scripts allow-same-origin"></iframe>
</div> </div>
<div class="box"> <div class="box">
<div class="box-content"> <div class="box-content">
@@ -112,7 +112,9 @@
selectedProviderType === providerType.OrganizationDuo selectedProviderType === providerType.OrganizationDuo
" "
> >
<div id="duo-frame"><iframe id="duo_iframe"></iframe></div> <div id="duo-frame">
<iframe id="duo_iframe" sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
</div>
<div class="box"> <div class="box">
<div class="box-content"> <div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow> <div class="box-content-row box-content-row-checkbox" appBoxRow>
@@ -123,7 +125,7 @@
</div> </div>
</ng-container> </ng-container>
<div class="box-content-row" [hidden]="!showCaptcha()"> <div class="box-content-row" [hidden]="!showCaptcha()">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe id="hcaptcha_iframe" height="80" sandbox="allow-scripts allow-same-origin"></iframe>
</div> </div>
<div class="content" *ngIf="selectedProviderType == null"> <div class="content" *ngIf="selectedProviderType == null">
<p class="text-center">{{ "noTwoStepProviders" | i18n }}</p> <p class="text-center">{{ "noTwoStepProviders" | i18n }}</p>

View File

@@ -89,7 +89,11 @@
</div> </div>
<div class="box last" [hidden]="!showCaptcha()"> <div class="box last" [hidden]="!showCaptcha()">
<div class="box-content"> <div class="box-content">
<iframe id="hcaptcha_iframe" style="margin-top: 20px"></iframe> <iframe
id="hcaptcha_iframe"
style="margin-top: 20px"
sandbox="allow-scripts allow-same-origin"
></iframe>
<div class="box-content-row"> <div class="box-content-row">
<button <button
class="btn block" class="btn block"

View File

@@ -100,7 +100,11 @@
<div class="box last" [hidden]="!showCaptcha()"> <div class="box last" [hidden]="!showCaptcha()">
<div class="box-content"> <div class="box-content">
<div class="box-content-row"> <div class="box-content-row">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe
id="hcaptcha_iframe"
height="80"
sandbox="allow-scripts allow-same-origin"
></iframe>
<button class="btn block" type="button" routerLink="/accessibility-cookie"> <button class="btn block" type="button" routerLink="/accessibility-cookie">
<i class="bwi bwi-universal-access" aria-hidden="true"></i> <i class="bwi bwi-universal-access" aria-hidden="true"></i>
{{ "loadAccessibilityCookie" | i18n }} {{ "loadAccessibilityCookie" | i18n }}

View File

@@ -65,7 +65,7 @@
</ng-container> </ng-container>
<ng-container *ngIf="selectedProviderType === providerType.WebAuthn"> <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
<div id="web-authn-frame"> <div id="web-authn-frame">
<iframe id="webauthn_iframe"></iframe> <iframe id="webauthn_iframe" sandbox="allow-scripts allow-same-origin"></iframe>
</div> </div>
<div class="box first"> <div class="box first">
<div class="box-content"> <div class="box-content">
@@ -82,7 +82,9 @@
selectedProviderType === providerType.OrganizationDuo selectedProviderType === providerType.OrganizationDuo
" "
> >
<div id="duo-frame"><iframe id="duo_iframe"></iframe></div> <div id="duo-frame">
<iframe id="duo_iframe" sandbox="allow-scripts allow-forms allow-same-origin"></iframe>
</div>
<div class="box last"> <div class="box last">
<div class="box-content"> <div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow> <div class="box-content-row box-content-row-checkbox" appBoxRow>
@@ -103,7 +105,11 @@
<div class="box last" [hidden]="!showCaptcha()"> <div class="box last" [hidden]="!showCaptcha()">
<div class="box-content"> <div class="box-content">
<div class="box-content-row"> <div class="box-content-row">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe
id="hcaptcha_iframe"
height="80"
sandbox="allow-scripts allow-same-origin"
></iframe>
<button class="btn block" type="button" routerLink="/accessibility-cookie"> <button class="btn block" type="button" routerLink="/accessibility-cookie">
<i class="bwi bwi-universal-access" aria-hidden="true"></i> <i class="bwi bwi-universal-access" aria-hidden="true"></i>
{{ "loadAccessibilityCookie" | i18n }} {{ "loadAccessibilityCookie" | i18n }}

View File

@@ -83,7 +83,11 @@
</div> </div>
<div [hidden]="!showCaptcha()"> <div [hidden]="!showCaptcha()">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe
id="hcaptcha_iframe"
height="80"
sandbox="allow-scripts allow-same-origin"
></iframe>
</div> </div>
<div class="tw-mb-3 tw-flex tw-space-x-4"> <div class="tw-mb-3 tw-flex tw-space-x-4">

View File

@@ -89,7 +89,7 @@
</div> </div>
<div [hidden]="!showCaptcha()"> <div [hidden]="!showCaptcha()">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe id="hcaptcha_iframe" height="80" sandbox="allow-scripts allow-same-origin"></iframe>
</div> </div>
<div class="tw-mb-4 tw-flex tw-items-start"> <div class="tw-mb-4 tw-flex tw-items-start">
<input <input

View File

@@ -80,7 +80,7 @@
</ng-container> </ng-container>
<ng-container *ngIf="selectedProviderType === providerType.WebAuthn"> <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
<div id="web-authn-frame" class="mb-3"> <div id="web-authn-frame" class="mb-3">
<iframe id="webauthn_iframe"></iframe> <iframe id="webauthn_iframe" sandbox="allow-scripts allow-same-origin"></iframe>
</div> </div>
</ng-container> </ng-container>
<ng-container <ng-container
@@ -90,7 +90,10 @@
" "
> >
<div id="duo-frame" class="mb-3"> <div id="duo-frame" class="mb-3">
<iframe id="duo_iframe"></iframe> <iframe
id="duo_iframe"
sandbox="allow-scripts allow-forms allow-same-origin"
></iframe>
</div> </div>
</ng-container> </ng-container>
<i <i
@@ -115,7 +118,11 @@
</ng-container> </ng-container>
<hr /> <hr />
<div [hidden]="!showCaptcha()"> <div [hidden]="!showCaptcha()">
<iframe id="hcaptcha_iframe" height="80"></iframe> <iframe
id="hcaptcha_iframe"
height="80"
sandbox="allow-scripts allow-same-origin"
></iframe>
</div> </div>
<div class="d-flex mb-3"> <div class="d-flex mb-3">
<button <button