Skip to content

Commit

Permalink
2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
er10yi committed Oct 9, 2020
1 parent bde0ee8 commit 34b0b3a
Show file tree
Hide file tree
Showing 29 changed files with 1,030 additions and 740 deletions.
14 changes: 14 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
3. 增加全局搜索
4. 增加资产导入接口,漏洞导入接口

### 正式版 V2.0.1 - 20201009

部署脚本:
1. 增加部署脚本执行目录判断(issues #3 建议判断或约束一下安装脚本执行目录)
2. 增加agent.yml内容是否已经修改判断
3. 增加center和agent所需文件判断
4. 增加前端api地址是否修改判断
5. 增加操作系统判断
6. 修复多次重新部署的时候,环境变量会写入多次
7. 优化脚本日志输出,屏蔽非脚本错误输出,优化所有脚本
8. Python升级到3.9.0
9. 部署脚本运行结束时,增加信息和错误提示
10. 移除agentDependency,nmap更新到7.90

### 正式版 V2.0 - 20200925

正式版发布,同时开源
Expand Down
1 change: 1 addition & 0 deletions deploy/GenPass.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
java -cp GenPass.jar com.eveino.GenPass
@echo off
pause
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions deploy/MagiCude/db/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.ignore
2 changes: 1 addition & 1 deletion deploy/MagiCude/dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>魔方-MagiCude</title><link href=/static/css/chunk-elementUI.68c70ad5.css rel=stylesheet><link href=/static/css/chunk-libs.ee57d822.css rel=stylesheet><link href=/static/css/app.03c741a6.css rel=stylesheet></head><body><noscript><strong>We're sorry but 魔方-MagiCude doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(c){function e(e){for(var u,f,h=e[0],t=e[1],r=e[2],k=0,b=[];k<h.length;k++)f=h[k],Object.prototype.hasOwnProperty.call(d,f)&&d[f]&&b.push(d[f][0]),d[f]=0;for(u in t)Object.prototype.hasOwnProperty.call(t,u)&&(c[u]=t[u]);o&&o(e);while(b.length)b.shift()();return a.push.apply(a,r||[]),n()}function n(){for(var c,e=0;e<a.length;e++){for(var n=a[e],u=!0,f=1;f<n.length;f++){var h=n[f];0!==d[h]&&(u=!1)}u&&(a.splice(e--,1),c=t(t.s=n[0]))}return c}var u={},f={runtime:0},d={runtime:0},a=[];function h(c){return t.p+"static/js/"+({}[c]||c)+"."+{"chunk-04a53b9c":"0199b051","chunk-051ee970":"b3676c2f","chunk-0743f666":"7c7dd864","chunk-085da9d9":"ddb6289f","chunk-0b3900d1":"396cf6a1","chunk-0c147953":"e61fb172","chunk-17108e1b":"258e6544","chunk-2824ff8e":"75b3c8fe","chunk-6563a41c":"855a2964","chunk-6c968c8c":"af36fbba","chunk-0f567348":"82c3f664","chunk-135b92be":"3c658b00","chunk-18be2291":"06bd3dc4","chunk-1c0778a3":"d90656b5","chunk-287cda81":"9dcac459","chunk-2d22676b":"9aa0c560","chunk-2f6f00b6":"fe27d054","chunk-305b8ac2":"6502df54","chunk-367cb1c8":"1c98df24","chunk-38969063":"83f50284","chunk-40bc77e4":"6de01222","chunk-444ad2a0":"d95b94c1","chunk-455bdd50":"8f9f4aae","chunk-4e589dbf":"1b3001e6","chunk-52aa8469":"cc459b44","chunk-569e313f":"a240b8b4","chunk-5d68df8b":"d3e1cba3","chunk-6166da60":"298daf19","chunk-64b30f9d":"1da1a167","chunk-027d9023":"bb090dd6","chunk-0c2da520":"815b8b11","chunk-1cf15413":"2b203d97","chunk-22d4a2d3":"9e3dc1bb","chunk-64744614":"4fab3b90","chunk-64b92768":"b1ab386c","chunk-95ae55b6":"947aba68","chunk-ec05ab82":"ad6d49cc","chunk-f63fbd8a":"0f7d92c0","chunk-668ca980":"82edaf1c","chunk-67130b18":"686079a8","chunk-6899ff79":"0bcb413e","chunk-6b170cf8":"65ec81cd","chunk-748ae12c":"d3da1f03","chunk-7522baad":"6c5d9821","chunk-791f0458":"69f22435","chunk-79a1eced":"5fc9460b","chunk-87590162":"0d29739d","chunk-305fa922":"923aecf7","chunk-fb05caa4":"bfb4a3e7","chunk-8ccb92d4":"853ef675","chunk-8dfcdace":"a9ffd5d4","chunk-c0baf5ba":"88e4fb45","chunk-c6c1cf3e":"189ea7cd","chunk-e9309dee":"c331924f","chunk-f5778866":"a67d54f5","chunk-f261f684":"b2b79ac1","chunk-ffc23878":"146dbd22","chunk-3c2d6792":"4269755a","chunk-4411ea1b":"df398f88","chunk-ee77943a":"ad962326","chunk-19d17be9":"0edd777b","chunk-035d1156":"0d768776"}[c]+".js"}function t(e){if(u[e])return u[e].exports;var n=u[e]={i:e,l:!1,exports:{}};return c[e].call(n.exports,n,n.exports,t),n.l=!0,n.exports}t.e=function(c){var e=[],n={"chunk-367cb1c8":1,"chunk-5d68df8b":1,"chunk-ec05ab82":1,"chunk-67130b18":1,"chunk-6899ff79":1,"chunk-87590162":1,"chunk-305fa922":1,"chunk-fb05caa4":1,"chunk-f261f684":1};f[c]?e.push(f[c]):0!==f[c]&&n[c]&&e.push(f[c]=new Promise((function(e,n){for(var u="static/css/"+({}[c]||c)+"."+{"chunk-04a53b9c":"31d6cfe0","chunk-051ee970":"31d6cfe0","chunk-0743f666":"31d6cfe0","chunk-085da9d9":"31d6cfe0","chunk-0b3900d1":"31d6cfe0","chunk-0c147953":"31d6cfe0","chunk-17108e1b":"31d6cfe0","chunk-2824ff8e":"31d6cfe0","chunk-6563a41c":"31d6cfe0","chunk-6c968c8c":"31d6cfe0","chunk-0f567348":"31d6cfe0","chunk-135b92be":"31d6cfe0","chunk-18be2291":"31d6cfe0","chunk-1c0778a3":"31d6cfe0","chunk-287cda81":"31d6cfe0","chunk-2d22676b":"31d6cfe0","chunk-2f6f00b6":"31d6cfe0","chunk-305b8ac2":"31d6cfe0","chunk-367cb1c8":"a219e5b4","chunk-38969063":"31d6cfe0","chunk-40bc77e4":"31d6cfe0","chunk-444ad2a0":"31d6cfe0","chunk-455bdd50":"31d6cfe0","chunk-4e589dbf":"31d6cfe0","chunk-52aa8469":"31d6cfe0","chunk-569e313f":"31d6cfe0","chunk-5d68df8b":"7114ac7a","chunk-6166da60":"31d6cfe0","chunk-64b30f9d":"31d6cfe0","chunk-027d9023":"31d6cfe0","chunk-0c2da520":"31d6cfe0","chunk-1cf15413":"31d6cfe0","chunk-22d4a2d3":"31d6cfe0","chunk-64744614":"31d6cfe0","chunk-64b92768":"31d6cfe0","chunk-95ae55b6":"31d6cfe0","chunk-ec05ab82":"7114ac7a","chunk-f63fbd8a":"31d6cfe0","chunk-668ca980":"31d6cfe0","chunk-67130b18":"46e39697","chunk-6899ff79":"a6223c38","chunk-6b170cf8":"31d6cfe0","chunk-748ae12c":"31d6cfe0","chunk-7522baad":"31d6cfe0","chunk-791f0458":"31d6cfe0","chunk-79a1eced":"31d6cfe0","chunk-87590162":"b11eb12c","chunk-305fa922":"34d47b8e","chunk-fb05caa4":"34d47b8e","chunk-8ccb92d4":"31d6cfe0","chunk-8dfcdace":"31d6cfe0","chunk-c0baf5ba":"31d6cfe0","chunk-c6c1cf3e":"31d6cfe0","chunk-e9309dee":"31d6cfe0","chunk-f5778866":"31d6cfe0","chunk-f261f684":"f1f1adb3","chunk-ffc23878":"31d6cfe0","chunk-3c2d6792":"31d6cfe0","chunk-4411ea1b":"31d6cfe0","chunk-ee77943a":"31d6cfe0","chunk-19d17be9":"31d6cfe0","chunk-035d1156":"31d6cfe0"}[c]+".css",d=t.p+u,a=document.getElementsByTagName("link"),h=0;h<a.length;h++){var r=a[h],k=r.getAttribute("data-href")||r.getAttribute("href");if("stylesheet"===r.rel&&(k===u||k===d))return e()}var b=document.getElementsByTagName("style");for(h=0;h<b.length;h++){r=b[h],k=r.getAttribute("data-href");if(k===u||k===d)return e()}var o=document.createElement("link");o.rel="stylesheet",o.type="text/css",o.onload=e,o.onerror=function(e){var u=e&&e.target&&e.target.src||d,a=new Error("Loading CSS chunk "+c+" failed.\n("+u+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=u,delete f[c],o.parentNode.removeChild(o),n(a)},o.href=d;var i=document.getElementsByTagName("head")[0];i.appendChild(o)})).then((function(){f[c]=0})));var u=d[c];if(0!==u)if(u)e.push(u[2]);else{var a=new Promise((function(e,n){u=d[c]=[e,n]}));e.push(u[2]=a);var r,k=document.createElement("script");k.charset="utf-8",k.timeout=120,t.nc&&k.setAttribute("nonce",t.nc),k.src=h(c);var b=new Error;r=function(e){k.onerror=k.onload=null,clearTimeout(o);var n=d[c];if(0!==n){if(n){var u=e&&("load"===e.type?"missing":e.type),f=e&&e.target&&e.target.src;b.message="Loading chunk "+c+" failed.\n("+u+": "+f+")",b.name="ChunkLoadError",b.type=u,b.request=f,n[1](b)}d[c]=void 0}};var o=setTimeout((function(){r({type:"timeout",target:k})}),12e4);k.onerror=k.onload=r,document.head.appendChild(k)}return Promise.all(e)},t.m=c,t.c=u,t.d=function(c,e,n){t.o(c,e)||Object.defineProperty(c,e,{enumerable:!0,get:n})},t.r=function(c){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},t.t=function(c,e){if(1&e&&(c=t(c)),8&e)return c;if(4&e&&"object"===typeof c&&c&&c.__esModule)return c;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:c}),2&e&&"string"!=typeof c)for(var u in c)t.d(n,u,function(e){return c[e]}.bind(null,u));return n},t.n=function(c){var e=c&&c.__esModule?function(){return c["default"]}:function(){return c};return t.d(e,"a",e),e},t.o=function(c,e){return Object.prototype.hasOwnProperty.call(c,e)},t.p="/",t.oe=function(c){throw console.error(c),c};var r=window["webpackJsonp"]=window["webpackJsonp"]||[],k=r.push.bind(r);r.push=e,r=r.slice();for(var b=0;b<r.length;b++)e(r[b]);var o=k;n()})([]);</script><script src=/static/js/chunk-elementUI.a450811c.js></script><script src=/static/js/chunk-libs.01c2f7cb.js></script><script src=/static/js/app.ea5c35e2.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=/favicon.ico><title>魔方-MagiCude</title><link href=/static/css/chunk-elementUI.68c70ad5.css rel=stylesheet><link href=/static/css/chunk-libs.ee57d822.css rel=stylesheet><link href=/static/css/app.03c741a6.css rel=stylesheet></head><body><noscript><strong>We're sorry but 魔方-MagiCude doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function(c){function e(e){for(var u,f,h=e[0],t=e[1],r=e[2],k=0,b=[];k<h.length;k++)f=h[k],Object.prototype.hasOwnProperty.call(d,f)&&d[f]&&b.push(d[f][0]),d[f]=0;for(u in t)Object.prototype.hasOwnProperty.call(t,u)&&(c[u]=t[u]);o&&o(e);while(b.length)b.shift()();return a.push.apply(a,r||[]),n()}function n(){for(var c,e=0;e<a.length;e++){for(var n=a[e],u=!0,f=1;f<n.length;f++){var h=n[f];0!==d[h]&&(u=!1)}u&&(a.splice(e--,1),c=t(t.s=n[0]))}return c}var u={},f={runtime:0},d={runtime:0},a=[];function h(c){return t.p+"static/js/"+({}[c]||c)+"."+{"chunk-04a53b9c":"0199b051","chunk-051ee970":"b3676c2f","chunk-0743f666":"7c7dd864","chunk-085da9d9":"ddb6289f","chunk-0b3900d1":"396cf6a1","chunk-0c147953":"e61fb172","chunk-17108e1b":"258e6544","chunk-2824ff8e":"75b3c8fe","chunk-6563a41c":"855a2964","chunk-6c968c8c":"af36fbba","chunk-0f567348":"82c3f664","chunk-135b92be":"3c658b00","chunk-18be2291":"06bd3dc4","chunk-1c0778a3":"d90656b5","chunk-287cda81":"9dcac459","chunk-2d22676b":"9aa0c560","chunk-2f6f00b6":"fe27d054","chunk-305b8ac2":"6502df54","chunk-367cb1c8":"1c98df24","chunk-38969063":"83f50284","chunk-40bc77e4":"6de01222","chunk-444ad2a0":"d95b94c1","chunk-455bdd50":"8f9f4aae","chunk-4e589dbf":"1b3001e6","chunk-52aa8469":"cc459b44","chunk-569e313f":"a240b8b4","chunk-5d68df8b":"d3e1cba3","chunk-6166da60":"298daf19","chunk-64b30f9d":"1da1a167","chunk-027d9023":"bb090dd6","chunk-0c2da520":"815b8b11","chunk-1cf15413":"2b203d97","chunk-22d4a2d3":"9e3dc1bb","chunk-64744614":"4fab3b90","chunk-64b92768":"b1ab386c","chunk-95ae55b6":"947aba68","chunk-ec05ab82":"ad6d49cc","chunk-f63fbd8a":"0f7d92c0","chunk-668ca980":"82edaf1c","chunk-67130b18":"31033bc9","chunk-6899ff79":"0bcb413e","chunk-6b170cf8":"65ec81cd","chunk-748ae12c":"d3da1f03","chunk-7522baad":"6c5d9821","chunk-791f0458":"69f22435","chunk-79a1eced":"5fc9460b","chunk-87590162":"0d29739d","chunk-305fa922":"923aecf7","chunk-fb05caa4":"bfb4a3e7","chunk-8ccb92d4":"853ef675","chunk-8dfcdace":"a9ffd5d4","chunk-c0baf5ba":"88e4fb45","chunk-c6c1cf3e":"189ea7cd","chunk-e9309dee":"c331924f","chunk-f5778866":"a67d54f5","chunk-f261f684":"b2b79ac1","chunk-ffc23878":"146dbd22","chunk-3c2d6792":"4269755a","chunk-4411ea1b":"df398f88","chunk-ee77943a":"ad962326","chunk-19d17be9":"0edd777b","chunk-035d1156":"0d768776"}[c]+".js"}function t(e){if(u[e])return u[e].exports;var n=u[e]={i:e,l:!1,exports:{}};return c[e].call(n.exports,n,n.exports,t),n.l=!0,n.exports}t.e=function(c){var e=[],n={"chunk-367cb1c8":1,"chunk-5d68df8b":1,"chunk-ec05ab82":1,"chunk-67130b18":1,"chunk-6899ff79":1,"chunk-87590162":1,"chunk-305fa922":1,"chunk-fb05caa4":1,"chunk-f261f684":1};f[c]?e.push(f[c]):0!==f[c]&&n[c]&&e.push(f[c]=new Promise((function(e,n){for(var u="static/css/"+({}[c]||c)+"."+{"chunk-04a53b9c":"31d6cfe0","chunk-051ee970":"31d6cfe0","chunk-0743f666":"31d6cfe0","chunk-085da9d9":"31d6cfe0","chunk-0b3900d1":"31d6cfe0","chunk-0c147953":"31d6cfe0","chunk-17108e1b":"31d6cfe0","chunk-2824ff8e":"31d6cfe0","chunk-6563a41c":"31d6cfe0","chunk-6c968c8c":"31d6cfe0","chunk-0f567348":"31d6cfe0","chunk-135b92be":"31d6cfe0","chunk-18be2291":"31d6cfe0","chunk-1c0778a3":"31d6cfe0","chunk-287cda81":"31d6cfe0","chunk-2d22676b":"31d6cfe0","chunk-2f6f00b6":"31d6cfe0","chunk-305b8ac2":"31d6cfe0","chunk-367cb1c8":"a219e5b4","chunk-38969063":"31d6cfe0","chunk-40bc77e4":"31d6cfe0","chunk-444ad2a0":"31d6cfe0","chunk-455bdd50":"31d6cfe0","chunk-4e589dbf":"31d6cfe0","chunk-52aa8469":"31d6cfe0","chunk-569e313f":"31d6cfe0","chunk-5d68df8b":"7114ac7a","chunk-6166da60":"31d6cfe0","chunk-64b30f9d":"31d6cfe0","chunk-027d9023":"31d6cfe0","chunk-0c2da520":"31d6cfe0","chunk-1cf15413":"31d6cfe0","chunk-22d4a2d3":"31d6cfe0","chunk-64744614":"31d6cfe0","chunk-64b92768":"31d6cfe0","chunk-95ae55b6":"31d6cfe0","chunk-ec05ab82":"7114ac7a","chunk-f63fbd8a":"31d6cfe0","chunk-668ca980":"31d6cfe0","chunk-67130b18":"46e39697","chunk-6899ff79":"a6223c38","chunk-6b170cf8":"31d6cfe0","chunk-748ae12c":"31d6cfe0","chunk-7522baad":"31d6cfe0","chunk-791f0458":"31d6cfe0","chunk-79a1eced":"31d6cfe0","chunk-87590162":"b11eb12c","chunk-305fa922":"34d47b8e","chunk-fb05caa4":"34d47b8e","chunk-8ccb92d4":"31d6cfe0","chunk-8dfcdace":"31d6cfe0","chunk-c0baf5ba":"31d6cfe0","chunk-c6c1cf3e":"31d6cfe0","chunk-e9309dee":"31d6cfe0","chunk-f5778866":"31d6cfe0","chunk-f261f684":"f1f1adb3","chunk-ffc23878":"31d6cfe0","chunk-3c2d6792":"31d6cfe0","chunk-4411ea1b":"31d6cfe0","chunk-ee77943a":"31d6cfe0","chunk-19d17be9":"31d6cfe0","chunk-035d1156":"31d6cfe0"}[c]+".css",d=t.p+u,a=document.getElementsByTagName("link"),h=0;h<a.length;h++){var r=a[h],k=r.getAttribute("data-href")||r.getAttribute("href");if("stylesheet"===r.rel&&(k===u||k===d))return e()}var b=document.getElementsByTagName("style");for(h=0;h<b.length;h++){r=b[h],k=r.getAttribute("data-href");if(k===u||k===d)return e()}var o=document.createElement("link");o.rel="stylesheet",o.type="text/css",o.onload=e,o.onerror=function(e){var u=e&&e.target&&e.target.src||d,a=new Error("Loading CSS chunk "+c+" failed.\n("+u+")");a.code="CSS_CHUNK_LOAD_FAILED",a.request=u,delete f[c],o.parentNode.removeChild(o),n(a)},o.href=d;var i=document.getElementsByTagName("head")[0];i.appendChild(o)})).then((function(){f[c]=0})));var u=d[c];if(0!==u)if(u)e.push(u[2]);else{var a=new Promise((function(e,n){u=d[c]=[e,n]}));e.push(u[2]=a);var r,k=document.createElement("script");k.charset="utf-8",k.timeout=120,t.nc&&k.setAttribute("nonce",t.nc),k.src=h(c);var b=new Error;r=function(e){k.onerror=k.onload=null,clearTimeout(o);var n=d[c];if(0!==n){if(n){var u=e&&("load"===e.type?"missing":e.type),f=e&&e.target&&e.target.src;b.message="Loading chunk "+c+" failed.\n("+u+": "+f+")",b.name="ChunkLoadError",b.type=u,b.request=f,n[1](b)}d[c]=void 0}};var o=setTimeout((function(){r({type:"timeout",target:k})}),12e4);k.onerror=k.onload=r,document.head.appendChild(k)}return Promise.all(e)},t.m=c,t.c=u,t.d=function(c,e,n){t.o(c,e)||Object.defineProperty(c,e,{enumerable:!0,get:n})},t.r=function(c){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(c,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(c,"__esModule",{value:!0})},t.t=function(c,e){if(1&e&&(c=t(c)),8&e)return c;if(4&e&&"object"===typeof c&&c&&c.__esModule)return c;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:c}),2&e&&"string"!=typeof c)for(var u in c)t.d(n,u,function(e){return c[e]}.bind(null,u));return n},t.n=function(c){var e=c&&c.__esModule?function(){return c["default"]}:function(){return c};return t.d(e,"a",e),e},t.o=function(c,e){return Object.prototype.hasOwnProperty.call(c,e)},t.p="/",t.oe=function(c){throw console.error(c),c};var r=window["webpackJsonp"]=window["webpackJsonp"]||[],k=r.push.bind(r);r.push=e,r=r.slice();for(var b=0;b<r.length;b++)e(r[b]);var o=k;n()})([]);</script><script src=/static/js/chunk-elementUI.a450811c.js></script><script src=/static/js/chunk-libs.01c2f7cb.js></script><script src=/static/js/app.ea5c35e2.js></script></body></html>
Loading

0 comments on commit 34b0b3a

Please sign in to comment.