v0.5.6

w5teams · Jun 5, 2022 · 5627259 · 5627259
1 parent 1927e8f
commit 5627259
Show file tree

Hide file tree

Showing 34 changed files with 94 additions and 89 deletions.
diff --git a/apps/helloworld/main/run.py b/apps/helloworld/main/run.py
@@ -5,4 +5,4 @@
 
 async def hello_world(name):
     logger.info("[Hello World] APP 执行参数为: {name}", name=name)
-    return {"status": 0, "result": "Hello," + name}
+    return {"status": 0, "result": {"a": "b", "c": "阿斯达多撒所"}}
diff --git a/core/__init__.py b/core/__init__.py
@@ -11,7 +11,7 @@
 from core.view import Decorator
 from flask import (Flask, send_from_directory)
 
-version = "0.5.5"
+version = "0.5.6"
 
 db = Orator()
 redis = FlaskRedis()

diff --git a/core/auto/linux/core.so b/core/auto/linux/core.so
diff --git a/core/auto/windows/core.pyd b/core/auto/windows/core.pyd
diff --git a/core/view/__init__.py b/core/view/__init__.py
@@ -39,7 +39,7 @@ def before():
         def after_request(resp):
             response_data = ""
             try:
-                response_data = resp.data
+                response_data = str(resp.data, "utf-8").encode('utf-8').decode("unicode_escape")
             except:
                 pass
 

diff --git a/core/view/library.py b/core/view/library.py
@@ -25,4 +25,4 @@
 elif platform.system() == 'Linux':
     from core.auto.linux.core import auto_execute, ManageTimer
 elif platform.system() == "Darwin":
-    print("Mac platform is not supported.")
+    print("Mac platform is not supported.")
diff --git a/core/web/index.html b/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.eda004da279e6c3098d4cbfa79e963c6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.42591e28d44d491c771a.js></script><script type=text/javascript src=./static/js/vendor.4c57ac819e0c732d9433.js></script><script type=text/javascript src=./static/js/app.b995b00e248386c7647c.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.32ad01e3776e3e4a713d166ae547e6a8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.a79c73bcdf98379eb6e0.js></script><script type=text/javascript src=./static/js/vendor.4c57ac819e0c732d9433.js></script><script type=text/javascript src=./static/js/app.d1ef59c11c157bd1e8a0.js></script></body></html>
diff --git a/.../app.eda004da279e6c3098d4cbfa79e963c6.css → .../app.32ad01e3776e3e4a713d166ae547e6a8.css b/.../app.eda004da279e6c3098d4cbfa79e963c6.css → .../app.32ad01e3776e3e4a713d166ae547e6a8.css
diff --git a/core/web/static/js/0.0f6907f0664e8b8ac4a5.js b/core/web/static/js/0.0f6907f0664e8b8ac4a5.js
diff --git a/core/web/static/js/1.3e6986617218fb2bee10.js b/core/web/static/js/1.3e6986617218fb2bee10.js
diff --git a/core/web/static/js/10.91f57ae8399e74c3145a.js b/core/web/static/js/10.91f57ae8399e74c3145a.js
diff --git a/core/web/static/js/10.e909651bdba1a3036f30.js b/core/web/static/js/10.e909651bdba1a3036f30.js
diff --git a/core/web/static/js/11.048747144dc7f6422999.js b/core/web/static/js/11.048747144dc7f6422999.js
diff --git a/core/web/static/js/11.df7d9dd0e82f49edc14b.js b/core/web/static/js/11.df7d9dd0e82f49edc14b.js
diff --git a/core/web/static/js/12.4b8241c86c0c2fd2cc28.js b/core/web/static/js/12.4b8241c86c0c2fd2cc28.js
diff --git a/core/web/static/js/13.58c2c9e1c5cb4ae487db.js b/core/web/static/js/13.58c2c9e1c5cb4ae487db.js
diff --git a/core/web/static/js/16.d5fc721bb537576012aa.js b/core/web/static/js/16.d5fc721bb537576012aa.js
diff --git a/core/web/static/js/17.1c1b280ebe10200470b7.js b/core/web/static/js/17.1c1b280ebe10200470b7.js
diff --git a/core/web/static/js/2.d4a230b72287bb7f2825.js b/core/web/static/js/2.d4a230b72287bb7f2825.js
diff --git a/core/web/static/js/3.c9cb8cf76b60d99f5839.js b/core/web/static/js/3.c9cb8cf76b60d99f5839.js
diff --git a/core/web/static/js/4.ca7b9cf1f548412033cd.js b/core/web/static/js/4.ca7b9cf1f548412033cd.js
diff --git a/core/web/static/js/5.730b81524870c4f0c20a.js b/core/web/static/js/5.730b81524870c4f0c20a.js
diff --git a/core/web/static/js/6.ec60b88d16ea242cc789.js b/core/web/static/js/6.ec60b88d16ea242cc789.js
diff --git a/core/web/static/js/7.cb3391ddd7191d390028.js b/core/web/static/js/7.cb3391ddd7191d390028.js
diff --git a/core/web/static/js/8.44c6241906883f765274.js b/core/web/static/js/8.44c6241906883f765274.js
diff --git a/core/web/static/js/9.f321d440c2516f3cb3eb.js b/core/web/static/js/9.f321d440c2516f3cb3eb.js
diff --git a/core/web/static/js/app.b995b00e248386c7647c.js b/core/web/static/js/app.b995b00e248386c7647c.js
diff --git a/core/web/static/js/app.d1ef59c11c157bd1e8a0.js b/core/web/static/js/app.d1ef59c11c157bd1e8a0.js
diff --git a/core/web/static/js/manifest.42591e28d44d491c771a.js b/core/web/static/js/manifest.42591e28d44d491c771a.js
diff --git a/core/web/static/js/manifest.a79c73bcdf98379eb6e0.js b/core/web/static/js/manifest.a79c73bcdf98379eb6e0.js
diff --git a/core/web/static/js/vendor.4c57ac819e0c732d9433.js b/core/web/static/js/vendor.4c57ac819e0c732d9433.js
diff --git a/docker/sql/w5.sql b/docker/sql/w5.sql
@@ -121,10 +121,10 @@ CREATE TABLE `w5_logs` (
   `uuid` varchar(100) NOT NULL,
   `app_uuid` varchar(100) NOT NULL,
   `app_name` varchar(20) NOT NULL DEFAULT '',
-  `result` text NOT NULL,
+  `result` mediumtext NOT NULL,
   `status` int NOT NULL DEFAULT '0',
-  `html` text,
-  `args` text,
+  `html` mediumtext,
+  `args` mediumtext,
   `create_time` datetime DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
@@ -291,13 +291,13 @@ CREATE TABLE `w5_workflow` (
   `input_app` varchar(100) NOT NULL DEFAULT '',
   `webhook_app` varchar(100) NOT NULL DEFAULT '',
   `timer_app` varchar(100) NOT NULL DEFAULT '',
-  `for_list` text,
-  `if_list` text,
-  `audit_list` text,
-  `flow_json` text,
-  `flow_data` text,
-  `controller_data` text,
-  `local_var_data` text,
+  `for_list` mediumtext,
+  `if_list` mediumtext,
+  `audit_list` mediumtext,
+  `flow_json` mediumtext,
+  `flow_data` mediumtext,
+  `controller_data` mediumtext,
+  `local_var_data` mediumtext,
   `grid_type` varchar(10) NOT NULL DEFAULT '',
   `edge_marker` varchar(10) NOT NULL DEFAULT '',
   `edge_color` varchar(10) NOT NULL DEFAULT '',

diff --git a/requirements.txt b/requirements.txt
@@ -23,4 +23,6 @@ jira== 2.0.0
 paramiko== 2.7.2
 pywinrm== 0.4.1
 rpyc== 5.0.0
-nest-asyncio== 1.5.4
+nest-asyncio== 1.5.4
+MarkupSafe== 1.1.1
+rsa== 4.8
diff --git a/run.py b/run.py
@@ -22,21 +22,23 @@ def w5_info(**kwargs):
     print(" ##@$%|||||||||||!`              :%@#@")
     print(" ###@&$||||||||!`               !&###@")
     print(" #####@&&%||||:.             `%&#####@")
-    print(" ########&&&%:   W5 SOAR  '$&@#######@  v{version}".format(version="0.5.5"))
+    print(" ########&&&%:   W5 SOAR  '$&@#######@  v{version}".format(version="0.5.6"))
     print("=============================================")
     print("* Web : https://w5.io")
     print("* Github : https://github.com/w5hub/w5")
     print("=============================================")
 
     if platform.system() == 'Windows':
-        print("* Running on http://{host}:{port}/ (Press CTRL+C to quit)".format(host=kwargs["host"],
-                                                                                 port=kwargs["port"]))
+        print("* Running on http://{host}:{port}/ (Press CTRL+C to quit)".format(
+            host=kwargs["host"],
+            port=kwargs["port"]
+        ))
 
 
 def start_w5(**kwargs):
     w5_info(host=kwargs["host"], port=kwargs["port"])
 
-    if platform.system() != 'Windows':
+    if platform.system() == 'Windows':
         from core import start
         from gevent import pywsgi
         from geventwebsocket.handler import WebSocketHandler
Original file line number	Diff line number	Diff line change
		@@ -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.eda004da279e6c3098d4cbfa79e963c6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.42591e28d44d491c771a.js></script><script type=text/javascript src=./static/js/vendor.4c57ac819e0c732d9433.js></script><script type=text/javascript src=./static/js/app.b995b00e248386c7647c.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.32ad01e3776e3e4a713d166ae547e6a8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.a79c73bcdf98379eb6e0.js></script><script type=text/javascript src=./static/js/vendor.4c57ac819e0c732d9433.js></script><script type=text/javascript src=./static/js/app.d1ef59c11c157bd1e8a0.js></script></body></html>