Skip to content

Commit

Permalink
fix 无效的空行 2022-07-11 11:53:1657511632
Browse files Browse the repository at this point in the history
  • Loading branch information
x51pwn committed Jul 11, 2022
1 parent 470ed06 commit d9d295e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
15 changes: 14 additions & 1 deletion pkg/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,27 @@ func CheckHvNmap() bool {
return false
}

func doReadBuff(buf *bytes.Buffer) string {
var a = []string{}
var data []byte = make([]byte, 1024)
n, err := buf.Read(data)
for nil == err && 0 < n {
s1 := string(data[:n])
fmt.Println(s1)
a = append(a, s1)
n, err = buf.Read(data)
}
return strings.Join(a, "")
}

// 最佳的方法是将命令写到临时文件,并通过bash进行执行
func DoCmd(args ...string) (string, error) {
cmd := exec.Command(args[0], args[1:]...)
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout // 标准输出
cmd.Stderr = &stderr // 标准错误
err := cmd.Run()
outStr, errStr := string(stdout.Bytes()), string(stderr.Bytes())
outStr, errStr := doReadBuff(&stdout), doReadBuff(&stderr)
// out, err := cmd.CombinedOutput()
if nil != err {
return "", err
Expand Down
4 changes: 4 additions & 0 deletions pkg/naabu/v2/pkg/runner/targets.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ func (r *Runner) DoTargets() (bool, error) {
aR := []string{}
a := strings.Split(string(data), "\n")
for _, x := range a {
// fix 无效的空行
if 3 > len(x) {
continue
}
if govalidator.IsURL(x) {
if x1, err := url.Parse(x); nil == err {
if govalidator.IsDNSName(x) {
Expand Down

0 comments on commit d9d295e

Please sign in to comment.