glpi-agent netscan feature with ToolBox enhancement

Changes

@@ -3,6 +3,11 @@ Revision history for GLPI agent
 1.6 not yet released
 
 core:
+* Rework of agent events support
+* Add support for tasks cache & tasks events
+* Support forbid_not_trusted option for all httpd server plugins. The option is set to "no"
+  by default to keep compatibility with older configurations. If set to "yes", only trusted
+  ips will be authorized to access related httpd plugin features.
 * fix #434: Fix XML encoding when sent by OCS client code, thanks to Nikolay Chizhov (@nchizhov)
 * fix #438: Fix forking when required on win32 for Proxy & ToolBox plugins, and so
   this fixes IPC support on win32
@@ -11,6 +16,7 @@ core:
 * Update getCanonicalSize() to recognize kibibyte, mebibyte, gibibyte, tebibyte
   pebibyte and exbibyte units
 * Always report first found route in unix getRoutingTable() API
+* fix: Update GLPI::Agent::XML class to make calls in a dedicated thread on win32
 
 inventory:
 * Fix inventory failure due to Oracle database inventory on win32
@@ -41,13 +47,32 @@ netdiscovery/netinventory:
 * Enhanced Cisco devices support
 * Enhanced Citrix devices support
 * PR #500: Enhanced Synology NAS support with drives & storages support
+* Use Parallel::ForkManager for netdiscovery & netinventory tasks
+* Preload mibsupport as optimization
+* Add ESX & RemoteInventory scanning support to netdiscovery
+
+esx:
+* Refactoring to share more code between task & glpi-esx script and to support netscan
+* Added --debug option support to glpi-esx
+* fixed & updated unittests
 
 proxy-server-plugin:
 * fix #461: Fix XML content-type support for inventories sent by android agent
 
 injector:
 * Support --ssl-cert-file option to permit SSL client authentication
 
+toolbox:
+* Feature: Inventory is now a list of local inventory or netscan task job
+* Feature: Support task job scheduling management in a dedicated page
+* Feature: Support ESX & RemoteInventory as credentials type
+* Feature: Support ESX & RemoteInventory credentials in IP range
+* Feature: Inventory netscan job can be started to discover and inventory ESX or
+  RemoteInventory computers
+* fix #254: Add credential to iprange not working after adding first one
+* Use tabler-icons v 2.24.0
+* Store discovered snmp credentials and ip_range in dedicated storage in place of netdisco XML
+
 packaging:
 * Update MacOSX packages to use OpenSSL 3.1.3 & zlib 1.3
 * Install basic-authentication-server-plugin.cfg plugin default configuration on debian

README.md

@@ -195,9 +195,3 @@ contains code from imvirt:
 * author: Thomas Liske <[email protected]>
 * copyright: 2008 IBH IT-Service GmbH <http://www.ibh.de/>
 * License: GPLv2+
-
-ToolBox HTTP daemon plugin uses flatpickr lightweight and powerful datetime picker js library.
-* author: Gregory Petrosyan
-* url: <https://flatpickr.js.org/>
-* copyright: 2017 Gregory Petrosyan
-* License: License MIT

bin/glpi-esx

@@ -10,9 +10,12 @@ use English qw(-no_match_vars) ;
 use Getopt::Long;
 use Pod::Usage;
 use UNIVERSAL::require;
+use File::Temp;
 
 use GLPI::Agent::Task::ESX;
 use GLPI::Agent::Logger;
+use GLPI::Agent::Config;
+use GLPI::Agent::Target::Local;
 use GLPI::Agent::Version;
 
 my $options = {
@@ -28,6 +31,7 @@ GetOptions(
     'path=s',
     'stdout',
     'tag=s',
+    'debug+',
     'help',
     'version',
     'dump',
@@ -46,12 +50,25 @@ if ($options->{version}) {
     exit 0;
 }
 
+my $config = GLPI::Agent::Config->new(
+    options => { map { $_ => $options->{$_} } qw{debug tag json} }
+);
+
+my $logger = GLPI::Agent::Logger->new(config => $config);
+
 my $esx = GLPI::Agent::Task::ESX->new(
-    target => {},
+    logger => $logger,
+    config => $config,
+    target => GLPI::Agent::Target::Local->new(
+        logger     => $logger,
+        path       => $options->{path},
+        json       => $config->{json},
+        basevardir => File::Temp->newdir(CLEANUP => 1),
+    ),
 );
 
 inventory_from_dump($options->{dumpfile})
-    if ($options->{dumpfile});
+    if $options->{dumpfile};
 
 $options->{path} = '-' if $options->{stdout};
 $options->{path} = $options->{directory} unless $options->{path};
@@ -74,13 +91,15 @@ if (!$esx->connect(
     die "Connection failure: ".$esx->lastError()."\n";
 }
 
-my $hasError = 0;
-my $hostIds = $esx->getHostIds();
-foreach my $hostId (@$hostIds) {
+$esx->serverInventory($options->{path}, $options->{dump} ? \&dump_from_hostfullinfo : undef);
+
+exit($esx->lastError ? 1 : 0);
 
-    my $file = write_inventory($hostId);
+sub dump_from_hostfullinfo {
+    my ($hostId, $file) = @_
+        or return;
 
-    next unless ($options->{dump});
+    return unless $esx;
 
     my $host = $esx->{vpbs}->getHostFullInfo($hostId);
     my $dumper = Data::Dumper->new([$host],["host"]);
@@ -93,57 +112,56 @@ foreach my $hostId (@$hostIds) {
     if (open my $handle, '>', $file) {
         print $handle $dumper->Dump();
         close $handle;
-        print("ESX Host full info dump saved in $file\n");
-    } else {
-        $hasError = 1;
-        print("Can't write to $file: $ERRNO\n");
-    }
-}
-exit($hasError);
-
-sub write_inventory {
-    my ($hostId, $file) = @_;
-
-    my $inventory = $esx->createInventory($hostId, $options->{tag});
-    $inventory->setFormat($options->{json} ? "json" : "xml");
-
-    $file = $inventory->save($options->{path}) unless $file;
-    if ($file) {
-        print STDERR "Inventory ".($file eq '-' ? "dumped\n" : "saved in $file\n");
+        print "ESX Host full info dump saved in $file\n";
     } else {
-        $hasError = 1;
-        print STDERR "Can't write to $file: $ERRNO\n";
+        $esx->lastError("Can't save host full info dump");
+        print STDERR "Can't write to $file: $ERRNO\n" ;
     }
-
-    return $file;
 }
 
 sub inventory_from_dump {
     my ($file) = @_;
 
     my $format = $options->{json} ? 'json' : 'xml';
 
-    $file =~ s/\-hostfullinfo.dump$/.$format/;
+    $file =~ s/\-hostfullinfo.dump(.gz)?$/.$format/;
 
-    die "dumpfile must be a *-hostfullinfo.dump file\n"
+    die "dumpfile must be a *-hostfullinfo.dump or *-hostfullinfo.dump.gz file\n"
         if $file eq $options->{dumpfile};
 
     our $host ;
 
-    do $options->{dumpfile}
-        or die "Can't load $options->{dumpfile}: $!\n";
+    my $fh;
+
+    # Support gzip compressed hostfullinfo.dump
+    my $mode = $options->{dumpfile} =~ /\.gz$/ ? "-|" : "<";
+    my $expr = $options->{dumpfile} =~ /\.gz$/ ? "gunzip -c $options->{dumpfile}" : $options->{dumpfile};
+    open $fh, $mode, $expr
+        or die "Can't open $options->{dumpfile}: $!\n";
+    my $dump = join("", <$fh>);
+    close($fh);
+
+    {
+        ## no critic (ProhibitStringyEval)
+        local ${^MAX_NESTED_EVAL_BEGIN_BLOCKS} = 0;
+        eval($dump)
+            or die "Can't load $options->{dumpfile}: $!\n";
+    }
 
     die "Can't load host full infos from $options->{dumpfile}\n"
         unless $host;
 
     $esx->{vpbs} = GLPI::Agent::Task::ESX::Dump->new($host);
 
-    write_inventory(undef, $file);
+    $esx->serverInventory($options->{path} // $file);
 
     exit 0;
 }
 
-package GLPI::Agent::Task::ESX::Dump;
+package
+    GLPI::Agent::Task::ESX::Dump;
+
+use parent qw(GLPI::Agent::SOAP::VMware::Host);
 
 sub new {
     my ($class, $fullinfo) = @_;
@@ -155,6 +173,11 @@ sub getHostFullInfo {
     return $self->{_fullinfo};
 }
 
+sub getHostIds {
+    my ($self) = @_;
+    return [ $self->getHostname() ];
+}
+
 __END__
 
 =head1 NAME
@@ -167,6 +190,7 @@ glpi-esx --host <host> --user <user> --password <password> --path <directory or
 
   Options:
     --help                 this menu
+    --debug                debug mode (false)
     --host hostname        ESX server hostname
     --user username        user name
     --password xxxx        user password

bin/glpi-inventory

@@ -15,6 +15,7 @@ use GLPI::Agent::Task::Inventory;
 use GLPI::Agent::Target::Local;
 use GLPI::Agent::Logger;
 use GLPI::Agent::Config;
+use GLPI::Agent::Event;
 use GLPI::Agent::Version;
 
 my $options = {
@@ -54,12 +55,12 @@ pod2usage(-verbose => 0, -exitval => 0) if $options->{help};
 
 my $event;
 if ($options->{partial}) {
-    $event = {
+    $event = GLPI::Agent::Event->new(
         task        => "inventory",
         partial     => 1,
         category    => $options->{partial},
         name        => "partial inventory",
-    };
+    );
 }
 
 my $config = GLPI::Agent::Config->new(