From 453f8ffb1b1b54998c208ec49a8284394b2727bf Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 10 Aug 1999 12:55:11 +0000 Subject: [PATCH] ready for testing --- fs_signup/fs_signup_server | 152 ++++++++++++++++++++++++++++++++------------- fs_signup/fs_signupd | 116 ++++++++++++++++++++++++++++------ 2 files changed, 206 insertions(+), 62 deletions(-) diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server index 5feed4cb6..cf2519ec0 100755 --- a/fs_signup/fs_signup_server +++ b/fs_signup/fs_signup_server @@ -20,7 +20,7 @@ my $machine = shift or die &usage; my $agentnum = shift or die &usage; my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } ) or die &usage; -#my %part_pkg = %{ $agent->pkgpart_hashref }; +my $pkgpart = $agent->pkgpart_hashref; my $refnum = shift or die &usage; @@ -34,9 +34,9 @@ while (1) { sshopen2($shellmachine,$reader,$writer,$fs_signupd); #send fs_signupd state/county/country - @cust_main_county = qsearch('cust_main_county', {} ); + @my cust_main_county = qsearch('cust_main_county', {} ); print $writer join("\n", - scalar(@cust_main_county), + scalar(@cust_main_county) || die "no tax rates (cust_main_county records)", map { $_->taxnum, $_->state, @@ -46,57 +46,121 @@ while (1) { ),"\n"; #send fs_signupd package definitions + my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } } + qsearch( 'part_pkg', {} ); + print $writer join("\n", + scalar(@part_pkg) || die "no usable package definitions, agent $agentnum", + map { + $_->pkgpart, + $_->pkg, + } @part_pkg + ), "\n"; #send fs_signupd POPs + my @svc_acct_pop = qsearch ('svc_acct_pop',{} ); + print $writer join("\n", + scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)", + map { + $_->popnum, + $_->city, + $_->state, + $_->ac, + $_->exch, + } @svc_acct_pop + ), "\n"; + while (1) { + chop( my( + $first, $last, $ss, $company, $address1, $address2, $city, $county, + $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo, + $paydate, $payname, $invoicing_list, $pkgpart, $username, $password, + $popnum, + ) = <$reader> ); + + my $error = ''; + + #shares some stuff with htdocs/edit/process/cust_main.cgi... take any + # common that are still here and library them. + my $cust_main = new FS::cust_main ( { + 'custnum' => '', + 'agentnum' => $agentnum, + 'refnum' => $refnum, + 'last' => $last, + 'first' => $first, + 'ss' => $ss, + 'company' => $company, + 'address1' => $address1, + 'address2' => $address2, + 'city' => $city, + 'county' => $county, + 'state' => $state, + 'zip' => $zip, + 'country' => $country, + 'daytime' => $daytime, + 'night' => $night, + 'fax' => $fax, + 'payby' => $payby, + 'payinfo' => $payinfo, + 'paydate' => $paydate, + 'payname' => $payname, + } ); + my @invoicing_list = split( /\s*\,\s*/, $invoicing_list ); - while (1) { - my( $first, $last, $ss, $company, $address1, $address2, $city, $county, - $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo, - $paydate, $payname, $username, $password, $popnum, - ); - - - - my($username,$old_password,$new_password,$new_gecos,$new_shell); - defined($username=<$reader>) or last; - defined($old_password=<$reader>) or last; - defined($new_password=<$reader>) or last; - defined($new_gecos=<$reader>) or last; - defined($new_shell=<$reader>) or last; - chop($username); - chop($old_password); - chop($new_password); - chop($new_gecos); - chop($new_shell); - my($svc_acct); - - #need to try both $old_password and encrypted $old_password - #maybe the crypt function in svc_acct.export needs to be a library? - my $salt = substr($old_password,0,2); - my $cold_password = crypt($old_password,$salt); - $svc_acct=qsearchs('svc_acct',{'username'=>$username, - '_password'=>$old_password, - } ) - || qsearchs('svc_acct',{'username'=>$username, - '_password'=>$cold_password, + $error ||= $cust_main->check_invoicing_list( \@invoicing_list ); + + my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } ) + or die "unknown pkgpart $pkgpart"; + my $svcpart = $part_pkg->svcpart; + + # this should wind up in FS::cust_pkg! + die "agent $agentnum can't purchase pkgpart $pkgpart" + unless $pkgpart->{ $pkgpart }; + + my $cust_pkg = new FS::cust_pkg ( { + #later#'custnum' => $custnum, + 'pkgpart' => $pkgpart, + } ); + $error ||= $cust_pkg->check; + + $svc_acct = new FS::svc_acct ( { + 'svcpart' => $svcpart, + 'username' => $username, + '_password' => $password, + 'popnum' => $popnum, } ); - unless ( $svc_acct ) { print $writer "Incorrect password.\n"; next; } - - my(%hash)=$svc_acct->hash; - my($new_svc_acct) = new FS::svc_acct ( \%hash ); - $new_svc_acct->setfield('_password',$new_password) - if $new_password && $new_password ne $old_password; - $new_svc_acct->setfield('finger',$new_gecos) if $new_gecos; - $new_svc_acct->setfield('shell',$new_shell) if $new_shell; - my($error)=$new_svc_acct->replace($svc_acct); - print $writer $error,"\n"; + + my $y = $svc_acct->setdefault; # arguably should be in new method + $error ||= $y unless ref($y); + #and just in case you were silly + $svc_acct->svcpart($svcpart); + $svc_acct->username($username); + $svc_acct->_password($password); + $svc_acct->popnum($popnum); + + $error ||= $svc_acct->check; + + $error ||= $cust_main->insert; + if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always + #be definied, but.... + $cust_pkg->custnum( $new->custnum ); + $error ||= $cust_pkg->insert; + warn "WARNING: $error on pre-checked cust_pkg record!" if $error; + $svc_acct->pkgnum( $cust_pkg->pkgnum ); + $error ||= $svc_acct->insert; + warn "WARNING: $error on pre-checked svc_acct record!" if $error; + } + + print $writer $error, "\n"; + + $cust_main->invoicing_list( \@invoicing_list ) unless $error; + } close $writer; close $reader; + warn "connection to $shellmachine lost! waiting 60 seconds...\n"; sleep 60; - warn "Connection to $shellmachine lost! Reconnecting...\n"; + warn "reconnecting...\n"; } sub usage { diff --git a/fs_signup/fs_signupd b/fs_signup/fs_signupd index 582e13ccd..71fd1540d 100755 --- a/fs_signup/fs_signupd +++ b/fs_signup/fs_signupd @@ -1,17 +1,16 @@ #!/usr/bin/perl -Tw # -# fs_passwdd +# fs_signupd # -# This is run REMOTELY over ssh by fs_passwd_server. +# This is run REMOTELY over ssh by fs_signup_server. # -# ivan@sisd.com 98-mar-9 use strict; use Socket; -my($fs_passwdd_socket)="/usr/local/freeside/fs_passwdd_socket"; +my($fs_passwdd_socket)="/usr/local/freeside/fs_signupd_socket"; -$ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin'; +$ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin'; $ENV{'SHELL'} = '/bin/sh'; $ENV{'IFS'} = " \t\n"; $ENV{'CDPATH'} = ''; @@ -20,6 +19,46 @@ $ENV{'BASH_ENV'} = ''; $|=1; +chomp( my $n_cust_main_county = ); +my @cust_main_county = map { + chomp( my $taxnum = ); + chomp( my $state = ); + chomp( my $county = ); + chomp( my $country = ); + { + 'taxnum' => $taxnum, + 'state' => $state, + 'county' => $county, + 'country' => $country, + }; +} ( 1 .. $n_cust_main_county ); + +chomp( my $n_part_pkg = ); +my @part_pkg = map { + chomp( my $pkgpart = ); + chomp( my $pkg = ); + { + 'pkgpart' => $pkgpart, + 'pkg' => $pkg, + }; +} ( 1 .. $n_part_pkg ); + +chomp( my $n_svc_acct_pop = ); +my @svc_acct_pop = map { + chomp( my $popnum = ); + chomp( my $city = ); + chomp( my $state = ); + chomp( my $ac = ); + chomp( my $exch = ); + { + 'popnum' => $popnum, + 'city' => $city, + 'state' => $state, + 'ac' => $ac, + 'exch' => $exch, + }; +} ( 1 .. $n_svc_acct_pop ); + my $uaddr = sockaddr_un($fs_passwdd_socket); my $proto = getprotobyname('tcp'); @@ -28,22 +67,63 @@ unlink($fs_passwdd_socket); bind(Server, $uaddr) or die "bind: $!"; listen(Server,SOMAXCONN) or die "listen: $!"; -my($paddr); +my $paddr; + for ( ; $paddr = accept(Client,Server); close Client) { - my($me,$old_password,$new_password,$new_gecos,$new_shell); - $me=; - $old_password=; - $new_password=; - $new_gecos=; - $new_shell=; + chop( my $command = ); + + if ( $command eq "signup_info" ) { + + print Client join("\n", $n_cust_main_county, + map { + $_->{taxnum}, + $_->{state}, + $_->{county}, + $_->{country}, + } @cust_main_county + ), "\n"; + + print Client join("\n", $n_part_pkg, + map { + $_->{pkgpart}, + $_->{pkg}, + } @part_pkg + ), "\n"; + + print Client join("\n", $n_svc_acct_pop, + map { + $_->{popnum}, + $_->{city}, + $_->{state}, + $_->{ac}, + $_->{exch}, + } @svc_acct_pop + ), "\n"; + + } elsif ( $operation eq "new_customer" ) { + + my( + $first, $last, $ss, $company, $address1, $address2, $city, $county, + $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo, + $paydate, $payname, $invoicing_list, $pkgpart, $username, $password, + $popnum, + ) = ; + + print + $first, $last, $ss, $company, $address1, $address2, $city, $county, + $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo, + $paydate, $payname, $invoicing_list, $pkgpart, $username, $password, + $popnum, + ; + + my $error = ; + + print Client $error; - print $me,$old_password,$new_password,$new_gecos,$new_shell; - my($error); + } else { + die "unexpected command from client: $command"; + } - $error=; - - print Client $error; - close Client; } -- 2.11.0