From 5575dfb689e8e161e5cb8a70c3aa24eb56305f5b Mon Sep 17 00:00:00 2001 From: SanJin Date: Sun, 25 Aug 2019 20:06:38 +0800 Subject: [PATCH] =?UTF-8?q?HFish=200.3=20=E5=AE=8C=E6=AF=95=EF=BC=8C?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=B5=8B=E8=AF=95=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/footer.html | 6 + admin/mail.html | 18 +-- admin/setting.html | 8 +- core/report/report.go | 174 ++++++++++++++------- db/hfish.db | Bin 121856 -> 121856 bytes logs/hfish.log | 353 ++++++++++++++++++++++++++++++------------ main.go | 1 - view/mail/view.go | 8 +- 8 files changed, 394 insertions(+), 174 deletions(-) diff --git a/admin/footer.html b/admin/footer.html index 3d28fb7..5f8ffb5 100644 --- a/admin/footer.html +++ b/admin/footer.html @@ -25,6 +25,12 @@
+
+
+ 2019-08-27 +

发布 v0.3 版本

+
+
2019-08-12 diff --git a/admin/mail.html b/admin/mail.html index 6ef9702..778c879 100644 --- a/admin/mail.html +++ b/admin/mail.html @@ -70,13 +70,13 @@
-
- -
- -
-
+ {{/*
*/}} + {{/**/}} + {{/*
*/}} + {{/**/}} + {{/*
*/}} + {{/*
*/}}
@@ -112,7 +112,7 @@ var sendMailToUsers = function () { var title = $("#title").val(); - var from = $("#from").val(); + // var from = $("#from").val(); var emails = $("#emails").val(); var content = editorx.txt.html(); @@ -123,7 +123,7 @@ dataType: "json", data: { "title": title, - "from": from, + // "from": from, "emails": emails, "content": content }, diff --git a/admin/setting.html b/admin/setting.html index e41f12b..af48efc 100644 --- a/admin/setting.html +++ b/admin/setting.html @@ -169,11 +169,11 @@
- +
- + @@ -197,8 +197,8 @@
- - + +
diff --git a/core/report/report.go b/core/report/report.go index 4042a5e..846ced4 100644 --- a/core/report/report.go +++ b/core/report/report.go @@ -28,6 +28,7 @@ type HFishInfo struct { time string } +// 通知模块 func alert(id string, model string, typex string, projectName string, agent string, ipx string, country string, region string, city string, infox string, time string) { // 判断邮件通知 try.Try(func() { @@ -147,114 +148,175 @@ func ReportAgentStatus(agentName string, agentIp string, webStatus string, deepS } } +// 判断是否为白名单IP +func isWhiteIp(ip string) bool { + sql := `select status,info from hfish_setting where type = "whiteIp"` + isStatus := dbUtil.Query(sql) + + status := strconv.FormatInt(isStatus[0]["status"].(int64), 10) + + // 判断是否启用通知 + if status == "1" { + info := isStatus[0]["info"] + ipArr := strings.Split(info.(string), "&&") + + for _, val := range ipArr { + if (ip == val) { + return true + } + } + } + + return false +} + // 上报 WEB func ReportWeb(projectName string, agent string, ipx string, info string) { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "WEB", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "WEB", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + // IP 不在白名单，进行上报 + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "WEB", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "WEB", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 暗网 WEB func ReportDeepWeb(projectName string, agent string, ipx string, info string) { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "DEEP", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "DEEP", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + // IP 不在白名单，进行上报 + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "DEEP", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "DEEP", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 蜜罐插件 func ReportPlugWeb(projectName string, agent string, ipx string, info string) { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "PLUG", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "PLUG", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + // IP 不在白名单，进行上报 + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "PLUG", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "PLUG", projectName, agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 SSH func ReportSSH(ipx string, agent string, info string) int64 { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "SSH", "SSH蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "SSH", "SSH蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - return id + // IP 不在白名单，进行上报 + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "SSH", "SSH蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "SSH", "SSH蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + return id + } + return 0 } // 更新 SSH 操作 func ReportUpdateSSH(id string, info string) { - sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` - dbUtil.Update(sql, info, id) - go alert(id, "update", "SSH", "SSH蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + if (id != "0") { + sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` + dbUtil.Update(sql, info, id) + go alert(id, "update", "SSH", "SSH蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 Redis func ReportRedis(ipx string, agent string, info string) int64 { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "REDIS", "Redis蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "REDIS", "Redis蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - return id + // IP 不在白名单，进行上报 + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "REDIS", "Redis蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "REDIS", "Redis蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + return id + } + return 0 } // 更新 Redis 操作 func ReportUpdateRedis(id string, info string) { - sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` - dbUtil.Update(sql, info, id) - go alert(id, "update", "REDIS", "Redis蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + if (id != "0") { + sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` + dbUtil.Update(sql, info, id) + go alert(id, "update", "REDIS", "Redis蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 Mysql func ReportMysql(ipx string, agent string, info string) int64 { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "MYSQL", "Mysql蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "MYSQL", "Mysql蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - return id + // IP 不在白名单，进行上报 + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "MYSQL", "Mysql蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "MYSQL", "Mysql蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + return id + } + return 0 } // 更新 Mysql 操作 func ReportUpdateMysql(id string, info string) { - sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` - dbUtil.Update(sql, info, id) - go alert(id, "update", "MYSQL", "Mysql蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + if (id != "0") { + sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` + dbUtil.Update(sql, info, id) + go alert(id, "update", "MYSQL", "Mysql蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 FTP func ReportFTP(ipx string, agent string, info string) { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "FTP", "FTP蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "FTP", "FTP蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "FTP", "FTP蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "FTP", "FTP蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 Telnet func ReportTelnet(ipx string, agent string, info string) int64 { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "TELNET", "Telnet蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "TELNET", "Telnet蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - return id + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "TELNET", "Telnet蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "TELNET", "Telnet蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + return id + } + return 0 } // 更新 Telnet 操作 func ReportUpdateTelnet(id string, info string) { - sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` - dbUtil.Update(sql, info, id) - go alert(id, "update", "TELNET", "Telnet蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + if (id != "0") { + sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` + dbUtil.Update(sql, info, id) + go alert(id, "update", "TELNET", "Telnet蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + } } // 上报 MemCache func ReportMemCche(ipx string, agent string, info string) int64 { - country, region, city := ip.GetIp(ipx) - sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` - id := dbUtil.Insert(sql, "MEMCACHE", "MemCache蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - go alert(strconv.FormatInt(id, 10), "new", "MEMCACHE", "MemCache蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) - return id + if (isWhiteIp(ipx) == false) { + country, region, city := ip.GetIp(ipx) + sql := `INSERT INTO hfish_info(type,project_name,agent,ip,country,region,city,info,create_time) values(?,?,?,?,?,?,?,?,?);` + id := dbUtil.Insert(sql, "MEMCACHE", "MemCache蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + go alert(strconv.FormatInt(id, 10), "new", "MEMCACHE", "MemCache蜜罐", agent, ipx, country, region, city, info, time.Now().Format("2006-01-02 15:04:05")) + return id + } + return 0 } // 更新 MemCache 操作 func ReportUpdateMemCche(id string, info string) { - sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` - dbUtil.Update(sql, info, id) - go alert(id, "update", "MEMCACHE", "MemCache蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + if (id != "0") { + sql := `UPDATE hfish_info SET info = info||? WHERE id = ?;` + dbUtil.Update(sql, info, id) + go alert(id, "update", "MEMCACHE", "MemCache蜜罐", "", "", "", "", "", info, time.Now().Format("2006-01-02 15:04:05")) + } } diff --git a/db/hfish.db b/db/hfish.db index ba8526c53cb92c19bd6d71faefcae8e3819151fc..909744e18916a8db3a48ceacb5e8aa732ad7e760 100644 GIT binary patch delta 154 zcmZqJ!QQZgeS$ROm5DOWj8`@$tl;Nhy1^96?92FRvm(bK#>tliZ?iCOWze3yQAj$p zo{^J5v{IKt-J2t~7{pG5uoE+LigQZ}^bF06^^)^*)znPPOx4ti6Z5h%^HLIvGg9*$ u;8GPv28Ncp1{S(TrV2&|RtCnCuL$c*_7%=xVPIhJZr&-peWx&^`w0L{k1dn{ delta 121 zcmZqJ!QQZgeS$ROxrs8)jOR8ctl;Nh-pUlp?92FRvm(bK#>tliZ?iBkFf5q7QAnCo z*T_V{(9+7(V6vK!zH%fpCxbM