From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/1] fix #1710: add retrieve from url button for storage
Date: Wed, 28 Apr 2021 16:13:44 +0200 [thread overview]
Message-ID: <20210428141346.240896-1-l.stechauner@proxmox.com> (raw)
Add PVE.storage.Retrieve window and PVE.form.hashAlgorithmSelector.
Users are now able to download/retrieve any .iso/... file onto their
storages and verify file integrity with checksums.
Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/form/HashAlgorithmSelector.js | 21 +++
www/manager6/storage/ContentView.js | 161 +++++++++++++++++++++
3 files changed, 183 insertions(+)
create mode 100644 www/manager6/form/HashAlgorithmSelector.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index afed3283..8e6557d8 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -38,6 +38,7 @@ JSSRC= \
form/GlobalSearchField.js \
form/GroupSelector.js \
form/GuestIDSelector.js \
+ form/HashAlgorithmSelector.js \
form/HotplugFeatureSelector.js \
form/IPProtocolSelector.js \
form/IPRefSelector.js \
diff --git a/www/manager6/form/HashAlgorithmSelector.js b/www/manager6/form/HashAlgorithmSelector.js
new file mode 100644
index 00000000..4a72cc08
--- /dev/null
+++ b/www/manager6/form/HashAlgorithmSelector.js
@@ -0,0 +1,21 @@
+Ext.define('PVE.form.hashAlgorithmSelector', {
+ extend: 'Proxmox.form.KVComboBox',
+ alias: ['widget.pveHashAlgorithmSelector'],
+ comboItems: [],
+ hasNoneOption: false,
+ initComponent: function() {
+ var me = this;
+ me.comboItems = [
+ ['md5', 'MD5'],
+ ['sha1', 'SHA-1'],
+ ['sha224', 'SHA-224'],
+ ['sha256', 'SHA-256'],
+ ['sha384', 'SHA-384'],
+ ['sha512', 'SHA-512'],
+ ];
+ if (me.hasNoneOption) {
+ me.comboItems.unshift(['none', 'None']);
+ }
+ this.callParent();
+ },
+});
diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index dd6df4b1..7187ebbe 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -191,6 +191,153 @@ Ext.define('PVE.storage.Upload', {
},
});
+Ext.define('PVE.storage.Retrieve', {
+ extend: 'Proxmox.window.Edit',
+ alias: 'widget.pveStorageRetrieve',
+
+ resizable: false,
+
+ modal: true,
+
+ isCreate: true,
+
+ showTaskViewer: true,
+ upidFieldName: 'upid',
+
+ initComponent: function() {
+ var me = this;
+
+ if (!me.nodename) {
+ throw "no node name specified";
+ }
+ if (!me.storage) {
+ throw "no storage ID specified";
+ }
+
+ me.url = `/nodes/${me.nodename}/storage/${me.storage}/retrieve`;
+ me.method = 'POST';
+
+ let defaultContent = me.contents[0] || '';
+
+ let urlField = Ext.create('Ext.form.field.Text', {
+ name: 'url',
+ allowBlank: false,
+ fieldLabel: gettext('URL'),
+ });
+
+ let fileNameField = Ext.create('Ext.form.field.Text', {
+ name: 'filename',
+ allowBlank: false,
+ fieldLabel: gettext('File name'),
+ });
+
+ let fileSizeField = Ext.create('Ext.form.field.Text', {
+ name: 'size',
+ disabled: true,
+ fieldLabel: gettext('File size'),
+ emptyText: gettext('unknown'),
+ });
+
+ let checksumField = Ext.create('Ext.form.field.Text', {
+ name: 'checksum',
+ fieldLabel: gettext('Checksum'),
+ allowBlank: true,
+ disabled: true,
+ emptyText: gettext('none'),
+ });
+
+ let checksumAlgField = Ext.create('PVE.form.hashAlgorithmSelector', {
+ name: 'checksumalg',
+ fieldLabel: gettext('Hash algorithm'),
+ allowBlank: true,
+ hasNoneOption: true,
+ value: 'none',
+ });
+
+ let inputPanel = Ext.create('Proxmox.panel.InputPanel', {
+ method: 'POST',
+ waitMsgTarget: true,
+ border: false,
+ columnT: [
+ urlField,
+ fileNameField,
+ ],
+ column1: [
+ {
+ xtype: 'pveContentTypeSelector',
+ cts: me.contents,
+ fieldLabel: gettext('Content'),
+ name: 'content',
+ value: defaultContent,
+ allowBlank: false,
+ },
+ ],
+ column2: [
+ fileSizeField,
+ ],
+ advancedColumn1: [
+ checksumField,
+ checksumAlgField,
+ ],
+ advancedColumn2: [
+ {
+ xtype: 'checkbox',
+ name: 'insecure',
+ fieldLabel: gettext('Trust invalid certificates'),
+ labelWidth: 150,
+ },
+ ],
+ });
+
+ urlField.on('change', function() {
+ urlField.setValidation("Waiting for response...");
+ urlField.validate();
+ fileSizeField.setValue("");
+ Proxmox.Utils.API2Request({
+ url: me.url,
+ method: 'POST',
+ params: {
+ metaonly: 1,
+ url: me.getValues()['url'],
+ content: me.getValues()['content'],
+ },
+ failure: function(res, opt) {
+ urlField.setValidation(res.result.message);
+ urlField.validate();
+ fileSizeField.setValue("");
+ },
+ success: function(res, opt) {
+ urlField.setValidation();
+ urlField.validate();
+
+ let data = res.result.data;
+ fileNameField.setValue(data.filename);
+ fileSizeField.setValue(Proxmox.Utils.format_size(data.size));
+ },
+ });
+ });
+
+ checksumAlgField.on('change', function() {
+ if (this.getValue() === 'none') {
+ checksumField.setDisabled(true);
+ checksumField.setValue("");
+ checksumField.allowBlank = true;
+ } else {
+ checksumField.setDisabled(false);
+ checksumField.allowBlank = false;
+ }
+ });
+
+ Ext.apply(me, {
+ title: gettext('Retrieve from URL'),
+ items: inputPanel,
+ submitText: gettext('Download'),
+ });
+
+ me.callParent();
+ },
+});
+
Ext.define('PVE.storage.ContentView', {
extend: 'Ext.grid.GridPanel',
@@ -262,6 +409,19 @@ Ext.define('PVE.storage.ContentView', {
},
});
+ let retrieveButton = Ext.create('Proxmox.button.Button', {
+ text: gettext('Retrieve from URL'),
+ handler: function() {
+ let win = Ext.create('PVE.storage.Retrieve', {
+ nodename: nodename,
+ storage: storage,
+ contents: [content],
+ });
+ win.show();
+ win.on('destroy', reload);
+ },
+ });
+
let removeButton = Ext.create('Proxmox.button.StdRemoveButton', {
selModel: sm,
delay: 5,
@@ -276,6 +436,7 @@ Ext.define('PVE.storage.ContentView', {
}
if (me.useUploadButton) {
me.tbar.push(uploadButton);
+ me.tbar.push(retrieveButton);
}
if (!me.useCustomRemoveButton) {
me.tbar.push(removeButton);
--
2.20.1
next reply other threads:[~2021-04-28 14:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 14:13 Lorenz Stechauner [this message]
2021-04-28 14:13 ` [pve-devel] [PATCH storage 1/1] fix #1710: add retrieve method " Lorenz Stechauner
2021-04-29 11:54 ` Dominik Csapak
2021-04-29 13:22 ` Thomas Lamprecht
2021-04-29 14:01 ` Dominik Csapak
2021-04-29 14:11 ` Thomas Lamprecht
2021-04-28 14:13 ` [pve-devel] [PATCH widget-toolkit 1/1] window: add upidFieldName option Lorenz Stechauner
2021-04-29 12:14 ` Dominik Csapak
2021-04-29 12:13 ` [pve-devel] [PATCH manager 1/1] fix #1710: add retrieve from url button for storage Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210428141346.240896-1-l.stechauner@proxmox.com \
--to=l.stechauner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal