remote ip delete local ip comparaison

README.md

@@ -6,7 +6,7 @@ MoniThor is a simple monitoring tools in bash.
 
 You can use it with netcat or cryptcat 
 
-You can see result on the client from a web page (self hosted python web server)
+You can see result on the client from a web page (self hosted python3 web server)
 
 
 ## Server Configuration
@@ -160,7 +160,7 @@ sudo /etc/init.d/monithor-c start/stop
 
 ### WEB
 
-The client start a python sumple http server on localhost on `WebPort`
+The client start a python3 sumple http server on localhost on `WebPort`
 
 ```
 /usr/local/bin/monithor-client.d/MoniThorWebServer

doc/monithor-client.md

@@ -1,5 +1,5 @@
 ---
-title: monithor-server
+title: monithor-client
 section: 1
 author: Guillaume Astier Ruiz
 date: 20220320
@@ -9,9 +9,6 @@ date: 20220320
 
 `/etc/init.d/monithor-c [start/stop]`
 
-`/etc/init.d/monithor-c [start/stop]`
-
-
 # DESCRIPTION
 
 monithor-client(1) permet de surveiller votre système d'information 
@@ -20,7 +17,7 @@ monithor-client(1) permet de surveiller votre système d'information
 
 -   il peut aussi utiliser cryptcat (chiffré)
 
--   un serveur web en python est lancé sur votre machine de monitoring 
+-   un serveur web en python3 est lancé sur votre machine de monitoring 
 
 # INIT.D
 
@@ -32,7 +29,7 @@ le service peut être démarré et arrêté via system V
 
 - Arrêt
 
-`/etc/init.d/monithor-c start`
+`/etc/init.d/monithor-c stop`
 
 # CONFIGURATION SERVICE
 
@@ -58,7 +55,7 @@ le service peut être démarré et arrêté via system V
 
 * TimeOut : correspond à la valeur en seconde (float) du temps maximal d'éxécution de chaque sonde
 
-* WebPort :  correpond au port utilisé pour lancer le serveur web python 
+* WebPort :  correpond au port utilisé pour lancer le serveur web python3 
 
 # CONFIGURATION SONDE
 

doc/monithor-server.md

@@ -7,9 +7,9 @@ date: 20220320
 
 # SYNOPSIS
 
-`/usr/local/bin/monithor-server [start/stop]`
+`/usr/local/bin/monithor-d [start/stop]`
 
-`/etc/init.d/monithor-c [start/stop]`
+`/etc/init.d/monithor-d [start/stop]`
 
 
 # DESCRIPTION
@@ -26,17 +26,17 @@ le service peut être démarré et arrêté via system V
 
 - Démarrage
 
-`/etc/init.d/monithor-c start`
+`/etc/init.d/monithor-d start`
 
 - Arrêt
 
-`/etc/init.d/monithor-c start`
+`/etc/init.d/monithor-d stop`
 
 # CONFIGURATION SERVICE
 
 - Le fichier responsable de la gestion IP/PORT est : service.cfg 
 
-`LocalIp=10.10.10.4`
+`RemoteIp=10.10.10.4`
 
 `LocalPort=1666`
 
@@ -44,7 +44,7 @@ le service peut être démarré et arrêté via system V
 
 `LocalPassword='Evil@MonitoR-666'`
 
-* LocalIp : correspond à l'adresse IP de l'interface réseau en écoute
+* RemoteIp : correspond à l'adresse IP de l'interface réseau en écoute du client de monitoring
 
 * LocalPort : correspond au port de communication du client monithor
 
@@ -82,9 +82,9 @@ les scripts sont tous stocké dans le répertoire :
 
 * Configuration client :
 
-`$ cat /etc/monithor-client/etc/monithor-client/conf/Card_10.10.10.3-1666.cfg`
+`$ cat /etc/monithor-client/etc/monithor-client/conf/sample.cfg
 
-`10.10.10.3:1666#part#/home/isen|50|80`
+`#10.10.10.3:1666#part#/home/isen|50|80`
 
 * Explication 
 
@@ -98,6 +98,8 @@ SERVEUR exécute : /usr/local/bin/monithor-server.d/part-space.sh /home/isen 50
 
 SERVEUR renvoie les valeur récupéré à CLIENT 
 
+Les lignes commençant par '#' sont à supprimer ou à décommenter 
+
 
 
 

monithor-client/DEBIAN/control

@@ -1,6 +1,6 @@
 Package: monithor-client
 Version: 1.0
 Architecture: all
-Dependsd:netcat,cryptcat,screen,python,netcat,cryptcat,elinks
+Dependsd:netcat,cryptcat,screen,python3,netcat,cryptcat,elinks
 Maintainer: Guillaume Astier <guillaume@gastier.net>
-Description: monithor client (with simple http server python)
+Description: monithor client (with simple http server python3)

monithor-client/etc/init.d/monithor-c

@@ -4,7 +4,7 @@
 # Provides:		monithor-c
 # Default-Start:	2 3 4 5
 # Default-Stop:		
-# Short-Description:	MoniThor Server
+# Short-Description:	MoniThor client 
 ### END INIT INFO
 
 set -e
@@ -21,15 +21,20 @@ case "$1" in
 		logger "monithor-client is running ..."
 		exit
 	else
-		logger "Starting MoniThor Server"
+		logger "Starting MoniThor client "
 		/usr/local/bin/monithor-client start
 	fi
 	;;
   stop)
-	logger "Stoping  MoniThor server" "monithor-c" || true
+	logger "Stoping  MoniThor client " "monithor-c" || true
 	/usr/local/bin/monithor-client stop
 	;;
 
+  status)
+	logger "status  MoniThor client " "monithor-c" || true
+	[ $(ps axf| grep MoniThor | grep SCREEN | wc -l) -gt 1 ] && echo "monithor-c is running" || echo "montihor-c is dead"
+	;;
+
   *)
 	echo  "Usage:  /etc/init.d/monithor-c {start|stop|status}" || true
 	exit 1

monithor-client/etc/monithor-client/conf/Card_10.10.10.3-1666.cfg

@@ -1,3 +0,0 @@
-10.10.10.3:1666#file#/tmp/test
-10.10.10.3:1666#part#/home/isen|50|80
-10.10.10.3:1666#process#sshd

monithor-client/etc/monithor-client/conf/Card_10.10.10.4-1666.cfg

@@ -1,3 +0,0 @@
-10.10.10.4:1666#file#/tmp/test
-10.10.10.4:1666#part#/home/isen|50|80
-10.10.10.4:1666#process#sshd

monithor-client/etc/monithor-client/conf/sample.cfg

@@ -0,0 +1,4 @@
+#IP:PORT#SONDE#ARGUMENT
+#Ex : 
+#10.10.10.3:1666#part#/home/isen|50|80
+

monithor-client/etc/monithor-client/service.cfg

@@ -1,4 +1,3 @@
-RemoteIp=10.10.10.3:1666 
 LocalPassword='Evil@MonitoR-666'
 Crypted=no
 Rotation=1

monithor-client/etc/monithor-client/sonde.cfg

@@ -1,8 +0,0 @@
-10.10.10.3:1666#file#/tmp/coucou
-10.10.10.3:1666#file#/tmp/nop
-10.10.10.3:1666#file#
-10.10.10.3:1666#NotRealSondeName#reboot
-10.10.10.4:1666#file#/tmp/coucou
-10.10.10.4:1666#file#/tmp/nop
-10.10.10.4:1666#file#
-10.10.10.4:1666#NotRealSondeName#reboot

monithor-client/usr/local/bin/monithor-client

@@ -19,8 +19,8 @@ if [[ "$1" == "start" ]]
 		[[ -f /tmp/endmonitor ]] && rm -f /tmp/endmonitor
 		rm /tmp/Monitor* /tmp/webmonithor &> /dev/null
 
-		TotalConfig=$(ls -1 /etc/monithor-client/conf/ | grep Card_.*\.cfg|wc -l)
-		for Conf in $(ls -1 /etc/monithor-client/conf/ | grep Card_.*\.cfg)
+		TotalConfig=$(ls -1 /etc/monithor-client/conf/ | grep .*\.cfg| wc -l)
+		for Conf in $(ls -1 /etc/monithor-client/conf/ | grep .*\.cfg)
 			do
 				screen -dmS ${Conf} bash /usr/local/bin/monithor-client.d/MoniThor ${Conf}
 			done
@@ -29,7 +29,7 @@ fi
 
 if [[ "$1" == "stop" ]]
 then
-		killall python &> /dev/null
+		killall python3 &> /dev/null
 		rm /tmp/Monithor* &> /dev/null
 		touch /tmp/endmonitor
 

monithor-client/usr/local/bin/monithor-client.d/MoniThor

@@ -23,7 +23,10 @@ while [[ ! -f  /tmp/endmonitor ]]
                                                 Arg=$(echo $DATA| cut -d"#" -f3)
                                                 Res=$( echo -e "${Cmd}#${Arg}" | eval ${NcCmd} ${Remote} ${Port} 2> /dev/null)
                                                 Ret=$?
+                                                if [[ ! -z $(echo $DATA | grep ^"[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*:[0-9]*#.*#" ) ]]
+                                                        then
                                                                 GenerateWeb "${Res:-5|No sonde $Cmd on serveur $Remote}" ${Cmd:-Nodata} ${Arg:-Noadata} ${Remote:-Nodata} /tmp/Monithor_${ConfFile}-tmp
+                                                fi
                                         done < /etc/monithor-client/conf/${ConfFile}
 		fi
 	done

monithor-client/usr/local/bin/monithor-client.d/MoniThorFnct

@@ -23,7 +23,7 @@ CheckAllEnd() {
 			echo '
 					<html>
 <head>
-	<title>MoniThor on '${RemoteIp}' </title>
+<title>MoniThor on '$(hostname)' </title>
 	<meta http-equiv="refresh" content="1" />
 </head>
 <title>MONITHOR</title>

monithor-client/usr/local/bin/monithor-client.d/MoniThorWebServer

@@ -3,18 +3,20 @@
 
 pushd /var/www/html/monithor
 source /usr/local/bin/monithor-client.d/MoniThorFnct
-python -m SimpleHTTPServer ${1} &
+python3 -m http.server ${1} &
 
 
 echo '<html>
 <head>
-        <title>MoniThor on '${RemoteIp}' </title>
+<title>MoniThor on '$(hostname)' </title>
         <meta http-equiv="refresh" content="1" />
 </head>
 <title>MONITHOR</title>
 
 !!!! Initialization !!!! 
 
+Warning : check the config /etc/monithor-client/conf/*cfg
+
 ' > index.html
 
 while [[ ! -f /tmp/endmonitor ]] 

monithor-server/DEBIAN/control

@@ -1,6 +1,6 @@
 Package: monithor-server
 Version: 1.0
 Architecture: all
-Dependsd:netcat,cryptcat,screen,python,netcat,cryptcat,elinks
+Dependsd:netcat,cryptcat,screen,python3,netcat,cryptcat,elinks
 Maintainer: Guillaume Astier <guillaume@gastier.net>
 Description: monithor server (netcat & snort)

monithor-server/etc/init.d/monithor-d

@@ -30,6 +30,13 @@ case "$1" in
 	/usr/local/bin/monithor-server stop
 	;;
 
+  status)
+        logger "status  MoniThor server" "monithor-d" || true
+        [ "$(ps axf| grep '/usr/local/bin/monithor-server'|grep -v grep)" ] && echo "monithor-d is running" || echo "montihor-d is dead"
+
+        ;;
+
+
   *)
 	echo  "Usage:  /etc/init.d/monithor-d {start|stop|status}" || true
 	exit 1

monithor-server/etc/monithor-server/service.cfg

@@ -1,4 +1,4 @@
-LocalIp=10.10.10.4
+RemoteIp=10.10.10.4
 LocalPort=1666
 ########
 Crypted=no

monithor-server/usr/local/bin/monithor-server

@@ -8,7 +8,7 @@ source /etc/monithor-server/service.cfg
 Exit () {
 
 	[[ "$1" == "root" ]] && echo "You have to be root ..." 
-	[[ "$1" == "Config" ]] && echo "Ip configuration will failed" 
+	#[[ "$1" == "Config" ]] && echo "Ip configuration will failed" 
 
 	exit
 }
@@ -18,17 +18,17 @@ if [[ $(id -u) != "0" ]]
 		Exit root
 fi
 
-[[ -z $(ifconfig  | grep inet | awk '{print $2}' | grep $LocalIp) ]] && Exit Config
+#[[ -z $(ifconfig  | grep inet | awk '{print $2}' | grep $RemoteIp) ]] && Exit Config
 
 
 
-[[ "${Crypted}" == "yes" ]] && NcCmd="cryptcat -k ${LocalPassword} -l ${LocalIp} -p ${LocalPort} " || NcCmd="nc -l ${LocalIp} ${LocalPort}"
+[[ "${Crypted}" == "yes" ]] && NcCmd="cryptcat -k ${LocalPassword} -l ${RemoteIp} -p ${LocalPort} " || NcCmd="nc -l ${RemoteIp} -p ${LocalPort}"
 
 if [[ "${1}" == "start" ]]
 	then
 		while true 
 			do
-			#coproc cryptcat -k ${LocalPassword} -l ${LocalIp} -p ${LocalPort}  
+			#coproc cryptcat -k ${LocalPassword} -l ${RemoteIp} -p ${LocalPort}  
 			coproc eval ${NcCmd}
 			while read -r cmd; do
 				logger "Running $cmd"