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

cleanup dist and meta

Browse Source
This commit is contained in:
Oliver Gorwits
2017-05-06 17:52:42 +01:00
parent 3af2bc2fec
commit 273b49b9ce
2 changed files with 1 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MANIFEST
View File

@@ -7,7 +7,6 @@ bin/netdisco-daemon-fg
bin/netdisco-db-deploy
bin/netdisco-deploy
bin/netdisco-do
bin/netdisco-do-e
bin/netdisco-rancid-export
bin/netdisco-sshcollector
bin/netdisco-web
@@ -17,33 +16,19 @@ Changes
lib/App/Netdisco.pm
lib/App/Netdisco/AnyEvent/Nbtstat.pm
lib/App/Netdisco/Backend/Job.pm
lib/App/Netdisco/Backend/Job.pm-e
lib/App/Netdisco/Backend/Util.pm
lib/App/Netdisco/Backend/Util.pm-e
lib/App/Netdisco/Backend/Worker/Common.pm
lib/App/Netdisco/Backend/Worker/Common.pm-e
lib/App/Netdisco/Backend/Worker/Interactive/DeviceActions.pm
lib/App/Netdisco/Backend/Worker/Interactive/DeviceActions.pm-e
lib/App/Netdisco/Backend/Worker/Interactive/PortActions.pm
lib/App/Netdisco/Backend/Worker/Interactive/PortActions.pm-e
lib/App/Netdisco/Backend/Worker/Manager.pm
lib/App/Netdisco/Backend/Worker/Manager.pm-e
lib/App/Netdisco/Backend/Worker/Poller.pm
lib/App/Netdisco/Backend/Worker/Poller.pm-e
lib/App/Netdisco/Backend/Worker/Poller/Arpnip.pm
lib/App/Netdisco/Backend/Worker/Poller/Arpnip.pm-e
lib/App/Netdisco/Backend/Worker/Poller/Common.pm
lib/App/Netdisco/Backend/Worker/Poller/Common.pm-e
lib/App/Netdisco/Backend/Worker/Poller/Device.pm
lib/App/Netdisco/Backend/Worker/Poller/Device.pm-e
lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm
lib/App/Netdisco/Backend/Worker/Poller/Expiry.pm-e
lib/App/Netdisco/Backend/Worker/Poller/Macsuck.pm
lib/App/Netdisco/Backend/Worker/Poller/Macsuck.pm-e
lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm
lib/App/Netdisco/Backend/Worker/Poller/Nbtstat.pm-e
lib/App/Netdisco/Backend/Worker/Scheduler.pm
lib/App/Netdisco/Backend/Worker/Scheduler.pm-e
lib/App/Netdisco/Configuration.pm
lib/App/Netdisco/Core/Arpnip.pm
lib/App/Netdisco/Core/Discover.pm
@@ -119,7 +104,6 @@ lib/App/Netdisco/GenericDB.pm
lib/App/Netdisco/GenericDB/Result/Virtual/GenericReport.pm
lib/App/Netdisco/JobQueue.pm
lib/App/Netdisco/JobQueue/PostgreSQL.pm
lib/App/Netdisco/JobQueue/PostgreSQL.pm-e
lib/App/Netdisco/Manual/BSDInstall.pod
lib/App/Netdisco/Manual/Configuration.pod
lib/App/Netdisco/Manual/Deployment.pod
@@ -396,6 +380,7 @@ share/views/ajax/report/portssid_csv.tt
share/views/ajax/report/portutilization.tt
share/views/ajax/report/portutilization_csv.tt
share/views/ajax/report/portvlanmismatch.tt
share/views/ajax/report/portvlanmismatch_csv.tt
share/views/ajax/report/subnets.tt
share/views/ajax/report/subnets_csv.tt
share/views/ajax/report/vlaninventory.tt
@@ -438,7 +423,6 @@ share/views/sidebar/report/subnets.tt
share/views/sidebar/search/device.tt
share/views/sidebar/search/node.tt
share/views/sidebar/search/port.tt
t/20-checkacl.t
xt/10-sort_port.t
xt/11-portsort.t
xt/20-checkacl.t

94
t/20-checkacl.t
View File

@@ -1,94 +0,0 @@
#!/usr/bin/env perl
use strict; use warnings FATAL => 'all';
use Test::More 1.302083;
BEGIN {
use_ok( 'App::Netdisco::Util::Permission', 'check_acl' );
}
my @conf = (
# +ve match -ve match
'localhost', '!www.example.com', # 0, 1
'127.0.0.1', '!192.0.2.1', # 2, 3
'::1', '!2001:db8::1', # 4, 5
'127.0.0.0/29', '!192.0.2.0/24', # 6, 7
'::1/128', '!2001:db8::/32', # 8, 9
'127.0.0.1-10', '!192.0.2.1-10', # 10,11
'::1-10', '!2001:db8::1-10', # 12,13
qr/^localhost$/, qr/^www.example.com$/, # 14,15
qr/(?!:www.example.com)/, '!127.0.0.0/29', # 16,17
'!127.0.0.1-10', qr/(?!:localhost)/, # 18,19
'op:and', # 20
);
# name, ipv4, ipv6, v4 prefix, v6 prefix
ok(check_acl('localhost',[$conf[0]]), 'same name');
ok(check_acl('127.0.0.1',[$conf[2]]), 'same ipv4');
ok(check_acl('::1',[$conf[4]]), 'same ipv6');
ok(check_acl('127.0.0.0/29',[$conf[6]]), 'same v4 prefix');
ok(check_acl('::1/128',[$conf[8]]), 'same v6 prefix');
# failed name, ipv4, ipv6, v4 prefix, v6 prefix
is(check_acl('www.microsoft.com',[$conf[0]]), 0, 'failed name');
is(check_acl('172.20.0.1',[$conf[2]]), 0, 'failed ipv4');
is(check_acl('2001:db8::5',[$conf[4]]), 0, 'failed ipv6');
is(check_acl('172.16.1.3/29',[$conf[6]]), 0, 'failed v4 prefix');
is(check_acl('2001:db8:f00d::/64',[$conf[8]]), 0, 'failed v6 prefix');
# negated name, ipv4, ipv6, v4 prefix, v6 prefix
ok(check_acl('localhost',[$conf[1]]), 'not same name');
ok(check_acl('127.0.0.1',[$conf[3]]), 'not same ipv4');
ok(check_acl('::1',[$conf[5]]), 'not same ipv6');
ok(check_acl('127.0.0.0/29',[$conf[7]]), 'not same v4 prefix');
ok(check_acl('::1/128',[$conf[9]]), 'not same v6 prefix');
# v4 range, v6 range
ok(check_acl('127.0.0.1',[$conf[10]]), 'in v4 range');
ok(check_acl('::1',[$conf[12]]), 'in v6 range');
# failed v4 range, v6 range
is(check_acl('172.20.0.1',[$conf[10]]), 0, 'failed v4 range');
is(check_acl('2001:db8::5',[$conf[12]]), 0, 'failed v6 range');
# negated v4 range, v6 range
ok(check_acl('127.0.0.1',[$conf[11]]), 'not in v4 range');
ok(check_acl('::1',[$conf[13]]), 'not in v6 range');
# hostname regexp
ok(check_acl('localhost',[$conf[14]]), 'name regexp');
ok(check_acl('127.0.0.1',[$conf[14]]), 'IP regexp');
is(check_acl('www.google.com',[$conf[14]]), 0, 'failed regexp');
# OR of prefix, range, regexp, property (2 of, 3 of, 4 of)
ok(check_acl('127.0.0.1',[@conf[8,0]]), 'OR: prefix, name');
ok(check_acl('127.0.0.1',[@conf[8,12,0]]), 'OR: prefix, range, name');
ok(check_acl('127.0.0.1',[@conf[8,12,15,0]]), 'OR: prefix, range, regexp, name');
# OR of negated prefix, range, regexp, property (2 of, 3 of, 4 of)
ok(check_acl('127.0.0.1',[@conf[17,0]]), 'OR: !prefix, name');
ok(check_acl('127.0.0.1',[@conf[17,18,0]]), 'OR: !prefix, !range, name');
ok(check_acl('127.0.0.1',[@conf[17,18,19,0]]), 'OR: !prefix, !range, !regexp, name');
# AND of prefix, range, regexp, property (2 of, 3 of, 4 of)
ok(check_acl('127.0.0.1',[@conf[6,0,20]]), 'AND: prefix, name');
ok(check_acl('127.0.0.1',[@conf[6,10,0,20]]), 'AND: prefix, range, name');
ok(check_acl('127.0.0.1',[@conf[6,10,14,0,20]]), 'AND: prefix, range, regexp, name');
# failed AND on prefix, range, regexp
is(check_acl('127.0.0.1',[@conf[8,10,14,0,20]]), 0, 'failed AND: prefix!, range, regexp, name');
is(check_acl('127.0.0.1',[@conf[6,12,14,0,20]]), 0, 'failed AND: prefix, range!, regexp, name');
is(check_acl('127.0.0.1',[@conf[6,10,15,0,20]]), 0, 'failed AND: prefix, range, regexp!, name');
# AND of negated prefix, range, regexp, property (2 of, 3 of, 4 of)
ok(check_acl('127.0.0.1',[@conf[9,0,20]]), 'AND: !prefix, name');
ok(check_acl('127.0.0.1',[@conf[7,11,0,20]]), 'AND: !prefix, !range, name');
ok(check_acl('127.0.0.1',[@conf[9,13,16,0,20]]), 'AND: !prefix, !range, !regexp, name');
# device property
# negated device property
done_testing;