✨ rewrite redis communication

exemples/redis-cache/docker-compose.redis.yml

@@ -45,16 +45,18 @@ services:
       - "traefik.http.middlewares.crowdsec1.plugin.bouncer.rediscacheenabled=true"
 
   whoami2:
-    image: traefik/whoami
+    image: 4206969/spiderfoot
     container_name: "simple-service2"
+    volumes:
+      - ./spiderfoot-data:/var/lib/spiderfoot
     labels:
       - "traefik.enable=true"
       # Definition of the router
-      - "traefik.http.routers.router2.rule=Path(`/bar`)"
+      - "traefik.http.routers.router2.rule=PathPrefix(`/`)"
       - "traefik.http.routers.router2.entrypoints=web"
       - "traefik.http.routers.router2.middlewares=crowdsec1@docker" 
       # Definition of the service
-      - "traefik.http.services.service2.loadbalancer.server.port=80"
+      - "traefik.http.services.service2.loadbalancer.server.port=5001"
       # Definition of the middleware
       - "traefik.http.middlewares.crowdsec2.plugin.bouncer.enabled=true"
       # crowdseclapikey must be uniq to the middleware attached to the service

pkg/cache/cache.go

@@ -19,6 +19,8 @@ var redis simpleredis.SimpleRedis
 
 var redisEnabled = false
 
+// CLASSIC
+
 func getDecisionLocalCache(clientIP string) (bool, error) {
 	banned, isCached := cache.Get(clientIP)
 	bannedString, isValid := banned.(string)
@@ -36,6 +38,8 @@ func deleteDecisionLocalCache(clientIP string) {
 	cache.Del(clientIP)
 }
 
+// REDIS
+
 func getDecisionRedisCache(clientIP string) (bool, error) {
 	banned, err := redis.Get(clientIP)
 	bannedString := string(banned)
@@ -53,6 +57,7 @@ func deleteDecisionRedisCache(clientIP string) {
 	redis.Del(clientIP)
 }
 
+// DeleteDecision delete decision in cache
 func DeleteDecision(clientIP string) {
 	if redisEnabled {
 		deleteDecisionRedisCache(clientIP)
@@ -89,5 +94,5 @@ func SetDecision(clientIP string, isBanned bool, duration int64) {
 func InitRedisClient(host string) {
 	redisEnabled = true
 	redis.Init(host)
-	logger.Debug("connect to redis")
+	logger.Debug("Redis initialized")
 }

pkg/logger/logger.go

@@ -14,13 +14,13 @@ var (
 // Init Set Default log level to info in case log level to defined
 func Init(logLevel string) {
 	switch logLevel {
-		case "INFO":
-			loggerInfo.SetOutput(os.Stdout)
-		case "DEBUG":
-			loggerInfo.SetOutput(os.Stdout)
-			loggerDebug.SetOutput(os.Stdout)
-		default:
-			loggerInfo.SetOutput(os.Stdout)
+	case "INFO":
+		loggerInfo.SetOutput(os.Stdout)
+	case "DEBUG":
+		loggerInfo.SetOutput(os.Stdout)
+		loggerDebug.SetOutput(os.Stdout)
+	default:
+		loggerInfo.SetOutput(os.Stdout)
 	}
 }
 

pkg/redis/redis.go

@@ -1,13 +1,14 @@
 package simpleredis
 
 import (
+	"bufio"
 	"fmt"
 	"net"
-	"strconv"
+	"net/textproto"
 	"strings"
 	"time"
 
-	"github.com/tehnerd/goUtils/netutils"
+	logger "github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin/pkg/logger"
 )
 
 type RedisCmd struct {
@@ -19,10 +20,7 @@ type RedisCmd struct {
 }
 
 type SimpleRedis struct {
-	redisChanRead  chan RedisCmd
-	redisChanWrite chan RedisCmd
-	redisHost      string
-	redisCmd       RedisCmd
+	redisHost string
 }
 
 func genRedisArray(params ...[]byte) []byte {
@@ -35,135 +33,43 @@ func genRedisArray(params ...[]byte) []byte {
 	return []byte(MSG)
 }
 
-func parseResponse(response []byte, dataBuf []byte, Len *int) ([]byte, []byte, error) {
-	dataBuf = append(dataBuf, response...)
-	lenCRLF := 2
-	if *Len != 0 {
-		if len(dataBuf) < *Len {
-			return nil, dataBuf, nil
-		} else {
-			return dataBuf[:*Len], dataBuf[*Len:], nil
-		}
-	}
-	for {
-		switch string(dataBuf[0]) {
-		case "+", "-", ":":
-			//simple strings, error,int. usually ther are in format (+|-|:)DATA\r\n"
-			if len(dataBuf) < 3 {
-				return nil, dataBuf, nil
-			}
-			cntr := 1
-			for ; cntr < len(dataBuf); cntr++ {
-				if dataBuf[cntr] == '\r' {
-					break
-				}
-			}
-			if cntr == len(dataBuf) {
-				return nil, dataBuf, nil
-			}
-			response = dataBuf[1:cntr]
-			return response, dataBuf[cntr+2:], nil
-		case "$":
-			//bulk string. format $LEN\r\nDATA\r\n. up to 512MB
-			cntr := 1
-			for ; cntr < len(dataBuf); cntr++ {
-				if string(dataBuf[cntr]) == "\r" {
-					break
-				}
-			}
-			if cntr == len(dataBuf) || cntr+lenCRLF > len(dataBuf) {
-				return nil, dataBuf, nil
-			}
-			dataLen, err := strconv.Atoi(string(dataBuf[1:cntr]))
-			if err != nil {
-				return nil, dataBuf[cntr:], nil
-			}
-
-			if dataLen == -1 {
-				return nil, dataBuf[cntr:], fmt.Errorf("NOT FOUND")
-			}
-			if cntr+lenCRLF > len(dataBuf)-lenCRLF {
-				*Len = dataLen
-				return nil, dataBuf[cntr+lenCRLF:], nil
-			}
-			if len(dataBuf[cntr+lenCRLF:len(dataBuf)-lenCRLF]) < dataLen {
-				*Len = dataLen
-				return nil, dataBuf[cntr+lenCRLF:], nil
-			} else {
-				return dataBuf[cntr+lenCRLF : cntr+dataLen+lenCRLF], dataBuf[cntr+dataLen+lenCRLF:], nil
-			}
-		case "*":
-			panic("array")
-		default:
-			if len(dataBuf) > 1 {
-				dataBuf = dataBuf[1:]
-			} else {
-				return nil, dataBuf, nil
-			}
-		}
-	}
-}
-
-func initContext(hostnamePort string, redisCmdWrite, redisCmdRead chan RedisCmd) {
-	tcpRemoteAddress, err := net.ResolveTCPAddr("tcp", hostnamePort)
+func askRedis(hostnamePort string, cmd RedisCmd, channel chan RedisCmd) {
+	conn, err := net.Dial("tcp", hostnamePort)
 	if err != nil {
-		panic("cant resolve remote redis address")
+		return
 	}
-	var ladr *net.TCPAddr
-	msgBuf := make([]byte, 65000)
-	initMsg := []byte("*1\r\n$4\r\nPING\r\n")
-	writeChan := make(chan []byte)
-	readChan := make(chan []byte)
-	flushChan := make(chan int)
-	go netutils.AutoRecoonectedTCP(ladr, tcpRemoteAddress, msgBuf, initMsg, writeChan, readChan, flushChan)
-	<-readChan
-	dataBuf := make([]byte, 0)
-	dataLen := 0
-	for {
-		select {
-		case cmd := <-redisCmdWrite:
-			switch cmd.Command {
-			case "SET":
-				data := genRedisArray([]byte("SET"), []byte(cmd.Name), cmd.Data, []byte("EX"), []byte(fmt.Sprintf("%v", cmd.Duration)))
-				writeChan <- data
-			case "GET":
-				data := genRedisArray([]byte("GET"), []byte(cmd.Name))
-				writeChan <- data
-			case "DEL":
-				data := genRedisArray([]byte("DEL"), []byte(cmd.Name))
-				writeChan <- data
-			}
-		case response := <-readChan:
-			data, dataBuf, err := parseResponse(response, dataBuf, &dataLen)
-			if dataLen != 0 {
-				for data == nil {
-					response = <-readChan
-					data, dataBuf, err = parseResponse(response, dataBuf, &dataLen)
-				}
-			}
-			if err != nil {
-				select {
-				case redisCmdRead <- RedisCmd{
-					Error: err,
-				}:
-				case <-time.After(time.Second * 5):
-				}
-			}
-			if data != nil && string(data) != "PONG" {
-				select {
-				case redisCmdRead <- RedisCmd{
-					Data: data,
-				}:
-				case <-time.After(time.Second * 5):
-				}
-				dataLen = 0
-			}
-		case <-flushChan:
-			dataBuf = dataBuf[:]
-			dataLen = 0
+	defer conn.Close()
+
+	writer := textproto.NewWriter(bufio.NewWriter(conn))
+	reader := textproto.NewReader(bufio.NewReader(conn))
+
+	switch cmd.Command {
+	case "SET":
+		data := genRedisArray([]byte("SET"), []byte(cmd.Name), []byte(cmd.Data), []byte("EX"), []byte(fmt.Sprintf("%v", cmd.Duration)))
+		writer.PrintfLine(string(data))
+		logger.Info("set")
+	case "DEL":
+		data := genRedisArray([]byte("DEL"), []byte(cmd.Name))
+		writer.PrintfLine(string(data))
+		logger.Info("del")
+	case "GET":
+		data := genRedisArray([]byte("GET"), []byte(cmd.Name))
+		writer.PrintfLine(string(data))
+		logger.Info("get")
+		for {
 			select {
-			case redisCmdRead <- RedisCmd{}:
-			case <-time.After(time.Second * 5):
+			case <-time.After(time.Second * 1):
+				channel <- RedisCmd{Error: fmt.Errorf("timeout")}
+				return
+			default:
+				read, _ := reader.ReadLineBytes()
+				if string(read) != "$1" {
+					channel <- RedisCmd{Error: fmt.Errorf("miss")}
+					return
+				}
+				read, _ = reader.ReadLineBytes()
+				channel <- RedisCmd{Data: read}
+				return
 			}
 		}
 	}
@@ -171,16 +77,16 @@ func initContext(hostnamePort string, redisCmdWrite, redisCmdRead chan RedisCmd)
 
 func (sr *SimpleRedis) Init(redisHost string) {
 	sr.redisHost = redisHost
-	sr.redisChanWrite = make(chan RedisCmd)
-	sr.redisChanRead = make(chan RedisCmd)
-	go initContext(sr.redisHost, sr.redisChanWrite, sr.redisChanRead)
 }
 
 func (sr *SimpleRedis) Get(name string) ([]byte, error) {
-	sr.redisCmd.Command = "GET"
-	sr.redisCmd.Name = name
-	sr.redisChanWrite <- sr.redisCmd
-	resp := <-sr.redisChanRead
+	redisCmd := RedisCmd{
+		Command: "GET",
+		Name:    name,
+	}
+	channel := make(chan RedisCmd)
+	go askRedis(sr.redisHost, redisCmd, channel)
+	resp := <-channel
 	if resp.Error != nil {
 		return nil, resp.Error
 	}
@@ -188,25 +94,21 @@ func (sr *SimpleRedis) Get(name string) ([]byte, error) {
 }
 
 func (sr *SimpleRedis) Set(name string, data []byte, duration int64) error {
-	sr.redisCmd.Command = "SET"
-	sr.redisCmd.Name = name
-	sr.redisCmd.Data = data
-	sr.redisCmd.Duration = duration
-	sr.redisChanWrite <- sr.redisCmd
-	resp := <-sr.redisChanRead
-	if resp.Error != nil {
-		return resp.Error
+	redisCmd := RedisCmd{
+		Command:  "SET",
+		Name:     name,
+		Data:     data,
+		Duration: duration,
 	}
+	go askRedis(sr.redisHost, redisCmd, nil)
 	return nil
 }
 
 func (sr *SimpleRedis) Del(name string) error {
-	sr.redisCmd.Command = "DEL"
-	sr.redisCmd.Name = name
-	sr.redisChanWrite <- sr.redisCmd
-	resp := <-sr.redisChanRead
-	if resp.Error != nil {
-		return resp.Error
+	redisCmd := RedisCmd{
+		Command: "DEL",
+		Name:    name,
 	}
+	go askRedis(sr.redisHost, redisCmd, nil)
 	return nil
 }