Merge pull request #1 from open-webrtc-toolkit/master

Update code

Author: DWJ01

doc/servermd/Server.md

@@ -447,7 +447,7 @@ Customers must be familiar with industry standards and best practices for deploy
 
 The following instructions are provided only as recommendations regarding security best practices and by no means are they fully complete:
 
-1. For the key pair access on OWT server, make sure only people with high enough privilege can have the clearance.
+1. For the key pair access on OWT server, make sure only people/process with high enough privilege can have the clearance. For service key, authentication service is recommended to integrate with OWT server and access it. For cipher key, hardware security storage is recommended.
 2. Regular system state audits or system change auto-detection. For example, OWT server system changes notification mechanism by third-party tool.
 3. Establish policy of file based operation history for the tracking purpose.
 4. Establish policy disallowing saving credentials for remote system access on OWT server.

docker/Dockerfile

@@ -27,14 +27,14 @@ RUN wget -O - ${NICE_REPO} | tar xz && \
     patch -p1 < owt-server-${LIBNICE_PATCH_VER}/scripts/patches/libnice014-removecandidate.patch && \
     patch -p1 < owt-server-${LIBNICE_PATCH_VER}/scripts/patches/libnice014-keepalive.patch && \
     patch -p1 < owt-server-${LIBNICE_PATCH_VER}/scripts/patches/libnice014-startcheck.patch && \
+    patch -p1 < owt-server-${LIBNICE_PATCH_VER}/scripts/patches/libnice014-closelock.patch && \
     ./configure --prefix="/usr/local" --libdir=/usr/local/lib/x86_64-linux-gnu && \
     make -s V=0 && \
     make install
 
 
 # Build open ssl
-ARG OPENSSL_BASE="1.1.1"
-ARG OPENSSL_VER="1.1.1h"
+ARG OPENSSL_VER="1.1.1j"
 ARG OPENSSL_REPO=https://www.openssl.org/source/openssl-${OPENSSL_VER}.tar.gz
 
 RUN wget -O - ${OPENSSL_REPO} | tar xz && \
@@ -92,7 +92,6 @@ ARG FFMPEG_VER="4.1.3"
 ARG FFMPEG_DIR="ffmpeg-${FFMPEG_VER}"
 ARG FFMPEG_SRC="${FFMPEG_DIR}.tar.bz2"
 ARG FFMPEG_SRC_URL="http://ffmpeg.org/releases/${FFMPEG_SRC}"
-ARG FFMPEG_SRC_MD5SUM="9985185a8de3678e5b55b1c63276f8b5"
 
 RUN wget ${FFMPEG_SRC_URL} && tar xf ${FFMPEG_SRC} && mv ${FFMPEG_DIR} FFmpeg && \
     cd FFmpeg  ;
@@ -154,7 +153,7 @@ ARG OWT_BRANCH=master
 ARG IMG_APP_PATH=/app_data/
 ENV APP_PATH=${IMG_APP_PATH}
 
-RUN apt-get update && apt-get install -y -q --no-install-recommends python libglib2.0-dev rabbitmq-server mongodb libboost-thread-dev libboost-system-dev liblog4cxx-dev
+RUN apt-get update && apt-get install -y -q --no-install-recommends python libglib2.0-dev rabbitmq-server mongodb libboost-thread-dev libboost-system-dev liblog4cxx-dev libgstreamer-plugins-base1.0-dev
 
 # 1. Clone OWT server source code 
 # 2. Clone licode source code and patch

source/agent/analytics/dist.json

@@ -16,7 +16,7 @@
             "../nodeManager.js",
             "../workingNode.js",
             "../../common/cipher.js",
-            "../../common/amqp_client.js",
+            "../../common/amqpClient.js",
             "../../common/cipher.js",
             "../../common/clusterWorker.js",
             "../../common/loadCollector.js",

source/agent/analytics/package.json

@@ -2,7 +2,7 @@
   "name": "OWT-Server-Agent",
   "version":"5.0.0",
   "dependencies": {
-    "amqp": "*",
+    "amqplib": "^0.7.0",
     "log4js": "^1.1.1",
     "node-getopt": "*",
     "toml": "*"

source/agent/audio/dist.json

@@ -15,7 +15,7 @@
             "../workingNode.js",
             "log4cxx.properties",
             "../../common/cipher.js",
-            "../../common/amqp_client.js",
+            "../../common/amqpClient.js",
             "../../common/clusterWorker.js",
             "../../common/loadCollector.js",
             "../../common/logger.js",

source/agent/conference/conference.js

@@ -509,7 +509,7 @@ var Conference = function (rpcClient, selfRpcId) {
     return Promise.all(pl)
       .then(() => {
         doClean();
-        process.exit();
+        process.kill(process.pid, 'SIGINT');
       });
   };
 

source/agent/conference/dist.json

@@ -22,7 +22,7 @@
             "../networkHelper.js",
             "../../common/formatUtil.js",
             "../../common/cipher.js",
-            "../../common/amqp_client.js",
+            "../../common/amqpClient.js",
             "../../common/clusterWorker.js",
             "../../common/loadCollector.js",
             "../../common/logger.js",

source/agent/conference/package.json

@@ -2,7 +2,7 @@
   "name": "OWT-Server-Conference-Controller",
   "version":"5.0.0",
   "dependencies": {
-    "amqp": "*",
+    "amqplib": "^0.7.0",
     "log4js": "^1.1.1",
     "node-getopt": "*",
     "toml": "*",

source/agent/index.js

@@ -52,7 +52,7 @@ for (var prop in opt.options) {
 
 var clusterWorker = require('./clusterWorker');
 var nodeManager = require('./nodeManager');
-var amqper = require('./amqp_client')();
+var amqper = require('./amqpClient')();
 var rpcClient;
 var monitoringTarget;
 
@@ -221,16 +221,21 @@ amqper.connect(config.rabbit, function () {
 });
 
 ['SIGINT', 'SIGTERM'].map(function (sig) {
-    process.on(sig, function () {
+    process.on(sig, async function () {
         log.warn('Exiting on', sig);
+        manager && manager.dropAllNodes(true);
+        worker && worker.quit();
+        try {
+            await amqper.disconnect();
+        } catch(e) {
+            log.warn('Exiting e:', e);
+        }
         process.exit();
     });
 });
 
 process.on('exit', function () {
-    manager && manager.dropAllNodes(true);
-    worker && worker.quit();
-    amqper.disconnect();
+    log.info('Process exit');
 });
 
 process.on('unhandledRejection', (reason) => {

source/agent/nodeManager.js

@@ -309,6 +309,7 @@ module.exports = function (spec, spawnOptions, onNodeAbnormallyQuit, onTaskAdded
   };
 
   that.dropAllNodes = function(quietly) {
+      spawn_failed = true;
       Object.keys(processes).map(function (k) {
           !quietly && onNodeAbnormallyQuit && onNodeAbnormallyQuit(k, tasksOnNode(k));
           dropNode(k);