Merge branch 'dev'

seccome · Jul 9, 2021 · 7302bfa · 7302bfa
2 parents 47b9e34 + 0a8954c
commit 7302bfa
Show file tree

Hide file tree

Showing 1,278 changed files with 111,969 additions and 14,364 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,4 @@
 site/*
 /.idea/*
 /logs/*
-
+.DS_Store
diff --git a/agent/decept-agent.tar.gz b/agent/decept-agent.tar.gz
diff --git a/conf/app.conf b/conf/app.conf
@@ -6,7 +6,7 @@ copyrequestbody = true
 ; mysql
 dbhost="127.0.0.1"
 dbport="3306"
-dbuser="sec_security"
+dbuser="root"
 dbpassword="Security#123456#"
 dbname="sec_ehoneypot"
 

diff --git a/data/IP2LOCATION-LITE-DB.BIN b/data/IP2LOCATION-LITE-DB.BIN
diff --git a/doc/Others/FAQ.md b/doc/Others/FAQ.md
@@ -38,3 +38,11 @@
 1. 查看协议代理日志/home/relay/agent/proxy/log/proxy.log
 2. 检查转发端口是否被占用/ssh_proxy文件是否正确
 
+- 配置修改
+
+1. redis、mysql修改请在部署服务前、修改源代码conf目录下的app.conf分别修改mysql或redis条目
+
+2. 同时、当前版本暂时不支持对后端web服务占用端口的修改、后续版本会支持
+
+
+
diff --git a/front/decept-defense.tar.gz b/front/decept-defense.tar.gz
diff --git a/go.mod b/go.mod
@@ -6,11 +6,15 @@ require github.com/astaxie/beego v1.12.1
 
 require (
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.885
+	github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc // indirect
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/garyburd/redigo v1.6.2
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/websocket v1.4.2
 	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/ip2location/ip2location-go/v9 v9.1.0
 	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jinzhu/gorm v1.9.16
 	github.com/jonboulle/clockwork v0.2.2 // indirect
@@ -25,17 +29,10 @@ require (
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/tebeka/strftime v0.1.5 // indirect
 	github.com/tidwall/gjson v1.6.7
-	github.com/xuanbo/eureka-client v0.0.3
 	github.com/xuanbo/requests v0.0.2
 	github.com/yudai/pp v2.0.1+incompatible // indirect
-	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect
-	golang.org/x/sys v0.0.0-20210112080510-489259a85091 // indirect
-	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	k8s.io/api v0.0.0-20210115125903-c873f2e8ab25
-	k8s.io/apimachinery v0.20.2
-	k8s.io/client-go v0.0.0-00010101000000-000000000000
-
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
+	k8s.io/client-go v0.21.1
 )
-
-replace k8s.io/client-go => /Users/jun/go/src/git.timevale.cn/yinxue/client-go
diff --git a/go.sum b/go.sum
diff --git a/main.go b/main.go
@@ -91,24 +91,24 @@ func makeRouter() *mux.Router {
 	api.HandleFunc("/applicationsignpolicydelete", DeleteApplicationSignPolicyHandler)
 	api.HandleFunc("/downloadapplicationsign", DownloadApplicationSignPolicyHandler)
 
-
 	/*策略管理*/
 	/*诱饵策略管理*/
 	api.HandleFunc("/baitPolicyDelete", DeleteBaitPolicyHandler)
 	api.HandleFunc("/baitPolicySelectAgentId", SelectBaitPolicyHandler)
 	api.HandleFunc("/getAllBaitType", SelectAllBaitTypeHandler)
 	api.HandleFunc("/getallhoneybaittype", SelectAllHoneyBaitTypeHandler)
 
-
 	/*透明转发策略管理*/
 	api.HandleFunc("/transPolicyAdd", CreateTransPolicyHandler)
 	api.HandleFunc("/transPolicyDelete", DeleteTransPolicyHandler)
+	api.HandleFunc("/transPolicyRemove", RemoveTransPolicyHandler)
 	api.HandleFunc("/transPolicySelectAgentId", SelectTransPolicyHandler)
 	api.HandleFunc("/transpolicytest", TestTransPolicyHandler)
 
 	/*协议转发策略管理*/
 	api.HandleFunc("/honeytranspolicyadd", CreateHoneyTransPolicyHandler)
 	api.HandleFunc("/honeytranspolicydelete", DeleteHoneyTransPolicyHandler)
+	api.HandleFunc("/honeytransPolicyRemove", RemoveHoneyTransPolicyHandler)
 	api.HandleFunc("/honeytranspolicyselectagentid", SelectHoneyTransPolicyHandler)
 	api.HandleFunc("/honeytranspolicytest", TestHoneyTransPolicyHandler)