From 2b1cd74b5c9e9dee6b4d18dcec692fa0150c0de5 Mon Sep 17 00:00:00 2001 From: liuhan Date: Wed, 2 Dec 2020 22:45:58 +0800 Subject: [PATCH] =?UTF-8?q?[UPD]=E6=9B=B4=E6=96=B0=E5=88=B0V0.6.4=E7=89=88?= =?UTF-8?q?=E6=9C=AC=201.=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=A8=81?= =?UTF-8?q?=E8=83=81=E6=83=85=E6=8A=A5=E6=95=B0=E6=8D=AE=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?2.=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=95=B4=E4=BD=93=E8=B0=83=E6=95=B4=E3=80=82=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=8E=B7=E5=8F=96=E5=A8=81=E8=83=81=E6=83=85?= =?UTF-8?q?=E6=8A=A5API=20key=E4=BB=A5=E5=8F=8Asyslog=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/colony.html | 16 +- admin/dashboard.html | 23 +- admin/fish.html | 931 ++++++-- admin/footer.html | 13 +- admin/header.html | 9 +- admin/login.html | 4 +- admin/mail.html | 15 +- admin/setting.html | 2063 ++++++++++++++---- core/alert/alert.go | 74 +- core/dbUtil/dbUtil.go | 2 +- core/exec/exec.go | 2 +- core/protocol/custom/custom.go | 14 +- core/protocol/elasticsearch/elasticsearch.go | 14 +- core/report/intelligence.go | 119 + core/report/report.go | 31 +- db/sql/hfish_db.sql | 4 +- docker-compose.yml | 24 + dockerfile/Dockerfile | 13 +- error/error.go | 37 +- go.mod | 1 + go.sum | 30 +- logs/hfish.log | 275 +-- main.go | 7 +- static/css/bootstrap-flex.css | 8 +- static/css/jquery.datetimepicker.css | 568 +++++ static/data/js/data.js | 4 +- static/images/copy1.svg | 19 + static/images/copy12.svg | 12 + static/images/copy6.svg | 18 + static/images/copy7.svg | 18 + static/js/jquery.datetimepicker.full.min.js | 1 + static/js/jquery.min.map | 1 + utils/geo/geo.go | 15 + utils/send/gomail.go | 38 +- utils/send/gosyslog.go | 34 + utils/setting/setting.go | 14 +- view/api/view.go | 81 +- view/colony/view.go | 13 +- view/dashboard/view.go | 18 +- view/data/view.go | 56 +- view/fish/view.go | 273 ++- view/login/view.go | 15 +- view/mail/view.go | 16 +- view/setting/alert/view.go | 222 ++ view/setting/intelligence/view.go | 190 ++ view/setting/massset/view.go | 86 + view/setting/secret/view.go | 121 + view/url.go | 47 +- 48 files changed, 4460 insertions(+), 1149 deletions(-) create mode 100644 core/report/intelligence.go create mode 100644 docker-compose.yml create mode 100644 static/css/jquery.datetimepicker.css create mode 100644 static/images/copy1.svg create mode 100644 static/images/copy12.svg create mode 100644 static/images/copy6.svg create mode 100644 static/images/copy7.svg create mode 100644 static/js/jquery.datetimepicker.full.min.js create mode 100644 static/js/jquery.min.map create mode 100644 utils/geo/geo.go create mode 100644 utils/send/gosyslog.go create mode 100644 view/setting/alert/view.go create mode 100644 view/setting/intelligence/view.go create mode 100644 view/setting/massset/view.go create mode 100644 view/setting/secret/view.go diff --git a/admin/colony.html b/admin/colony.html index 014a0b3..4954868 100644 --- a/admin/colony.html +++ b/admin/colony.html @@ -50,11 +50,21 @@ color: #dc0e0e; margin-right: 5px; } + .title { + font-family: MicrosoftYaHeiUI-Bold; + font-size: 14px; + color: #2B3D51; + line-height: 16px; + border-left: 3px solid #2B3D51; + padding-left: 3px; + margin: 15px 0; + margin-left:20px; + }
-
-

分布式集群

-
+
+

分布式集群

+
diff --git a/admin/dashboard.html b/admin/dashboard.html index 1cdbec1..bf96754 100644 --- a/admin/dashboard.html +++ b/admin/dashboard.html @@ -11,7 +11,16 @@ color: #ff0101; margin-right: 5px; } - + .title_1 { + font-family: MicrosoftYaHeiUI-Bold; + font-size: 14px; + color: #2B3D51; + line-height: 16px; + border-left: 3px solid #2B3D51; + padding-left: 3px; + margin: 15px 0; + margin-left:10px; + } .openx { background: #3dd209; width: 10px; @@ -107,8 +116,11 @@ 切换大屏
-

仪表盘

+
+

仪表盘

+
+
@@ -214,6 +226,7 @@
+

最近24小时

@@ -388,6 +401,7 @@ \ No newline at end of file + diff --git a/admin/fish.html b/admin/fish.html index e96646a..d9be3d6 100644 --- a/admin/fish.html +++ b/admin/fish.html @@ -1,6 +1,21 @@ {{template "header"}} -
-
- {{/*
*/}} - {{/*导出 */}} - {{/**/}} - {{/*
*/}} -

上钩列表

+
+

上钩列表

+
+
+
- -
-
- -
-
- +
+
+
+
+ +
-
+
+
-
+
+
-
-
- - +
+ +
+ + +
字节
+
-
+
+ + +
+
+
-
+
- + - + - - - - - + + + + @@ -216,11 +480,16 @@
项目蜜罐服务 集群名称来源 IP地理信息信息长度上钩时间攻击IP威胁情报详情攻击时间
+ + -
+
-
+
+ {{template "footer" }} + \ No newline at end of file diff --git a/admin/footer.html b/admin/footer.html index de13205..a4eb871 100644 --- a/admin/footer.html +++ b/admin/footer.html @@ -1,17 +1,15 @@ {{define "footer"}} -
+
@@ -79,7 +77,7 @@

发布 v0.3.1 版本

-
+
2019-08-27

发布 v0.3 版本

@@ -119,7 +117,8 @@ - + + diff --git a/admin/header.html b/admin/header.html index 045a71a..8d41e3c 100644 --- a/admin/header.html +++ b/admin/header.html @@ -10,6 +10,8 @@ + + @@ -47,9 +49,9 @@
  • - +
  • -
    +
    diff --git a/admin/login.html b/admin/login.html index 9acad81..c4841e0 100644 --- a/admin/login.html +++ b/admin/login.html @@ -56,9 +56,7 @@
    - Copyright 2019 © HFish - HackLC + Copyright 2019 © HFish
    diff --git a/admin/mail.html b/admin/mail.html index 778c879..e2d7328 100644 --- a/admin/mail.html +++ b/admin/mail.html @@ -1,6 +1,16 @@ {{template "header"}} -
    - -
    -
    -
    - -
    -

    系统设置

    -
    + .email_span { + margin-top: 5px; + margin-bottom: 5px; + margin-right: 10px; + } + .email_inco { + margin-top: 7px; + margin-left: 10px; + margin-right: 5px; + margin-bottom: 5px; -
    -
    - - - - - - - - - - - - - {{range $i, $e := .dataList}} - - - - - - - - - {{end}} - -
    名称介绍更新时间配置状态状态操作
    {{$e.setting_name}} {{$e.setting_dis}} - - {{if ne $e.info ""}} - 已配置 - {{else}} - 未配置 - {{end}} - - - -
    -
    -
    + } + #webhook_info { + width: 480px; + height: 26px; + margin-left: 15px; + margin-top: 10px; + } + .span_touch { + color: #1D88FF; + } + .span_touch:hover { + border-bottom: 1px solid #1772D6; + color: #1772D6; + cursor: pointer; + } + #webhook_div { + margin-top: 10px; + background: #FAFAFB; + border: 1px solid #E0E0E2; + border-radius: 2px; + margin-right: 20px; + } -
    -
    + #massset_div { + background: #FAFAFB; + border: 1px solid #E0E0E2; + border-radius: 2px; + margin-right: 20px; + } + .massset_div_content { + display: flex; + margin-left: 15px; + margin-top: 10px; + } + #intelligence_div1,#intelligence_div2 { + margin-left: 20px; + background: #FAFAFB; + border: 1px solid #E0E0E2; + border-radius: 2px; + height: 230px; + margin-right: 20px; + } + #intelligence_apikey { + width: 300px; + height: 26px; + background: #FFFFFF; + border: 1px solid #E0E0E2; + border-radius: 2px; + margin-left: 15px; + margin-top: 10px; + margin-bottom: 15px; + } + .intelligence_test_div { + width: 300px; + margin-left: 15px; + display: flex; + margin-top: 10px; + margin-bottom: 10px; + position: relative; - -