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

tidy up

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-16 18:04:59 +00:00
parent 4b8492f4f0
commit c0322b9bf1
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,12 @@ use Dancer::Plugin::Swagger;
use MIME::Base64; use MIME::Base64;
sub request_is_api {
return (setting('api_token_lifetime')
and request->header('Authorization')
and request->accept =~ m/(?:json|javascript)/);
}
hook 'before' => sub { hook 'before' => sub {
params->{return_url} ||= ((request->path ne uri_for('/')->path) params->{return_url} ||= ((request->path ne uri_for('/')->path)
? request->uri : uri_for('/inventory')->path); ? request->uri : uri_for('/inventory')->path);
@@ -42,22 +48,18 @@ hook 'before' => sub {
session(logged_in_user => $user); session(logged_in_user => $user);
session(logged_in_user_realm => 'users'); session(logged_in_user_realm => 'users');
} }
elsif (setting('api_token_lifetime') elsif (setting('no_auth')) {
and request->header('Authorization')) { session(logged_in_user => 'guest');
session(logged_in_user_realm => 'users');
use DDP; my $s = session; p $s;
}
elsif (request_is_api()) {
my $token = request->header('Authorization'); my $token = request->header('Authorization');
my $user = $provider->validate_api_token($token) my $user = $provider->validate_api_token($token)
or return; or return;
session(logged_in_user => $user); session(logged_in_user => $user);
session(logged_in_user_realm => 'users'); session(logged_in_user_realm => 'users');
# you can use Authorization header to get a session cookie,
# but the session is not useful for future API calls.
}
elsif (setting('no_auth')) {
session(logged_in_user => 'guest');
session(logged_in_user_realm => 'users');
} }
else { else {
# user has no AuthN - force to handler for '/' # user has no AuthN - force to handler for '/'
@@ -66,8 +68,9 @@ hook 'before' => sub {
} }
}; };
# user redirected here (POST -> GET) when login fails
get qr{^/(?:login(?:/denied)?)?} => sub { get qr{^/(?:login(?:/denied)?)?} => sub {
if (param('return_url') and request->header('Authorization')) { if (request_is_api()) {
status('unauthorized'); status('unauthorized');
return to_json { return to_json {
error => 'not authorized', error => 'not authorized',
@@ -91,10 +94,9 @@ swagger_path {
}, },
}, },
post '/login' => sub { post '/login' => sub {
my $mode = (request->is_ajax ? 'WebData' my $mode = (request_is_api() ? 'API' : 'WebUI');
: request->header('Authorization') ? 'API'
: 'WebUI'); # get authN data from request (HTTP BasicAuth or Form params)
# get authN data from request (HTTP BasicAuth or URL params)
my $authheader = request->header('Authorization'); my $authheader = request->header('Authorization');
if (defined $authheader and $authheader =~ /^Basic (.*)$/i) { if (defined $authheader and $authheader =~ /^Basic (.*)$/i) {
my ($u, $p) = split(m/:/, (MIME::Base64::decode($1) || ":")); my ($u, $p) = split(m/:/, (MIME::Base64::decode($1) || ":"));
@@ -102,7 +104,7 @@ post '/login' => sub {
params->{password} = $p; params->{password} = $p;
} }
# test authN # validate authN
my ($success, $realm) = authenticate_user(param('username'),param('password')); my ($success, $realm) = authenticate_user(param('username'),param('password'));
if ($success) { if ($success) {
@@ -121,9 +123,6 @@ post '/login' => sub {
}); });
$user->update({ last_on => \'now()' }); $user->update({ last_on => \'now()' });
return if $mode eq 'WebData';
# if API return a token and record its lifetime
if ($mode eq 'API') { if ($mode eq 'API') {
$user->update({ $user->update({
token_from => time, token_from => time,
@@ -144,10 +143,7 @@ post '/login' => sub {
details => param('return_url'), details => param('return_url'),
}); });
if ($mode eq 'WebData') { if ($mode eq 'API') {
status('unauthorized');
}
elsif ($mode ne 'API') {
status('unauthorized'); status('unauthorized');
return to_json { error => 'authentication failed' }; return to_json { error => 'authentication failed' };
} }
@@ -189,7 +185,7 @@ get '/logout' => sub {
details => '', details => '',
}); });
if (request->header('Accept') =~ m/(?:json|javascript)/i) { if (request_is_api()) {
return to_json {}; return to_json {};
} }
else { else {