public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH api 5/8] api: add ACME and ACMEPlugin module
Date: Thu, 11 Mar 2021 11:41:22 +0100	[thread overview]
Message-ID: <1a9960dd-ef4f-e348-ea73-30272b9df8cd@proxmox.com> (raw)
In-Reply-To: <20210309141401.19237-6-w.bumiller@proxmox.com>

comments inline

On 3/9/21 3:13 PM, Wolfgang Bumiller wrote:
> This adds the cluster-wide acme account and plugin
> configuration:
> 
>     * /config/acme
>     |`+ account/
>     | '- {name}
>     |`- tos
>     |`- directories
>     |`- challenge-schema
>      `+ plugins/
>       '- {name}
> 
> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> ---
>   src/Makefile               |   2 +
>   src/PMG/API2/ACME.pm       | 436 +++++++++++++++++++++++++++++++++++++
>   src/PMG/API2/ACMEPlugin.pm | 270 +++++++++++++++++++++++
>   src/PMG/API2/Config.pm     |   7 +
>   4 files changed, 715 insertions(+)
>   create mode 100644 src/PMG/API2/ACME.pm
>   create mode 100644 src/PMG/API2/ACMEPlugin.pm
> 
> diff --git a/src/Makefile b/src/Makefile
> index ce76f9f..ebc6bd8 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -155,6 +155,8 @@ LIBSOURCES =				\
>   	PMG/API2/When.pm		\
>   	PMG/API2/What.pm		\
>   	PMG/API2/Action.pm		\
> +	PMG/API2/ACME.pm		\
> +	PMG/API2/ACMEPlugin.pm		\
>   	PMG/API2.pm			\
>   
>   SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-apt.conf pmg-initramfs.conf
> diff --git a/src/PMG/API2/ACME.pm b/src/PMG/API2/ACME.pm
> new file mode 100644
> index 0000000..3b031fb
> --- /dev/null
> +++ b/src/PMG/API2/ACME.pm
> @@ -0,0 +1,436 @@
> +package PMG::API2::ACME;
> +
> +use strict;
> +use warnings;
> +
> +use PVE::Exception qw(raise_param_exc);
> +use PVE::JSONSchema qw(get_standard_option);
> +use PVE::Tools qw(extract_param);
> +
> +use PVE::ACME::Challenge;
> +
> +use PMG::RESTEnvironment;
> +use PMG::RS::Acme;
> +use PMG::CertHelpers;
> +
> +use PMG::API2::ACMEPlugin;
> +
> +use base qw(PVE::RESTHandler);
> +
> +__PACKAGE__->register_method ({
> +    subclass => "PMG::API2::ACMEPlugin",
> +    path => 'plugins',
> +});
> +
> +# FIXME: Put this list in pve-common or proxmox-acme{,-rs}?
> +my $acme_directories = [
> +    {
> +	name => 'Let\'s Encrypt V2',
> +	url => 'https://acme-v02.api.letsencrypt.org/directory',
> +    },
> +    {
> +	name => 'Let\'s Encrypt V2 Staging',
> +	url => 'https://acme-staging-v02.api.letsencrypt.org/directory',
> +    },
> +];
> +my $acme_default_directory_url = $acme_directories->[0]->{url};
> +my $account_contact_from_param = sub {
> +    my @addresses = PVE::Tools::split_list(extract_param($_[0], 'contact'));
> +    return [ map { "mailto:$_" } @addresses ];
> +};
> +my $acme_account_dir = PMG::CertHelpers::acme_account_dir();
> +
> +__PACKAGE__->register_method ({
> +    name => 'index',
> +    path => '',
> +    method => 'GET',
> +    permissions => { user => 'all' },
> +    description => "ACME index.",
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	},
> +    },
> +    returns => {
> +	type => 'array',
> +	items => {
> +	    type => "object",
> +	    properties => {},
> +	},
> +	links => [ { rel => 'child', href => "{name}" } ],
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	return [
> +	    { name => 'account' },
> +	    { name => 'tos' },
> +	    { name => 'directories' },
> +	    { name => 'plugins' },
> +	    { name => 'challengeschema' },
> +	];
> +    }});
> +
> +__PACKAGE__->register_method ({
> +    name => 'account_index',
> +    path => 'account',
> +    method => 'GET',
> +    permissions => { user => 'all' },

i'd argue that the qmanager should not list the
available acme accounts

> +    description => "ACME account index.",
> +    protected => 1,
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	},
> +    },
> +    returns => {
> +	type => 'array',
> +	items => {
> +	    type => "object",
> +	    properties => {},
> +	},
> +	links => [ { rel => 'child', href => "{name}" } ],
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $accounts = PMG::CertHelpers::list_acme_accounts();
> +	return [ map { { name => $_ }  } @$accounts ];
> +    }});

for the following create/update
the permissions are missing but should be 'admin'
(they are ok for the plugins)

> +
> +__PACKAGE__->register_method ({
> +    name => 'register_account',
> +    path => 'account',
> +    method => 'POST',
> +    description => "Register a new ACME account with CA.",
> +    proxyto => 'master',
> +    protected => 1,
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    name => get_standard_option('pmg-acme-account-name'),
> +	    contact => get_standard_option('pmg-acme-account-contact'),
> +	    tos_url => {
> +		type => 'string',
> +		description => 'URL of CA TermsOfService - setting this indicates agreement.',
> +		optional => 1,
> +	    },
> +	    directory => get_standard_option('pmg-acme-directory-url', {
> +		default => $acme_default_directory_url,
> +		optional => 1,
> +	    }),
> +	},
> +    },
> +    returns => {
> +	type => 'string',
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $rpcenv = PMG::RESTEnvironment->get();
> +	my $authuser = $rpcenv->get_user();
> +
> +	my $account_name = extract_param($param, 'name') // 'default';
> +	my $account_file = "${acme_account_dir}/${account_name}";
> +	mkdir $acme_account_dir if ! -e $acme_account_dir;
> +
> +	raise_param_exc({'name' => "ACME account config file '${account_name}' already exists."})
> +	    if -e $account_file;
> +
> +	my $directory = extract_param($param, 'directory') // $acme_default_directory_url;
> +	my $contact = $account_contact_from_param->($param);
> +
> +	my $realcmd = sub {
> +	    PMG::CertHelpers::lock_acme($account_name, 10, sub {
> +		die "ACME account config file '${account_name}' already exists.\n"
> +		    if -e $account_file;
> +
> +		print "Registering new ACME account..\n";
> +		my $acme = PMG::RS::Acme->new($directory);
> +		eval {
> +		    $acme->new_account($account_file, defined($param->{tos_url}), $contact, undef);
> +		};
> +		if (my $err = $@) {
> +		    unlink $account_file;
> +		    die "Registration failed: $err\n";
> +		}
> +		my $location = $acme->location();
> +		print "Registration successful, account URL: '$location'\n";
> +	    });
> +	    die $@ if $@;
> +	};
> +
> +	return $rpcenv->fork_worker('acmeregister', undef, $authuser, $realcmd);
> +    }});
> +
> +my $update_account = sub {
> +    my ($param, $msg, %info) = @_;
> +
> +    my $account_name = extract_param($param, 'name') // 'default';
> +    my $account_file = "${acme_account_dir}/${account_name}";
> +
> +    raise_param_exc({'name' => "ACME account config file '${account_name}' does not exist."})
> +	if ! -e $account_file;
> +
> +
> +    my $rpcenv = PMG::RESTEnvironment->get();
> +    my $authuser = $rpcenv->get_user();
> +
> +    my $realcmd = sub {
> +	PMG::CertHelpers::lock_acme($account_name, 10, sub {
> +	    die "ACME account config file '${account_name}' does not exist.\n"
> +		if ! -e $account_file;
> +
> +	    my $acme = PMG::RS::Acme->load($account_file);
> +	    $acme->update_account(\%info);
> +	    if ($info{status} && $info{status} eq 'deactivated') {
> +		my $deactivated_name;
> +		for my $i (0..100) {
> +		    my $candidate = "${acme_account_dir}/_deactivated_${account_name}_${i}";
> +		    if (! -e $candidate) {
> +			$deactivated_name = $candidate;
> +			last;
> +		    }
> +		}
> +		if ($deactivated_name) {
> +		    print "Renaming account file from '$account_file' to '$deactivated_name'\n";
> +		    rename($account_file, $deactivated_name) or
> +			warn ".. failed - $!\n";
> +		} else {
> +		    warn "No free slot to rename deactivated account file '$account_file', leaving in place\n";
> +		}
> +	    }
> +	});
> +	die $@ if $@;
> +    };
> +
> +    return $rpcenv->fork_worker("acme${msg}", undef, $authuser, $realcmd);
> +};
> +
> +__PACKAGE__->register_method ({
> +    name => 'update_account',
> +    path => 'account/{name}',
> +    method => 'PUT',
> +    description => "Update existing ACME account information with CA. Note: not specifying any new account information triggers a refresh.",
> +    proxyto => 'master',
> +    protected => 1,
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    name => get_standard_option('pmg-acme-account-name'),
> +	    contact => get_standard_option('pmg-acme-account-contact', {
> +		optional => 1,
> +	    }),
> +	},
> +    },
> +    returns => {
> +	type => 'string',
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $contact = $account_contact_from_param->($param);
> +	if (scalar @$contact) {
> +	    return $update_account->($param, 'update', contact => $contact);
> +	} else {
> +	    return $update_account->($param, 'refresh');
> +	}
> +    }});
> +
> +__PACKAGE__->register_method ({
> +    name => 'get_account',
> +    path => 'account/{name}',
> +    method => 'GET',
> +    description => "Return existing ACME account information.",
> +    protected => 1,
> +    proxyto => 'master',
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    name => get_standard_option('pmg-acme-account-name'),
> +	},
> +    },
> +    returns => {
> +	type => 'object',
> +	additionalProperties => 0,
> +	properties => {
> +	    account => {
> +		type => 'object',
> +		optional => 1,
> +		renderer => 'yaml',
> +	    },
> +	    directory => get_standard_option('pmg-acme-directory-url', {
> +		optional => 1,
> +	    }),
> +	    location => {
> +		type => 'string',
> +		optional => 1,
> +	    },
> +	    tos => {
> +		type => 'string',
> +		optional => 1,
> +	    },
> +	},
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $account_name = extract_param($param, 'name') // 'default';
> +	my $account_file = "${acme_account_dir}/${account_name}";
> +
> +	raise_param_exc({'name' => "ACME account config file '${account_name}' does not exist."})
> +	    if ! -e $account_file;
> +
> +	my $acme = PMG::RS::Acme->load($account_file);
> +	my $data = $acme->account();
> +
> +	return {
> +	    account => $data->{account},
> +	    tos => $data->{tos},
> +	    location => $data->{location},
> +	    directory => $data->{directoryUrl},
> +	};
> +    }});
> +
> +__PACKAGE__->register_method ({
> +    name => 'deactivate_account',
> +    path => 'account/{name}',
> +    method => 'DELETE',
> +    description => "Deactivate existing ACME account at CA.",
> +    protected => 1,
> +    proxyto => 'master',
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    name => get_standard_option('pmg-acme-account-name'),
> +	},
> +    },
> +    returns => {
> +	type => 'string',
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	return $update_account->($param, 'deactivate', status => 'deactivated');
> +    }});
> +
> +__PACKAGE__->register_method ({
> +    name => 'get_tos',
> +    path => 'tos',
> +    method => 'GET',
> +    description => "Retrieve ACME TermsOfService URL from CA.",
> +    permissions => { user => 'all' },
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    directory => get_standard_option('pmg-acme-directory-url', {
> +		default => $acme_default_directory_url,
> +		optional => 1,
> +	    }),
> +	},
> +    },
> +    returns => {
> +	type => 'string',
> +	optional => 1,
> +	description => 'ACME TermsOfService URL.',
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $directory = extract_param($param, 'directory') // $acme_default_directory_url;
> +
> +	my $acme = PMG::RS::Acme->new($directory);
> +	my $meta = $acme->get_meta();
> +
> +	return $meta ? $meta->{termsOfService} : undef;
> +    }});

just for my understanding: what happens here if there is no TOS?
is that valid ACME behaviour? or should we somehow error out?

> +
> +__PACKAGE__->register_method ({
> +    name => 'get_directories',
> +    path => 'directories',
> +    method => 'GET',
> +    description => "Get named known ACME directory endpoints.",
> +    permissions => { user => 'all' },
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {},
> +    },
> +    returns => {
> +	type => 'array',
> +	items => {
> +	    type => 'object',
> +	    additionalProperties => 0,
> +	    properties => {
> +		name => {
> +		    type => 'string',
> +		},
> +		url => get_standard_option('pmg-acme-directory-url'),
> +	    },
> +	},
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	return $acme_directories;
> +    }});
> +
> +__PACKAGE__->register_method ({
> +    name => 'challengeschema',
> +    path => 'challenge-schema',
> +    method => 'GET',
> +    description => "Get schema of ACME challenge types.",
> +    permissions => { user => 'all' },
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {},
> +    },
> +    returns => {
> +	type => 'array',
> +	items => {
> +	    type => 'object',
> +	    additionalProperties => 0,
> +	    properties => {
> +		id => {
> +		    type => 'string',
> +		},
> +		name => {
> +		    description => 'Human readable name, falls back to id',
> +		    type => 'string',
> +		},
> +		type => {
> +		    type => 'string',
> +		},
> +		schema => {
> +		    type => 'object',
> +		},
> +	    },
> +	},
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $plugin_type_enum = PVE::ACME::Challenge->lookup_types();
> +
> +	my $res = [];
> +
> +	for my $type (@$plugin_type_enum) {
> +	    my $plugin = PVE::ACME::Challenge->lookup($type);
> +	    next if !$plugin->can('get_supported_plugins');
> +
> +	    my $plugin_type = $plugin->type();
> +	    my $plugins = $plugin->get_supported_plugins();
> +	    for my $id (sort keys %$plugins) {
> +		my $schema = $plugins->{$id};
> +		push @$res, {
> +		    id => $id,
> +		    name => $schema->{name} // $id,
> +		    type => $plugin_type,
> +		    schema => $schema,
> +		};
> +	    }
> +	}
> +
> +	return $res;
> +    }});
> +
> +1;
> diff --git a/src/PMG/API2/ACMEPlugin.pm b/src/PMG/API2/ACMEPlugin.pm
> new file mode 100644
> index 0000000..38540b1
> --- /dev/null
> +++ b/src/PMG/API2/ACMEPlugin.pm
> @@ -0,0 +1,270 @@
> +package PMG::API2::ACMEPlugin;
> +
> +use strict;
> +use warnings;
> +
> +use Storable qw(dclone);
> +
> +use PVE::ACME::Challenge;
> +use PVE::ACME::DNSChallenge;
> +use PVE::ACME::StandAlone;
> +use PVE::INotify;
> +use PVE::JSONSchema qw(get_standard_option);
> +use PVE::Tools qw(extract_param);
> +
> +use base qw(PVE::RESTHandler);
> +
> +my $inotify_file_id = 'pmg-acme-plugins-config.conf';
> +my $config_filename = '/etc/pmg/acme-plugins.conf';
> +my $lockfile = "/var/lock/pmg-acme-plugins-config.lck";
> +
> +PVE::ACME::DNSChallenge->register();
> +PVE::ACME::StandAlone->register();
> +PVE::ACME::Challenge->init();
> +
> +PVE::JSONSchema::register_standard_option('pmg-acme-pluginid', {
> +    type => 'string',
> +    format => 'pve-configid',
> +    description => 'Unique identifier for ACME plugin instance.',
> +});
> +
> +sub read_pmg_acme_challenge_config {
> +    my ($filename, $fh) = @_;
> +    local $/ = undef; # slurp mode
> +    my $raw = defined($fh) ? <$fh> : '';
> +    return PVE::ACME::Challenge->parse_config($filename, $raw);
> +}
> +
> +sub write_pmg_acme_challenge_config {
> +    my ($filename, $fh, $cfg) = @_;
> +    my $raw = PVE::ACME::Challenge->write_config($filename, $cfg);
> +    PVE::Tools::safe_print($filename, $fh, $raw);
> +}
> +
> +PVE::INotify::register_file($inotify_file_id, $config_filename,
> +			    \&read_pmg_acme_challenge_config,
> +			    \&write_pmg_acme_challenge_config,
> +			    undef,
> +			    always_call_parser => 1);
> +
> +sub lock_config {
> +    my ($code) = @_;
> +    my $p = PVE::Tools::lock_file($lockfile, undef, $code);
> +    die $@ if $@;
> +    return $p;
> +}
> +
> +sub load_config {
> +    # auto-adds the standalone plugin if no config is there for backwards
> +    # compatibility, so ALWAYS call the cfs registered parser
> +    return PVE::INotify::read_file($inotify_file_id);
> +}
> +
> +sub write_config {
> +    my ($self) = @_;
> +    return PVE::INotify::write_file($inotify_file_id, $self);
> +}
> +
> +my $plugin_type_enum = PVE::ACME::Challenge->lookup_types();
> +
> +my $modify_cfg_for_api = sub {
> +    my ($cfg, $pluginid) = @_;
> +
> +    die "ACME plugin '$pluginid' not defined\n" if !defined($cfg->{ids}->{$pluginid});
> +
> +    my $plugin_cfg = dclone($cfg->{ids}->{$pluginid});
> +    $plugin_cfg->{plugin} = $pluginid;
> +    $plugin_cfg->{digest} = $cfg->{digest};
> +
> +    return $plugin_cfg;
> +};
> +
> +__PACKAGE__->register_method ({
> +    name => 'index',
> +    path => '',
> +    method => 'GET',
> +    permissions => { check => [ 'admin', 'audit' ] },
> +    description => "ACME plugin index.",
> +    protected => 1,
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    type => {
> +		description => "Only list ACME plugins of a specific type",
> +		type => 'string',
> +		enum => $plugin_type_enum,
> +		optional => 1,
> +	    },
> +	},
> +    },
> +    returns => {
> +	type => 'array',
> +	items => {
> +	    type => "object",
> +	    properties => {
> +		plugin => get_standard_option('pmg-acme-pluginid'),
> +	    },
> +	},
> +	links => [ { rel => 'child', href => "{plugin}" } ],
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $cfg = load_config();
> +
> +	my $res = [];
> +	foreach my $pluginid (keys %{$cfg->{ids}}) {
> +	    my $plugin_cfg = $modify_cfg_for_api->($cfg, $pluginid);
> +	    next if $param->{type} && $param->{type} ne $plugin_cfg->{type};
> +	    push @$res, $plugin_cfg;
> +	}
> +
> +	return $res;
> +    }
> +});
> +
> +__PACKAGE__->register_method({
> +    name => 'get_plugin_config',
> +    path => '{id}',
> +    method => 'GET',
> +    description => "Get ACME plugin configuration.",
> +    permissions => { check => [ 'admin', 'audit' ] },
> +    protected => 1,
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    id => get_standard_option('pmg-acme-pluginid'),
> +	},
> +    },
> +    returns => {
> +	type => 'object',
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $cfg = load_config();
> +	return $modify_cfg_for_api->($cfg, $param->{id});
> +    }
> +});
> +
> +__PACKAGE__->register_method({
> +    name => 'add_plugin',
> +    path => '',
> +    method => 'POST',
> +    description => "Add ACME plugin configuration.",
> +    permissions => { check => [ 'admin' ] },
> +    protected => 1,
> +    parameters => PVE::ACME::Challenge->createSchema(),
> +    returns => {
> +	type => "null"
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $id = extract_param($param, 'id');
> +	my $type = extract_param($param, 'type');
> +
> +	lock_config(sub {
> +	    my $cfg = load_config();
> +	    die "ACME plugin ID '$id' already exists\n" if defined($cfg->{ids}->{$id});
> +
> +	    my $plugin = PVE::ACME::Challenge->lookup($type);
> +	    my $opts = $plugin->check_config($id, $param, 1, 1);
> +
> +	    $cfg->{ids}->{$id} = $opts;
> +	    $cfg->{ids}->{$id}->{type} = $type;
> +
> +	    write_config($cfg);
> +	});
> +	die "$@" if $@;

you already die in lock_config if $@ is set.

> +
> +	return undef;
> +    }
> +});
> +
> +__PACKAGE__->register_method({
> +    name => 'update_plugin',
> +    path => '{id}',
> +    method => 'PUT',
> +    description => "Update ACME plugin configuration.",
> +    permissions => { check => [ 'admin' ] },
> +    protected => 1,
> +    parameters => PVE::ACME::Challenge->updateSchema(),
> +    returns => {
> +	type => "null"
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $id = extract_param($param, 'id');
> +	my $delete = extract_param($param, 'delete');
> +	my $digest = extract_param($param, 'digest');
> +
> +	lock_config(sub {
> +	    my $cfg = load_config();
> +	    PVE::Tools::assert_if_modified($cfg->{digest}, $digest);
> +	    my $plugin_cfg = $cfg->{ids}->{$id};
> +	    die "ACME plugin ID '$id' does not exist\n" if !$plugin_cfg;
> +
> +	    my $type = $plugin_cfg->{type};
> +	    my $plugin = PVE::ACME::Challenge->lookup($type);
> +
> +	    if (defined($delete)) {
> +		my $schema = $plugin->private();
> +		my $options = $schema->{options}->{$type};
> +		for my $k (PVE::Tools::split_list($delete)) {
> +		    my $d = $options->{$k} || die "no such option '$k'\n";
> +		    die "unable to delete required option '$k'\n" if !$d->{optional};
> +
> +		    delete $cfg->{ids}->{$id}->{$k};
> +		}
> +	    }
> +
> +	    my $opts = $plugin->check_config($id, $param, 0, 1);
> +	    for my $k (sort keys %$opts) {

not that it should make a difference, but why sort?

> +		$plugin_cfg->{$k} = $opts->{$k};
> +	    }
> +
> +	    write_config($cfg);
> +	});
> +	die "$@" if $@;

again

> +
> +	return undef;
> +    }
> +});
> +
> +__PACKAGE__->register_method({
> +    name => 'delete_plugin',
> +    path => '{id}',
> +    method => 'DELETE',
> +    description => "Delete ACME plugin configuration.",
> +    permissions => { check => [ 'admin' ] },
> +    protected => 1,
> +    parameters => {
> +	additionalProperties => 0,
> +	properties => {
> +	    id => get_standard_option('pmg-acme-pluginid'),
> +	},
> +    },
> +    returns => {
> +	type => "null"
> +    },
> +    code => sub {
> +	my ($param) = @_;
> +
> +	my $id = extract_param($param, 'id');
> +
> +	lock_config(sub {
> +	    my $cfg = load_config();
> +
> +	    delete $cfg->{ids}->{$id};
> +
> +	    write_config($cfg);
> +	});
> +	die "$@" if $@;

again

> +
> +	return undef;
> +    }
> +});
> +
> +1;
> diff --git a/src/PMG/API2/Config.pm b/src/PMG/API2/Config.pm
> index e11eb3f..c5697e1 100644
> --- a/src/PMG/API2/Config.pm
> +++ b/src/PMG/API2/Config.pm
> @@ -26,6 +26,7 @@ use PMG::API2::DestinationTLSPolicy;
>   use PMG::API2::DKIMSign;
>   use PMG::API2::SACustom;
>   use PMG::API2::PBS::Remote;
> +use PMG::API2::ACME;
>   
>   use base qw(PVE::RESTHandler);
>   
> @@ -99,6 +100,11 @@ __PACKAGE__->register_method ({
>       path => 'pbs',
>   });
>   
> +__PACKAGE__->register_method ({
> +    subclass => "PMG::API2::ACME",
> +    path => 'acme',
> +});
> +
>   __PACKAGE__->register_method ({
>       name => 'index',
>       path => '',
> @@ -138,6 +144,7 @@ __PACKAGE__->register_method ({
>   	push @$res, { section => 'tlspolicy' };
>   	push @$res, { section => 'dkim' };
>   	push @$res, { section => 'pbs' };
> +	push @$res, { section => 'acme' };
>   
>   	return $res;
>       }});
> 




  reply	other threads:[~2021-03-11 10:41 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-09 14:13 [pmg-devel] [RFC api/gui/wtk/acme 0/many] Certificates & ACME Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 1/8] depend on libpmg-rs-perl and proxmox-acme Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 2/8] add PMG::CertHelpers module Wolfgang Bumiller
2021-03-11 10:05   ` Dominik Csapak
2021-03-12 13:55     ` Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 3/8] add PMG::NodeConfig module Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 4/8] cluster: sync acme/ and acme-plugins.conf Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 5/8] api: add ACME and ACMEPlugin module Wolfgang Bumiller
2021-03-11 10:41   ` Dominik Csapak [this message]
2021-03-12 14:10     ` Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 6/8] add certificates api endpoint Wolfgang Bumiller
2021-03-11 11:06   ` Dominik Csapak
2021-03-12 14:51     ` Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 7/8] add node-config api entry points Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH api 8/8] add acme and cert subcommands to pmgconfig Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH gui] add certificates and acme view Wolfgang Bumiller
2021-03-11 12:35   ` Dominik Csapak
2021-03-09 14:13 ` [pmg-devel] [PATCH acme] add missing 'use PVE::Acme' statement Wolfgang Bumiller
2021-03-12 15:00   ` [pmg-devel] applied: " Thomas Lamprecht
2021-03-09 14:13 ` [pmg-devel] [PATCH widget-toolkit 1/7] Utils: add ACME related utilities Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH widget-toolkit 2/7] add ACME related data models Wolfgang Bumiller
2021-03-11 12:41   ` Dominik Csapak
2021-03-09 14:13 ` [pmg-devel] [PATCH widget-toolkit 3/7] add ACME forms: Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH widget-toolkit 4/7] add certificate panel Wolfgang Bumiller
2021-03-09 14:13 ` [pmg-devel] [PATCH widget-toolkit 5/7] add ACME account panel Wolfgang Bumiller
2021-03-11 13:51   ` Dominik Csapak
2021-03-11 15:14     ` Thomas Lamprecht
2021-03-11 15:16       ` Dominik Csapak
2021-03-11 15:27         ` Thomas Lamprecht
2021-03-09 14:14 ` [pmg-devel] [PATCH widget-toolkit 6/7] add ACME plugin editing Wolfgang Bumiller
2021-03-09 14:14 ` [pmg-devel] [PATCH widget-toolkit 7/7] add ACME domain editing Wolfgang Bumiller
2021-03-10 12:27 ` [pmg-devel] [RFC api/gui/wtk/acme 0/many] Certificates & ACME 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=1a9960dd-ef4f-e348-ea73-30272b9df8cd@proxmox.com \
    --to=d.csapak@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal