From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 1/2] api: acme: set http_proxy if configured in pmg.conf
Date: Tue, 9 Nov 2021 17:20:08 +0100 [thread overview]
Message-ID: <20211109162009.3186-8-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20211109162009.3186-1-s.ivanov@proxmox.com>
If a http_proxy is set in pmg.conf, use it for communicating with the
(usually public) Acme provider.
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PMG/API2/ACME.pm | 21 +++++++++++++++++++++
src/PMG/API2/Certificates.pm | 13 +++++++++++++
2 files changed, 34 insertions(+)
diff --git a/src/PMG/API2/ACME.pm b/src/PMG/API2/ACME.pm
index 42c9f4e..bb12177 100644
--- a/src/PMG/API2/ACME.pm
+++ b/src/PMG/API2/ACME.pm
@@ -14,6 +14,7 @@ use PVE::ACME::Challenge;
use PMG::RESTEnvironment;
use PMG::RS::Acme;
use PMG::CertHelpers;
+use PMG::Config;
use PMG::API2::ACMEPlugin;
@@ -159,6 +160,11 @@ __PACKAGE__->register_method ({
print "Registering new ACME account..\n";
my $acme = PMG::RS::Acme->new($directory);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
+
eval {
$acme->new_account($account_file, defined($param->{tos_url}), $contact, undef);
};
@@ -192,6 +198,11 @@ my $update_account = sub {
if ! -e $account_file;
my $acme = PMG::RS::Acme->load($account_file);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
+
eval {
$acme->update_account(\%info);
};
@@ -297,6 +308,11 @@ __PACKAGE__->register_method ({
if ! -e $account_file;
my $acme = PMG::RS::Acme->load($account_file);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
+
my $data = $acme->account();
return {
@@ -365,6 +381,11 @@ __PACKAGE__->register_method ({
my $directory = extract_param($param, 'directory') // $acme_default_directory_url;
my $acme = PMG::RS::Acme->new($directory);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
+
my $meta = $acme->get_meta();
return $meta ? $meta->{termsOfService} : undef;
diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm
index b52f010..6627328 100644
--- a/src/PMG/API2/Certificates.pm
+++ b/src/PMG/API2/Certificates.pm
@@ -9,6 +9,7 @@ use PVE::JSONSchema qw(get_standard_option);
use PVE::Tools qw(extract_param file_get_contents file_set_contents);
use PMG::CertHelpers;
+use PMG::Config;
use PMG::NodeConfig;
use PMG::RS::Acme;
use PMG::RS::CSR;
@@ -535,6 +536,10 @@ __PACKAGE__->register_method ({
print "Loading ACME account details\n";
my $acme = PMG::RS::Acme->load($account_file);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
my ($cert, $key) = $order_certificate->($acme, $acme_config);
my $certificate = "$key\n$cert";
@@ -609,6 +614,10 @@ __PACKAGE__->register_method ({
print "Loading ACME account details\n";
my $acme = PMG::RS::Acme->load($account_file);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
my ($cert, $key) = $order_certificate->($acme, $acme_config);
my $certificate = "$key\n$cert";
@@ -676,6 +685,10 @@ __PACKAGE__->register_method ({
print "Loading ACME account details\n";
my $acme = PMG::RS::Acme->load($account_file);
+ my $pmg_cfg = PMG::Config->new();
+ if (my $http_proxy = $pmg_cfg->get('admin', 'http_proxy')) {
+ $acme->set_proxy($http_proxy);
+ }
print "Revoking old certificate\n";
eval { $acme->revoke_certificate($cert, undef) };
--
2.30.2
next prev parent reply other threads:[~2021-11-09 16:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 16:20 [pmg-devel] [PATCH pmg-api/proxmox-acme/various] acme: add support for http_proxy Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH proxmox-acme 1/2] add support for proxies Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH proxmox-acme 2/2] dns-challenge: add 'use-proxy' property Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH proxmox-acme-rs 1/1] client: add support for proxies Stoiko Ivanov
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-rs 1/2] add support for set_proxy Stoiko Ivanov
2021-11-18 10:22 ` [pmg-devel] applied: " Wolfgang Bumiller
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-rs 2/2] update to perlmod 0.8 Stoiko Ivanov
2021-11-18 10:23 ` [pmg-devel] applied: " Wolfgang Bumiller
2021-11-09 16:20 ` [pmg-devel] [PATCH widget-toolkit 1/1] acmeplugin: add use-proxy checkbox Stoiko Ivanov
2021-11-09 16:20 ` Stoiko Ivanov [this message]
2021-11-09 16:20 ` [pmg-devel] [PATCH pmg-api 2/2] api: acme: dns-plugin: conditionally pass proxy to acme.sh wrapper Stoiko Ivanov
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=20211109162009.3186-8-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-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