Small fixes

OphiteCorp · Jun 2, 2018 · ab01514 · ab01514
1 parent 7676b8b
commit ab01514
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/m.api/src/main/java/cz/ophite/mimic/vhackos/botnet/api/IBotnet.java b/m.api/src/main/java/cz/ophite/mimic/vhackos/botnet/api/IBotnet.java
@@ -13,7 +13,7 @@ public interface IBotnet {
     /**
      * Verze Botnetu.
      */
-    String VERSION = "0.9.2";
+    String VERSION = "0.9.3";
 
     /**
      * Verze REST API pro vHackOS.

diff --git a/m.api/src/main/java/cz/ophite/mimic/vhackos/botnet/api/module/base/Module.java b/m.api/src/main/java/cz/ophite/mimic/vhackos/botnet/api/module/base/Module.java
@@ -71,6 +71,7 @@ protected final Map<String, Object> sendRequest(IOpcode opcode) {
                     .getOpcodeValue(), getConfig().getUserName());
 
             int attempts = getBotnet().getConfig().getMaxRequestAttempts(); // maximální počet pokusů
+            Exception prevException = null;
 
             while (attempts > 0) {
                 try {
@@ -79,6 +80,7 @@ protected final Map<String, Object> sendRequest(IOpcode opcode) {
                     return request.send(this);
 
                 } catch (InvalidAccessTokenException e) {
+                    prevException = e;
                     try {
                         log.info("Invalid access token. Getting a new...");
                         Thread.sleep(5000);
@@ -95,11 +97,20 @@ protected final Map<String, Object> sendRequest(IOpcode opcode) {
                     } catch (InterruptedException e1) {
                         break;
                     }
+                } catch (ConnectionException e) {
+                    prevException = e;
+                    attempts--;
+                    log.error("Request failed. Remaining attempts: {}", attempts);
+                    try {
+                        Thread.sleep(10000);
+                    } catch (InterruptedException e1) {
+                        break;
+                    }
                 } catch (InterruptedException e) {
                     break;
                 }
             }
-            throw new ConnectionException("Could not send request to server");
+            throw new ConnectionException(null, "Could not send request to server", prevException);
         }
     }
 }
diff --git a/m.bot/src/main/java/cz/ophite/mimic/vhackos/botnet/service/NetworkScanService.java b/m.bot/src/main/java/cz/ophite/mimic/vhackos/botnet/service/NetworkScanService.java
@@ -49,6 +49,11 @@ protected void initialize() {
         }
     }
 
+    @Override
+    protected void onStopped() {
+        scansCountBeforePause = null;
+    }
+
     @Override
     protected void execute() {
         counter.incrementAndGet();

diff --git a/m.bot/src/main/java/cz/ophite/mimic/vhackos/botnet/service/base/Service.java b/m.bot/src/main/java/cz/ophite/mimic/vhackos/botnet/service/base/Service.java
@@ -109,13 +109,15 @@ public final synchronized boolean stop() {
                 log.info("Waiting for finish...");
                 executor.shutdownNow();
                 log.info("Stopped");
+                onStopped();
                 return true;
             } else {
                 log.debug("Executor was already stopped");
             }
         } else if (running) {
             log.info("Stopped");
             running = false;
+            onStopped();
             return true;
         } else {
             log.debug("Service is already stopped");
@@ -156,6 +158,10 @@ protected final void setAutoResetExecutor(boolean autoResetExecutor) {
 
     protected abstract void execute() throws Exception;
 
+    protected void onStopped() {
+        // nic
+    }
+
     protected final Logger getLog() {
         return log;
     }
@@ -253,9 +259,12 @@ public void run() {
                 try {
                     execute();
                 } catch (ConnectionException e) {
+                    stop();
                     throw e;
+
                 } catch (BotnetException e) {
                     log.error("An unexpected error occurred while processing the service", e);
+
                 } catch (Exception e) {
                     log.error("There was a fatal error while processing the service. The service will be stopped", e);
                     stop();