Merge branch 'release/3.9.0' into customer

OPSWAT · Sep 25, 2019 · b34738c · b34738c
2 parents b9cb67e + 950ee63
commit b34738c
Show file tree

Hide file tree

Showing 35 changed files with 1,013 additions and 428 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:11-alpine
 
-LABEL version="1.2"
+LABEL version="1.3"
 LABEL description="Linux alpine with node:11 and chromium browser"
 
 RUN set -x \
@@ -9,9 +9,7 @@ RUN set -x \
     && echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
     && echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories
 
-RUN apk add --no-cache \
-    bash \
-    python3
+RUN apk add --no-cache bash python3 pkgconfig autoconf automake libtool nasm build-base zlib-dev
 
 RUN apk add --no-cache \
         chromium@edge \

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -48,7 +48,7 @@
     "description": ""
   },
   "aboutThankYou": {
-    "message": "Thank you for installing <strong>OPSWAT File Security for Chrome</strong>! This extension gives you the ability to scan downloads* for malware with 30+ anti-malware engines using OPSWAT's <a target='_blank' href='__mclDomain__/#!/?utm_source=extension&utm_medium=extension&utm_campaign=extension&utm_term=about'>MetaDefender Cloud</a>.<br/><small>*  maximum file size is 140 MB</small>",
+    "message": "Thank you for installing <strong>OPSWAT File Security for Chrome</strong>! This extension gives you the ability to scan downloads* for malware with 30+ anti-malware engines using OPSWAT's <a target='_blank' href='__mclDomain__/#!/?utm_source=extension&utm_medium=extension&utm_campaign=extension&utm_term=about'>MetaDefender Cloud</a>.",
     "description": ""
   },
   "aboutApiKeyInfo": {
@@ -60,7 +60,7 @@
     "description": ""
   },
   "aboutMoreAboutMCL": {
-    "message": "Read more about <a target='_blank' href='__opswatDomain__/products/metadefender/enterprise?utm_source=extension&utm_medium=extension&utm_campaign=extension&utm_term=about'>MetaDefender Cloud Licensing</a> options",
+    "message": "Read more about  <a target='_blank' href='__mclDomain__/licensing?utm_source=extension&utm_medium=extension&utm_campaign=extension&utm_term=about'>MetaDefender Cloud Licensing</a> options",
     "description": ""
   },
   "aboutHowToUse": {
@@ -79,17 +79,11 @@
     "message": "To access the OPSWAT File Security for Chrome extension settings page, right click on the 'OPSWAT File Security for Chrome' button in the Chrome top bar and select 'Options' from the drop down menu",
     "description": ""
   },
-  "howToScanAll": {
-    "message": "If you would like to automatically scan all downloads, click on the 'OPSWAT File Security for Chrome button' in the Chrome top bar and select the box to 'Scan downloads'",
-    "description": ""
-  },
-  "howToSaveClean": {
-    "message": "If you would like to automatically download the scanned files with no threat detected, go to OPSWAT File Security for Chrome settings page and enable 'Save clean files'",
-    "description": ""
+  "chromeExtensionHelp": {
+    "message": "Read more about OPSWAT File Security for Chrome extension settings on our <a target='blank' href='https://onlinehelp.opswat.com/mdcloud/OPSWAT_File_Security_for_Chrome.html'>online help</a> page."
   },
-  "howToMoreInfo": {
-    "message": "To view more information about the scan results, go to scan history page and click on the file result",
-    "description": ""
+  "githubInfo": {
+    "message": "The chrome extension is an open-source tool developed by OPSWAT, the source code is published on github: <a target='blank' href='https://github.com/OPSWAT/metadefender-browser-extension'>metadefender-browser-extension</a>"
   },
   "contactOpswat": {
     "message": "Contact OPSWAT Sales to increase your limits",
@@ -129,6 +123,22 @@
   "safeUrlSub": {
     "message": "Read more about <a target='blank' href='https://onlinehelp.opswat.com/mdcloud/2.1_Safe_URL_redirect.html'>Safe URL Redirect</a>"
   },
+  "useCore": {
+    "message": "On-premise scanning using MetaDefender Core <div class='text-secondary text-14'>Send your files to a private <a target='blank' href='https://onlinehelp.opswat.com/corev4/8._MetaDefender_Core_Developer_Guide.html'>MetaDefender Core server</a></div>",
+    "description": ""
+  },
+  "useCoreSub": {
+    "message": ""
+  },
+  "coreUrl": {
+    "message": "URL"
+  },
+  "coreApikey": {
+    "message": "Apikey"
+  },
+  "coreRule": {
+    "message": "Workflow"
+  },
   "searcHistory": {
     "message": "Search history"
   },
@@ -140,6 +150,22 @@
     "message": "Threats detected",
     "description": ""
   },
+  "coreSettingsSave": {
+    "message": "Validate & Save",
+    "description": "Save core settings button label"
+  },
+  "coreSettingsSavedNotification": {
+    "message": "Core settings saved!"
+  },
+  "coreSettingsInvalidNotification": {
+    "message": "Core settings are not valid!"
+  },
+  "coreSettingsInvalidApikey": {
+    "message": "Invalid MetaDefender Core apikey!"
+  },
+  "coreSettingsInvalidUrl": {
+    "message": "Could not connect to a MetaDefender Core server at the specified URL!"
+  },
   "scanStatusScanning": {
     "message": "Scan in progress...",
     "description": ""
@@ -157,7 +183,7 @@
     "description": ""
   },
   "unsupportedUrl": {
-    "message": "Url not supported.\nYou may be able to scan the file by downloading it while 'Scan Downloads' is enabled"
+    "message": "URL not supported.\nYou may be able to scan the file by downloading it while 'Scan Downloads' is enabled"
   },
   "errorWhileDownloading": {
     "message": "We encountered an error while downloading this file. Please try again",
@@ -167,6 +193,9 @@
     "message": "Unable to access local file. Please make sure 'Allow access to file URLs' is enabled for OPSWAT extension",
     "description": ""
   },
+  "scanFileError": {
+    "message": "There was an error while scanning the file. Please try again later"
+  },
   "fileAccessDisabled": {
     "message": "To use this feature, 'Allow access to file URLs' must be enabled for OPSWAT extension"
   },

diff --git a/app/fonts/fontello/LICENSE.txt b/app/fonts/fontello/LICENSE.txt
@@ -1,24 +1,6 @@
 Font license info
 
 
-## Iconic
-
-   Copyright (C) 2012 by P.J. Onori
-
-   Author:    P.J. Onori
-   License:   SIL (http://scripts.sil.org/OFL)
-   Homepage:  http://somerandomdude.com/work/iconic/
-
-
-## MFG Labs
-
-   Copyright (C) 2012 by Daniel Bruce
-
-   Author:    MFG Labs
-   License:   SIL (http://scripts.sil.org/OFL)
-   Homepage:  http://www.mfglabs.com/
-
-
 ## Font Awesome
 
    Copyright (C) 2016 by Dave Gandy

diff --git a/app/fonts/fontello/config.json b/app/fonts/fontello/config.json
@@ -6,12 +6,6 @@
   "units_per_em": 1000,
   "ascent": 850,
   "glyphs": [
-    {
-      "uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
-      "css": "trash-empty",
-      "code": 59394,
-      "src": "fontawesome"
-    },
     {
       "uid": "9bc2902722abb366a213a052ade360bc",
       "css": "spin",
@@ -25,34 +19,52 @@
       "src": "fontawesome"
     },
     {
-      "uid": "1d35198f5190ec004dd4ec742fbe19ca",
-      "css": "right",
-      "code": 59393,
-      "src": "mfglabs"
+      "uid": "2c413e78faf1d6631fd7b094d14c2253",
+      "css": "cloud",
+      "code": 59395,
+      "src": "fontawesome"
     },
     {
-      "uid": "ec21fe3492bb04d9e29103c319556ed8",
-      "css": "search",
-      "code": 62733,
-      "src": "mfglabs"
+      "uid": "bbfb51903f40597f0b70fd75bc7b5cac",
+      "css": "trash",
+      "code": 61944,
+      "src": "fontawesome"
     },
     {
-      "uid": "ce50292e85eb5d6ee3be61b32bf2bdf3",
-      "css": "ok",
-      "code": 59399,
-      "src": "mfglabs"
+      "uid": "e99461abfef3923546da8d745372c995",
+      "css": "cog",
+      "code": 59394,
+      "src": "fontawesome"
     },
     {
-      "uid": "06301c50d89b5d3e651bd07ebd6d7de7",
+      "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
+      "css": "search",
+      "code": 59392,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "5211af474d3a9848f67f945e2ccaf143",
       "css": "cancel",
+      "code": 59396,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "12f4ece88e46abd864e40b35e05b11cd",
+      "css": "ok",
       "code": 59400,
-      "src": "mfglabs"
+      "src": "fontawesome"
     },
     {
-      "uid": "fc94b92194752796654c96c7b7dccebb",
-      "css": "cog",
-      "code": 59392,
-      "src": "iconic"
+      "uid": "ad6b3fbb5324abe71a9c0b6609cbb9f1",
+      "css": "right",
+      "code": 59397,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "d59ff824282fc6edaeca991deab522aa",
+      "css": "server",
+      "code": 62003,
+      "src": "fontawesome"
     }
   ]
 }
diff --git a/app/fonts/fontello/css/mcl-ext-icons-codes.css b/app/fonts/fontello/css/mcl-ext-icons-codes.css
@@ -1,9 +1,11 @@
 
-.icon-cog:before { content: '\e800'; } /* '' */
-.icon-right:before { content: '\e801'; } /* '' */
-.icon-trash-empty:before { content: '\e802'; } /* '' */
-.icon-ok:before { content: '\e807'; } /* '' */
-.icon-cancel:before { content: '\e808'; } /* '' */
+.icon-search:before { content: '\e800'; } /* '' */
+.icon-cog:before { content: '\e802'; } /* '' */
+.icon-cloud:before { content: '\e803'; } /* '' */
+.icon-cancel:before { content: '\e804'; } /* '' */
+.icon-right:before { content: '\e805'; } /* '' */
+.icon-ok:before { content: '\e808'; } /* '' */
 .icon-spin:before { content: '\e839'; } /* '' */
 .icon-help:before { content: '\f128'; } /* '' */
-.icon-search:before { content: '\f50d'; } /* '' */
+.icon-trash:before { content: '\f1f8'; } /* '' */
+.icon-server:before { content: '\f233'; } /* '' */