v0.5.5

w5teams · Jan 9, 2022 · 1927e8f · 1927e8f
1 parent 49cf921
commit 1927e8f
Show file tree

Hide file tree

Showing 35 changed files with 322 additions and 320 deletions.
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.3"
+version = "0.5.5"
 
 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/api/view.py b/core/view/api/view.py
@@ -3,11 +3,6 @@
 from . import *
 
 
-@r.route("/webhookx", methods=['GET', 'POST'])
-def api_webhookx():
-    return Response.re()
-
-
 @r.route("/webhook", methods=['GET', 'POST'])
 def api_webhook():
     if request.method == "POST":

diff --git a/core/view/workflow/view.py b/core/view/workflow/view.py
@@ -216,6 +216,8 @@ def post_workflow_update():
         edge_router = request.json.get("edge_router", "")
 
         if str(controller_data) != "{}":
+            is_exist = json.loads(controller_data).get(timer_app)
+
             work_info = Workflow.select("timer_app").where('uuid', uuid).first()
 
             if work_info:
@@ -225,7 +227,12 @@ def post_workflow_update():
                     w_timer_app = work_info.timer_app
 
                 conn = rpyc.connect('localhost', 53124)
-                conn.root.exec(uuid, timer_app, w_timer_app, controller_data)
+
+                if is_exist:
+                    conn.root.exec(uuid, timer_app, w_timer_app, controller_data)
+                else:
+                    conn.root.exec(uuid, "", w_timer_app, controller_data)
+
                 conn.close()
             else:
                 return Response.re(err=ErrIsNotPlayBook)

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.33ebebe38df9e8fa5f41d611dd289e49.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.59cb5594783e87bf6a60.js></script><script type=text/javascript src=./static/js/vendor.4c57ac819e0c732d9433.js></script><script type=text/javascript src=./static/js/app.9e335cf7a791fddcedcf.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.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>
diff --git a/.../app.33ebebe38df9e8fa5f41d611dd289e49.css → .../app.eda004da279e6c3098d4cbfa79e963c6.css b/.../app.33ebebe38df9e8fa5f41d611dd289e49.css → .../app.eda004da279e6c3098d4cbfa79e963c6.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.8b51665a3c5053ab6493.js b/core/web/static/js/10.8b51665a3c5053ab6493.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.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.2f9ff79fcfa11885aebf.js b/core/web/static/js/5.2f9ff79fcfa11885aebf.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.256ccdfb99fc9ed4bf05.js b/core/web/static/js/6.256ccdfb99fc9ed4bf05.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.29f3b937b0160834ebd9.js b/core/web/static/js/7.29f3b937b0160834ebd9.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/8.d6a9df667c171344a175.js b/core/web/static/js/8.d6a9df667c171344a175.js
diff --git a/core/web/static/js/9.ae121ec2fc7a178c9365.js b/core/web/static/js/9.ae121ec2fc7a178c9365.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.9e335cf7a791fddcedcf.js b/core/web/static/js/app.9e335cf7a791fddcedcf.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/manifest.42591e28d44d491c771a.js b/core/web/static/js/manifest.42591e28d44d491c771a.js
diff --git a/core/web/static/js/manifest.59cb5594783e87bf6a60.js b/core/web/static/js/manifest.59cb5594783e87bf6a60.js
diff --git a/core/web/static/js/vendor.4c57ac819e0c732d9433.js b/core/web/static/js/vendor.4c57ac819e0c732d9433.js
diff --git a/run.py b/run.py
@@ -22,7 +22,7 @@ def w5_info(**kwargs):
     print(" ##@$%|||||||||||!`              :%@#@")
     print(" ###@&$||||||||!`               !&###@")
     print(" #####@&&%||||:.             `%&#####@")
-    print(" ########&&&%:   W5 SOAR  '$&@#######@  v{version}".format(version="0.5.3"))
+    print(" ########&&&%:   W5 SOAR  '$&@#######@  v{version}".format(version="0.5.5"))
     print("=============================================")
     print("* Web : https://w5.io")
     print("* Github : https://github.com/w5hub/w5")
@@ -36,7 +36,7 @@ def w5_info(**kwargs):
 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.33ebebe38df9e8fa5f41d611dd289e49.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.59cb5594783e87bf6a60.js></script><script type=text/javascript src=./static/js/vendor.4c57ac819e0c732d9433.js></script><script type=text/javascript src=./static/js/app.9e335cf7a791fddcedcf.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.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>