From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lorenz Stechauner <l.stechauner@proxmox.com>
Subject: Re: [pve-devel] [PATCH v4 manager 1/7] api: nodes: add query_url_metadata method
Date: Thu, 6 May 2021 15:15:05 +0200 [thread overview]
Message-ID: <5affaa5f-0506-bed2-56b8-485460e43b74@proxmox.com> (raw)
In-Reply-To: <20210506091105.40976-1-l.stechauner@proxmox.com>
one comment inline
On 5/6/21 11:10, Lorenz Stechauner wrote:
> Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
> ---
> PVE/API2/Nodes.pm | 95 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 95 insertions(+)
>
> diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
> index e58d9c10..a6681ab3 100644
> --- a/PVE/API2/Nodes.pm
> +++ b/PVE/API2/Nodes.pm
> @@ -11,6 +11,7 @@ use JSON;
> use POSIX qw(LONG_MAX);
> use Time::Local qw(timegm_nocheck);
> use Socket;
> +use IO::Socket::SSL;
>
> use PVE::API2Tools;
> use PVE::APLInfo;
> @@ -238,6 +239,7 @@ __PACKAGE__->register_method ({
> { name => 'netstat' },
> { name => 'network' },
> { name => 'qemu' },
> + { name => 'query-url-metadata' },
> { name => 'replication' },
> { name => 'report' },
> { name => 'rrd' }, # fixme: remove?
> @@ -1595,6 +1597,99 @@ __PACKAGE__->register_method({
> return $rpcenv->fork_worker('download', undef, $user, $worker);
> }});
>
> +__PACKAGE__->register_method({
> + name => 'query_url_metadata',
> + path => 'query-url-metadata',
> + method => 'GET',
> + description => "Query metadata of an URL: file size, file name and mime type.",
> + proxyto => 'node',
> + permissions => {
> + check => ['perm', '/', [ 'Sys.Audit', 'Sys.Modify' ]],
> + },
> + parameters => {
> + additionalProperties => 0,
> + properties => {
> + node => get_standard_option('pve-node'),
> + url => {
> + description => "The URL to query the metadata from.",
> + type => 'string',
> + pattern => 'https?://.*',
> + },
> + 'verify-certificates' => {
> + description => "If false, no SSL/TLS certificates will be verified.",
> + type => 'boolean',
> + optional => 1,
> + default => 1,
> + }
> + },
> + },
> + returns => {
> + type => "object",
> + properties => {
> + filename => {
> + type => 'string',
> + optional => 1,
> + },
> + size => {
> + type => 'integer',
> + renderer => 'bytes',
> + optional => 1,
> + },
> + mimetype => {
> + type => 'string',
> + optional => 1,
> + },
> + },
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + my $url = $param->{url};
> +
> + my $ua = LWP::UserAgent->new();
> +
> + my $dccfg = PVE::Cluster::cfs_read_file('datacenter.cfg');
> + if ($dccfg->{http_proxy}) {
> + $ua->proxy('http', $dccfg->{http_proxy});
> + }
> +
> + if (!$param->{'verify-certificates'}) {
this does not work sadly
we do not fill in the defaults from the api schema into $param
so when nothing is given
$param->{'verify-certificates'} will be 'undef'
if you want a 'truthy' default you have to do it yourself:
my $verify = $param->{'verify-certificates'} // 1;
(although there are some pieces of code where we *do* inject the
default, e.g. pmg config parsing...)
> + $ua->ssl_opts(
> + verify_hostname => 0,
> + SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE,
> + );
> + }
> +
> + my $req = HTTP::Request->new(HEAD => $url);
> + my $res = $ua->request($req);
> +
> + die "invalid server response: '" . $res->status_line() . "'\n" if ($res->code() != 200);
> +
> + my $size = $res->header("Content-Length");
> + my $disposition = $res->header("Content-Disposition");
> + my $type = $res->header("Content-Type");
> +
> + my $filename;
> +
> + if ($disposition && $disposition =~ m/filename=(.+)/) {
> + $filename = $1;
> + } elsif ($url =~ m!^[^?]+/([^?/]*)(?:\?.*)?$!) {
> + $filename = $1;
> + }
> +
> + # Content-Type: text/html; charset=utf-8
> + if ($type && $type =~ m/^([^;]+);/) {
> + $type = $1;
> + }
> +
> + my $ret = {};
> + $ret->{filename} = $filename if $filename;
> + $ret->{size} = $size + 0 if $size;
> + $ret->{mimetype} = $type if $type;
> +
> + return $ret;
> + }});
> +
> __PACKAGE__->register_method({
> name => 'report',
> path => 'report',
>
prev parent reply other threads:[~2021-05-06 13:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 10:20 [pve-devel] [PATCH-SERIES v2 manager/storage 0/2] fix #1710: add retrieve method for Lorenz Stechauner
2021-05-03 10:20 ` [pve-devel] [PATCH v2 storage 1/2] fix #1710: add retrieve method for storage Lorenz Stechauner
2021-05-03 10:21 ` [pve-devel] [PATCH v2 manager 2/2] fix #1710: add retrieve from url button " Lorenz Stechauner
2021-05-04 8:55 ` [pve-devel] [PATCH-SERIES v3 manager/storage 0/2] " Lorenz Stechauner
2021-05-04 8:56 ` [pve-devel] [PATCH v3 storage 1/2] fix #1710: add retrieve method " Lorenz Stechauner
2021-05-04 9:31 ` Thomas Lamprecht
2021-05-04 8:57 ` [pve-devel] [PATCH v3 manager 2/2] fix #1710: add retrieve from url button " Lorenz Stechauner
2021-05-04 9:47 ` Thomas Lamprecht
2021-05-06 9:10 ` [pve-devel] [PATCH-SERIES v4 manager/common/storage 0/7] fix #1710: add download from url button Lorenz Stechauner
2021-05-06 9:10 ` [pve-devel] [PATCH v4 manager 1/7] api: nodes: add query_url_metadata method Lorenz Stechauner
2021-05-06 9:11 ` [pve-devel] [PATCH v4 common 2/7] tools: add download_file_from_url Lorenz Stechauner
2021-05-06 10:04 ` Oguz Bektas
2021-05-06 12:15 ` Thomas Lamprecht
2021-05-06 12:17 ` Thomas Lamprecht
2021-05-06 9:11 ` [pve-devel] [PATCH v4 manager 3/7] api: nodes: refactor aplinfo to use common download function Lorenz Stechauner
2021-05-06 9:11 ` [pve-devel] [PATCH v4 storage 4/7] status: add download_url method Lorenz Stechauner
2021-05-06 9:23 ` [pve-devel] [PATCH v5 storage] " Lorenz Stechauner
2021-05-06 9:11 ` [pve-devel] [PATCH v4 manager 5/7] ui: add HashAlgorithmSelector Lorenz Stechauner
2021-05-06 9:11 ` [pve-devel] [PATCH v4 manager 6/7] ui: Utils: change download task format Lorenz Stechauner
2021-05-06 9:11 ` [pve-devel] [PATCH v4 manager 7/7] fix #1710: ui: storage: add download from url button Lorenz Stechauner
2021-05-06 13:15 ` Dominik Csapak [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=5affaa5f-0506-bed2-56b8-485460e43b74@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=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