Merge branch 'master' of github.com:ail-project/ail-framework

Author: Terrtia

bin/LAUNCH.sh

@@ -114,7 +114,13 @@ function launching_kvrocks {
     echo -e $GREEN"\t* Launching KVROCKS servers"$DEFAULT
 
     sleep 0.1
-    screen -S "KVROCKS_AIL" -X screen -t "6383" bash -c 'cd '${AIL_HOME}'; ./kvrocks/build/kvrocks -c '$conf_dir'/6383.conf ; read x'
+    if [ -f "./kvrocks/build/kvrocks" ]; then
+        screen -S "KVROCKS_AIL" -X screen -t "6383" bash -c 'cd '${AIL_HOME}'; ./kvrocks/build/kvrocks -c '$conf_dir'/6383.conf ; read x'
+    elif [ -f "/usr/bin/kvrocks" ]; then
+        screen -S "KVROCKS_AIL" -X screen -t "6383" bash -c 'cd '${AIL_HOME}'; kvrocks -c '$conf_dir'/6383.conf ; read x'
+    else
+        echo -e $RED"\t* KVROCKS is not installed."$DEFAULT
+    fi
 }
 
 function launching_logs {

installing_deps.sh

@@ -71,6 +71,21 @@ make
 sudo make install
 popd
 
+# Yara
+YARA_VERSION="4.3.0"
+mkdir yara_temp
+wget https://github.com/VirusTotal/yara/archive/v${YARA_VERSION}.zip -O yara_temp/yara.zip
+unzip yara_temp/yara.zip -d yara_temp/
+pushd yara_temp/yara-${YARA_VERSION}
+./bootstrap.sh
+./configure
+make
+sudo make install
+make check
+popd
+rm -rf yara_temp
+
+
 # ARDB #
 #test ! -d ardb/ && git clone https://github.com/ail-project/ardb.git
 #pushd ardb/

var/www/Flask_server.py

@@ -117,10 +117,15 @@ def filter(self, record):
 
 # =========  TLS  =========#
 
-ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
-ssl_context.load_cert_chain(certfile=os.path.join(Flask_dir, 'server.crt'), keyfile=os.path.join(Flask_dir, 'server.key'))
-ssl_context.suppress_ragged_eofs = True
-# print(ssl_context.get_ciphers())
+ssl_context = None
+self_signed_certfile = os.path.join(Flask_dir, 'server.crt')
+self_signed_keyfile = os.path.join(Flask_dir, 'server.key')
+
+if os.path.exists(self_signed_certfile) and os.path.exists(self_signed_keyfile):
+    ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    ssl_context.load_cert_chain(certfile=self_signed_certfile, keyfile=self_signed_keyfile)
+    ssl_context.suppress_ragged_eofs = True
+    # print(ssl_context.get_ciphers())
 # =========       =========#
 
 Flask_config.app = Flask(__name__, static_url_path=baseUrl+'/static/')

var/www/update_thirdparty.sh

@@ -77,22 +77,6 @@ unzip -qq temp/popper.zip -d temp/
 mv temp/floating-ui-${POPPER_VERSION}/dist/umd/popper.min.js ./static/js/
 mv temp/floating-ui-${POPPER_VERSION}/dist/umd/popper.min.js.map ./static/js/
 
-
-
-
-# INSTALL YARA
-YARA_VERSION="4.3.0"
-wget https://github.com/VirusTotal/yara/archive/v${YARA_VERSION}.zip -O temp/yara.zip
-unzip temp/yara.zip -d temp/
-pushd temp/yara-${YARA_VERSION}
-./bootstrap.sh
-./configure
-make
-sudo make install
-make check
-popd
-
-
 rm -rf temp
 
 mkdir -p ./static/image