Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复logAudit的panic #270

Merged
merged 2 commits into from
Sep 12, 2023
Merged

修复logAudit的panic #270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b9be93
修复logAudit的panic
lanrenwo Sep 8, 2023
8e843d5
Update payload_access_audit.go
lanrenwo Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 6 additions & 11 deletions server/handler/payload_access_audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ func logAuditBatch() {
// 解析IP包的数据
func logAudit(userName string, pl *sessdata.Payload) {
defer func() {
putPayload(pl)
if err := recover(); err != nil {
base.Error("logAudit is panic: ", err, "\n", string(debug.Stack()), "\n", pl.Data)
}
putPayload(pl)
}()

if !(pl.LType == sessdata.LTypeIPData && pl.PType == 0x00) {
Expand All @@ -125,19 +125,15 @@ func logAudit(userName string, pl *sessdata.Payload) {
default:
return
}

ipSrc := waterutil.IPv4Source(pl.Data)
ipDst := waterutil.IPv4Destination(pl.Data)

// ipPort := waterutil.IPv4DestinationPort(pl.Data)
// 修复 panic: runtime error: index out of range [2] with length 2
// IP报文只包含头部信息时, 则打印LOG，并退出
ipPl := waterutil.IPv4Payload(pl.Data)
if len(ipPl) < 3 {
base.Error("ipPl len < 3", pl.Data)
if len(ipPl) < 4 {
base.Error("ipPl len < 4", ipPl, pl.Data)
return
}
ipPort := (uint16(ipPl[2]) << 8) | uint16(ipPl[3])

ipSrc := waterutil.IPv4Source(pl.Data)
ipDst := waterutil.IPv4Destination(pl.Data)
b := getByte51()
key := *b
copy(key[:16], ipSrc)
Expand Down Expand Up @@ -193,7 +189,6 @@ func logAudit(userName string, pl *sessdata.Payload) {
AccessProto: accessProto,
Info: info,
}

select {
case logBatch.LogChan <- audit:
default:
Expand Down