package FS::UID;
+use base qw( Exporter );
use strict;
use vars qw(
- @ISA @EXPORT_OK $DEBUG $me $cgi $freeside_uid $user $conf_dir $cache_dir
+ @EXPORT_OK $DEBUG $me $cgi $freeside_uid $conf_dir $cache_dir
$secrets $datasrc $db_user $db_pass $schema $dbh $driver_name
- $AutoCommit %callback @callback $callback_hack $use_confcompat
+ $AutoCommit %callback @callback $callback_hack
);
use subs qw( getsecrets );
-use Exporter;
use Carp qw( carp croak cluck confess );
use DBI;
use IO::File;
use FS::CurrentUser;
-@ISA = qw(Exporter);
@EXPORT_OK = qw( checkeuid checkruid cgi setcgi adminsuidsetup forksuidsetup
- preuser_setup
+ preuser_setup load_schema
getotaker dbh datasrc getsecrets driver_name myconnect
- use_confcompat
);
$DEBUG = 0;
$cache_dir = "%%%FREESIDE_CACHE%%%";
$AutoCommit = 1; #ours, not DBI
-$use_confcompat = 1;
$callback_hack = 0;
=head1 NAME
=head1 SYNOPSIS
- use FS::UID qw(adminsuidsetup dbh datasrc getotaker checkeuid checkruid);
+ use FS::UID qw(adminsuidsetup dbh datasrc checkeuid checkruid);
$dbh = adminsuidsetup $user;
}
sub forksuidsetup {
- $user = shift;
- my $olduser = $user;
+ my $user = shift;
warn "$me forksuidsetup starting for $user\n" if $DEBUG;
if ( $FS::CurrentUser::upgrade_hack ) {
env_setup();
- db_setup($olduser);
+ db_setup();
callback_setup();
}
-sub db_setup {
- my $olduser = shift;
+sub load_schema {
+ warn "$me loading schema\n" if $DEBUG;
+ getsecrets() unless $datasrc;
+ use FS::Schema qw(reload_dbdef dbdef);
+ reload_dbdef("$conf_dir/dbdef.$datasrc")
+ unless $FS::Schema::setup_hack;
+}
+sub db_setup {
croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
warn "$me forksuidsetup connecting to database\n" if $DEBUG;
- if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
- $dbh = &myconnect($olduser);
- } else {
- $dbh = &myconnect();
- }
+ $dbh = &myconnect();
+
warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
- warn "$me forksuidsetup loading schema\n" if $DEBUG;
- use FS::Schema qw(reload_dbdef dbdef);
- reload_dbdef("$conf_dir/dbdef.$datasrc")
- unless $FS::Schema::setup_hack;
+ load_schema();
warn "$me forksuidsetup deciding upon config system to use\n" if $DEBUG;
- if ( ! $FS::Schema::setup_hack && dbdef->table('conf') ) {
+ unless ( $FS::Schema::setup_hack ) {
+ #how necessary is this now that we're no longer possibly a pre-1.9 db?
my $sth = $dbh->prepare("SELECT COUNT(*) FROM conf") or die $dbh->errstr;
$sth->execute or die $sth->errstr;
- my $confcount = $sth->fetchrow_arrayref->[0];
-
- if ($confcount) {
- $use_confcompat = 0;
- }else{
- die "NO CONFIGURATION RECORDS FOUND";
- }
+ $sth->fetchrow_arrayref->[0] or die "NO CONFIGURATION RECORDS FOUND";
- } else {
- die "NO CONFIGURATION TABLE FOUND" unless $FS::Schema::setup_hack;
}
}
sub myconnect {
- my $handle = DBI->connect( getsecrets(@_), { 'AutoCommit' => 0,
- 'ChopBlanks' => 1,
- 'ShowErrorStatement' => 1,
- 'pg_enable_utf8' => 1,
- #'mysql_enable_utf8' => 1,
- }
+ my $handle = DBI->connect( getsecrets(), { 'AutoCommit' => 0,
+ 'ChopBlanks' => 1,
+ 'ShowErrorStatement' => 1,
+ 'pg_enable_utf8' => 1,
+ #'mysql_enable_utf8' => 1,
+ }
)
or die "DBI->connect error: $DBI::errstr\n";
+ $FS::Conf::conf_cache = undef;
+
if ( $schema ) {
use DBIx::DBSchema::_util qw(_load_driver ); #quelle hack
my $driver = _load_driver($handle);
=item getotaker
-Returns the current Freeside user.
+(Deprecated) Returns the current Freeside user's username.
=cut
sub getotaker {
- $user;
+ carp "FS::UID::getotaker deprecated";
+ $FS::CurrentUser::CurrentUser->username;
}
=item checkeuid
( $< == $freeside_uid );
}
-=item getsecrets [ USER ]
+=item getsecrets
-Sets the user to USER, if supplied.
-Sets and returns the DBI datasource, username and password for this user from
-the `/usr/local/etc/freeside/mapsecrets' file.
+Sets and returns the DBI datasource, username and password from
+the `/usr/local/etc/freeside/secrets' file.
=cut
sub getsecrets {
- my($setuser) = shift;
- $user = $setuser if $setuser;
-
- if ( -e "$conf_dir/mapsecrets" ) {
- die "No user!" unless $user;
- my($line) = grep /^\s*($user|\*)\s/,
- map { /^(.*)$/; $1 } readline(new IO::File "$conf_dir/mapsecrets");
- confess "User $user not found in mapsecrets!" unless $line;
- $line =~ /^\s*($user|\*)\s+(.*)$/;
- $secrets = $2;
- die "Illegal mapsecrets line for user?!" unless $secrets;
- } else {
- # no mapsecrets file at all, so do the default thing
- $secrets = 'secrets';
- }
($datasrc, $db_user, $db_pass, $schema) =
- map { /^(.*)$/; $1 } readline(new IO::File "$conf_dir/$secrets")
- or die "Can't get secrets: $conf_dir/$secrets: $!\n";
+ map { /^(.*)$/; $1 } readline(new IO::File "$conf_dir/secrets")
+ or die "Can't get secrets: $conf_dir/secrets: $!\n";
undef $driver_name;
($datasrc, $db_user, $db_pass);
}
-=item use_confcompat
-
-Returns true whenever we should use 1.7 configuration compatibility.
-
-=cut
-
-sub use_confcompat {
- $use_confcompat;
-}
-
=back
=head1 CALLBACKS
projects / freeside.git / blobdiff