Skip to content

Commit

Permalink
Fix unable to parse nmap output for incomplete XML output (#127)
Browse files Browse the repository at this point in the history
  • Loading branch information
idkw authored Feb 21, 2024
1 parent f809241 commit 58d9339
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 1 deletion.
15 changes: 14 additions & 1 deletion nmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"io"
"os/exec"
"strings"
"sync"
"syscall"
"time"

Expand Down Expand Up @@ -125,15 +126,25 @@ func (s *Scanner) Run() (result *Run, warnings *[]string, err error) {
stdoutDuplicate := io.TeeReader(stdoutPipe, &stdout)
cmd.Stderr = &stderr

// According to cmd.StdoutPipe() doc, we must not "call Wait before all reads from the pipe have completed"
// We use this WaitGroup to wait for all IO operations to finish before calling wait
var wg sync.WaitGroup

var streamerErrs *errgroup.Group
if s.streamer != nil {
streamerErrs, _ = errgroup.WithContext(s.ctx)
wg.Add(1)
streamerErrs.Go(func() error {
defer wg.Done()
_, err = io.Copy(s.streamer, stdoutDuplicate)
return err
})
} else {
go io.Copy(io.Discard, stdoutDuplicate)
wg.Add(1)
go func() {
defer wg.Done()
io.Copy(io.Discard, stdoutDuplicate)
}()
}

// Run nmap process.
Expand All @@ -145,7 +156,9 @@ func (s *Scanner) Run() (result *Run, warnings *[]string, err error) {
// Add goroutine that updates chan when command is finished.
done := make(chan error, 1)
doneProgress := make(chan bool, 1)

go func() {
wg.Wait()
err := cmd.Wait()
if streamerErrs != nil {
streamerError := streamerErrs.Wait()
Expand Down
77 changes: 77 additions & 0 deletions nmap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ import (
"bytes"
"context"
"encoding/xml"
"fmt"
"io/ioutil"
"os"
"os/exec"
"reflect"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -484,3 +487,77 @@ func TestCheckStdErr(t *testing.T) {
})
}
}

// Test to verify the fix for a race condition works
// See: https://github.com/Ullaakut/nmap/issues/122
func TestParseXMLOutputRaceCondition(t *testing.T) {
scans := make(chan int, 100)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

var wg sync.WaitGroup

// Publish many scan orders
wg.Add(1)
go func() {
defer wg.Done()
for taskId := 0; taskId < 1000; taskId++ {
wg.Add(1)
scans <- taskId
}
}()

// Consume scan orders with workers in parallel
for worker := 1; worker <= 10; worker++ {
wg.Add(1)
go func(w int) {
defer wg.Done()
for {
var taskId int

select {
case <-ctx.Done():
t.Logf("stopping worker %d", w)
return
case i, ok := <-scans:
if !ok {
t.Logf("stopping worker %d", w)
return
}
taskId = i
default:
t.Logf("stopping worker %d", w)
return
}

_, err := getNmapVersion(ctx)
if err != nil {
t.Errorf("[w:%d] failed scan %d with err: %s", w, taskId, err)
} else {
t.Logf("[w:%d] completed scan %d", w, taskId)
}
wg.Done()
}
}(worker)
}

wg.Wait()
}

// getNmapVersion returns the version of nmap installed on the system.
// e.g. "7.80".
func getNmapVersion(ctx context.Context) (string, error) {
scanner, err := NewScanner(ctx)
if err != nil {
return "", fmt.Errorf("nmap.NewScanner: %w", err)
}

var sb strings.Builder
scanner.Streamer(&sb)
results, warnings, err := scanner.Run()

if err != nil {
return "", fmt.Errorf("nmap.Run: %w (%v). Result: %+v", err, warnings, sb.String())
}
return results.Version, nil
}

0 comments on commit 58d9339

Please sign in to comment.