external program runner termiting bug fixed

0xMartin · 0xMartin · commit 7c7ffc1e56e2 · 2024-08-12T18:24:02.000+02:00
diff --git a/examples/plugin-example/plugin/libs/natt-spi-1.1.0.jar b/examples/plugin-example/plugin/libs/natt-spi-1.1.0.jar
diff --git a/examples/project-example/NATT.jar b/examples/project-example/NATT.jar
diff --git a/natt-config-editor/NATT.jar b/natt-config-editor/NATT.jar
diff --git a/natt-vscode-extension/out/extension.js b/natt-vscode-extension/out/extension.js
diff --git a/natt-vscode-extension/package.json b/natt-vscode-extension/package.json
@@ -5,7 +5,7 @@
   "publisher": "0xM4R71N",
   "repository": "https://github.com/0xMartin/NetworkAppTestingTool",
   "description": "Test scenario configuration editor for black box network application testing tool.",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "engines": {
     "vscode": "^1.91.1"
   },
@@ -90,7 +90,7 @@
     "properties": {
       "yourExtension.nattJarUrl": {
         "type": "string",
-        "default": "https://github.com/0xMartin/NetworkAppTestingTool/releases/download/1.6.3/NATT.jar",
+        "default": "https://github.com/0xMartin/NetworkAppTestingTool/releases/download/1.6.4/NATT.jar",
         "description": "URL for the NATT JAR file"
       }
     }
diff --git a/natt-vscode-extension/src/extension.ts b/natt-vscode-extension/src/extension.ts
@@ -170,7 +170,7 @@ export function activate(context: vscode.ExtensionContext) {
             }
             // Define the URL and destination path for the JAR file
             const config = vscode.workspace.getConfiguration('natt-configuration-editor');
-            const jarUrl = config.get<string>('nattJarUrl', 'https://github.com/0xMartin/NetworkAppTestingTool/releases/download/1.6.3/NATT.jar');
+            const jarUrl = config.get<string>('nattJarUrl', 'https://github.com/0xMartin/NetworkAppTestingTool/releases/download/1.6.4/NATT.jar');
             const destJarPath = path.join(projectPath, 'NATT.jar');
 
             // Function to download the file
diff --git a/natt/build.gradle b/natt/build.gradle
@@ -77,5 +77,5 @@ task writeVersionProperties {
 
 processResources.dependsOn writeVersionProperties
 
-version = '1.6.3'
+version = '1.6.4'
 group = 'utb.fai.natt'
diff --git a/natt/libs/natt-spi-1.1.0.jar b/natt/libs/natt-spi-1.1.0.jar
diff --git a/natt/src/main/java/utb/fai/natt/module/ExternalProgramRunner.java b/natt/src/main/java/utb/fai/natt/module/ExternalProgramRunner.java
@@ -102,17 +102,17 @@ public boolean terminateModule() {
             try {
                 outputStream.close();
             } catch (IOException e) {
+                logger.warning(super.getNameForLogger() + "Failed to close output stream!");
             }
 
             try {
                 ProcessManager.removePID(ProcessManager.DEFAULT_FILE, String.valueOf(this.currentPID));
             } catch (Exception ex) {
+                logger.warning(super.getNameForLogger() + "Failed to remove PID from file!");
             }
-
-            return true;
         }
 
-        return false;
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
diff --git a/natt/src/main/java/utb/fai/natt/module/MQTTBroker.java b/natt/src/main/java/utb/fai/natt/module/MQTTBroker.java
@@ -55,11 +55,10 @@ public void runModule() throws InternalErrorException {
 
     @Override
     public boolean terminateModule() {
-        // odstraneni tohoto modulu z aktivnich modulu
         super.setRunning(false);
         this.server.stopServer();
         logger.info(String.format(super.getNameForLogger() + "MQTT broker [%s] terminated", this.getName()));
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
diff --git a/natt/src/main/java/utb/fai/natt/module/MQTTClientTester.java b/natt/src/main/java/utb/fai/natt/module/MQTTClientTester.java
@@ -79,27 +79,25 @@ public void runModule() throws InternalErrorException {
 
     @Override
     public boolean terminateModule() {
-        // odstraneni tohoto modulu z aktivnich modulu
         super.setRunning(false);
 
         if (this.mqttClient.isConnected()) {
             try {
                 this.mqttClient.disconnect();
+                logger.info(super.getNameForLogger() + "MQTT client disconnected from broker.");
             } catch (MqttException e) {
                 logger.warning(super.getNameForLogger() + "Failed to disconnect MQTT client: " + e.getMessage());
             }
         }
 
         try {
             this.mqttClient.close();
+            logger.info(super.getNameForLogger() + String.format("MQTT client [%s] terminated", this.getName()));
         } catch (MqttException e) {
             logger.warning(super.getNameForLogger() + "Failed to terminate MQTT client: " + e.getMessage());
-            return false;
         }
 
-        logger.info(super.getNameForLogger() + String.format("MQTT client [%s] terminated", this.getName()));
-
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
diff --git a/natt/src/main/java/utb/fai/natt/module/RESTTester.java b/natt/src/main/java/utb/fai/natt/module/RESTTester.java
@@ -102,19 +102,16 @@ public void runModule() throws InternalErrorException {
 
     @Override
     public boolean terminateModule() {
-        // odstraneni tohoto modulu z aktivnich modulu
         super.setRunning(false);
 
         try {
             this.httpClient.close();
+            logger.info(super.getNameForLogger() + String.format("REST tester [%s] terminated", this.getName()));
         } catch (IOException e) {
             logger.warning(super.getNameForLogger() + "Failed to close client: " + e.getMessage());
-            return false;
         }
 
-        logger.info(super.getNameForLogger() + String.format("REST tester [%s] terminated", this.getName()));
-
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
diff --git a/natt/src/main/java/utb/fai/natt/module/SMTPEmailServer.java b/natt/src/main/java/utb/fai/natt/module/SMTPEmailServer.java
@@ -105,7 +105,7 @@ public boolean terminateModule() {
         super.setRunning(false);
         smtpServer.stop();
         logger.info(super.getNameForLogger() + String.format("SMTP email server [%s] terminated", this.getName()));
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
diff --git a/natt/src/main/java/utb/fai/natt/module/SOAPTester.java b/natt/src/main/java/utb/fai/natt/module/SOAPTester.java
@@ -74,32 +74,31 @@ public void runModule() throws InternalErrorException {
 
     @Override
     public boolean terminateModule() {
-        // odstraneni tohoto modulu z aktivnich modulu
         super.setRunning(false);
+
         try {
             this.httpClient.close();
+            logger.info(super.getNameForLogger() + String.format("SOAP tester [%s] terminated", this.getName()));
         } catch (IOException e) {
             logger.warning(super.getNameForLogger() + "Failed to close client: " + e.getMessage());
-            return false;
         }
 
-        logger.info(super.getNameForLogger() + String.format("SOAP tester [%s] terminated", this.getName()));
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
     public boolean sendMessage(String message) throws InternalErrorException {
         if (message == null || message.isEmpty()) {
             return false;
         }
-    
+
         // vytvoreni pozadavku
         HttpPost httpPost = new HttpPost(url);
-    
+
         // nastavi SOAP XML jako obsahu pozadavku
         StringEntity entity = new StringEntity(message, ContentType.create("text/xml", "UTF-8"));
         httpPost.setEntity(entity);
-    
+
         // odeslani pozadavku na SOAP sluzbu
         logger.info(super.getNameForLogger() + "Sending a request on URL: " + this.url);
         try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
@@ -115,7 +114,7 @@ public boolean sendMessage(String message) throws InternalErrorException {
                     super.notifyMessageListeners("", RESTTester.ERROR_CODE_PREFIX + String.valueOf(statusCode));
                     return true;
                 }
-    
+
                 try (BufferedReader rd = new BufferedReader(new InputStreamReader(responseEntity.getContent()))) {
                     StringBuilder result = new StringBuilder();
                     String line;
@@ -127,15 +126,15 @@ public boolean sendMessage(String message) throws InternalErrorException {
                     super.notifyMessageListeners("", jsonResponse);
                 }
             }
-            
+
         } catch (IOException e) {
             logger.warning(super.getNameForLogger() + "Failed to send request: " + e.getMessage());
             return false;
         } catch (Exception e) {
             logger.warning(super.getNameForLogger() + "Failed process response: " + e.getMessage());
             return false;
         }
-    
+
         return true;
     }
 
diff --git a/natt/src/main/java/utb/fai/natt/module/TelnetClient.java b/natt/src/main/java/utb/fai/natt/module/TelnetClient.java
@@ -88,7 +88,6 @@ public void runModule() throws InternalErrorException {
 
     @Override
     public boolean terminateModule() {
-        // odstraneni tohoto modulu z aktivnich modulu
         super.setRunning(false);
 
         try {
@@ -98,15 +97,14 @@ public boolean terminateModule() {
                 reader.close();
             if (writer != null)
                 writer.close();
+            logger.info(super.getNameForLogger() + String.format("Telnet client [%s] terminated", this.getName()));
         } catch (IOException e) {
-            logger.warning(
-                    super.getNameForLogger() + "Failed to termite telnet client. Error message: " + e.getMessage());
-            return false;
+            logger.warning(super.getNameForLogger() +
+                    "Failed to termite telnet client. Error message: " + e.getMessage());
         }
 
-        logger.info(super.getNameForLogger() + String.format("Telnet client [%s] terminated", this.getName()));
 
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override
diff --git a/natt/src/main/java/utb/fai/natt/module/TelnetServer.java b/natt/src/main/java/utb/fai/natt/module/TelnetServer.java
@@ -93,17 +93,16 @@ public void runModule() throws InternalErrorException {
 
     @Override
     public boolean terminateModule() {
-        // odstraneni tohoto modulu z aktivnich modulu
         super.setRunning(false);
+
         try {
             serverSocket.close();
+            logger.info(super.getNameForLogger() + String.format("Telnet server [%s] terminated", this.getName()));
         } catch (IOException e) {
             logger.warning(super.getNameForLogger() + "Failed to terminate Telnet server: " + e.getMessage());
-            return false;
         }
 
-        logger.info(super.getNameForLogger() + String.format("Telnet server [%s] terminated", this.getName()));
-        return NATTContext.instance().removeActiveModule(this.getName());
+        return this.getContext().removeActiveModule(this.getName());
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ export function activate(context: vscode.ExtensionContext) {`
`170`	`170`	`}`
`171`	`171`	`// Define the URL and destination path for the JAR file`
`172`	`172`	`const config = vscode.workspace.getConfiguration('natt-configuration-editor');`
`173`		`- const jarUrl = config.get<string>('nattJarUrl', 'https://github.com/0xMartin/NetworkAppTestingTool/releases/download/1.6.3/NATT.jar');`
	`173`	`+ const jarUrl = config.get<string>('nattJarUrl', 'https://github.com/0xMartin/NetworkAppTestingTool/releases/download/1.6.4/NATT.jar');`
`174`	`174`	`const destJarPath = path.join(projectPath, 'NATT.jar');`
`175`	`175`
`176`	`176`	`// Function to download the file`
Original file line number	Diff line number	Diff line change
`@@ -102,17 +102,17 @@ public boolean terminateModule() {`
`102`	`102`	`try {`
`103`	`103`	`outputStream.close();`
`104`	`104`	`} catch (IOException e) {`
	`105`	`+ logger.warning(super.getNameForLogger() + "Failed to close output stream!");`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`try {`
`108`	`109`	`ProcessManager.removePID(ProcessManager.DEFAULT_FILE, String.valueOf(this.currentPID));`
`109`	`110`	`} catch (Exception ex) {`
	`111`	`+ logger.warning(super.getNameForLogger() + "Failed to remove PID from file!");`
`110`	`112`	`}`
`111`		`-`
`112`		`- return true;`
`113`	`113`	`}`
`114`	`114`
`115`		`- return false;`
	`115`	`+ return this.getContext().removeActiveModule(this.getName());`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`@Override`