grahamc/hydra2 - Change JO75HQLOPQKFJ4PGB4R3RMOR5A4XG3QDKLKYI7IV2HUQ347MCARAC

Add a restart-jobs role

Frequently users want Hydra access just to restart jobs. However, prior to this commit the only way to grant that access was by giving them full Admin access which isn't necessarily what we want to do.

By having a restart-jobs role, we can grant this privilege to users who are known to the community and want to help, but aren't long-time members.

I haven't tested this commit, but it looks good to me…

Created by Graham Christensen on December 30, 2017

JO75HQLOPQKFJ4PGB4R3RMOR5A4XG3QDKLKYI7IV2HUQ347MCARAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/JobsetEval.pm at line 191 [6.1302]
∅:D[4.51] → [5.379:436]
B:BD[5.379] → [5.379:436]
```
    requireProjectOwner($c, $c->stash->{eval}->project);
```
[4.51]
[4.52]
```
    requireRestartPrivileges($c, $c->stash->{eval}->project);
```

Replacement in src/lib/Hydra/Helper/CatalystUtils.pm at line 15 [8.3469]

∅:D[3.368] → [7.263:358]

B:BD[7.263] → [7.263:358]

    forceLogin requireUser requireProjectOwner requireAdmin requirePost isAdmin isProjectOwner

[3.368]

[9.9771]

    forceLogin requireUser requireProjectOwner requireRestartPrivileges requireAdmin requirePost isAdmin isProjectOwner

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 174 [8.3469]
B:BD[10.1331] → [11.1029:1030]

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 182 [8.3469]

[7.794]

[12.1951]

}
sub hasRestartJobsRole {
    my ($c) = @_;
    return $c->user_exists && $c->check_user_roles('restart-jobs');
}
sub mayRestartJobs {
    my ($c, $project) = @_;
    return
        $c->user_exists &&
        (isAdmin($c) ||
         hasRestartJobsRole($c) ||
         isProjectOwner($c, $project));

Insertion in src/lib/Hydra/Helper/CatalystUtils.pm at line 198 [8.3469]

[12.1954]

[11.1031]

sub requireRestartPrivileges {
    my ($c, $project) = @_;
    requireUser($c);
    accessDenied($c, "Only the project members, administrators, and accounts with restart-jobs privileges can perform this operation.")
        unless mayRestartJobs($c, $project);
}

Deletion in src/lib/Hydra/Helper/CatalystUtils.pm at line 218 [8.3469]
∅:D[11.1034] → [12.2097:2098]
B:BD[12.2097] → [12.2097:2098]

Insertion in src/root/user.tt at line 83 [14.4561]

[2.60]

[13.6750]

            [% INCLUDE roleoption role="restart-jobs" %]