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

add api user role and fix api auth failure response

Browse Source
This commit is contained in:
Oliver Gorwits
2018-12-31 19:30:41 +00:00
parent 1a038079bf
commit 4691808fa6
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/App/Netdisco/DB/Result/Virtual/UserRole.pm
View File

@@ -19,6 +19,9 @@ __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
UNION UNION
SELECT username, 'ldap' AS role FROM users SELECT username, 'ldap' AS role FROM users
WHERE ldap WHERE ldap
UNION
SELECT username, 'api', AS role FROM users
WHERE token AND token_from
ENDSQL ENDSQL
); );

11
lib/App/Netdisco/Web/AuthN.pm
View File

@@ -59,7 +59,16 @@ hook 'before' => sub {
}; };
get qr{^/(?:login(?:/denied)?)?} => sub { get qr{^/(?:login(?:/denied)?)?} => sub {
template 'index', { return_url => param('return_url') }; if (param('return_url') and param('return_url') =~ m{^/api/}) {
status 403;
return to_json {
error => 'not authorized',
return_url => param('return_url'),
};
}
else {
template 'index', { return_url => param('return_url') };
}
}; };
# override default login_handler so we can log access in the database # override default login_handler so we can log access in the database