From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DF6C37CF64 for ; Mon, 8 Nov 2021 09:55:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CC71921DD5 for ; Mon, 8 Nov 2021 09:54:56 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 03C6321DB8 for ; Mon, 8 Nov 2021 09:54:56 +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 AF02C432F2 for ; Mon, 8 Nov 2021 09:54:55 +0100 (CET) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Mon, 8 Nov 2021 09:53:48 +0100 Message-Id: <20211108085350.33374-4-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211108085350.33374-1-l.stechauner@proxmox.com> References: <20211108085350.33374-1-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.373 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 v5 manager 3/5] fix #3505: ui/UploadToStorage: add checksum and algorithm X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Nov 2021 08:55:26 -0000 Signed-off-by: Lorenz Stechauner Reviewed-by: Dominik Csapak Tested-by: Dominik Csapak --- www/manager6/window/UploadToStorage.js | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/www/manager6/window/UploadToStorage.js b/www/manager6/window/UploadToStorage.js index e9c35f77..7dc51882 100644 --- a/www/manager6/window/UploadToStorage.js +++ b/www/manager6/window/UploadToStorage.js @@ -62,6 +62,16 @@ Ext.define('PVE.window.UploadToStorage', { const filename = filenameField.getValue(); filenameField.setDisabled(true); + const algorithmField = form.findField('checksum-algorithm'); + algorithmField.setDisabled(true); + if (algorithmField.getValue() !== '__default__') { + fd.append("checksum-algorithm", algorithmField.getValue()); + + const checksumField = form.findField('checksum'); + fd.append("checksum", checksumField.getValue()); + checksumField.setDisabled(true); + } + fd.append("filename", file, filename); pbar.setVisible(true); @@ -115,6 +125,16 @@ Ext.define('PVE.window.UploadToStorage', { vm.set('size', (fileInput.files[0] && Proxmox.Utils.format_size(fileInput.files[0].size)) || '-'); vm.set('mimetype', (fileInput.files[0] && fileInput.files[0].type) || '-'); }, + + hashChange: function(field, value) { + const checksum = this.lookup('downloadUrlChecksum'); + if (value === '__default__') { + checksum.setDisabled(true); + checksum.setValue(""); + } else { + checksum.setDisabled(false); + } + }, }, items: [ @@ -169,6 +189,26 @@ Ext.define('PVE.window.UploadToStorage', { value: '{mimetype}', }, }, + { + xtype: 'pveHashAlgorithmSelector', + name: 'checksum-algorithm', + fieldLabel: gettext('Hash algorithm'), + allowBlank: true, + hasNoneOption: true, + value: '__default__', + listeners: { + change: 'hashChange', + }, + }, + { + xtype: 'textfield', + name: 'checksum', + fieldLabel: gettext('Checksum'), + allowBlank: false, + disabled: true, + emptyText: gettext('none'), + reference: 'downloadUrlChecksum', + }, { xtype: 'progressbar', text: 'Ready', -- 2.30.2