X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FCLIHandler.pm;h=e61fa6a1cdf02c601d1850021cc3e94e246ca099;hb=fb3a6db16c82e2b911700cd5a362e7b4bec18d9a;hp=0e7f20250639850af968cc50efa990ea4188a350;hpb=bf27456b4e6f7da0e75331e88a8bd70d6281c9c6;p=pve-common.git

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index 0e7f202..e61fa6a 100644
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -112,7 +112,7 @@ __PACKAGE__->register_method ({
 
     }});
 
-sub print_simple_asciidoc_synopsys {
+sub print_simple_asciidoc_synopsis {
     my ($class, $name, $arg_param, $uri_param) = @_;
 
     die "not initialized" if !$cli_handler_class;
@@ -128,7 +128,7 @@ sub print_simple_asciidoc_synopsys {
     return $synopsis;
 }
 
-sub print_asciidoc_synopsys {
+sub print_asciidoc_synopsis {
 
     die "not initialized" if !($cmddef && $exename && $cli_handler_class);
 
@@ -363,6 +363,11 @@ sub find_cli_class_source {
 
 sub generate_asciidoc_synopsys {
     my ($class) = @_;
+    $class->generate_asciidoc_synopsis();
+};
+
+sub generate_asciidoc_synopsis {
+    my ($class) = @_;
 
     $cli_handler_class = $class;
 
@@ -372,16 +377,23 @@ sub generate_asciidoc_synopsys {
     my $def = ${"${class}::cmddef"};
 
     if (ref($def) eq 'ARRAY') {
-	print_simple_asciidoc_synopsys(@$def);
+	print_simple_asciidoc_synopsis(@$def);
     } else {
 	$cmddef = $def;
 
 	$cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
 
-	print_asciidoc_synopsys();
+	print_asciidoc_synopsis();
     }
 }
 
+# overwrite this if you want to run/setup things early
+sub setup_environment {
+    my ($class) = @_;
+
+    # do nothing by default
+}
+
 my $handle_cmd  = sub {
     my ($def, $cmdname, $cmd, $args, $pwcallback, $preparefunc, $stringfilemap) = @_;
 
@@ -390,13 +402,20 @@ my $handle_cmd  = sub {
 
     $cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
 
-    if (!$cmd) { 
+    # call verifyapi before setup_environment(), because we do not want to
+    # execute any real code in this case
+
+    if (!$cmd) {
 	print_usage_short (\*STDERR, "no command specified");
 	exit (-1);
     } elsif ($cmd eq 'verifyapi') {
 	PVE::RESTHandler::validate_method_schemas();
 	return;
-    } elsif ($cmd eq 'bashcomplete') {
+    }
+
+    $cli_handler_class->setup_environment();
+
+    if ($cmd eq 'bashcomplete') {
 	&$print_bash_completion($cmddef, 0, @$args);
 	return;
     }
@@ -430,16 +449,22 @@ my $handle_simple_cmd = sub {
 	    $str .= $class->usage_str($name, $name, $arg_param, $uri_param, 'long', $pwcallback, $stringfilemap);
 	    print STDERR "$str\n\n";
 	    return;
-	} elsif ($args->[0] eq 'bashcomplete') {
-	    shift @$args;
-	    &$print_bash_completion({ $name => $def }, $name, @$args);
-	    return;
 	} elsif ($args->[0] eq 'verifyapi') {
 	    PVE::RESTHandler::validate_method_schemas();
 	    return;
 	}
     }
 
+    $cli_handler_class->setup_environment();
+
+    if (scalar(@$args) >= 1) {
+	if ($args->[0] eq 'bashcomplete') {
+	    shift @$args;
+	    &$print_bash_completion({ $name => $def }, $name, @$args);
+	    return;
+	}
+    }
+
     &$preparefunc() if $preparefunc;
 
     my $res = $class->cli_handler($name, $name, \@ARGV, $arg_param, $uri_param, $pwcallback, $stringfilemap);
@@ -450,7 +475,12 @@ my $handle_simple_cmd = sub {
 sub run_cli {
     my ($class, $pwcallback, $podfn, $preparefunc) = @_;
 
-    die "depreciated function run_cli - use run_cli_handler instead";
+    # Note: "depreciated function run_cli - use run_cli_handler instead";
+    # silently ignore $podfn , which is no longer supported.
+
+    die "password callback is no longer supported" if $pwcallback;
+
+    run_cli_handler($class, prepare => $preparefunc);
 }
 
 sub run_cli_handler {
@@ -462,12 +492,12 @@ sub run_cli_handler {
 
     foreach my $key (keys %params) {
 	next if $key eq 'prepare';
-	next if $key eq 'no_init'; # used by lxc hooks
+	next if $key eq 'no_init'; # not used anymore
+	next if $key eq 'no_rpcenv'; # not used anymore
 	die "unknown parameter '$key'";
     }
 
     my $preparefunc = $params{prepare};
-    my $no_init = $params{no_init};
 
     my $pwcallback = $class->can('read_password');
     my $stringfilemap = $class->can('string_param_file_mapping');
@@ -476,17 +506,6 @@ sub run_cli_handler {
 
     initlog($exename);
 
-    if ($class !~ m/^PVE::Service::/) {
-	die "please run as root\n" if $> != 0;
-
-	PVE::INotify::inotify_init() if !$no_init;
-
-	my $rpcenv = PVE::RPCEnvironment->init('cli');
-	$rpcenv->init_request() if !$no_init;
-	$rpcenv->set_language($ENV{LANG});
-	$rpcenv->set_user('root@pam');
-    }
-
     no strict 'refs';
     my $def = ${"${class}::cmddef"};