From e7b84aa262d4390d8abdb943c2ae084fa44e5538 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 5 Jun 2004 09:34:49 +0000 Subject: [PATCH] sqlradius import updates --- bin/sqlradius-norealm.reimport | 113 +++++++++++++++++++++++++++++++++++++++++ bin/sqlradius.import | 2 +- bin/sqlradius.reimport | 18 ++++--- 3 files changed, 125 insertions(+), 8 deletions(-) create mode 100755 bin/sqlradius-norealm.reimport diff --git a/bin/sqlradius-norealm.reimport b/bin/sqlradius-norealm.reimport new file mode 100755 index 000000000..b7d016609 --- /dev/null +++ b/bin/sqlradius-norealm.reimport @@ -0,0 +1,113 @@ +#!/usr/bin/perl -Tw + +use strict; +use vars qw(%part_svc); +#use Date::Parse; +use DBI; +use Term::Query qw(query); +use FS::UID qw(adminsuidsetup); #datasrc +use FS::Record qw(qsearch qsearchs); +use FS::svc_acct; +use FS::part_svc; + +my $user = shift or die &usage; +adminsuidsetup $user; + +#push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others? + +$FS::svc_Common::noexport_hack = 1; + +### + +%part_svc=map { $_->svcpart, $_ } qsearch('part_svc',{'svcdb'=>'svc_acct'}); + +die "No services with svcdb svc_acct!\n" unless %part_svc; + +print "\n\n", &menu_svc, "\n", <svc, sort keys %part_svc ). "\n"; +} +sub getpart { + $^W=0; # Term::Query isn't -w-safe + my $return = query "Enter part number:", 'irk', [ keys %part_svc ]; + $^W=1; + $return; +} +sub getvalue { + my $prompt = shift; + $^W=0; # Term::Query isn't -w-safe + my $return = query $prompt, ''; + $^W=1; + $return; +} + +print "\n\n"; + +### + +my $dbh = DBI->connect( $datasrc, $db_user, $db_pass ) + or die $DBI::errstr; + +my $sth = $dbh->prepare('SELECT DISTINCT UserName FROM radcheck') + or die $dbh->errstr; +$sth->execute or die $sth->errstr; + +my $row; +while ( defined ( $row = $sth->fetchrow_arrayref ) ) { + my( $username ) = @$row; + + my( $password, $group ) = ( '', '', '' ); + + my $rc_sth = $dbh->prepare( + 'SELECT Attribute, Value'. + ' FROM radcheck'. + ' WHERE UserName = ?' + ) or die $dbh->errstr; + $rc_sth->execute($username) or die $rc_sth->errstr; + + foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) { + my($attribute, $value) = @$rc_row; + if ( $attribute =~ /^((Crypt|User)-)?Password$/ ) { + $password = $value unless $password && !$1; + } else { + #handle other params! + } + } + + my @svc_acct = grep { $_->cust_svc->svcpart == $sqlradius_svcpart } + qsearch('svc_acct', { 'username' => $username, } ); + + #print "$r_username / $realm: $password / $finger: "; + print "$username: $password: "; + if ( scalar(@svc_acct) == 0 ) { + print "not found\n"; + next; + } elsif ( scalar(@svc_acct) > 1 ) { + print "multiple matches found?!?!\n"; + next; + } else { + #print "correcting password and name\n"; + print "correcting password\n"; + } + + my $svc_acct = $svc_acct[0]; + #my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger }; + my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password }; + my $error = $new->replace($svc_acct); + #my $error = $new->check; + die "$username: $error" if $error; + +} + +sub usage { + die "Usage:\n\n sqlradius-norealm.reimport user\n"; +} + diff --git a/bin/sqlradius.import b/bin/sqlradius.import index 587d828e4..e8b63949c 100644 --- a/bin/sqlradius.import +++ b/bin/sqlradius.import @@ -117,7 +117,7 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) { foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) { my($attribute, $value, $name, $groupname) = @$row; - if ( $attribute =~ /^(Crypt-)?Password$/ ) { + if ( $attribute =~ /^((User|Crypt)-)?Password$/ ) { $password = $value; $finger = $name; $group = $groupname; diff --git a/bin/sqlradius.reimport b/bin/sqlradius.reimport index 89eb8018b..2218a3f13 100755 --- a/bin/sqlradius.reimport +++ b/bin/sqlradius.reimport @@ -107,7 +107,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) { } } - my( $password, $finger, $group ) = ( '', '', '' ); + #my( $password, $finger, $group ) = ( '', '', '' ); + my( $password, $group ) = ( '', '', '' ); my $rc_sth = $dbh->prepare( 'SELECT Attribute, Value, Name, GroupName'. @@ -118,9 +119,9 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) { foreach my $rc_row ( @{$rc_sth->fetchall_arrayref} ) { my($attribute, $value, $name, $groupname) = @$rc_row; - if ( $attribute =~ /^(Crypt-)?Password$/ ) { + if ( $attribute =~ /^((Crypt|User)-)?Password$/ ) { $password = $value; - $finger = $name; + #$finger = $name; $group = $groupname; } else { #handle other params! @@ -131,7 +132,8 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) { qsearch('svc_acct', { 'username' => $username, 'domsvc' => $svc_domain->svcnum, } ); - print "$r_username / $realm: $password / $finger: "; + #print "$r_username / $realm: $password / $finger: "; + print "$r_username / $realm: $password: "; if ( scalar(@svc_acct) == 0 ) { print "not found\n"; next; @@ -139,11 +141,13 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) { print "multiple matches found?!?!\n"; next; } else { - print "correcting password and name\n"; + #print "correcting password and name\n"; + print "correcting password\n"; } my $svc_acct = $svc_acct[0]; - my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger }; + #my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password, 'finger' => $finger }; + my $new = new FS::svc_acct { $svc_acct->hash, '_password' => $password }; my $error = $new->replace($svc_acct); #my $error = $new->check; die "$r_username / $realm: $error" if $error; @@ -151,6 +155,6 @@ while ( defined ( $row = $sth->fetchrow_arrayref ) ) { } sub usage { - die "Usage:\n\n sqlradius.import user\n"; + die "Usage:\n\n sqlradius.reimport user\n"; } -- 2.11.0