From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: Lorenz Stechauner <l.stechauner@proxmox.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v7 manager 5/5] fix #1710: ui: storage: add download from url button
Date: Tue, 15 Jun 2021 09:58:03 +0200 [thread overview]
Message-ID: <efeed42f-6bdc-c52d-0ba1-fba82ed3ffe0@proxmox.com> (raw)
In-Reply-To: <20210614090557.33455-8-l.stechauner@proxmox.com>
uses the common function PVE::Tools::download_file_from_url to download
a iso image or container template.
note: Only users with permissions `Sys.Audit` and `Sys.Modify` on `/`
are permitted to use the api endpoints due to security reasons. (it is
possible to download files from internal networks which would be not
visible/accessible from outside)
On 14.06.21 11:05, Lorenz Stechauner wrote:
> Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
> ---
> www/manager6/storage/Browser.js | 8 +
> www/manager6/storage/ContentView.js | 247 +++++++++++++++++++++++++---
> 2 files changed, 231 insertions(+), 24 deletions(-)
>
> diff --git a/www/manager6/storage/Browser.js b/www/manager6/storage/Browser.js
> index 5fee94c7..fe5df3e2 100644
> --- a/www/manager6/storage/Browser.js
> +++ b/www/manager6/storage/Browser.js
> @@ -53,6 +53,9 @@ Ext.define('PVE.storage.Browser', {
> let plugin = res.plugintype;
> let contents = res.content.split(',');
>
> + let enableUpload = !!caps.storage['Datastore.AllocateTemplate'];
> + let enableDownloadUrl = enableUpload && !!(caps.nodes['Sys.Audit'] && caps.nodes['Sys.Modify']);
> +
> if (contents.includes('backup')) {
> me.items.push({
> xtype: 'pveStorageBackupView',
> @@ -91,6 +94,8 @@ Ext.define('PVE.storage.Browser', {
> itemId: 'contentIso',
> content: 'iso',
> pluginType: plugin,
> + enableUploadButton: enableUpload,
> + enableDownloadUrlButton: enableDownloadUrl,
> useUploadButton: true,
> });
> }
> @@ -101,6 +106,9 @@ Ext.define('PVE.storage.Browser', {
> iconCls: 'fa fa-file-o lxc',
> itemId: 'contentVztmpl',
> pluginType: plugin,
> + enableUploadButton: enableUpload,
> + enableDownloadUrlButton: enableDownloadUrl,
> + useUploadButton: true,
> });
> }
> if (contents.includes('snippets')) {
> diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
> index dd6df4b1..6171d30c 100644
> --- a/www/manager6/storage/ContentView.js
> +++ b/www/manager6/storage/ContentView.js
> @@ -191,6 +191,191 @@ Ext.define('PVE.storage.Upload', {
> },
> });
>
> +Ext.define('PVE.storage.DownloadUrl', {
> + extend: 'Proxmox.window.Edit',
> + alias: 'widget.pveStorageDownloadUrl',
> + mixins: ['Proxmox.Mixin.CBind'],
> +
> + isCreate: true,
> +
> + method: 'POST',
> +
> + showTaskViewer: true,
> +
> + title: gettext('Download from URL'),
> + submitText: gettext('Download'),
> +
> + cbindData: function(initialConfig) {
> + var me = this;
> + return {
> + nodename: me.nodename,
> + storage: me.storage,
> + contents: me.contents,
> + content: me.contents[0],
> + };
> + },
> +
> + cbind: {
> + url: '/nodes/{nodename}/storage/{storage}/download-url',
> + },
> +
> + controller: {
> + xclass: 'Ext.app.ViewController',
> +
> + urlChange: function(field) {
> + let me = this;
> + let view = me.getView();
> + field = view.down('[name=url]');
> + field.setValidation("Waiting for response...");
> + field.validate();
> + view.setValues({ size: "" });
> + Proxmox.Utils.API2Request({
> + url: `/nodes/${view.nodename}/query-url-metadata`,
> + method: 'GET',
> + params: {
> + url: field.getValue(),
> + 'verify-certificates': view.getValues()['verify-certificates'],
> + },
> + failure: function(res, opt) {
> + field.setValidation(res.result.message);
> + field.validate();
> + view.setValues({
> + size: "",
> + mimetype: "",
> + });
> + },
> + success: function(res, opt) {
> + field.setValidation();
> + field.validate();
> +
> + let data = res.result.data;
> + view.setValues({
> + filename: data.filename || "",
> + size: (data.size && Proxmox.Utils.format_size(data.size)) || "",
> + mimetype: data.mimetype || "",
> + });
> + },
> + });
> + },
> +
> + hashChange: function(field) {
> + let checksum = Ext.getCmp('downloadUrlChecksum');
> + if (field.getValue() === '__default__') {
> + checksum.setDisabled(true);
> + checksum.setValue("");
> + checksum.allowBlank = true;
> + } else {
> + checksum.setDisabled(false);
> + checksum.allowBlank = false;
> + }
> + },
> + },
> +
> + items: [
> + {
> + xtype: 'inputpanel',
> + waitMsgTarget: true,
> + border: false,
> + columnT: [
> + {
> + xtype: 'textfield',
> + name: 'url',
> + allowBlank: false,
> + fieldLabel: gettext('URL'),
> + listeners: {
> + change: {
> + buffer: 500,
> + fn: 'urlChange',
> + },
> + },
> + },
> + {
> + xtype: 'textfield',
> + name: 'filename',
> + allowBlank: false,
> + fieldLabel: gettext('File name'),
> + },
> + ],
> + column1: [
> + {
> + xtype: 'pveContentTypeSelector',
> + fieldLabel: gettext('Content'),
> + name: 'content',
> + allowBlank: false,
> + cbind: {
> + cts: '{contents}',
> + value: '{content}',
> + },
> + },
> + ],
> + column2: [
> + {
> + xtype: 'textfield',
> + name: 'size',
> + disabled: true,
> + fieldLabel: gettext('File size'),
> + emptyText: gettext('unknown'),
> + },
> + ],
> + advancedColumn1: [
> + {
> + 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: true,
> + disabled: true,
> + emptyText: gettext('none'),
> + id: 'downloadUrlChecksum',
> + },
> + ],
> + advancedColumn2: [
> + {
> + xtype: 'textfield',
> + fieldLabel: gettext('MIME type'),
> + name: 'mimetype',
> + disabled: true,
> + editable: false,
> + emptyText: gettext('unknown'),
> + },
> + {
> + xtype: 'proxmoxcheckbox',
> + name: 'verify-certificates',
> + fieldLabel: gettext('Verify certificates'),
> + uncheckedValue: 0,
> + checked: true,
> + listeners: {
> + change: 'urlChange',
> + },
> + },
> + ],
> + },
> + ],
> +
> + initComponent: function() {
> + var me = this;
> +
> + if (!me.nodename) {
> + throw "no node name specified";
> + }
> + if (!me.storage) {
> + throw "no storage ID specified";
> + }
> +
> + me.callParent();
> + },
> +});
> +
> Ext.define('PVE.storage.ContentView', {
> extend: 'Ext.grid.GridPanel',
>
> @@ -249,36 +434,50 @@ Ext.define('PVE.storage.ContentView', {
>
> Proxmox.Utils.monStoreErrors(me, store);
>
> - let uploadButton = Ext.create('Proxmox.button.Button', {
> - text: gettext('Upload'),
> - handler: function() {
> - let win = Ext.create('PVE.storage.Upload', {
> - nodename: nodename,
> - storage: storage,
> - contents: [content],
> - });
> - win.show();
> - win.on('destroy', reload);
> - },
> - });
> -
> - let removeButton = Ext.create('Proxmox.button.StdRemoveButton', {
> - selModel: sm,
> - delay: 5,
> - callback: function() {
> - reload();
> - },
> - baseurl: baseurl + '/',
> - });
> -
> if (!me.tbar) {
> me.tbar = [];
> }
> if (me.useUploadButton) {
> - me.tbar.push(uploadButton);
> + me.tbar.unshift(
> + {
> + xtype: 'button',
> + text: gettext('Upload'),
> + disabled: !me.enableUploadButton,
> + handler: function() {
> + Ext.create('PVE.storage.Upload', {
> + nodename: nodename,
> + storage: storage,
> + contents: [content],
> + autoShow: true,
> + taskDone: () => reload(),
> + });
> + },
> + },
> + {
> + xtype: 'button',
> + text: gettext('Download from URL'),
> + disabled: !me.enableDownloadUrlButton,
> + handler: function() {
> + Ext.create('PVE.storage.DownloadUrl', {
> + nodename: nodename,
> + storage: storage,
> + contents: [content],
> + autoShow: true,
> + taskDone: () => reload(),
> + });
> + },
> + },
> + '-',
> + );
> }
> if (!me.useCustomRemoveButton) {
> - me.tbar.push(removeButton);
> + me.tbar.push({
> + xtype: 'proxmoxStdRemoveButton',
> + selModel: sm,
> + delay: 5,
> + callback: () => reload(),
> + baseurl: baseurl + '/',
> + });
> }
> me.tbar.push(
> '->',
prev parent reply other threads:[~2021-06-15 7:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 9:05 [pve-devel] [PATCH-SERIES v7 manager/common/storage] fix #1710: add downlaod " Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 common 1/1] tools: add download_file_from_url Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
2021-06-15 12:25 ` [pve-devel] applied: " Thomas Lamprecht
2021-06-14 9:05 ` [pve-devel] [PATCH v7 storage 1/1] status: add download_url method Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 1/5] api: nodes: add query_url_metadata method Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 2/5] api: nodes: refactor aplinfo to use common download function Lorenz Stechauner
2021-06-15 7:57 ` Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 3/5] ui: add HashAlgorithmSelector Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 4/5] ui: Utils: change download task format Lorenz Stechauner
2021-06-14 9:05 ` [pve-devel] [PATCH v7 manager 5/5] fix #1710: ui: storage: add download from url button Lorenz Stechauner
2021-06-15 7:58 ` Lorenz Stechauner [this message]
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=efeed42f-6bdc-c52d-0ba1-fba82ed3ffe0@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox