Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More fixes for #1286 #1319

Merged
merged 3 commits into from Jan 12, 2022
Merged

More fixes for #1286 #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59780fb
CLI: Improve error messages
ikedas Jan 5, 2022
04b9232
i18n'ized messages
ikedas Jan 5, 2022
40b6c5c
Prevent duplicated errors with some commands.
ikedas Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
99 changes: 55 additions & 44 deletions src/lib/Sympa/CLI.pm
View file
Open in desktop
Expand Up @@ -37,31 +37,40 @@ use Sympa::Mailer;
use Sympa::Template;
use Sympa::Tools::Data;

my $language = Sympa::Language->instance;

sub run {
my $class = shift;
my $options = shift if @_ and ref $_[0] eq 'HASH';
my $module = shift;
my $command = shift;
my @argv = @_;

if ($class eq 'Sympa::CLI') {
# Deal with some POSIX locales (LL.encoding)
my @langs =
map {s/[.].*\z//r} grep {defined} @ENV{qw(LANGUAGE LC_ALL LANG)};
$language->set_lang(@langs, 'en-US', 'en');
}

# Load module for the command.
unless ($module and $module !~ /\W/) {
print STDERR "Unable to use %s module: Illegal module\n";
unless ($command and $command !~ /\W/) {
warn $language->gettext_sprintf(
'Invalid argument \'%s\' (command is expected)', $command)
. "\n";
return undef;
}
$module = sprintf '%s::%s', $class, $module;

my $module = sprintf '%s::%s', $class, $command;
unless (eval sprintf 'require %s', $module and $module->isa($class)) {
printf STDERR "Unable to use %s module: %s\n",
$module, $EVAL_ERROR || "Not a $class class";
warn $language->gettext_sprintf('Invalid command \'%s\'', $command)
. "\n";
return undef;
}

# Check if any sub-commands are implemented.
if (@argv and length($argv[0] // '') and $argv[0] !~ /\W/) {
my $subdir = $INC{($module =~ s|::|/|gr) . '.pm'} =~ s/[.]pm\z//r;
if (<$subdir/*.pm>) {
$module->run(($options ? ($options) : ()), @argv);
exit 0;
return $module->run(($options ? ($options) : ()), @argv);
}
}

Expand All @@ -78,19 +87,17 @@ sub run {
$module->_options
)
) {
printf STDERR "See '%s help %s'\n", $PROGRAM_NAME, join ' ',
split /::/, ($module =~ s/\ASympa::CLI:://r);
exit 1;
warn $language->gettext_sprintf('See \'%s help %s\'',
$PROGRAM_NAME, join ' ', split /::/,
($module =~ s/\ASympa::CLI:://r))
. "\n";
return undef;
}

# Get privileges and load config if necessary.
# Otherwise only setup language.
if ($module->_need_priv) {
$module->arrange(%options);
} else {
my $lang = $ENV{'LANGUAGE'} || $ENV{'LC_ALL'} || $ENV{'LANG'};
$module->set_lang($options{'lang'}, $lang);
}
# Otherwise only setup language if specified.
$language->set_lang($options{lang}) if $options{lang};
$module->arrange(%options) if $module->_need_priv;

# Parse arguments.
my @parsed_argv = ();
Expand All @@ -104,28 +111,40 @@ sub run {
} elsif (@argv and defined $argv[0]) {
@a = (shift @argv);
} else {
printf STDERR "Missing %s.\n", $defs;
exit 1;
warn $language->gettext_sprintf(
'Missing argument (%s is expected)', $defs)
. "\n";
return undef;
}
foreach my $arg (@a) {
my $val;
foreach my $def (split /[|]/, $defs) {
if ($def eq 'list') {
unless (0 <= index $arg, '@') {
$val = Sympa::List->new($arg, $Conf::Conf{'domain'});
} elsif ($arg =~ /\A[^\@]+\@[^\@]*\z/) {
$val = Sympa::List->new($arg);
if (index($arg, '@') < 0 and index($defs, 'domain') < 0) {
$val = Sympa::List->new($arg, $Conf::Conf{'domain'},
{just_try => 1});
} elsif ($arg =~ /\A([^\@]+)\@([^\@]*)\z/) {
my ($name, $domain) = ($1, $2);
$val = Sympa::List->new(
$name,
$domain || $Conf::Conf{'domain'},
{just_try => 1}
);
}
} elsif ($def eq 'list_id') {
unless (0 <= index $arg, '@') {
if (index($arg, '@') < 0 and index($defs, 'domain') < 0) {
$val = $arg;
} elsif ($arg =~ /\A[^\@]+\@[^\@]*\z/) {
$val = $arg;
}
} elsif ($def eq 'family') {
my ($family_name, $domain) = split /\@\@/, $arg, 2;
if (length $family_name) {
$val = Sympa::Family->new($family_name,
if (index($arg, '@@') < 0 and index($defs, 'domain') < 0)
{
$val =
Sympa::Family->new($arg, $Conf::Conf{'domain'});
} elsif ($arg =~ /\A([^\@]+)\@\@([^\@]*)\z/) {
my ($name, $domain) = ($1, $2);
$val = Sympa::Family->new($name,
$domain || $Conf::Conf{'domain'});
}
} elsif ($def eq 'domain') {
Expand All @@ -144,8 +163,11 @@ sub run {
if (defined $val) {
push @parsed_argv, $val;
} else {
printf STDERR "Unknown %s \"%s\".\n", $defs, $arg;
exit 1;
warn $language->gettext_sprintf(
'Invalid argument \'%s\' (%s is expected)',
$arg, $defs)
. "\n";
return undef;
}
}
}
Expand Down Expand Up @@ -223,7 +245,7 @@ sub arrange {
Conf::get_sympa_conf();
}

$class->set_lang($options{'lang'}, $Conf::Conf{'lang'});
$language->set_lang($Conf::Conf{'lang'}) unless $options{lang};

## Main program
if (!chdir($Conf::Conf{'home'})) {
Expand Down Expand Up @@ -272,16 +294,6 @@ sub arrange {
$is_arranged = 1;
}

sub set_lang {
my $class = shift;
my @langs = @_;

foreach (@langs) {
s/[.].*\z// if defined; # Compat.<2.3.3 & some POSIX locales
}
Sympa::Language->instance->set_lang(@langs, 'en-US', 'en');
}

# Moved from: _report() in sympa.pl.
sub _report {
my $class = shift;
Expand All @@ -306,7 +318,7 @@ sub _report {
$message ||= $report_entry;
$message =~ s/\n/ /g;

printf STDERR "%s [%s] %s\n", $action, $report_type, $message;
warn sprintf "%s [%s] %s\n", $action, $report_type, $message;
}

return $spindle->success ? 1 : undef;
Expand Down Expand Up @@ -334,7 +346,6 @@ my @getoptions_messages = (
sub _translate_warn {
my $output = shift;

my $language = Sympa::Language->instance;
foreach my $item (@getoptions_messages) {
my $format = $item->{'gettext_id'};
my $regexp = quotemeta $format;
Expand Down
1 change: 1 addition & 0 deletions src/lib/Sympa/Request/Handler/get.pm
View file
Open in desktop
Expand Up @@ -61,6 +61,7 @@ sub _twist {
$log->syslog('info',
'GET %s %s from %s refused, no archive for list %s',
$which, $arc, $sender, $which);
$self->{finish} = 1;
return undef;
}

Expand Down
1 change: 1 addition & 0 deletions src/lib/Sympa/Request/Handler/move_user.pm
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ sub _twist {
$log->syslog('info', 'No change on email');
$self->add_stash($request, 'user', 'no_email_changed',
{email => $email});
$self->{finish} = 1;
return 1;
}

Expand Down