Skip to content

Commit 7ebb5fc

Browse files
committed
fix 无效的空行 2022-07-11 11:53:1657511632
1 parent 8cedb23 commit 7ebb5fc

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

pkg/config.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,27 @@ func CheckHvNmap() bool {
184184
return false
185185
}
186186

187+
func doReadBuff(buf *bytes.Buffer) string {
188+
var a = []string{}
189+
var data []byte = make([]byte, 1024)
190+
n, err := buf.Read(data)
191+
for nil == err && 0 < n {
192+
s1 := string(data[:n])
193+
fmt.Println(s1)
194+
a = append(a, s1)
195+
n, err = buf.Read(data)
196+
}
197+
return strings.Join(a, "")
198+
}
199+
187200
// 最佳的方法是将命令写到临时文件,并通过bash进行执行
188201
func DoCmd(args ...string) (string, error) {
189202
cmd := exec.Command(args[0], args[1:]...)
190203
var stdout, stderr bytes.Buffer
191204
cmd.Stdout = &stdout // 标准输出
192205
cmd.Stderr = &stderr // 标准错误
193206
err := cmd.Run()
194-
outStr, errStr := string(stdout.Bytes()), string(stderr.Bytes())
207+
outStr, errStr := doReadBuff(&stdout), doReadBuff(&stderr)
195208
// out, err := cmd.CombinedOutput()
196209
if nil != err {
197210
return "", err

pkg/naabu/v2/pkg/runner/targets.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ func (r *Runner) DoTargets() (bool, error) {
113113
aR := []string{}
114114
a := strings.Split(string(data), "\n")
115115
for _, x := range a {
116+
// fix 无效的空行
117+
if 3 > len(x) {
118+
continue
119+
}
116120
if govalidator.IsURL(x) {
117121
if x1, err := url.Parse(x); nil == err {
118122
if govalidator.IsDNSName(x) {

0 commit comments

Comments
 (0)