Merge Develop into Master (#8)

Merge Develop into Master

Author: J12934

Dockerfile

@@ -6,23 +6,20 @@ RUN apt-get update && \
     apt-get install -y nodejs && \
     apt-get -y clean
 
+RUN pip install sslyze==2.1.3 && \
+    python -m sslyze --update_trust_store
+
 COPY package.json package-lock.json /src/
-COPY lib/ src/lib/
 
 WORKDIR /src
 
-RUN ls -l
-
-RUN pip install sslyze && \
-    python -m sslyze --update_trust_store
 RUN npm install --production
 
+COPY lib/ src/lib/
 COPY . /src
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=120s --retries=3 CMD node healthcheck.js || exit 1
 
-RUN ls -l
-
 RUN addgroup --system sslyze_group && adduser --system --ingroup sslyze_group sslyze_user 
 
 USER sslyze_user

index.js

@@ -26,14 +26,16 @@ const scanner = new ScannerScaffolding(worker, {
     topic: 'sslyze_scan',
     async testScannerFunctionality() {
         try {
-            await testRun();
+            const { res } = await testRun();
+            const version = res.sslyze_version || 'unkown';
+
+            return {
+                version,
+                testRun: 'successful',
+            };
         } catch (error) {
             return { version: 'unkown', testRun: 'failed' };
         }
-        return {
-            version: 'unkown',
-            testRun: 'successful',
-        };
     },
 });
 

lib/__mocks__/sslscan.js

@@ -17,16 +17,16 @@
         "url": "git@github.com:secureCodeBox/scanner-infrastructure-sslyze.git"
     },
     "dependencies": {
-        "@securecodebox/scanner-scaffolding": "^2.2.0",
+        "@securecodebox/scanner-scaffolding": "^2.2.4",
         "lodash": "^4.17.11",
         "node-sslyze": "file:lib/node-sslyze",
-        "sprintf-js": "^1.1.1",
+        "sprintf-js": "^1.1.2",
         "uuid": "^3.3.2"
     },
     "devDependencies": {
-        "eslint": "^5.4.0",
-        "eslint-plugin-prettier": "^2.6.2",
-        "jest": "^23.5.0",
-        "prettier": "^1.14.2"
+        "eslint": "^5.16.0",
+        "eslint-plugin-prettier": "^3.1.0",
+        "jest": "^24.8.0",
+        "prettier": "^1.17.1"
     }
 }