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@ | |
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/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"
)
diff --git a/server/base/cmd.go b/server/base/cmd.go
index 0abdcb2..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()] = rr.Value().String()
+ // fmt.Println(rr.Key(), rr.Value().Index(0))
+ envs[rr.Key().String()] = rr.Value().Index(0).String()
}
if !runSrv {
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/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 {
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+