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

add token schema and validation

Browse Source
This commit is contained in:
Oliver Gorwits
2018-10-21 17:31:52 +01:00
parent fb4e5c0793
commit f01bc6a695
8 changed files with 80 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
View File

@@ -53,6 +53,27 @@ sub get_user_details {
return $user;
}
sub validate_api_token {
my ($self, $token) = @_;
return unless defined $token;
my $settings = $self->realm_settings;
my $database = schema($settings->{schema_name})
or die "No database connection";
my $users_table = $settings->{users_resultset} || 'User';
my $token_column = $settings->{users_token_column} || 'token';
my $user = try {
$database->resultset($users_table)->find({ $token_column => $token });
};
return $user->username
if $user and $user->in_storage and $user->token_from
and $user->token_from > (time - setting('api_token_lifetime'));
return undef;
}
sub get_user_roles {
my ($self, $username) = @_;
return unless defined $username;

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

@@ -36,6 +36,14 @@ hook 'before' => sub {
session(logged_in_user => $user);
session(logged_in_user_realm => 'users');
}
elsif (setting('api_token_lifetime')
and index(request->path,uri_for('/api/')->path) == 0) {
my $user = $provider->validate_api_token(param('token'))
or return;
session(logged_in_user => $user);
session(logged_in_user_realm => 'users');
}
elsif (setting('no_auth')) {
session(logged_in_user => 'guest');
session(logged_in_user_realm => 'users');
@@ -56,16 +64,16 @@ post '/login' => sub {
my $mode = (request->is_ajax ? 'WebData'
: request->header('Authorization') ? 'API'
: 'WebUI');
# get authN data from request (HTTP BasicAuth or URL params)
my $authheader = request->header('Authorization');
my ($u, $p) = (param('username'), param('password'));
if (defined $authheader and $authheader =~ /^Basic (.*)$/) {
($u, $p) = split(m/:/, (MIME::Base64::decode($1) || ":"));
my ($u, $p) = split(m/:/, (MIME::Base64::decode($1) || ":"));
params->{username} = $u;
params->{password} = $p;
}
# test authN
my ($success, $realm) = authenticate_user( $u, $p );
my ($success, $realm) = authenticate_user(param('username'),param('password'));
if ($success) {
my $user = schema('netdisco')->resultset('User')
@@ -92,7 +100,7 @@ post '/login' => sub {
$user->update({
token_from => time,
token => \'md5(random()::text)',
});
})->discard_changes();
}
return 'token:'. $user->token;
}