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

1、banner中不存在server字段，但仍然是rtsp的情况 2、snmp提取的server信息问题 #24

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

1、banner中不存在server字段，但仍然是rtsp的情况 2、snmp提取的server信息问题 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22a359c
Update rtsp.go
zhangkaibin0921 Nov 4, 2023
85c1ffb
Update snmp.go(提取出来的Server有问题)
zhangkaibin0921 Nov 4, 2023
d4e78d0
Update snmp.go(提取的server信息有问题)
zhangkaibin0921 Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions pkg/plugins/services/rtsp/rtsp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,28 +83,13 @@ func (p *RTSPPlugin) Run(conn net.Conn, timeout time.Duration, target plugins.Ta
return nil, nil
}
if string(response[:RtspMagicHeaderLength]) == RtspMagicHeader {
cseqStart := strings.Index(response, RtspCseqHeader)
if cseqStart == -1 {
return nil, nil
}

cseqValueStart := cseqStart + RtspCseqHeaderLength
if response[cseqValueStart:cseqValueStart+len(cseq)+RtspNewlineLength] != cseq+"\r\n" {
return nil, nil
}

var serverinfo string
serverStart := strings.Index(response, RtspServerHeader)
if serverStart == -1 {
return nil, nil
if serverStart != -1 {
serverValueStart := serverStart + RtspServerHeaderLength
serverValueEnd := strings.Index(response[serverValueStart:], "\r\n")
serverinfo = response[serverValueStart+2 : serverValueStart+serverValueEnd]
}

serverValueStart := serverStart + RtspServerHeaderLength
serverValueEnd := strings.Index(response[serverValueStart:], "\r\n")
if serverValueStart+serverValueEnd >= len(response) {
return nil, nil
}

serverinfo := response[serverValueStart : serverValueStart+serverValueEnd]
payload := plugins.ServiceRtsp{
ServerInfo: serverinfo,
}
Expand Down
18 changes: 17 additions & 1 deletion pkg/plugins/services/snmp/snmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,24 @@ func (f *SNMPPlugin) Run(conn net.Conn, timeout time.Duration, target plugins.Ta
stringBegin := idx + InfoOffset
if bytes.Contains(response, RequestID) {
if stringBegin < len(response) {
stringEnd := len(response)
if bytes.Contains(response, []byte("\r\n")) {
stringEnd = bytes.Index(response, []byte("\r\n"))
}
//处理\x06\x01\x02\x01\x01\x01\x00\x04\x82\x00\xa1VRP Comware Platform Software, Software Version 5.20, Release 5303\r\nQuidway S3528P-EA\r\nCopyright (c) 1998-2008 Huawei Techno情况
for i, c := range response[stringBegin:stringEnd] {
if c > 32 && c < 127 { // 判断字符是否可见
stringBegin = stringBegin + i
break
}
}
//处理Linux FRR-CORE 5.14.0-70.13.1.el9_0.x86_64 #1 SMP PREEMPT Tue May 17 15:53:11 EDT 2022 x86_64:161情况
serverInfo := string(response[stringBegin:stringEnd])
if strings.Contains(serverInfo, "#") {
serverInfo = strings.Split(serverInfo, "#")[0]
}
return plugins.CreateServiceFrom(target, plugins.ServiceSNMP{}, false,
string(response[stringBegin:]), plugins.UDP), nil
serverInfo, plugins.UDP), nil
}
return plugins.CreateServiceFrom(target, plugins.ServiceSNMP{}, false, "", plugins.UDP), nil
}
Expand Down