proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-10-04 15:53:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: realm sync: code cleanups

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-06-07 09:32:26 +02:00
parent 51ae7bbb69
commit c0210e3cf1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/PVE/API2/AccessControl/RealmSync.pm
View File

@ -102,6 +102,7 @@ __PACKAGE__->register_method ({
if (my $schedule = $job->{schedule}) { if (my $schedule = $job->{schedule}) {
$job->{'last-run'} = eval { $get_cluster_last_run->($jobid) }; $job->{'last-run'} = eval { $get_cluster_last_run->($jobid) };
my $last_run = $job->{'last-run'} // time(); # current time as fallback my $last_run = $job->{'last-run'} // time(); # current time as fallback
my $calendar_event = Proxmox::RS::CalendarEvent->new($schedule); my $calendar_event = Proxmox::RS::CalendarEvent->new($schedule);
my $next_run = $calendar_event->compute_next_event($last_run); my $next_run = $calendar_event->compute_next_event($last_run);
$job->{'next-run'} = $next_run if defined($next_run); $job->{'next-run'} = $next_run if defined($next_run);
@ -201,8 +202,8 @@ __PACKAGE__->register_method({
protected => 1, protected => 1,
description => "Update realm-sync job definition.", description => "Update realm-sync job definition.",
permissions => { permissions => {
description => "'Realm.AllocateUser' on '/access/realm/<realm>' and " description => "'Realm.AllocateUser' on '/access/realm/<realm>' and 'User.Modify'"
." 'User.Modify' permissions to '/access/groups/'.", ." permissions to '/access/groups/'.",
check => [ 'and', check => [ 'and',
['perm', '/access/realm/{realm}', ['Realm.AllocateUser']], ['perm', '/access/realm/{realm}', ['Realm.AllocateUser']],
['perm', '/access/groups', ['User.Modify']], ['perm', '/access/groups', ['User.Modify']],
@ -215,9 +216,7 @@ __PACKAGE__->register_method({
my $id = extract_param($param, 'id'); my $id = extract_param($param, 'id');
my $delete = extract_param($param, 'delete'); my $delete = extract_param($param, 'delete');
if ($delete) { $delete = [PVE::Tools::split_list($delete)] if $delete;
$delete = [PVE::Tools::split_list($delete)];
}
cfs_lock_file('jobs.cfg', undef, sub { cfs_lock_file('jobs.cfg', undef, sub {
my $jobs = cfs_read_file('jobs.cfg'); my $jobs = cfs_read_file('jobs.cfg');