fix: Limit the number of attempts and reported errors when libssh2 fails

Author: g-bougard

Changes

@@ -21,6 +21,10 @@ inventory:
 * fix #611: Wrong bios value as array on win32 bios when using WMI in proxmox vm
 * fix #609: Fix rustdesk remote management version analysis
 
+remoteinventory:
+* Limit the number of attempts and reported errors when libssh2 fails but ssh command
+  works. Libssh2 attempts will be disabled for a minute on failed attempt.
+
 netdiscovery/netinventory:
 * Keep device mac address found via snmp during netdiscovery as this is the one
   which will be reported during netinventory. This will fix duplication issues

lib/GLPI/Agent/Task/RemoteInventory/Remote/Ssh.pm

@@ -45,10 +45,18 @@ sub disconnect {
 sub _connect {
     my ($self) = @_;
 
+    # We don't need to retry too early if an attempt failed recently
+    if ($self->{_ssh2_dont_retry_before}) {
+        return 0 if time < $self->{_ssh2_dont_retry_before};
+        delete $self->{_ssh2_dont_retry_before};
+    }
+
     unless ($self->{_ssh2} || ($self->mode('ssh') && !$self->mode('libssh2'))) {
         Net::SSH2->require();
         if ($EVAL_ERROR) {
             $self->{logger}->debug("Can't use libssh2: $EVAL_ERROR");
+            # Don't retry to load libssh2 before a minute
+            $self->{_ssh2_dont_retry_before} = time + 60;
         } else {
             my $timeout = $self->timeout();
             $self->{_ssh2} = Net::SSH2->new(timeout => $timeout * 1000);
@@ -70,7 +78,9 @@ sub _connect {
         my @error = $ssh2->error;
         $self->{logger}->debug("Can't reach $remote for ssh remoteinventory via libssh2: @error");
         undef $self->{_ssh2};
-        return;
+        # Don't retry to connect with libssh2 before a minute
+        $self->{_ssh2_dont_retry_before} = time + 60;
+        return 0;
     }
 
     # Use Trust On First Use policy to verify remote host
@@ -103,9 +113,11 @@ sub _connect {
     }
     unless ($ssh2->check_hostkey($hostkey_checking)) {
         my @error = $ssh2->error;
-        $self->{logger}->error("Can't trust $remote for ssh remoteinventory: @error");
+        $self->{logger}->error("[libssh2] Can't trust $remote for ssh remoteinventory: @error");
         undef $self->{_ssh2};
-        return;
+        # Don't retry to connect with libssh2 before a minute
+        $self->{_ssh2_dont_retry_before} = time + 60;
+        return 0;
     }
 
     # Support authentication by password
@@ -161,8 +173,12 @@ sub _connect {
         }
     }
 
-    $self->{logger}->error("Can't authenticate on $remote remote host");
+    $self->{logger}->error("Can't authenticate on $remote remote host via libssh2");
     undef $self->{_ssh2};
+
+    # Don't retry libssh2 before a minute
+    $self->{_ssh2_dont_retry_before} = time + 60;
+
     return 0;
 }