Merge pull request #198 from bunkerity/dev

Author: TheophileDiot

clamav/plugin.json

@@ -2,7 +2,7 @@
   "id": "clamav",
   "name": "ClamAV",
   "description": "Automatic scan of uploaded files with ClamAV antivirus engine.",
-  "version": "1.9",
+  "version": "1.10",
   "stream": "no",
   "settings": {
     "USE_CLAMAV": {

coraza/plugin.json

@@ -2,7 +2,7 @@
   "id": "coraza",
   "name": "Coraza",
   "description": "Use Coraza as a library to inspect client request.",
-  "version": "1.9",
+  "version": "1.10",
   "stream": "no",
   "settings": {
     "USE_CORAZA": {

discord/plugin.json

@@ -2,7 +2,7 @@
   "id": "discord",
   "name": "Discord",
   "description": "Send alerts to a Discord channel (using webhooks).",
-  "version": "1.9",
+  "version": "1.10",
   "stream": "yes",
   "settings": {
     "USE_DISCORD": {

slack/plugin.json

@@ -2,7 +2,7 @@
   "id": "slack",
   "name": "Slack",
   "description": "Send alerts to a Slack channel (using webhooks).",
-  "version": "1.9",
+  "version": "1.10",
   "stream": "partial",
   "settings": {
     "USE_SLACK": {

virustotal/plugin.json

@@ -2,7 +2,7 @@
   "id": "virustotal",
   "name": "VirusTotal",
   "description": "Automatic scan of uploaded files and ips optionally with the VirusTotal API.",
-  "version": "1.9",
+  "version": "1.10",
   "stream": "partial",
   "settings": {
     "USE_VIRUSTOTAL": {
@@ -23,6 +23,15 @@
       "regex": "^.*$",
       "type": "password"
     },
+    "VIRUSTOTAL_TIMEOUT": {
+      "context": "global",
+      "default": "1000",
+      "help": "Timeout in milliseconds for VirusTotal API requests.",
+      "id": "virustotal-timeout",
+      "label": "API timeout (ms)",
+      "regex": "^[0-9]+$",
+      "type": "text"
+    },
     "VIRUSTOTAL_SCAN_FILE": {
       "context": "multisite",
       "default": "yes",

virustotal/virustotal.lua

@@ -248,6 +248,9 @@ function virustotal:request(url)
 	if not httpc then
 		return false, err
 	end
+	-- Set timeouts for connect, send, and read
+	local timeout = tonumber(self.variables["VIRUSTOTAL_TIMEOUT"]) or 1000
+	httpc:set_timeouts(timeout, timeout, timeout)
 	-- Send request
 	local res
 	res, err = httpc:request_uri("https://www.virustotal.com/api/v3" .. url, {

webhook/plugin.json

@@ -2,7 +2,7 @@
   "id": "webhook",
   "name": "WebHook",
   "description": "Send alerts to a custom webhook.",
-  "version": "1.9",
+  "version": "1.10",
   "stream": "yes",
   "settings": {
     "USE_WEBHOOK": {