feat: handle stdin piped input #71

DnFreddie · 2024-11-17T18:56:41Z

Added functionality to handle input via STDIN.
If STDIN input is available, it is read and used to set the DNS resolver.
If no STDIN input is detected, the program falls back to parsing command-line arguments.
Errors encountered while reading from STDIN are logged as fatal.
I can add also the validation for the right DNS string if u want .

Closes #39

jesusprubio · 2024-11-17T21:33:09Z

I was thinking in this use case. For example an user checking a list of IP addresses/URLs domains. I can't see why an user would use this feature? What use case do you have in mind?

Custom target support #29

main.go

DnFreddie · 2024-11-17T22:01:10Z

A ok now I understand thank u for feedback I will fix this

DnFreddie · 2024-11-18T00:35:50Z

I updated the program to read from stdin, parse URLs, added testing, and modified Probe.Do to accept an array of addresses or use defaults if empty.

jesusprubio

Thank you (again) :).

internal/probe.go

jesusprubio · 2024-11-18T21:18:10Z

internal/probe.go

+								"Sending report back for address",
+								"count", count, "address", addr, "report", report,
+							)
+							p.ReportCh <- &report


We need another sleep here. Isn't it?

internal/probe.go

internal/utils.go

main.go

jesusprubio · 2024-11-18T21:31:41Z

main.go

@@ -45,7 +43,14 @@ func main() {
 		Level: lvl,
 	}))
 	var opts internal.Options
+	stdin, err := internal.ReadStdin()
+	if err != nil {
+		fatal(err)


Please enrich the error: fatal(fmt.Errorf("reading stdin: %w", err))

internal/utils_test.go

jesusprubio · 2024-11-18T21:39:18Z

internal/utils_test.go

+			got, _ := ReadStdin()
+			addrs := ProcessAddrs(got)
+
+			if !reflect.DeepEqual(addrs, tt.wantAddrs) {


Please lets avoid reflect and use a simple for.

- Moved regex patterns out of function definitions. - Changed the test input structure and migrated example-based tests to standard Go tests. - Change the utils.go to stdin.go - Fixed the probe function to sleep properly. - Renamed the 'address' variable to 'input' for clarity. - Added a line comment to describe the 'input' field for better documentation.

DnFreddie · 2024-11-19T10:35:19Z

Fixed the issue i think it's ready to merge details in commit message

jesusprubio

Thank you, only some details more and we are ready to go :).

jesusprubio · 2024-11-19T21:49:16Z

internal/probe.go

-			}
+		}
+		p.Logger.Debug(
+			"Iteration finished", "count", count, "p.Count", p.Count,


This could be one line

jesusprubio · 2024-11-19T21:49:40Z

internal/probe.go

@@ -20,6 +20,8 @@ type Probe struct {
 	Logger *slog.Logger
 	// Channel to send back partial results.
 	ReportCh chan *Report
+	//URLs (HTTP), host/port strings (TCP) or domains (DNS).


Please add an space after //

jesusprubio · 2024-11-19T21:50:10Z

internal/stdin.go

+	if err != nil {
+		return "", fmt.Errorf("failed to retrieve stdin information: %w", err)
+	}
+


Empty line.

jesusprubio · 2024-11-19T21:50:17Z

internal/stdin.go

+	if (info.Mode() & os.ModeCharDevice) != 0 {
+		return "", nil
+	}
+


Empty line.

jesusprubio · 2024-11-19T21:50:22Z

internal/stdin.go

+	if err != nil {
+		return "", fmt.Errorf("reading from stdin: %w", err)
+	}
+


Empty line.

jesusprubio · 2024-11-19T21:50:30Z

internal/stdin.go

+)
+
+func validateInput(addr string) bool {
+


Empty lines.

jesusprubio · 2024-11-19T21:50:38Z

internal/stdin.go

+func ProcessInputs(s string) ([]string, error) {
+	var inputs []string
+	var errFormats []error
+


Empty lines.

jesusprubio · 2024-11-19T21:51:01Z

internal/stdin_test.go

+		{"invalid@domain", false},
+		{"not-a-domain", false},
+	}
+


Empty line.

jesusprubio · 2024-11-19T21:51:11Z

internal/stdin_test.go

+			wantAddrs: []string{},
+		},
+	}
+


Empty lines.

jesusprubio · 2024-11-19T21:51:23Z

main.go

 	opts.Parse()
+


Empty line.

jesusprubio · 2024-11-19T21:57:01Z

internal/stdin.go

+func ReadStdin() (string, error) {
+	info, err := os.Stdin.Stat()
+	if err != nil {
+		return "", fmt.Errorf("failed to retrieve stdin information: %w", err)


retrieving stdin is enough

jesusprubio · 2024-11-19T21:57:54Z

internal/stdin_test.go

+			w.Close()
+
+			got, _ := ReadStdin()
+			addrs, _ := ProcessInputs(got)


jesusprubio · 2024-11-19T21:58:41Z

internal/stdin_test.go

+		{
+			name:      "single valid url",
+			input:     "http://192.168.1.1\n",
+			wantAddrs: []string{"http://192.168.1.1"},


jesusprubio · 2024-11-19T21:59:51Z

main.go

+	}
+	inputs, err := internal.ProcessInputs(stdin)
+	if err != nil {
+		fmt.Printf("failed to process the inputs:\n%v\n", err)


processing inputs and use fatal

jesusprubio · 2024-11-19T22:00:16Z

main.go

@@ -125,8 +133,13 @@ func main() {
 			}
 		}
 	}()
+


jesusprubio · 2024-11-19T22:00:32Z

main.go

+	if err != nil {
+		fatal(fmt.Errorf("running probe: %w", err))
+	}
+


jesusprubio · 2024-11-19T22:00:45Z

main.go

+	if err != nil {
+		fatal(fmt.Errorf("running probe: %w", err))
+	}
+
 	if err != nil {


Repeated lines?

jesusprubio · 2024-11-19T22:01:08Z

internal/stdin.go

+	}
+	return false
+}
+


Add a comment

jesusprubio · 2024-11-19T22:01:39Z

internal/stdin.go

+	domainRegex = regexp.MustCompile(domainPattern)
+)
+
+func validateInput(addr string) bool {


Comment: Ensures the inputs are correct

jesusprubio · 2024-11-19T22:05:21Z

internal/stdin_test.go

+			w.Write([]byte(tt.input))
+			w.Close()
+
+			got, _ := ReadStdin()


We need to capture the errors and check them here.

jesusprubio · 2024-11-19T22:06:25Z

internal/stdin.go

+		if validateInput(input) {
+			inputs = append(inputs, input)
+		} else {
+			errFormats = append(errFormats, fmt.Errorf("invalid address format: %s", input))


Just return an error and use fatal in the caller.

Fix jesusprubio#39: Handle STDIN piped input

c4a69cd

jesusprubio reviewed Nov 17, 2024

View reviewed changes

main.go Outdated Show resolved Hide resolved

Fix jesusprubio#39: Handle STDIN piped input

4a3b8d0

jesusprubio requested changes Nov 18, 2024

View reviewed changes

jesusprubio changed the title ~~Fix #39: Handle STDIN piped input~~ feat: handle stdin piped input Nov 18, 2024

DnFreddie mentioned this pull request Nov 19, 2024

feat: optionally perform probes in parallel (Closes #65) #76

Closed

jesusprubio requested changes Nov 19, 2024

View reviewed changes