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

#715 fix crash on missing Accept Header

Browse Source
This commit is contained in:
Oliver Gorwits
2020-05-15 11:52:21 +01:00
parent 42bb6e548b
commit 0d3aec8c17
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@@ -2,6 +2,7 @@
[BUG FIXES] [BUG FIXES]
* #715 fix crash on missing Accept Header
* #718 fix Node Search API endpoint * #718 fix Node Search API endpoint
* #719 include IO::Socket::INET6 in deps to ensure IPv6 support * #719 include IO::Socket::INET6 in deps to ensure IPv6 support

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

@@ -92,7 +92,7 @@ swagger_path {
}, },
}, },
post '/login' => sub { post '/login' => sub {
my $api = ((request->accept =~ m/(?:json|javascript)/) ? true : false); my $api = ((request->accept and request->accept =~ m/(?:json|javascript)/) ? true : false);
# get authN data from BasicAuth header used by API, put into params # get authN data from BasicAuth header used by API, put into params
my $authheader = request->header('Authorization'); my $authheader = request->header('Authorization');
@@ -171,7 +171,7 @@ swagger_path {
responses => { default => { examples => { 'application/json' => {} } } }, responses => { default => { examples => { 'application/json' => {} } } },
}, },
get '/logout' => sub { get '/logout' => sub {
my $api = ((request->accept =~ m/(?:json|javascript)/) ? true : false); my $api = ((request->accept and request->accept =~ m/(?:json|javascript)/) ? true : false);
# clear out API token # clear out API token
my $user = schema('netdisco')->resultset('User') my $user = schema('netdisco')->resultset('User')
@@ -199,7 +199,7 @@ get '/logout' => sub {
# user redirected here (POST -> GET) when login fails # user redirected here (POST -> GET) when login fails
get qr{^/(?:login(?:/denied)?)?} => sub { get qr{^/(?:login(?:/denied)?)?} => sub {
my $api = ((request->accept =~ m/(?:json|javascript)/) ? true : false); my $api = ((request->accept and request->accept =~ m/(?:json|javascript)/) ? true : false);
if ($api) { if ($api) {
header('Content-Type' => 'application/json'); header('Content-Type' => 'application/json');