X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=c0c9f7af4f2a61ce8e4917aee60a93fa2a7385cd;hp=f5c4f6139102a0295860793abffa6ae188eb0e0c;hb=6cf964d0dc008621fb30fd2da28e2c44f29c6364;hpb=ece31063b782031e21ba1f57476afab555af5363

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index f5c4f6139..c0c9f7af4 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -3,8 +3,8 @@ package FS::UID;
 use strict;
 use vars qw(
   @ISA @EXPORT_OK $cgi $dbh $freeside_uid $user 
-  $conf_dir $secrets $datasrc $db_user $db_pass %callback $driver_name
-  $AutoCommit
+  $conf_dir $secrets $datasrc $db_user $db_pass %callback @callback
+  $driver_name $AutoCommit
 );
 use subs qw(
   getsecrets cgisetotaker
@@ -15,8 +15,8 @@ use DBI;
 use FS::Conf;
 
 @ISA = qw(Exporter);
-@EXPORT_OK = qw(checkeuid checkruid swapuid cgisuidsetup
-                adminsuidsetup getotaker dbh datasrc getsecrets driver_name );
+@EXPORT_OK = qw(checkeuid checkruid cgisuidsetup adminsuidsetup forksuidsetup
+                getotaker dbh datasrc getsecrets driver_name myconnect );
 
 $freeside_uid = scalar(getpwnam('freeside'));
 
@@ -31,7 +31,7 @@ FS::UID - Subroutines for database login and assorted other stuff
 =head1 SYNOPSIS
 
   use FS::UID qw(adminsuidsetup cgisuidsetup dbh datasrc getotaker
-  checkeuid checkruid swapuid);
+  checkeuid checkruid);
 
   adminsuidsetup $user;
 
@@ -65,10 +65,17 @@ Returns the DBI database handle (usually you don't need this).
 =cut
 
 sub adminsuidsetup {
+  $dbh->disconnect if $dbh;
+  &forksuidsetup(@_);
+}
 
+sub forksuidsetup {
   $user = shift;
   croak "fatal: adminsuidsetup called without arguements" unless $user;
 
+  $user =~ /^([\w\-\.]+)$/ or croak "fatal: illegal user $user";
+  $user = $1;
+
   $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
   $ENV{'SHELL'} = '/bin/sh';
   $ENV{'IFS'} = " \t\n";
@@ -77,22 +84,46 @@ sub adminsuidsetup {
   $ENV{'BASH_ENV'} = '';
 
   croak "Not running uid freeside!" unless checkeuid();
-  getsecrets;
-  $dbh->disconnect if $dbh;
-  $dbh = DBI->connect($datasrc,$db_user,$db_pass, {
-                          'AutoCommit' => 0,
-                          'ChopBlanks' => 1,
-  } ) or die "DBI->connect error: $DBI::errstr\n";
 
-  swapuid(); #go to non-privledged user if running setuid freeside
+  $dbh = &myconnect;
 
   foreach ( keys %callback ) {
     &{$callback{$_}};
+    # breaks multi-database installs # delete $callback{$_}; #run once
   }
 
+  &{$_} foreach @callback;
+
   $dbh;
 }
 
+sub myconnect {
+  DBI->connect( getsecrets, {'AutoCommit' => 0, 'ChopBlanks' => 1, } )
+    or die "DBI->connect error: $DBI::errstr\n";
+}
+
+=item install_callback
+
+A package can install a callback to be run in adminsuidsetup by passing
+a coderef to the FS::UID->install_callback class method.  If adminsuidsetup has
+run already, the callback will also be run immediately.
+
+    $coderef = sub { warn "Hi, I'm returning your call!" };
+    FS::UID->install_callback($coderef);
+
+    install_callback FS::UID sub { 
+      warn "Hi, I'm returning your call!"
+    };
+
+=cut
+
+sub install_callback {
+  my $class = shift;
+  my $callback = shift;
+  push @callback, $callback;
+  &{$callback} if $dbh;
+}
+
 =item cgisuidsetup CGI_object
 
 Takes a single argument, which is a CGI (see L<CGI>) or Apache (see L<Apache>)
@@ -186,7 +217,8 @@ sub cgisetotaker {
   } elsif ( $cgi && $cgi->isa('Apache') ) {
     $user = lc ( $cgi->connection->user );
   } else {
-    die "fatal: Can't get REMOTE_USER! for cgi $cgi";
+    die "fatal: Can't get REMOTE_USER! for cgi $cgi - you need to setup ".
+        "Apache user authentication as documented in httemplate/docs/install.html";
   }
   $user;
 }
@@ -211,16 +243,6 @@ sub checkruid {
   ( $< == $freeside_uid );
 }
 
-=item swapuid
-
-Swaps real and effective UIDs.
-
-=cut
-
-sub swapuid {
-  ($<,$>) = ($>,$<) if $< != $>;
-}
-
 =item getsecrets [ USER ]
 
 Sets the user to USER, if supplied.
@@ -235,7 +257,7 @@ sub getsecrets {
   die "No user!" unless $user;
   my($conf) = new FS::Conf $conf_dir;
   my($line) = grep /^\s*$user\s/, $conf->config('mapsecrets');
-  die "User not found in mapsecrets!" unless $line;
+  die "User $user not found in mapsecrets!" unless $line;
   $line =~ /^\s*$user\s+(.*)$/;
   $secrets = $1;
   die "Illegal mapsecrets line for user?!" unless $secrets;
@@ -250,17 +272,28 @@ sub getsecrets {
 
 =head1 CALLBACKS
 
-Warning: this interface is likely to change in future releases.
+Warning: this interface is (still) likely to change in future releases.
 
-A package can install a callback to be run in adminsuidsetup by putting a
-coderef into the hash %FS::UID::callback :
+New (experimental) callback interface:
+
+A package can install a callback to be run in adminsuidsetup by passing
+a coderef to the FS::UID->install_callback class method.  If adminsuidsetup has
+run already, the callback will also be run immediately.
 
     $coderef = sub { warn "Hi, I'm returning your call!" };
-    $FS::UID::callback{'Package::Name'};
+    FS::UID->install_callback($coderef);
 
-=head1 VERSION
+    install_callback FS::UID sub { 
+      warn "Hi, I'm returning your call!"
+    };
 
-$Id: UID.pm,v 1.6 2001-04-23 09:00:06 ivan Exp $
+Old (deprecated) callback interface:
+
+A package can install a callback to be run in adminsuidsetup by putting a
+coderef into the hash %FS::UID::callback :
+
+    $coderef = sub { warn "Hi, I'm returning your call!" };
+    $FS::UID::callback{'Package::Name'} = $coderef;
 
 =head1 BUGS
 
@@ -273,7 +306,7 @@ cgisuidsetup will go away as well.
 
 Goes through contortions to support non-OO syntax with multiple datasrc's.
 
-Callbacks are inelegant.
+Callbacks are (still) inelegant.
 
 =head1 SEE ALSO