From 55ab603f27c4cf8d67579d9cd20c0dd759bd63a0 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Thu, 3 Sep 2020 14:38:17 +0200
Subject: [PATCH] fix: [Launcher] fix virtualenv loader

---
 bin/LAUNCH.sh      | 14 ++++++--------
 bin/lib/Tracker.py |  6 ++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh
index 1a117c1c..0c8a6a70 100755
--- a/bin/LAUNCH.sh
+++ b/bin/LAUNCH.sh
@@ -18,23 +18,21 @@ cd ${AIL_HOME}
 if [ -e "${DIR}/AILENV/bin/python" ]; then
     ENV_PY="${DIR}/AILENV/bin/python"
     export AIL_VENV=${AIL_HOME}/AILENV/
+    . ./AILENV/bin/activate
 elif [ ! -z "$TRAVIS" ]; then
     echo "Travis detected"
     ENV_PY="~/virtualenv/python3.6/bin/python"
     export AIL_VENV="~/virtualenv/python3.6/"
+
+    export AIL_BIN=${AIL_HOME}/bin/
+    export AIL_FLASK=${AIL_HOME}/var/www/
+    export AIL_REDIS=${AIL_HOME}/redis/src/
+    export AIL_ARDB=${AIL_HOME}/ardb/src/
 else
     echo "Please make sure you have a AIL-framework environment, au revoir"
     exit 1
 fi
 
-# redis-server is bundled during install
-## [ ! -f "`which redis-server`" ] && echo "'redis-server' is not installed/not on PATH. Please fix and run again." && exit 1
-
-export AIL_BIN=${AIL_HOME}/bin/
-export AIL_FLASK=${AIL_HOME}/var/www/
-export AIL_REDIS=${AIL_HOME}/redis/src/
-export AIL_ARDB=${AIL_HOME}/ardb/src/
-
 export PATH=$AIL_VENV/bin:$PATH
 export PATH=$AIL_HOME:$PATH
 export PATH=$AIL_REDIS:$PATH
diff --git a/bin/lib/Tracker.py b/bin/lib/Tracker.py
index 020a56c4..52c85b67 100755
--- a/bin/lib/Tracker.py
+++ b/bin/lib/Tracker.py
@@ -103,13 +103,11 @@ def is_valid_default_yara_rule(yara_rule):
     yara_dir = get_yara_rules_default_dir()
     filename = os.path.join(yara_dir, yara_rule)
     filename = os.path.realpath(filename)
-
-    print(yara_dir)
-    print(filename)
-
     # incorrect filename
     if not os.path.commonprefix([filename, yara_dir]) == yara_dir:
         print('error: file transversal')
+        print(yara_dir)
+        print(filename)
         return False
     else:
         if os.path.isfile(filename):