v0.3.2

apps/es/app.json

@@ -0,0 +1,49 @@
+{
+  "identification": "w5soar",
+  "is_public": true,
+  "name": "ES 查询",
+  "version": "0.1",
+  "description": "查询ES数据",
+  "type": "数据库",
+  "action": [
+    {
+      "name": "查询数据",
+      "func": "query"
+    }
+  ],
+  "args": {
+    "query": [
+      {
+        "key": "host",
+        "type": "text",
+        "required": true
+      },
+      {
+        "key": "port",
+        "type": "number",
+        "required": true,
+        "default": 9200
+      },
+      {
+        "key": "index",
+        "type": "text",
+        "required": true
+      },
+      {
+        "key": "body",
+        "type": "textarea",
+        "required": true
+      },
+      {
+        "key": "account",
+        "type": "text",
+        "required": false
+      },
+      {
+        "key": "password",
+        "type": "text",
+        "required": false
+      }
+    ]
+  }
+}

apps/es/readme.md

@@ -0,0 +1,25 @@
+## APP 说明
+
+- 查询 ES 服务器中的数据
+
+## 动作列表
+
+### 查询信息
+
+**参数：**
+
+|  参数   | 类型  |  必填   |  备注  |
+|  ----  | ----  |  ----  |  ----  |
+| **host**  | text | `是` | ES 服务器地址 |
+| **port**  | number | `是` | ES 端口号 |
+| **index**  | text | `是` | 索引名称 |
+| **body**  | text | `是` | DSL 语句 |
+| **account**  | text | `否` | 认证账号 |
+| **password**  | text | `否` | 认证密码 |
+
+**返回值：**
+
+```
+# 正常
+{'Extra': None, 'StatusCode': 0, 'StatusMessage': 'success'}
+```

apps/feishu/app.json

@@ -0,0 +1,28 @@
+{
+  "identification": "w5soar",
+  "is_public": true,
+  "name": "飞书通知",
+  "version": "0.1",
+  "description": "飞书消息通知",
+  "type": "消息通知",
+  "action": [
+    {
+      "name": "飞书通知",
+      "func": "send"
+    }
+  ],
+  "args": {
+    "send": [
+      {
+        "key": "hook_uuid",
+        "type": "text",
+        "required": true
+      },
+      {
+        "key": "msg",
+        "type": "text",
+        "required": true
+      }
+    ]
+  }
+}

apps/feishu/readme.md

@@ -0,0 +1,21 @@
+## APP 说明
+
+- 飞书官方文档：https://www.feishu.cn/hc/zh-CN/articles/360024984973
+
+## 动作列表
+
+### 飞书通知
+
+**参数：**
+
+|  参数   | 类型  |  必填   |  备注  |
+|  ----  | ----  |  ----  |  ----  |
+| **hook_uuid**  | text | `是` | URL hook 后面的 UUID |
+| **msg**  | text | `是` | 通知内容|
+
+**返回值：**
+
+```
+# 正常
+{'Extra': None, 'StatusCode': 0, 'StatusMessage': 'success'}
+```

core/__init__.py

@@ -11,7 +11,7 @@
 from core.view import Decorator
 from flask import (Flask, send_from_directory)
 
-version = "0.3.1"
+version = "0.3.2"
 
 db = Orator()
 redis = FlaskRedis()
@@ -104,10 +104,16 @@ def init_config(app):
             }
         }
 
-    redis_host = cf.get("redis", "host")
-    redis_port = cf.get("redis", "port")
-    redis_database = cf.get("redis", "database")
-    redis_password = cf.get("redis", "password")
+    if os.getenv('REDIS_HOST'):
+        redis_host = os.getenv('REDIS_HOST')
+        redis_port = os.getenv('REDIS_PORT')
+        redis_database = os.getenv('REDIS_DATABASE')
+        redis_password = os.getenv('REDIS_PASSWORD')
+    else:
+        redis_host = cf.get("redis", "host")
+        redis_port = cf.get("redis", "port")
+        redis_database = cf.get("redis", "database")
+        redis_password = cf.get("redis", "password")
 
     if str(redis_password) == "":
         app.config['REDIS_URL'] = "redis://{host}:{port}/{db}".format(

core/view/system/view.py

@@ -52,6 +52,8 @@ def post_system_del():
             Variablen.where("id", "!=", "0").delete()
         elif type == 4:
             redis.flushdb()
+        elif type == 5:
+            Report.where("id", "!=", "0").delete()
 
         return Response.re()
 

core/view/workflow/view.py

@@ -373,7 +373,17 @@ def get_workflow_workflow():
             }
         ]
 
-        return Response.re(data=result)
+        if redis.exists(uuid + "&&exec_sum") == 1:
+            exec_sum = redis.get(uuid + "&&exec_sum")
+        else:
+            exec_sum = 0
+
+        data = {
+            "result": result,
+            "exec_sum": exec_sum
+        }
+
+        return Response.re(data=data)
 
 
 def get_workflow_exec(uuid):

core/web/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" type=image/x-icon href=static/favicon.ico><title>W5 SOAR - 无需编写代码的安全自动化平台</title><link href=./static/css/app.53d038a820ec1e26e409d15b3b7060ba.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d12e5bfb66740ea12d27.js></script><script type=text/javascript src=./static/js/vendor.62490b09734a45385f12.js></script><script type=text/javascript src=./static/js/app.bd19c4bfdbb7974be759.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" type=image/x-icon href=static/favicon.ico><title>W5 SOAR - 无需编写代码的安全自动化平台</title><link href=./static/css/app.2674f0ac4e9d106fe14d4815fb19bd73.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.52ec6ab1418921f3bbf8.js></script><script type=text/javascript src=./static/js/vendor.62490b09734a45385f12.js></script><script type=text/javascript src=./static/js/app.1e758d934c33d95bb4ab.js></script></body></html>

run.py

@@ -22,7 +22,7 @@ def w5_info(**kwargs):
     print(" ##@$%|||||||||||!`              :%@#@")
     print(" ###@&$||||||||!`               !&###@")
     print(" #####@&&%||||:.             `%&#####@")
-    print(" ########&&&%:   W5 SOAR  '$&@#######@  v{version}".format(version="0.3.1"))
+    print(" ########&&&%:   W5 SOAR  '$&@#######@  v{version}".format(version="0.3.2"))
     print("=============================================")
     print("* Web : https://w5.io")
     print("* Github : https://github.com/w5hub/w5")