0.2.3; 2025-01-07

Author: cyclone-github

CHANGELOG.md

@@ -1,3 +1,9 @@
+### version 0.2.3; 2025-01-07
+```
+add sanity check for punycode domains, https://github.com/cyclone-github/ipscope/issues/1
+add -json output flag, https://github.com/cyclone-github/ipscope/issues/2
+fixed stdout to stderr, https://github.com/cyclone-github/ipscope/issues/3
+```
 ### version 0.2.2; 2025-01-04
 ```
 Added geo printout

crt.go

@@ -39,7 +39,8 @@ func getSubdomainsFromCRT(domain string) ([]string, error) {
 		names := strings.Split(entry.NameValue, "\n")
 		for _, name := range names {
 			name = strings.TrimSpace(name)
-			if strings.HasSuffix(name, domain) {
+			// tld sanity check
+			if isValidDomain(name, domain) {
 				subdomainsSet[name] = struct{}{}
 			}
 		}
@@ -52,3 +53,16 @@ func getSubdomainsFromCRT(domain string) ([]string, error) {
 
 	return subdomains, nil
 }
+
+func isValidDomain(name, domain string) bool {
+	// only process domains from the tld domain
+	if !strings.HasSuffix(name, "."+domain) && name != domain {
+		return false
+	}
+	/* // explicitly exclude punycode domains -- probably not necessary as this would cause false negatives
+	if strings.HasPrefix(name, "xn--") {
+		return false
+	}
+	*/
+	return true
+}

main.go

@@ -36,6 +36,10 @@ Version History:
 0.2.2; 2025-01-04
 	Added geo printout
 	Updated Reverse Proxy / WAF list
+0.2.3; 2025-01-07
+	add sanity check for punycode domains, https://github.com/cyclone-github/ipscope/issues/1
+	add -json output flag, https://github.com/cyclone-github/ipscope/issues/2
+	fixed stdout to stderr, https://github.com/cyclone-github/ipscope/issues/3
 */
 
 const cloudflareIPv4URL = "https://www.cloudflare.com/ips-v4/"
@@ -52,6 +56,7 @@ func main() {
 	urlFlag := flag.String("url", "", "URL to process")
 	subFlag := flag.String("sub", "", "File containing subdomains")
 	dnsFlag := flag.String("dns", "1.1.1.1", "Custom DNS server (ex: 1.1.1.1)")
+	jsonFlag := flag.Bool("json", false, "Output results in JSON format")
 	cycloneFlag := flag.Bool("cyclone", false, "")
 	versionFlag := flag.Bool("version", false, "Version info")
 	helpFlag := flag.Bool("help", false, "Display help")
@@ -79,6 +84,8 @@ func main() {
 		os.Exit(1)
 	}
 
+	jsonOutput := *jsonFlag
+
 	domain := *urlFlag
 
 	// DNS resolver
@@ -99,8 +106,8 @@ func main() {
 
 	printCyclone()
 
-	fmt.Fprintf(writer, "Processing URL: %s using DNS: %s\n\n", domain, *dnsFlag)
-	writer.Flush()
+	fmt.Fprintf(os.Stderr, "Processing URL: %s using DNS: %s\n\n", domain, *dnsFlag)
+	//writer.Flush()
 
 	// load Cloudflare IP ranges
 	loadCloudflareIPs()
@@ -136,7 +143,7 @@ func main() {
 			}
 
 			if ips, err := customResolver.LookupIP(context.Background(), "ip4", fullDomain); err == nil {
-				printOutput(writer, label, fullDomain, ips)
+				printOutput(writer, label, fullDomain, ips, jsonOutput)
 				writer.Flush()
 			}
 		}
@@ -148,7 +155,7 @@ func main() {
 		if err != nil {
 			fmt.Fprintf(writer, "Error getting IP for TLD (%s): %v\n", domain, err)
 		} else {
-			printOutput(writer, "TLD", domain, tldIPs)
+			printOutput(writer, "TLD", domain, tldIPs, jsonOutput)
 			writer.Flush()
 			processedSubdomains[domain] = true
 		}
@@ -171,7 +178,7 @@ func main() {
 			}
 			processedSubdomains[fullDomain] = true
 			if ips, err := customResolver.LookupIP(context.Background(), "ip4", fullDomain); err == nil {
-				printOutput(writer, "SUB", fullDomain, ips)
+				printOutput(writer, "SUB", fullDomain, ips, jsonOutput)
 				writer.Flush()
 			}
 		}
@@ -187,7 +194,7 @@ func main() {
 			}
 			processedSubdomains[fullDomain] = true
 			if ips, err := customResolver.LookupIP(context.Background(), "ip4", fullDomain); err == nil {
-				printOutput(writer, "SUB", fullDomain, ips)
+				printOutput(writer, "SUB", fullDomain, ips, jsonOutput)
 				writer.Flush()
 			}
 		}

utils.go

@@ -48,17 +48,60 @@ func init() {
 }
 
 // print info
-func printOutput(writer *tabwriter.Writer, label, domain string, ips []net.IP) {
-	for _, ip := range ips {
-		if ipv4 := ip.To4(); ipv4 != nil {
-			if !isValidPublicIPv4(ipv4) {
-				continue
+func printOutput(writer *tabwriter.Writer, label, domain string, ips []net.IP, jsonOutput bool) {
+	type JSONOutput struct {
+		Label   string `json:"label"`
+		Domain  string `json:"domain"`
+		IP      string `json:"ip"`
+		Asn     string `json:"asn"`
+		City    string `json:"city"`
+		Region  string `json:"region"`
+		Country string `json:"country"`
+		Proxy   bool   `json:"proxy"`
+	}
+
+	if jsonOutput {
+		// JSON output format
+		for _, ip := range ips {
+			if ipv4 := ip.To4(); ipv4 != nil {
+				if !isValidPublicIPv4(ipv4) {
+					continue
+				}
+
+				ipInfo, err := getIPInfo(ipv4.String())
+				if err != nil {
+					continue
+				}
+
+				output := JSONOutput{
+					Label:   label,
+					Domain:  domain,
+					IP:      ipv4.String(),
+					Asn:     ipInfo.Org,
+					City:    ipInfo.City,
+					Region:  ipInfo.Region,
+					Country: ipInfo.Country,
+					Proxy:   checkCloudFlare(ipv4.String()) || checkKnownWAF(ipInfo.Org),
+				}
+
+				jsonData, _ := json.Marshal(output)
+				fmt.Println(string(jsonData))
 			}
+		}
+	} else {
+		// tabwriter "pretty" output
+		for _, ip := range ips {
+			if ipv4 := ip.To4(); ipv4 != nil {
+				if !isValidPublicIPv4(ipv4) {
+					continue
+				}
+
+				ipInfo, err := getIPInfo(ipv4.String())
+				if err != nil {
+					fmt.Fprintf(writer, "Error fetching IP info: %v\n", err)
+					continue
+				}
 
-			ipInfo, err := getIPInfo(ipv4.String())
-			if err != nil {
-				fmt.Fprintf(writer, "Error fetching IP info: %v\n", err)
-			} else {
 				isReverseProxy := checkCloudFlare(ipv4.String()) || checkKnownWAF(ipInfo.Org)
 				if isReverseProxy {
 					fmt.Fprintf(writer, "%-3s\t%-25s\t%-16s\t%-32s\t %s, %s, %s (Reverse Proxy or WAF Detected)\n", label, domain, ipv4, ipInfo.Org, ipInfo.City, ipInfo.Region, ipInfo.Country)
@@ -223,7 +266,7 @@ func isValidPublicIPv4(ip net.IP) bool {
 
 // version info
 func versionFunc() {
-	fmt.Fprintln(os.Stderr, "Cyclone's IPScope v0.2.2; 2025-01-04\nhttps://github.com/cyclone-github/ipscope\n")
+	fmt.Fprintln(os.Stderr, "Cyclone's IPScope v0.2.3; 2025-01-07\nhttps://github.com/cyclone-github/ipscope\n")
 }
 
 // cyclone
@@ -236,7 +279,7 @@ func printCyclone() {
  \____)\__  |\____)\_)___/|_| |_|_____)
       (____/                           
 `
-	fmt.Println(cyclone)
+	fmt.Fprintln(os.Stderr, cyclone)
 	time.Sleep(250 * time.Millisecond)
 }