ip范围判断

hmac/hmac.go

@@ -21,13 +21,13 @@ var _ crypto.Signer = &hashComparer{}
 type HMacFunc func(key, msg []byte) bytesconv.BytesResult
 
 var hmacFuncs = map[string]HMacFunc{
-	"HmacMD5":    Md5,
-	"HmacSHA1":   Sha1,
-	"HmacSHA224": Sha224,
-	"HmacSHA256": Sha256,
-	"HmacSHA384": Sha384,
-	"HmacSHA512": Sha512,
-	"HmacSM3":    Sm3,
+	"HMACMD5":    Md5,
+	"HMACSHA1":   Sha1,
+	"HMACSHA224": Sha224,
+	"HMACSHA256": Sha256,
+	"HMACSHA384": Sha384,
+	"HMACSHA512": Sha512,
+	"HMACSM3":    Sm3,
 }
 
 type hashComparer struct {
@@ -63,7 +63,7 @@ func ByName(name string) (HMacFunc, error) {
 		return f, nil
 	}
 
-	return nil, errors.New("Unsupported hash functions")
+	return nil, errors.New("Unsupported hash function:" + name)
 }
 
 func Md5(key, msg []byte) bytesconv.BytesResult { return sum(md5.New, key, msg) }

ip_range/ip_range.go

@@ -0,0 +1,125 @@
+package iprange
+
+import (
+	"fmt"
+	"net"
+	"strings"
+
+	"github.com/charlienet/go-mixed/bytesconv"
+)
+
+type IpRange struct {
+	segments []ipSegment
+}
+
+type ipSegment interface {
+	Contains(net.IP) bool
+}
+
+type singleIp struct {
+	ip net.IP
+}
+
+func (i *singleIp) Contains(ip net.IP) bool {
+	return i.ip.Equal(ip)
+}
+
+type cidrSegments struct {
+	cidr *net.IPNet
+}
+
+func (i *cidrSegments) Contains(ip net.IP) bool {
+	return i.cidr.Contains(ip)
+}
+
+type rangeSegment struct {
+	start rangeIP
+	end   rangeIP
+}
+
+type rangeIP struct {
+	Hight uint64
+	Lower uint64
+}
+
+func (r *rangeSegment) Contains(ip net.IP) bool {
+	ih, _ := bytesconv.BigEndian.BytesToUInt64(ip[:8])
+	i, _ := bytesconv.BigEndian.BytesToUInt64(ip[8:])
+
+	return ih >= r.start.Hight && ih <= r.end.Hight && i >= r.start.Lower && i <= r.end.Lower
+}
+
+// IP范围判断，支持以下规则:
+// 单IP地址，如 192.168.100.2
+// IP范围, 如 192.168.100.120-192.168.100.150
+// 掩码模式，如 192.168.2.0/24
+func NewRange(ip ...string) (*IpRange, error) {
+	seg := make([]ipSegment, 0, len(ip))
+	for _, i := range ip {
+		if s, err := createSegment(i); err != nil {
+			return nil, err
+		} else {
+			seg = append(seg, s)
+		}
+	}
+
+	return &IpRange{segments: seg}, nil
+}
+
+func (r *IpRange) Contains(ip string) bool {
+	nip := net.ParseIP(ip)
+	if nip == nil {
+		return false
+	}
+
+	for _, v := range r.segments {
+		if v.Contains(nip) {
+			return true
+		}
+	}
+
+	return false
+}
+
+func createSegment(ip string) (ipSegment, error) {
+	switch {
+	case strings.Contains(ip, "-"):
+		ips := strings.Split(ip, "-")
+		if len(ips) != 2 {
+			return nil, fmt.Errorf("IP范围定义错误:%s", ip)
+		}
+
+		start := net.ParseIP(ips[0])
+		end := net.ParseIP(ips[1])
+		if start == nil {
+			return nil, fmt.Errorf("IP范围起始地址格式错误:%s", ips[0])
+		}
+
+		if end == nil {
+			return nil, fmt.Errorf("IP范围结束地址格式错误:%s", ips[0])
+		}
+
+		sh, _ := bytesconv.BigEndian.BytesToUInt64(start[:8])
+		s, _ := bytesconv.BigEndian.BytesToUInt64(start[8:])
+		eh, _ := bytesconv.BigEndian.BytesToUInt64(end[:8])
+		e, _ := bytesconv.BigEndian.BytesToUInt64(end[8:])
+
+		return &rangeSegment{start: rangeIP{
+			Hight: sh, Lower: s},
+			end: rangeIP{Hight: eh, Lower: e}}, nil
+
+	case strings.Contains(ip, "/"):
+		if _, cidr, err := net.ParseCIDR(ip); err != nil {
+			return nil, err
+		} else {
+			return &cidrSegments{cidr: cidr}, nil
+		}
+	default:
+		i := net.ParseIP(ip)
+		if i == nil {
+			return nil, fmt.Errorf("格式错误, 不是有效的IP地址:%s", ip)
+		}
+
+		return &singleIp{ip: i}, nil
+	}
+}

ip_range/ip_range_test.go

@@ -0,0 +1,56 @@
+package iprange
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSingleErrorIP(t *testing.T) {
+	values := []string{
+		"192.168.01",
+		"::",
+	}
+
+	for _, v := range values {
+		r, err := NewRange(v)
+
+		t.Log(r, err)
+	}
+}
+
+func TestSingleIp(t *testing.T) {
+	r, err := NewRange("192.168.0.1")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.True(t, r.Contains("192.168.0.1"))
+	assert.False(t, r.Contains("192.168.0.123"))
+}
+
+func TestCIDR(t *testing.T) {
+	r, err := NewRange("192.168.2.0/24")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.True(t, r.Contains("192.168.2.12"))
+	assert.True(t, r.Contains("192.168.2.162"))
+	assert.False(t, r.Contains("192.168.3.162"))
+}
+
+func TestRange(t *testing.T) {
+	r, err := NewRange("192.168.2.20-192.168.2.30")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	assert.True(t, r.Contains("192.168.2.20"))
+	assert.True(t, r.Contains("192.168.2.21"))
+	assert.True(t, r.Contains("192.168.2.30"))
+
+	assert.False(t, r.Contains("192.168.2.10"))
+	assert.False(t, r.Contains("192.168.2.31"))
+
+}

logx/log.go

@@ -1,5 +1,7 @@
 package logx
 
+import "io"
+
 var std = defaultLogger()
 
 func StandardLogger() Logger {
@@ -34,4 +36,5 @@ type Logger interface {
 	Println(args ...any)
 	Print(args ...any)
 	Printf(format string, args ...any)
+	Writer() io.Writer
 }

logx/logrus.go

@@ -1,6 +1,8 @@
 package logx
 
 import (
+	"io"
+
 	"github.com/sirupsen/logrus"
 )
 
@@ -37,3 +39,7 @@ func (l *logrusWrpper) WithFields(fields Fields) Logger {
 
 	return l
 }
+
+func (l *logrusWrpper) Writer() io.Writer {
+	return l.Entry.Writer()
+}