From 6dcdc9766a368c2802f31a835a2a8a6e1d9c4e33 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Fri, 13 Aug 2021 17:09:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/base/app_ver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/base/app_ver.go b/server/base/app_ver.go index ddd4aa2..6051d04 100644 --- a/server/base/app_ver.go +++ b/server/base/app_ver.go @@ -2,6 +2,6 @@ package base const ( APP_NAME = "AnyLink" - // 添加访问日志审计 - APP_VER = "0.5.2" + // 添加macvtap支持 + APP_VER = "0.6.1" ) From d9a3b0152b2fe22d37c103914bd13ff2b33413c4 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Tue, 17 Aug 2021 13:14:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E8=AE=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/admin/api_set_audit.go | 33 ++++++++ server/admin/server.go | 1 + server/base/config.go | 2 +- server/handler/payload.go | 4 + web/src/layout/LayoutAside.vue | 1 + web/src/pages/set/Audit.vue | 146 +++++++++++++++++++++++++++++++++ web/src/plugins/router.js | 1 + 7 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 server/admin/api_set_audit.go create mode 100644 web/src/pages/set/Audit.vue diff --git a/server/admin/api_set_audit.go b/server/admin/api_set_audit.go new file mode 100644 index 0000000..868957c --- /dev/null +++ b/server/admin/api_set_audit.go @@ -0,0 +1,33 @@ +package admin + +import ( + "net/http" + "strconv" + + "github.com/bjdgyc/anylink/dbdata" +) + +func SetAuditList(w http.ResponseWriter, r *http.Request) { + _ = r.ParseForm() + pageS := r.FormValue("page") + page, _ := strconv.Atoi(pageS) + if page < 1 { + page = 1 + } + + var datas []dbdata.AccessAudit + count := dbdata.CountAll(&dbdata.AccessAudit{}) + err := dbdata.Find(&datas, dbdata.PageSize, page) + if err != nil && !dbdata.CheckErrNotFound(err) { + RespError(w, RespInternalErr, err) + return + } + + data := map[string]interface{}{ + "count": count, + "page_size": dbdata.PageSize, + "datas": datas, + } + + RespSucess(w, data) +} diff --git a/server/admin/server.go b/server/admin/server.go index df66908..00bb25e 100644 --- a/server/admin/server.go +++ b/server/admin/server.go @@ -32,6 +32,7 @@ func StartAdmin() { r.HandleFunc("/set/other/edit", SetOtherEdit) r.HandleFunc("/set/other/smtp", SetOtherSmtp) r.HandleFunc("/set/other/smtp/edit", SetOtherSmtpEdit) + r.HandleFunc("/set/audit/list", SetAuditList) r.HandleFunc("/user/list", UserList) r.HandleFunc("/user/detail", UserDetail) diff --git a/server/base/config.go b/server/base/config.go index 1bcc09b..adf9a6f 100644 --- a/server/base/config.go +++ b/server/base/config.go @@ -55,7 +55,7 @@ var configs = []config{ {Typ: cfgInt, Name: "mobile_dpd", Usage: "移动端死链接检测时间(秒)", ValInt: 60}, {Typ: cfgInt, Name: "session_timeout", Usage: "session过期时间(秒)", ValInt: 3600}, // {Typ: cfgInt, Name: "auth_timeout", Usage: "auth_timeout", ValInt: 0}, - {Typ: cfgInt, Name: "audit_interval", Usage: "审计去重间隔(秒)", ValInt: 1800}, + {Typ: cfgInt, Name: "audit_interval", Usage: "审计去重间隔(秒),0关闭", ValInt: 0}, } var envs = map[string]string{} diff --git a/server/handler/payload.go b/server/handler/payload.go index c641fdd..4cee71f 100644 --- a/server/handler/payload.go +++ b/server/handler/payload.go @@ -100,6 +100,10 @@ func checkLinkAcl(group *dbdata.Group, pl *sessdata.Payload) bool { // 访问日志审计 func logAudit(cSess *sessdata.ConnSession, pl *sessdata.Payload) { + if base.Cfg.AuditInterval <= 0 { + return + } + ipSrc := waterutil.IPv4Source(pl.Data) ipDst := waterutil.IPv4Destination(pl.Data) ipPort := waterutil.IPv4DestinationPort(pl.Data) diff --git a/web/src/layout/LayoutAside.vue b/web/src/layout/LayoutAside.vue index d00036a..fb2973c 100644 --- a/web/src/layout/LayoutAside.vue +++ b/web/src/layout/LayoutAside.vue @@ -32,6 +32,7 @@ 系统信息 软件配置 其他设置 + 审计日志 diff --git a/web/src/pages/set/Audit.vue b/web/src/pages/set/Audit.vue new file mode 100644 index 0000000..de457cc --- /dev/null +++ b/web/src/pages/set/Audit.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/web/src/plugins/router.js b/web/src/plugins/router.js index 02550f4..f574b08 100644 --- a/web/src/plugins/router.js +++ b/web/src/plugins/router.js @@ -17,6 +17,7 @@ const routes = [ {path: 'set/system', component: () => import('@/pages/set/System')}, {path: 'set/soft', component: () => import('@/pages/set/Soft')}, {path: 'set/other', component: () => import('@/pages/set/Other')}, + {path: 'set/audit', component: () => import('@/pages/set/Audit')}, {path: 'user/list', component: () => import('@/pages/user/List')}, {path: 'user/online', component: () => import('@/pages/user/Online')}, From dfe61667cbc1f57d918c55790404f997be668b32 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Fri, 20 Aug 2021 19:13:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Denv=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/base/cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/base/cmd.go b/server/base/cmd.go index 0abdcb2..f530c47 100644 --- a/server/base/cmd.go +++ b/server/base/cmd.go @@ -52,7 +52,7 @@ func execute() { rr := ee.MapRange() for rr.Next() { // fmt.Println(rr.Key(), rr.Value()) - envs[rr.Key().String()] = rr.Value().String() + envs[rr.Key().String()] = fmt.Sprint(rr.Value()) } if !runSrv { From 80ca45c6ea6a045d7b359be06b91fe7f9698c40c Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Fri, 20 Aug 2021 19:16:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Denv=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/base/cmd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/base/cmd.go b/server/base/cmd.go index f530c47..1fc4959 100644 --- a/server/base/cmd.go +++ b/server/base/cmd.go @@ -51,8 +51,8 @@ func execute() { } rr := ee.MapRange() for rr.Next() { - // fmt.Println(rr.Key(), rr.Value()) - envs[rr.Key().String()] = fmt.Sprint(rr.Value()) + // fmt.Println(rr.Key(), rr.Value().Index(0)) + envs[rr.Key().String()] = rr.Value().Index(0).String() } if !runSrv { From 246efe430dac3e1c97d876729019383e117fdc3e Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Fri, 20 Aug 2021 19:20:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E8=B5=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/README.md b/doc/README.md index ff5c693..870b7f6 100644 --- a/doc/README.md +++ b/doc/README.md @@ -14,3 +14,4 @@ | -------- | ---------------------------- | | 代码 oo8 | | | 甘磊 | https://github.com/ganlei333 | +| Oo@ | | From 44adbe71ed103617fd177b377eb28a0802bbefc0 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Sun, 22 Aug 2021 19:36:30 +0800 Subject: [PATCH 6/6] Update user.go --- server/dbdata/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/dbdata/user.go b/server/dbdata/user.go index b50dfce..5fbb2d7 100644 --- a/server/dbdata/user.go +++ b/server/dbdata/user.go @@ -69,7 +69,7 @@ func SetUser(v *User) error { // 验证用户登陆信息 func CheckUser(name, pwd, group string) error { // TODO 严重问题 - return nil + // return nil pl := len(pwd) if name == "" || pl < 6 {