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

#1064 implement tags in database and ACL

Browse Source
This commit is contained in:
Oliver Gorwits
2023-07-18 10:32:02 +01:00
parent b52e58880e
commit f72acb6006
6 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB.pm
View File

@@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces(
);
our # try to hide from kwalitee
$VERSION = 80; # schema version used for upgrades, keep as integer
$VERSION = 81; # schema version used for upgrades, keep as integer
use Path::Class;
use File::ShareDir 'dist_dir';

2
lib/App/Netdisco/DB/Result/Device.pm
View File

@@ -87,6 +87,8 @@ __PACKAGE__->add_columns(
{ data_type => "boolean", is_nullable => 1 },
"custom_fields",
{ data_type => "jsonb", is_nullable => 0, default_value => \"{}" },
"tags",
{ data_type => "text[]", is_nullable => 0, default_value => \"'{}'::text[]" },
);
__PACKAGE__->set_primary_key("ip");

2
lib/App/Netdisco/DB/Result/DevicePort.pm
View File

@@ -73,6 +73,8 @@ __PACKAGE__->add_columns(
{ data_type => "bigint", is_nullable => 1 },
"custom_fields",
{ data_type => "jsonb", is_nullable => 0, default_value => \"{}" },
"tags",
{ data_type => "text[]", is_nullable => 0, default_value => \"'{}'::text[]" },
);
__PACKAGE__->set_primary_key("port", "ip");

27
lib/App/Netdisco/Util/Permission.pm
View File

@@ -201,6 +201,33 @@ sub check_acl {
next RULE;
}
if ($rule =~ m/^tag:(.+)$/) {
my $tag = $1;
my $found = false;
ITEM: foreach my $item (@$things) {
if (blessed $item) {
if ($neg xor ($item->can('tags') and ref [] eq ref $item->tags
and scalar grep {$_ eq $tag} @{ $item->tags })) {
return true if not $all;
$found = true;
last ITEM;
}
}
elsif (ref {} eq ref $item) {
if ($neg xor (exists $item->{'tags'} and ref [] eq ref $item->{'tags'}
and scalar grep {$_ eq $tag} @{ $item->{'tags'} })) {
return true if not $all;
$found = true;
last ITEM;
}
}
}
return false if $all and not $found;
next RULE;
}
# prop:val
# with a check that prop isn't just the first part of a v6 addr
if ($rule =~ m/^([^:]+):(.*)$/ and $1 !~ m/^[a-f0-9]+$/i) {

7
share/schema_versions/App-Netdisco-DB-80-81-PostgreSQL.sql Normal file
View File

@@ -0,0 +1,7 @@
BEGIN;
ALTER TABLE device ADD COLUMN "tags" text[] DEFAULT '{}' NOT NULL;
ALTER TABLE device_port ADD COLUMN "tags" text[] DEFAULT '{}' NOT NULL;
COMMIT;

17
xt/20-checkacl.t
View File

@@ -150,6 +150,12 @@ my $dp = App::Netdisco::DB->resultset('DevicePort')->new_result({
ip => '127.0.0.1',
port => 'TenGigabitEthernet1/10',
type => 'l3ipvlan',
tags => [qw/ foo bar baz /],
});
my $d = App::Netdisco::DB->resultset('Device')->new_result({
ip => '127.0.0.1',
tags => [qw/ quux /],
});
# device properties
@@ -167,6 +173,7 @@ is(acl_matches([$dip2, $dp], ['foobar:xyz']), 0, '2obj unknown property');
my $dip2c = { $dip2->get_inflated_columns };
my $dpc = { $dp->get_inflated_columns };
my $dc = { $d->get_inflated_columns };
# device properties
ok(acl_matches([$dip2c, $dpc], [$conf[23]]), 'hh instance anon property deviceport:alias');
@@ -204,4 +211,14 @@ ok(acl_matches([$dip2c, $dp], ['remote_ip:']), 'ho related item field empty');
ok(acl_matches([$dip2c, $dp], ['!type:']), 'ho related item field not empty');
is(acl_matches([$dip2c, $dp], ['foobar:xyz']), 0, 'ho unknown property');
# tags
ok(acl_matches([$dip2, $dp], ['tag:foo']), '2obj tag exists');
ok(acl_matches([$dip2, $dp], ['!tag:quux']), '2obj tag not existing');
is(acl_matches([$dp], ['tag:quux']), 0, '1obh tag does not exist');
ok(acl_matches([$dip2c, $dpc], ['tag:foo']), 'hh tag exists');
ok(acl_matches([$dip2c, $dpc], ['!tag:quux']), 'hh tag not existing');
is(acl_matches([$dpc], ['tag:quux']), 0, 'hh tag does not exist');
done_testing;