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

Fix some error handling for API/Device.pm

Browse Source
This commit is contained in:
Ryan Gasik
2018-10-24 20:41:41 -07:00
parent 4d68bffeea
commit d79411a34d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/App/Netdisco/Web/Plugin/API/Device.pm
View File

@@ -102,6 +102,9 @@ get '/api/device/:device' => sub {
get '/api/device/:device/:method' => sub { get '/api/device/:device/:method' => sub {
my $dev = params->{device}; my $dev = params->{device};
my $method = params->{method}; my $method = params->{method};
if (! ($method =~ m/[-_a-z]/)) {
return format_error(400,"Invalid collection $method.");
}
try { try {
my $device = schema('netdisco')->resultset('Device')->search_for_device($dev); my $device = schema('netdisco')->resultset('Device')->search_for_device($dev);
my $results = $device->$method; my $results = $device->$method;
@@ -139,9 +142,10 @@ get qr{/api/device/(?<ip>.*)/port/(?<port>.*)} => sub {
my $port; my $port;
try { try {
$port = schema('netdisco')->resultset('DevicePort')->find({ip=>$$param{ip}, port => $$param{port}}); $port = schema('netdisco')->resultset('DevicePort')->find({ip=>$$param{ip}, port => $$param{port}});
return format_error(404, "Port not found.") if not defined $port;
return format_data($port); return format_data($port);
} catch { } catch {
return format_error("Port not found."); return format_error(404, "Port not found.");
} }
}; };