review 2

ethanndickson · ethanndickson · commit 41ab80ff1aeb · 2024-08-27T15:28:47.000Z
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -377,8 +377,9 @@ func ConnDiagnostics(w io.Writer, d ConnDiags) {
 
 	if d.PingP2P {
 		_, _ = fmt.Fprint(w, "✔ You are connected directly (p2p)\n")
+	} else {
+		_, _ = fmt.Fprint(w, "❗ You are connected via a DERP relay, not directly (p2p)\n")
 	}
-	_, _ = fmt.Fprint(w, "❗ You are connected via a DERP relay, not directly (p2p)\n")
 
 	if d.DisableDirect {
 		_, _ = fmt.Fprint(w, "❗ Direct connections are disabled locally, by `--disable-direct` or `CODER_DISABLE_DIRECT`\n")
diff --git a/cli/cliutil/awscheck.go b/cli/cliutil/awscheck.go
@@ -71,6 +71,9 @@ func FetchAWSIPRanges(ctx context.Context, url string) (*AWSIPRanges, error) {
 		if err != nil {
 			return nil, xerrors.Errorf("parse ip prefix: %w", err)
 		}
+		if prefix.Addr().Is6() {
+			return nil, xerrors.Errorf("ipv4 prefix contains ipv6 address: %s", p.Prefix)
+		}
 		out.V4 = append(out.V4, prefix)
 	}
 
@@ -79,6 +82,9 @@ func FetchAWSIPRanges(ctx context.Context, url string) (*AWSIPRanges, error) {
 		if err != nil {
 			return nil, xerrors.Errorf("parse ip prefix: %w", err)
 		}
+		if prefix.Addr().Is4() {
+			return nil, xerrors.Errorf("ipv6 prefix contains ipv4 address: %s", p.Prefix)
+		}
 		out.V6 = append(out.V6, prefix)
 	}
 
diff --git a/cli/ping.go b/cli/ping.go
@@ -224,10 +224,17 @@ func (r *RootCmd) ping() *serpent.Command {
 }
 
 func isAWSIP(awsRanges *cliutil.AWSIPRanges, ni *tailcfg.NetInfo) bool {
-	checkIP := func(ipStr string) bool {
-		ip, err := netip.ParseAddr(ipStr)
-		return err == nil && awsRanges.CheckIP(ip)
+	if ni.GlobalV4 != "" {
+		ip, err := netip.ParseAddr(ni.GlobalV4)
+		if err == nil && awsRanges.CheckIP(ip) {
+			return true
+		}
 	}
-
-	return checkIP(ni.GlobalV4) || checkIP(ni.GlobalV6)
+	if ni.GlobalV6 != "" {
+		ip, err := netip.ParseAddr(ni.GlobalV6)
+		if err == nil && awsRanges.CheckIP(ip) {
+			return true
+		}
+	}
+	return false
 }

Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,9 @@ func ConnDiagnostics(w io.Writer, d ConnDiags) {`
`377`	`377`
`378`	`378`	`if d.PingP2P {`
`379`	`379`	`_, _ = fmt.Fprint(w, "✔ You are connected directly (p2p)\n")`
	`380`	`+ } else {`
	`381`	`+ _, _ = fmt.Fprint(w, "❗ You are connected via a DERP relay, not directly (p2p)\n")`
`380`	`382`	`}`
`381`		`- _, _ = fmt.Fprint(w, "❗ You are connected via a DERP relay, not directly (p2p)\n")`
`382`	`383`
`383`	`384`	`if d.DisableDirect {`
`384`	`385`	_, _ = fmt.Fprint(w, "❗ Direct connections are disabled locally, by `--disable-direct` or `CODER_DISABLE_DIRECT`\n")
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,9 @@ func FetchAWSIPRanges(ctx context.Context, url string) (*AWSIPRanges, error) {`
`71`	`71`	`if err != nil {`
`72`	`72`	`return nil, xerrors.Errorf("parse ip prefix: %w", err)`
`73`	`73`	`}`
	`74`	`+ if prefix.Addr().Is6() {`
	`75`	`+ return nil, xerrors.Errorf("ipv4 prefix contains ipv6 address: %s", p.Prefix)`
	`76`	`+ }`
`74`	`77`	`out.V4 = append(out.V4, prefix)`
`75`	`78`	`}`
`76`	`79`
`@@ -79,6 +82,9 @@ func FetchAWSIPRanges(ctx context.Context, url string) (*AWSIPRanges, error) {`
`79`	`82`	`if err != nil {`
`80`	`83`	`return nil, xerrors.Errorf("parse ip prefix: %w", err)`
`81`	`84`	`}`
	`85`	`+ if prefix.Addr().Is4() {`
	`86`	`+ return nil, xerrors.Errorf("ipv6 prefix contains ipv4 address: %s", p.Prefix)`
	`87`	`+ }`
`82`	`88`	`out.V6 = append(out.V6, prefix)`
`83`	`89`	`}`
`84`	`90`