Merge pull request #66 from rm-Umar/master

Added range2ip

Author: UmanShahzad

.gitignore

@@ -4,7 +4,9 @@ ipinfo/dist/
 grepip/dist/
 cidr2range/dist/
 range2cidr/dist/
+range2ip/dist/
 !ipinfo/dist/DEBIAN/
 !grepip/dist/DEBIAN/
 !cidr2range/dist/DEBIAN/
 !range2cidr/dist/DEBIAN/
+!range2ip/dist/DEBIAN/

README.md

@@ -134,8 +134,8 @@ Replace `<path>` with the required location.
 
 ## Additional CLIs
 
-The `ipinfo` CLI has some subcommands like `grepip`, `cidr2range` and
-`range2cidr` which are also shipped as standalone binaries.
+The `ipinfo` CLI has some subcommands like `grepip`, `cidr2range`,
+`range2cidr` and `range2ip` which are also shipped as standalone binaries.
 
 These binaries are available via all the **same installation methods** as
 mentioned above for `ipinfo`, except you must change only the name to the name
@@ -148,6 +148,7 @@ Currently these subcommands are separately shipped:
 | grepip     | [1.2.0](https://github.com/ipinfo/cli/releases/tag/grepip-1.2.0) |
 | cidr2range | [1.2.0](https://github.com/ipinfo/cli/releases/tag/cidr2range-1.2.0) |
 | range2cidr | [1.2.0](https://github.com/ipinfo/cli/releases/tag/range2cidr-1.2.0) |
+| range2ip   | [1.0.0](https://github.com/ipinfo/cli/releases/tag/range2ip-1.0.0) |
 
 ## Quick Start
 

ipinfo/cmd_default.go

@@ -27,6 +27,7 @@ Commands:
   grepip      grep for IPs matching criteria from any source.
   cidr2range  convert CIDRs to IP ranges.
   range2cidr  convert IP ranges to CIDRs.
+  range2ip    convert IP ranges to individual IPs within those ranges.
   cache       manage the cache.
   login       save an API token session.
   logout      delete your current API token session.

ipinfo/cmd_range2ip.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/ipinfo/cli/lib"
+	"github.com/ipinfo/cli/lib/complete"
+	"github.com/ipinfo/cli/lib/complete/predict"
+	"github.com/spf13/pflag"
+)
+
+var completionsRange2IP = &complete.Command{
+	Flags: map[string]complete.Predictor{
+		"-h":     predict.Nothing,
+		"--help": predict.Nothing,
+	},
+}
+
+func printHelpRange2IP() {
+	fmt.Printf(
+		`Usage: %s range2ip [<opts>] <ip-range | filepath>
+
+Description:
+  Accepts IP ranges and file paths to files containing IP ranges, converting
+  them all to individual IPs within those ranges.
+
+  $ %[1]s range2ip 8.8.8.0-8.8.8.255
+
+  IP ranges can be of the form "<start><sep><end>" where "<sep>" can be "," or
+  "-", and "<start>" and "<end>" can be any 2 IPs; order does not matter.
+
+
+Options:
+  --help, -h
+    show help.
+`, progBase)
+}
+
+func cmdRange2IP() error {
+	f := lib.CmdRange2IPFlags{}
+	f.Init()
+	pflag.Parse()
+
+	return lib.CmdRange2IP(f, pflag.Args()[1:], printHelpRange2IP)
+}

ipinfo/completions.go

@@ -15,6 +15,7 @@ var completions = &complete.Command{
 		"grepip":     completionsGrepIP,
 		"cidr2range": completionsCIDR2Range,
 		"range2cidr": completionsRange2CIDR,
+		"range2ip":   completionsRange2IP,
 		"cache":      completionsCache,
 		"login":      completionsLogin,
 		"logout":     completionsLogout,

ipinfo/main.go

@@ -57,6 +57,8 @@ func main() {
 		err = cmdCIDR2Range()
 	case cmd == "range2cidr":
 		err = cmdRange2CIDR()
+	case cmd == "range2ip":
+		err = cmdRange2IP()
 	case cmd == "cache":
 		err = cmdCache()
 	case cmd == "login":

lib/cmd_range2ip.go

@@ -0,0 +1,41 @@
+package lib
+
+import (
+	"os"
+
+	"github.com/spf13/pflag"
+)
+
+// CmdRange2IPFlags are flags expected by CmdRange2IP.
+type CmdRange2IPFlags struct {
+	Help bool
+}
+
+// Init initializes the common flags available to CmdRange2IP with sensible
+// defaults.
+//
+// pflag.Parse() must be called to actually use the final flag values.
+func (f *CmdRange2IPFlags) Init() {
+	pflag.BoolVarP(
+		&f.Help,
+		"help", "h", false,
+		"show help.",
+	)
+}
+
+func CmdRange2IP(f CmdRange2IPFlags, args []string, printHelp func()) error {
+	if f.Help {
+		printHelp()
+		return nil
+	}
+
+	// require args and/or stdin.
+	stat, _ := os.Stdin.Stat()
+	isStdin := (stat.Mode() & os.ModeCharDevice) == 0
+	if len(args) == 0 && !isStdin {
+		printHelp()
+		return nil
+	}
+
+	return IPListWriteFrom(args, true, true, true, false, true)
+}

lib/ip_list_write.go

@@ -39,7 +39,7 @@ func IPListWriteFrom(
 		}
 
 		if isPiped || isTyping || stat.Size() > 0 {
-			IPListWriteFromStdin()
+			IPListWriteFromStdin(ip, iprange, cidr)
 		}
 	}
 
@@ -63,11 +63,10 @@ func IPListWriteFrom(
 		}
 
 		if file && FileExists(input) {
-			if err := IPListWriteFromFile(input); err == nil {
+			if err := IPListWriteFromFile(input, ip, iprange, cidr); err == nil {
 				continue
 			}
 		}
-
 		return ErrInvalidInput
 	}
 
@@ -80,8 +79,8 @@ func IPListWriteFromAllSrcs(inputs []string) error {
 	return IPListWriteFrom(inputs, true, true, true, true, true)
 }
 
-// IPListFromCIDRWrite is the same as IPListFromCIDR with O(1) memory by discarding
-// IPs after printing.
+// IPListFromCIDRWrite is the same as IPListFromCIDR with O(1) memory
+// by discarding IPs after printing.
 func IPListWriteFromCIDR(cidrStr string) error {
 	_, ipnet, err := net.ParseCIDR(cidrStr)
 	if err != nil {
@@ -161,25 +160,37 @@ func IPListWriteFromIPRangeStr(rStr string) error {
 
 // IPListWriteFromReader returns a list of IPs after reading from a reader; the
 // reader should have IPs per-line.
-func IPListWriteFromReader(r io.Reader) {
+func IPListWriteAllFromReader(r io.Reader) {
+	IPListWriteFromReader(r, true, true, true)
+}
+
+// IPListWriteFromReader returns a list of IPs after reading from a reader
+// from selected sources; the reader should have IPs per-line.
+func IPListWriteFromReader(
+	r io.Reader,
+	ip bool,
+	iprange bool,
+	cidr bool) {
 	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
-		ipStr := strings.TrimSpace(scanner.Text())
-		if ipStr == "" {
+		input := strings.TrimSpace(scanner.Text())
+		if input == "" {
 			break
 		}
 
-		if err := IPListWriteFromIPRangeStr(ipStr); err == nil {
-			continue
+		if iprange {
+			if err := IPListWriteFromIPRangeStr(input); err == nil {
+				continue
+			}
 		}
 
-		if StrIsIPStr(ipStr) {
-			fmt.Println(ipStr)
+		if ip && StrIsIPStr(input) {
+			fmt.Println(input)
 			continue
 		}
 
-		if StrIsCIDRStr(ipStr) {
-			if err := IPListWriteFromCIDR(ipStr); err == nil {
+		if cidr && StrIsCIDRStr(input) {
+			if err := IPListWriteFromCIDR(input); err == nil {
 				continue
 			}
 		}
@@ -190,25 +201,56 @@ func IPListWriteFromReader(r io.Reader) {
 
 // IPListWriteFromStdin returns a list of IPs from a stdin; the IPs should be 1
 // per line.
-func IPListWriteFromStdin() {
-	IPListWriteFromReader(os.Stdin)
+func IPListWriteAllFromStdin() {
+	IPListWriteAllFromReader(os.Stdin)
+}
+
+// IPListWriteFromStdin returns a list of IPs from a stdin from selected
+// sources; the IPs should be 1 per line.
+func IPListWriteFromStdin(
+	ip bool,
+	iprange bool,
+	cidr bool) {
+	IPListWriteFromReader(os.Stdin, ip, iprange, cidr)
 }
 
 // IPListWriteFromFile returns a list of IPs found in a file.
-func IPListWriteFromFile(pathToFile string) error {
+func IPListWriteAllFromFile(pathToFile string) error {
+	return IPListWriteFromFile(pathToFile, true, true, true)
+}
+
+// IPListWriteFromSrcFile returns a list of IPs from selected sources found
+// in a file.
+func IPListWriteFromFile(
+	pathToFile string,
+	ip bool,
+	iprange bool,
+	cidr bool,
+) error {
 	f, err := os.Open(pathToFile)
 	if err != nil {
 		return err
 	}
-
-	IPListWriteFromReader(f)
+	IPListWriteFromReader(f, ip, iprange, cidr)
 	return nil
 }
 
-// IPListWriteFromFiles returns a list of IPs found in a list of files.
-func IPListWriteFromFiles(paths []string) error {
+// IPListWriteFromFiles returns a list of IPs found in a list of files from
+// all sources.
+func IPListWriteAllFromFiles(paths []string) error {
+	return IPListWriteFromFiles(paths, true, true, true)
+}
+
+// IPListWriteFromFiles returns a list of IPs found in a list of files from
+// select sources.
+func IPListWriteFromFiles(
+	paths []string,
+	ip bool,
+	iprange bool,
+	cidr bool,
+) error {
 	for _, p := range paths {
-		if err := IPListWriteFromFile(p); err != nil {
+		if err := IPListWriteFromFile(p, ip, iprange, cidr); err != nil {
 			return err
 		}
 	}

range2ip/build-all-platforms.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Build binary for all platforms for version $1.
+
+set -e
+
+DIR=`dirname $0`
+ROOT=$DIR/..
+
+VSN=$1
+
+$ROOT/scripts/build-all-platforms.sh "range2ip" $VSN

range2ip/build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Build local binary.
+
+set -e
+
+DIR=`dirname $0`
+ROOT=$DIR/..
+
+$ROOT/scripts/build.sh "range2ip"