From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <a.lauterer@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id DB05191551
 for <pve-devel@lists.proxmox.com>; Fri, 10 Mar 2023 15:36:58 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 997B3227BB
 for <pve-devel@lists.proxmox.com>; Fri, 10 Mar 2023 15:36:58 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
 [94.136.29.106])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS
 for <pve-devel@lists.proxmox.com>; Fri, 10 Mar 2023 15:36:58 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
 by proxmox-new.maurer-it.com (Proxmox) with ESMTP id ACA8F45DF1
 for <pve-devel@lists.proxmox.com>; Fri, 10 Mar 2023 15:36:57 +0100 (CET)
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 10 Mar 2023 15:36:57 +0100
Message-Id: <20230310143657.1957557-1-a.lauterer@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.042 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH manager] ui: PBSEdit: cleanup iframe for paperkey
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 10 Mar 2023 14:36:58 -0000

Otherwise the iframe used to print the paperkey will remain even after
the encryption key window is closed.
Additionally clean before creating a new one as otherwise we might end
up with multiple iframes.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
 www/manager6/storage/PBSEdit.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/www/manager6/storage/PBSEdit.js b/www/manager6/storage/PBSEdit.js
index 5b6b6bb8..dbc88668 100644
--- a/www/manager6/storage/PBSEdit.js
+++ b/www/manager6/storage/PBSEdit.js
@@ -112,7 +112,10 @@ Ext.define('PVE.Storage.PBSKeyShow', {
 			    width: 110,
 			    handler: function(b) {
 				let win = this.up('window');
-				win.paperkey(win.key);
+				if (win.printFrame) {
+				    document.body.removeChild(win.printFrame);
+				}
+				win.printFrame = win.paperkey(win.key, win.printFrame);
 			    },
 			},
 		    ],
@@ -132,6 +135,9 @@ Ext.define('PVE.Storage.PBSKeyShow', {
 	    text: gettext('Close'),
 	    handler: function(b) {
 		let win = this.up('window');
+		if (win.printFrame) {
+		    document.body.removeChild(win.printFrame);
+		}
 		win.close();
 	    },
 	},
@@ -181,6 +187,7 @@ ${prettifiedKey}
 
 	printFrame.src = "data:text/html;base64," + btoa(html);
 	document.body.appendChild(printFrame);
+	return printFrame;
     },
 });
 
-- 
2.30.2