From 27b8ed017b626ca14ac207641a02a6a6c6367672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Fra=C3=9F?= <frass@greenscale.de>
Date: Fri, 3 Mar 2023 15:27:43 +0100
Subject: [PATCH] [fix] [#1] lib:shell_command, check:generic_remote

---
 source/logic/checks/generic_remote.py | 10 ++++++++--
 source/logic/lib.py                   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/source/logic/checks/generic_remote.py b/source/logic/checks/generic_remote.py
index b92b35b..ad33581 100644
--- a/source/logic/checks/generic_remote.py
+++ b/source/logic/checks/generic_remote.py
@@ -11,6 +11,10 @@ class implementation_check_kind_generic_remote(interface_check_kind):
 				"host" : {
 					"type" : "string"
 				},
+				"port": {
+					"type": "integer",
+					"default": 22
+				},
 				"user" : {
 					"type" : "string"
 				},
@@ -45,6 +49,8 @@ class implementation_check_kind_generic_remote(interface_check_kind):
 		   or not "user" in node \
 		   or not "ssh_key" in node:
 			raise ValueError("MISSING STUFF!")
+		if not "port" in node:
+			node["port"] = 22
 		if not "mount_point" in node:
 			node["mount_point"] = "/"
 		if not "threshold" in node:
@@ -58,7 +64,7 @@ class implementation_check_kind_generic_remote(interface_check_kind):
 	[implementation]
 	'''
 	def run(self, parameters):
-		SSH_COMMAND=string_coin("ssh -i {{ssh_key}} {{user}}@{{host}} \"df {{mount_point}} | tr -s ' '\"", parameters)
+		SSH_COMMAND = string_coin("ssh -i {{ssh_key}} -p {{port}} {{user}}@{{host}} \"df {{mount_point}} | tr -s ' '\"", parameters)
 		
 		retval=shell_command(SSH_COMMAND)
 	
@@ -70,7 +76,7 @@ class implementation_check_kind_generic_remote(interface_check_kind):
 				}
 			}
 		else:
-			parts=retval["stdout"].split("\n")[-1].split(" ")
+			parts=retval["stdout"].split("\n")[-2].split(" ")
 			ret={
 				"device" : parts[0], 
 				"used" : parts[2], 
diff --git a/source/logic/lib.py b/source/logic/lib.py
index 9d741ac..9854a3f 100644
--- a/source/logic/lib.py
+++ b/source/logic/lib.py
@@ -51,7 +51,8 @@ def env_get_language():
 def shell_command(command):
 	result = _subprocess.run(
 		command,
-		capture_output = True
+		capture_output = True,
+		shell = True,
 	)
 	return {
 		"return_code": result.returncode,