Skip to content

Commit

Permalink
Modified to add Radius support (#621)
Browse files Browse the repository at this point in the history
Lines 110-112 commented out
Lines 113-124 added
Lines 233-249 added match_with_radius  function
  • Loading branch information
jngreene authored and ollyg committed Aug 18, 2019
1 parent 2b4802d commit 85b73e1
Showing 1 changed file with 36 additions and 4 deletions.
40 changes: 36 additions & 4 deletions lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ use Digest::MD5;
use Net::LDAP;
use Try::Tiny;

if (setting('radius') and ref {} eq ref setting('radius')) {
use Authen::Radius;
}

sub authenticate_user {
my ($self, $username, $password) = @_;
return unless defined $username;
Expand Down Expand Up @@ -103,9 +107,21 @@ sub match_password {
my $settings = $self->realm_settings;
my $username_column = $settings->{users_username_column} || 'username';

return $user->ldap
? $self->match_with_ldap($password, $user->$username_column)
: $self->match_with_local_pass($password, $user);
# return $user->ldap
# ? $self->match_with_ldap($password, $user->$username_column)
# : $self->match_with_local_pass($password, $user);
my $pwmatch_result=0;
my $username = $user->$username_column;

if ($user->ldap) {
$pwmatch_result = $self->match_with_ldap($password, $user->$username_column);
} else {
if ( setting('radius') and ref {} eq ref setting('radius') ) {
$pwmatch_result = ( $self->match_with_radius($password, $username) || $self->match_with_local_pass($password, $user) );
} else {
$pwmatch_result = $self->match_with_local_pass($password, $user);
}
}
}

sub match_with_local_pass {
Expand Down Expand Up @@ -214,5 +230,21 @@ sub _ldap_search {

return undef;
}

sub match_with_radius {
my($self, $pass, $user) = @_;
return unless setting('radius') and ref {} eq ref setting('radius');
my $conf = setting('radius');
my $radius = new Authen::Radius(Host => $conf->{server}, Secret => $conf->{secret});
Authen::Radius->load_dictionary();
$radius->add_attributes(
{ Name=> 'User-Name', Value => $user },
{ Name=> 'User-Password', Value => $pass },
{ Name => 'h323-return-code', Value => '0' }, # Cisco AV pair
{ Name => 'Digest-Attributes', Value => { Method => 'REGISTER' } }
);
$radius->send_packet(ACCESS_REQUEST);
my $type = $radius->recv_packet();
my $radius_return = ($type eq ACCESS_ACCEPT)?1:0;
return $radius_return;
}
1;

0 comments on commit 85b73e1

Please sign in to comment.