Revision e46c6825
Von Sven Schöling vor mehr als 14 Jahren hinzugefügt
| SL/Auth.pm | ||
|---|---|---|
|
$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();
|
||
Auch abrufbar als: Unified diff
Fehler im Bootstrapping besser handhaben.
Konkret, wenn config/authentication.pl nicht richtig geladen wird.
Fix für Bug 1472.