From 414b0f5b52ac15a4fdec9706727ff541d3bca039 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:30:52 +0000
Subject: carriage return helps alot

---
 FS/bin/freeside-sqlradius-seconds | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index e65b87f89..f785e23c2 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -16,7 +16,8 @@ my $stop = shift || time;
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) );
+print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) ).
+      "\n";
 
 sub usage {
   die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
-- 
cgit v1.2.1


From d86fad39ef5038a76c87e15b03b579f5151eb55b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:35:36 +0000
Subject: doh

---
 FS/bin/freeside-sqlradius-seconds | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index f785e23c2..e40dc91b6 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -16,7 +16,9 @@ my $stop = shift || time;
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct( str2time($start), str2time($stop) ).
+print $svc_acct->seconds_since_sqlradacct(
+                                           str2time($start),
+                                           $stop ? str2time($stop) : time  ).
       "\n";
 
 sub usage {
-- 
cgit v1.2.1


From eb3e4b97673b20b626774b9e000c5c327c991d5b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:37:12 +0000
Subject: grr double doh

---
 FS/bin/freeside-sqlradius-seconds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index e40dc91b6..d2358cd5e 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -11,7 +11,7 @@ adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
 my $start = shift or die &usage;
-my $stop = shift || time;
+my $stop = scalar(@_) ? shift : '';
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From d37105c93eae1366ee72ef93ae3d79cc5b04ade6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:47:06 +0000
Subject: is this broken or is the calculation?

---
 FS/bin/freeside-sqlradius-seconds | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index d2358cd5e..0539cb4d2 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,16 +10,13 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = shift or die &usage;
-my $stop = scalar(@_) ? shift : '';
+my $start = scalar(@_) && str2time(shift) or die &usage;
+my $stop =  scalar(@_) ?  str2time(shift) :  time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
 
-print $svc_acct->seconds_since_sqlradacct(
-                                           str2time($start),
-                                           $stop ? str2time($stop) : time  ).
-      "\n";
+print $svc_acct->seconds_since_sqlradacct( $start, $stop ). "\n";
 
 sub usage {
   die "Usage:\n\n  freeside-sqlradius-seconds freeside_username target_username start_date stop_date\n";
-- 
cgit v1.2.1


From 9f981d37086cea91e17aa2aefeee43388c60eb19 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:48:46 +0000
Subject: sigh

---
 FS/bin/freeside-sqlradius-seconds | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index 0539cb4d2..31450bd2c 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,8 +10,8 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = scalar(@_) && str2time(shift) or die &usage;
-my $stop =  scalar(@_) ?  str2time(shift) :  time;
+my $start = scalar(@_) ? str2time(shift) : die &usage;
+my $stop =  scalar(@_) ? str2time(shift) :  time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 0d6147067e8d5317d01692f8588b3a0167c664c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 09:52:46 +0000
Subject: sheesh

---
 FS/bin/freeside-sqlradius-seconds | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index 31450bd2c..a61e97730 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -10,8 +10,9 @@ my $fs_user = shift or die &usage;
 adminsuidsetup( $fs_user );
 
 my $target_user = shift or die &usage;
-my $start = scalar(@_) ? str2time(shift) : die &usage;
-my $stop =  scalar(@_) ? str2time(shift) :  time;
+my $start = shift or die &usage;
+$start = str2time($start);
+my $stop =  scalar(@_) ? str2time(shift) : time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 869f3b5401b5111789bf03a7a4cc5699ad2993a7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 17 Dec 2002 10:42:26 +0000
Subject: doh!  but finally fixed

---
 FS/bin/freeside-sqlradius-seconds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-sqlradius-seconds b/FS/bin/freeside-sqlradius-seconds
index a61e97730..1c978fa8a 100644
--- a/FS/bin/freeside-sqlradius-seconds
+++ b/FS/bin/freeside-sqlradius-seconds
@@ -12,7 +12,7 @@ adminsuidsetup( $fs_user );
 my $target_user = shift or die &usage;
 my $start = shift or die &usage;
 $start = str2time($start);
-my $stop =  scalar(@_) ? str2time(shift) : time;
+my $stop =  scalar(@ARGV) ? str2time(shift) : time;
 
 my $svc_acct = qsearchs( 'svc_acct', { 'username' => $target_user } );
 die "username $target_user not found\n" unless $svc_acct;
-- 
cgit v1.2.1


From 1a7b34a94745208217187050c1daec5bb31b7eb7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 22 Dec 2002 08:53:25 +0000
Subject: -p option for freeside-daily to only run for a particular payby
 $disable_agentcheck option for cust_pkg for import optimization

---
 FS/bin/freeside-daily | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 1db786120..c82dc07a0 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -11,16 +11,19 @@ use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw($opt_d $opt_v);
-getopts("d:v");
+getopts("p:d:v");
 my $user = shift or die &usage;
 
 adminsuidsetup $user;
 
 $FS::cust_main::Debug = 1 if $opt_v;
 
+my %search;
+$search{'payby'} = $opt_p if $opt_p;
+
 my @cust_main = @ARGV
-  ? map { qsearchs('cust_main', { custnum => $_ } ) } @ARGV
-  : qsearch('cust_main', {} )
+  ? map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
+  : qsearch('cust_main', \%search )
 ;
 
 #we're at now now (and later).
@@ -95,7 +98,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -p 'payby' ] [ -v ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -110,6 +113,10 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
   -d: Pretend it's 'date'.  Date is in any format Date::Parse is happy with,
       but be careful.
 
+  -p: Only process customers with the specified payby (CARD, CHEK, BILL, COMP, LECB)
+
+  -v: enable debugging
+
 user: From the mapsecrets file - see config.html from the base documentation
 
 custnum: if one or more customer numbers are specified, only bills those
-- 
cgit v1.2.1


From b1d4c3b5b5a05d38a4baf9c49bd7fdfb6990531d Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 24 Dec 2002 22:41:23 +0000
Subject: optimization for ginourmous numbers of packages for intergate, whew

---
 FS/bin/freeside-setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 8f3d99fd5..8b7466222 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -669,7 +669,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'pkgpart',
       'unique' => [],
-      'index' => [],
+      'index' => [ [ disabled ], ],
     },
 
 #    'part_title' => {
@@ -712,7 +712,7 @@ sub tables_hash_hack {
       ],
       'primary_key' => 'svcpart',
       'unique' => [],
-      'index' => [],
+      'index' => [ [ 'disabled' ] ],
     },
 
     'part_svc_column' => {
-- 
cgit v1.2.1


From 7926d92e41b592b08f15d250ac5e78f75a2a29c7 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 25 Dec 2002 06:59:09 +0000
Subject: declare $opt_p usage

---
 FS/bin/freeside-daily | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index c82dc07a0..579d071ac 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -10,7 +10,7 @@ use FS::Conf;
 use FS::cust_main;
 
 &untaint_argv;	#what it sounds like  (eww)
-use vars qw($opt_d $opt_v);
+use vars qw($opt_d $opt_v $opt_p);
 getopts("p:d:v");
 my $user = shift or die &usage;
 
-- 
cgit v1.2.1


From 1bfcd9ce4738e5c9f3c8a309775235e823b2f82c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 14 Jan 2003 09:26:49 +0000
Subject: move freeside-selfservice-server to proper MakeMaker install location

---
 FS/bin/freeside-selfservice-server | 235 +++++++++++++++++++++++++++++++++++++
 1 file changed, 235 insertions(+)
 create mode 100644 FS/bin/freeside-selfservice-server

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-selfservice-server b/FS/bin/freeside-selfservice-server
new file mode 100644
index 000000000..264cbc56d
--- /dev/null
+++ b/FS/bin/freeside-selfservice-server
@@ -0,0 +1,235 @@
+#!/usr/bin/perl -w
+#
+# freeside-selfservice-server
+
+# alas, much false laziness with freeside-queued and fs_signup_server.  at
+# least it is slated to replace fs_{signup,passwd,mailadmin}_server
+# should probably generalize the version in here, or better yet use
+# Proc::Daemon or somesuch
+
+use strict;
+use vars qw( $Debug %kids $kids $max_kids $shutdown $log_file $ssh_pid );
+use Fcntl qw(:flock);
+use POSIX qw(:sys_wait_h setsid);
+use IO::Handle;
+use IO::Select;
+use IO::File;
+use Storable qw(nstore_fd fd_retrieve);
+use Net::SSH qw(sshopen2);
+use FS::UID qw(adminsuidsetup forksuidsetup);
+use FS::ClientAPI;
+
+use FS::Conf;
+use FS::cust_bill;
+use FS::cust_pkg;
+
+$Debug = 2; # >= 2 will log packet contents, including potentially compromising
+            # information
+
+$shutdown = 0;
+$max_kids = '10'; #?
+$kids = 0;
+
+my $user = shift or die &usage;
+my $machine = shift or die &usage;
+my $pid_file = "/var/run/freeside-selfservice-server.$user.pid";
+#my $pid_file = "/var/run/freeside-selfservice-server.$user.pid"; $FS::UID::datasrc not posible, but should include machine name at least, hmm
+
+&init($user);
+
+my $conf = new FS::Conf;
+
+if ($conf->exists('selfservice_server-quiet')) {
+    $FS::cust_bill::quiet = 1;
+    $FS::cust_pkg::quiet = 1;
+}
+
+my $clientd = "/usr/local/sbin/freeside-selfservice-clientd"; #better name?
+
+my $warnkids=0;
+while (1) {
+  my($writer,$reader,$error) = (new IO::Handle, new IO::Handle, new IO::Handle);
+  warn "connecting to $machine\n" if $Debug;
+
+  $ssh_pid = sshopen2($machine,$reader,$writer,$clientd);
+
+#  nstore_fd(\*writer, {'hi'=>'there'});
+
+  warn "entering main loop\n" if $Debug;
+  my $undisp = 0;
+  my $s = IO::Select->new( $reader );
+  while (1) {
+
+    &reap_kids;
+
+    warn "waiting for packet from client\n" if $Debug && !$undisp;
+    $undisp = 1;
+    my @handles = $s->can_read(5);
+    unless ( @handles ) {
+      &shutdown if $shutdown;
+      next;
+    }
+
+    $undisp = 0;
+
+    warn "receiving packet from client\n" if $Debug;
+
+    my $packet = fd_retrieve($reader);
+    warn "packet received\n".
+         join('', map { " $_=>$packet->{$_}\n" } keys %$packet )
+      if $Debug > 1;
+
+    #prevent runaway forking
+    my $warnkids = 0;
+    while ( $kids >= $max_kids ) {
+      warn "WARNING: maximum $kids children reached\n" unless $warnkids++;
+      &reap_kids;
+      sleep 1;
+    }
+
+    warn "forking child\n" if $Debug;
+    defined( my $pid = fork ) or die "can't fork: $!";
+    if ( $pid ) {
+      $kids++;
+      $kids{$pid} = 1;
+      warn "child $pid spawned\n" if $Debug;
+    } else { #kid time
+
+      #get new db handle
+      $FS::UID::dbh->{InactiveDestroy} = 1;
+      forksuidsetup($user);
+
+      my $type = $packet->{_packet};
+      warn "calling $type handler\n" if $Debug; 
+      my $rv = eval { FS::ClientAPI->dispatch($type, $packet); };
+      if ( $@ ) {
+        warn my $error = "WARNING: error dispatching $type: $@";
+        $rv = { _error => $error };
+      }
+      $rv->{_token} = $packet->{_token}; #identifier
+
+      warn "sending response\n" if $Debug;
+      flock($writer, LOCK_EX) or die "FATAL: can't lock write stream: $!";
+      nstore_fd($rv, $writer) or die "FATAL: can't send response: $!";
+      $writer->flush or die "FATAL: can't flush: $!";
+      flock($writer, LOCK_UN) or die "WARNING: can't release write lock: $!";
+
+      warn "child exiting\n" if $Debug;
+      exit; #end-of-kid
+    }
+
+  }
+
+}
+
+###
+# utility subroutines
+###
+
+sub reap_kids {
+  #warn "reaping kids\n";
+  foreach my $pid ( keys %kids ) {
+    my $kid = waitpid($pid, WNOHANG);
+    if ( $kid > 0 ) {
+      $kids--;
+      delete $kids{$kid};
+    }
+  }
+  #warn "done reaping\n";
+}
+
+sub init {
+  my $user = shift;
+
+  chdir "/" or die "Can't chdir to /: $!";
+  open STDIN, '/dev/null' or die "Can't read /dev/null: $!";
+  defined(my $pid = fork) or die "Can't fork: $!";
+  if ( $pid ) {
+    print "freeside-selfservice-server to $machine started with pid $pid\n"; #logging to $log_file
+    exit unless $pid_file;
+    my $pidfh = new IO::File ">$pid_file" or exit;
+    print $pidfh "$pid\n";
+    exit;
+  }
+
+#  sub REAPER { my $pid = wait; $SIG{CHLD} = \&REAPER; $kids--; }
+#  #sub REAPER { my $pid = wait; $kids--; $SIG{CHLD} = \&REAPER; }
+#  $SIG{CHLD} =  \&REAPER;
+
+  $shutdown = 0;
+  $SIG{HUP} = sub { warn "SIGHUP received; shutting down\n"; $shutdown++; };
+  $SIG{INT} = sub { warn "SIGINT received; shutting down\n"; $shutdown++; };
+  $SIG{TERM} = sub { warn "SIGTERM received; shutting down\n"; $shutdown++; };
+  $SIG{QUIT} = sub { warn "SIGQUIT received; shutting down\n"; $shutdown++; };
+  $SIG{PIPE} = sub { warn "SIGPIPE received; shutting down\n"; $shutdown++; };
+
+  #false laziness w/freeside-queued
+  my $freeside_gid = scalar(getgrnam('freeside'))
+    or die "can't setgid to freeside group\n";
+  $) = $freeside_gid;
+  $( = $freeside_gid;
+  #if freebsd can't setuid(), presumably it can't setgid() either.  grr fleabsd
+  ($(,$)) = ($),$();
+  $) = $freeside_gid;
+
+  $> = $FS::UID::freeside_uid;
+  $< = $FS::UID::freeside_uid;
+  #freebsd is sofa king broken, won't setuid()
+  ($<,$>) = ($>,$<);
+  $> = $FS::UID::freeside_uid;
+  #eslaf
+
+  $ENV{HOME} = (getpwuid($>))[7]; #for ssh
+  adminsuidsetup $user;
+
+  #$log_file = "/usr/local/etc/freeside/selfservice.". $FS::UID::datasrc; #MACHINE NAME
+  $log_file = "/usr/local/etc/freeside/selfservice.$machine.log";
+
+  open STDOUT, '>/dev/null'
+                            or die "Can't write to /dev/null: $!";
+  setsid                  or die "Can't start a new session: $!";
+  open STDERR, '>&STDOUT' or die "Can't dup stdout: $!";
+
+  $SIG{__DIE__} = \&_die;
+  $SIG{__WARN__} = \&_logmsg;
+
+  warn "freeside-selfservice-server starting\n";
+
+}
+
+sub shutdown {
+  my $wait = 12; #wait up to 1 minute
+  while ( $kids > 0 && $wait-- ) {
+    warn "waiting for $kids children to terminate";
+    sleep 5;
+  }
+  warn "abandoning $kids children" if $kids;
+  kill 'TERM', $ssh_pid if $ssh_pid;
+  die "exiting";
+}
+
+sub _die {
+  my $msg = shift;
+  unlink $pid_file if -e $pid_file;
+  _logmsg($msg);
+}
+
+sub _logmsg {
+  chomp( my $msg = shift );
+  _do_logmsg( "[server] [". scalar(localtime). "] [$$] $msg\n" );
+}
+
+sub _do_logmsg {
+  chomp( my $msg = shift );
+  my $log = new IO::File ">>$log_file";
+  flock($log, LOCK_EX);
+  seek($log, 0, 2);
+  print $log "$msg\n";
+  flock($log, LOCK_UN);
+  close $log;
+}
+
+sub usage {
+  die "Usage:\n\n  fs_signup_server user machine\n";
+}
+
-- 
cgit v1.2.1