Merge pull request #55 from dxbednarczyk/origin/proxy_v2

Add random IP generation for bots

cmd/main.go

@@ -101,7 +101,7 @@ func main() {
 	}
 
 	if *randomBingBot {
-		err := bot.GoogleBot.UpdatePool("https://www.bing.com/toolbox/bingbot.json")
+		err := bot.BingBot.UpdatePool("https://www.bing.com/toolbox/bingbot.json")
 		if err != nil {
 			fmt.Println("error while retrieving list of Bingbot IPs: " + err.Error())
 			fmt.Println("defaulting to known trusted Bingbot identity")

proxychain/requestmodifers/bot/bot.go

@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"math/big"
+	"math/bits"
 	"math/rand"
+	"net"
 	"net/http"
 	"time"
-
-	"github.com/3th1nk/cidr"
 )
 
 type Bot interface {
@@ -100,30 +101,42 @@ func (b *bot) GetRandomIP() string {
 	if prefix.IPv4 != "" {
 		ip, err := randomIPFromSubnet(prefix.IPv4)
 		if err == nil {
-			return ip
+			return ip.String()
 		}
 	}
 
 	if prefix.IPv6 != "" {
 		ip, err := randomIPFromSubnet(prefix.IPv6)
 		if err == nil {
-			return ip
+			return ip.String()
 		}
 	}
 
 	// fallback to default IP which is known to work
 	ip, _ := randomIPFromSubnet(b.IPPool.Prefixes[0].IPv4)
 
-	return ip
+	return ip.String()
 }
 
-func randomIPFromSubnet(c string) (string, error) {
+func randomIPFromSubnet(c string) (net.IP, error) {
-	block, err := cidr.Parse(c)
+	ip, ipnet, err := net.ParseCIDR(c)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
-	// TODO: the beginning of the network is technically a viable IP to use
+	// int representation of byte mask
-	// but maybe a different solution would be better here
+	mask := big.NewInt(0).SetBytes(ipnet.Mask).Uint64()
-	return block.Network().String(), nil
+
+	// how many unset bits there are at the end of the mask
+	offset := bits.TrailingZeros8(byte(0) ^ byte(mask))
+
+	// total number of ips available in the block
+	offset *= offset
+
+	toAdd := rand.Intn(offset)
+
+	last := len(ip) - 1
+	ip[last] = ip[last] + byte(toAdd)
+
+	return ip, nil
 }

proxychain/requestmodifers/bot/bot_test.go

@@ -0,0 +1,36 @@
+package bot
+
+import (
+	"net"
+	"testing"
+)
+
+func TestRandomIPFromSubnet(t *testing.T) {
+	err := GoogleBot.UpdatePool("https://developers.google.com/static/search/apis/ipranges/googlebot.json")
+	if err != nil {
+		t.Error(err)
+	}
+
+	for _, prefix := range GoogleBot.IPPool.Prefixes {
+		subnet := prefix.IPv4
+		if prefix.IPv6 != "" {
+			subnet = prefix.IPv6
+		}
+
+		t.Run(subnet, func(t *testing.T) {
+			_, ipnet, err := net.ParseCIDR(subnet)
+			if err != nil {
+				t.Error(err)
+			}
+
+			ip, err := randomIPFromSubnet(subnet)
+			if err != nil {
+				t.Error(err)
+			}
+
+			if !ipnet.Contains(ip) {
+				t.Fail()
+			}
+		})
+	}
+}