use IO::File;
use Time::HiRes qw(gettimeofday);
use List::MoreUtils qw(uniq);
+use YAML;
use SL::Auth::Constants qw(:all);
use SL::Auth::DB;
return $self;
}
+sub get_user_dbh {
+ my ($self, $login) = @_;
+ my %user = $self->read_user($login);
+ my $dbh = DBI->connect(
+ $user{dbconnect},
+ $user{dbuser},
+ $user{dbpasswd},
+ {
+ pg_enable_utf8 => $::locale->is_utf8,
+ AutoCommit => 0
+ }
+ ) or $::form->dberror;
+
+ if ($user{dboptions}) {
+ $dbh->do($user{dboptions}) or $::form->dberror($user{dboptions});
+ }
+
+ return $dbh;
+}
+
sub DESTROY {
my $self = shift;
$self->{dbh}->disconnect() if ($self->{dbh});
}
+# form isn't loaded yet, so auth needs it's own error.
+sub mini_error {
+ $::lxdebug->show_backtrace();
+
+ my ($self, @msg) = @_;
+ if ($ENV{HTTP_USER_AGENT}) {
+ print Form->create_http_response(content_type => 'text/html');
+ print "<pre>", join ('<br>', @msg), "</pre>";
+ } else {
+ print STDERR "Error: @msg\n";
+ }
+ ::end_of_request();
+}
+
sub _read_auth_config {
$main::lxdebug->enter_sub();
my $self = shift;
- my $form = $main::form;
- my $locale = $main::locale;
-
my $code;
my $in = IO::File->new('config/authentication.pl', 'r');
if (!$in) {
- $form->error($locale->text('The config file "config/authentication.pl" was not found.'));
+ my $locale = Locale->new('en');
+ $self->mini_error($locale->text('The config file "config/authentication.pl" was not found.'));
}
while (<$in>) {
eval $code;
if ($@) {
- $form->error($locale->text('The config file "config/authentication.pl" contained invalid Perl code:') . "\n" . $@);
+ my $locale = Locale->new('en');
+ $self->mini_error($locale->text('The config file "config/authentication.pl" contained invalid Perl code:'), $@);
}
if ($self->{module} eq 'DB') {
}
if (!$self->{authenticator}) {
- $form->error($locale->text('No or an unknown authenticantion module specified in "config/authentication.pl".'));
+ my $locale = Locale->new('en');
+ $self->mini_error($locale->text('No or an unknown authenticantion module specified in "config/authentication.pl".'));
}
my $cfg = $self->{DB_config};
if (!$cfg) {
- $form->error($locale->text('config/authentication.pl: Key "DB_config" is missing.'));
+ my $locale = Locale->new('en');
+ $self->mini_error($locale->text('config/authentication.pl: Key "DB_config" is missing.'));
}
if (!$cfg->{host} || !$cfg->{db} || !$cfg->{user}) {
- $form->error($locale->text('config/authentication.pl: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".'));
+ my $locale = Locale->new('en');
+ $self->mini_error($locale->text('config/authentication.pl: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".'));
}
$self->{authenticator}->verify_config();
$main::lxdebug->leave_sub();
- return $password eq $admin_password ? OK : ERR_PASSWORD;
+ return OK if $password eq $admin_password;
+ sleep 5;
+ return ERR_PASSWORD;
}
sub authenticate {
$main::lxdebug->leave_sub();
- return $self->{authenticator}->authenticate(@_);
+ my $result = $self->{authenticator}->authenticate(@_);
+ return OK if $result eq OK;
+ sleep 5;
+ return $result;
}
sub dbconnect {
$main::lxdebug->message(LXDebug->DEBUG1, "Auth::dbconnect DSN: $dsn");
- $self->{dbh} = DBI->connect($dsn, $cfg->{user}, $cfg->{password}, { 'AutoCommit' => 0 });
+ $self->{dbh} = DBI->connect($dsn, $cfg->{user}, $cfg->{password}, { pg_enable_utf8 => $::locale->is_utf8, AutoCommit => 0 });
if (!$may_fail && !$self->{dbh}) {
$main::form->error($main::locale->text('The connection to the authentication database failed:') . "\n" . $DBI::errstr);
$main::lxdebug->message(LXDebug->DEBUG1(), "Auth::create_database DSN: $dsn");
- my $dbh = DBI->connect($dsn, $params{superuser}, $params{superuser_password});
-
- if (!$dbh) {
- $main::form->error($main::locale->text('The connection to the template database failed:') . "\n" . $DBI::errstr);
- }
-
my $charset = $main::dbcharset;
$charset ||= Common::DEFAULT_CHARSET;
my $encoding = $Common::charset_to_db_encoding{$charset};
$encoding ||= 'UNICODE';
+ my $dbh = DBI->connect($dsn, $params{superuser}, $params{superuser_password}, { pg_enable_utf8 => $charset =~ m/^utf-?8$/i });
+
+ if (!$dbh) {
+ $main::form->error($main::locale->text('The connection to the template database failed:') . "\n" . $DBI::errstr);
+ }
+
my $query = qq|CREATE DATABASE "$cfg->{db}" OWNER "$cfg->{user}" TEMPLATE "$params{template}" ENCODING '$encoding'|;
$main::lxdebug->message(LXDebug->DEBUG1(), "Auth::create_database query: $query");
$sth = prepare_execute_query($form, $dbh, $query, $session_id);
while (my $ref = $sth->fetchrow_hashref()) {
- $self->{SESSION}->{$ref->{sess_key}} = $ref->{sess_value};
- $form->{$ref->{sess_key}} = $ref->{sess_value} if (!defined $form->{$ref->{sess_key}});
+ my $value = $self->_load_value($ref->{sess_value});
+ $self->{SESSION}->{$ref->{sess_key}} = $value;
+ $form->{$ref->{sess_key}} = $value if (!defined $form->{$ref->{sess_key}});
}
$sth->finish();
return SESSION_OK;
}
+sub _load_value {
+ return $_[1] if $_[1] !~ m/^---/;
+
+ my $value;
+ eval {
+ $value = YAML::Load($_[1]);
+ 1;
+ } or return $_[1];
+
+ return $value;
+}
+
sub destroy_session {
$main::lxdebug->enter_sub();
sub set_session_value {
$main::lxdebug->enter_sub();
- my $self = shift;
+ my $self = shift;
+ my %params = @_;
$self->{SESSION} ||= { };
- while (2 <= scalar @_) {
- my $key = shift;
- my $value = shift;
-
- $self->{SESSION}->{$key} = $value;
+ while (my ($key, $value) = each %params) {
+ $self->{SESSION}->{ $key } = YAML::Dump($value);
}
$main::lxdebug->leave_sub();
["--reports", $locale->text('Reports')],
["report", $locale->text('All reports')],
["advance_turnover_tax_return", $locale->text('Advance turnover tax return')],
+ ["--batch_printing", $locale->text("Batch Printing")],
+ ["batch_printing", $locale->text("Batch Printing")],
["--others", $locale->text("Others")],
["email_bcc", $locale->text("May set the BCC field when sending emails")],
["config", $locale->text("Change Lx-Office installation settings (all menu entries beneath 'System')")],
projects / kivitendo-erp.git / blobdiff