135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

access to manual topology for admins without port_control role

Browse Source
This commit is contained in:
Oliver Gorwits
2018-03-22 17:17:27 +00:00
parent 3ae4eabd39
commit b3457954a3
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@@ -5,6 +5,10 @@
* #371 usernames are case insensitive but case preserving * #371 usernames are case insensitive but case preserving
* #12 store Cisco PortFast status in device_port_properties:faststart * #12 store Cisco PortFast status in device_port_properties:faststart
[BUG FIXES]
* access to manual topology for admins without port_control role
2.039017 - 2018-03-20 2.039017 - 2018-03-20
[BUG FIXES] [BUG FIXES]

6
lib/App/Netdisco/Web/Plugin/AdminTask/Topology.pm
View File

@@ -29,7 +29,7 @@ sub _sanity_ok {
return 1; return 1;
} }
ajax '/ajax/control/admin/topology/add' => require_role port_control => sub { ajax '/ajax/control/admin/topology/add' => require_any_role [qw(admin port_control)] => sub {
send_error('Bad Request', 400) unless _sanity_ok(); send_error('Bad Request', 400) unless _sanity_ok();
my $device = schema('netdisco')->resultset('Topology') my $device = schema('netdisco')->resultset('Topology')
@@ -78,7 +78,7 @@ ajax '/ajax/control/admin/topology/add' => require_role port_control => sub {
}; };
}; };
ajax '/ajax/control/admin/topology/del' => require_role port_control => sub { ajax '/ajax/control/admin/topology/del' => require_any_role [qw(admin port_control)] => sub {
send_error('Bad Request', 400) unless _sanity_ok(); send_error('Bad Request', 400) unless _sanity_ok();
schema('netdisco')->txn_do(sub { schema('netdisco')->txn_do(sub {
@@ -129,7 +129,7 @@ ajax '/ajax/control/admin/topology/del' => require_role port_control => sub {
}; };
}; };
ajax '/ajax/content/admin/topology' => require_role port_control => sub { ajax '/ajax/content/admin/topology' => require_any_role [qw(admin port_control)] => sub {
my $set = schema('netdisco')->resultset('Topology') my $set = schema('netdisco')->resultset('Topology')
->search({},{order_by => [qw/dev1 dev2 port1/]}); ->search({},{order_by => [qw/dev1 dev2 port1/]});

2
lib/App/Netdisco/Web/PortControl.pm
View File

@@ -7,7 +7,7 @@ use Dancer::Plugin::Auth::Extensible;
use App::Netdisco::JobQueue qw/jq_insert jq_userlog/; use App::Netdisco::JobQueue qw/jq_insert jq_userlog/;
ajax '/ajax/portcontrol' => require_role port_control => sub { ajax '/ajax/portcontrol' => require_any_role [qw(admin port_control)] => sub {
send_error('No device/port/field', 400) send_error('No device/port/field', 400)
unless param('device') and (param('port') or param('field')); unless param('device') and (param('port') or param('field'));