trim more debug loglines

Author: orangepizza

providers/http/nfqueue/nfqueue.go

@@ -14,7 +14,6 @@ import (
 	"time"
 
 	gnfqueue "github.com/florianl/go-nfqueue"
-	"github.com/go-acme/lego/v4/log"
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 )
@@ -81,15 +80,16 @@ func craftReplyPacketBytes(keyAuth string, inputpacket gopacket.Packet) []byte {
 	return outbuffer.Bytes()
 }
 
-func sendPacketv4(packet []byte, DstIP *net.IP) {
+// sendPacket sends packet: TODO: call cleanup if errors out
+func sendPacket(packet []byte, DstIP *net.IP) error {
 	var err error
 	con, err := net.Dial("ip:6", DstIP.String())
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 	_, err = con.Write(packet)
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 }
 
@@ -99,7 +99,7 @@ func (w *HTTPProvider) serve(domain, token, keyAuth string) error {
 	//run nfqueue start
 	cmd := exec.Command("iptables", "-I", "INPUT", "-p", "tcp", "--dport", w.port, "-j", "NFQUEUE", "--queue-num", "8555")
 	err := cmd.Run()
-	// run this down when this server come down
+	// ensure even if clean funtion failed to called
 	defer exec.Command("iptables", "-D", "INPUT", "-p", "tcp", "--dport", w.port, "-j", "NFQUEUE", "--queue-num", "8555").Run()
 	if err != nil {
 		return err
@@ -128,13 +128,9 @@ func (w *HTTPProvider) serve(domain, token, keyAuth string) error {
 		payload := gopacket.NewPacket(*a.Payload, layers.LayerTypeIPv4, opt)
 		ipL := payload.Layer(layers.LayerTypeIPv4)
 		srcip := ipL.(*layers.IPv4).SrcIP
-		log.Infof("%s, %s", srcip.String())
 		if tcpLayer := payload.Layer(layers.LayerTypeTCP); tcpLayer != nil {
 			// Get actual TCP data from this layer
 			inputTcp, _ := tcpLayer.(*layers.TCP)
-			log.Infof("From src port %d to dst port %d\n", inputTcp.SrcPort, inputTcp.DstPort)
-			log.Infof("Payload: %s", inputTcp.Payload)
-			log.Infof("tcp header: %s", inputTcp.LayerContents())
 			// this should be HTTP payload
 			httpPayload, err := http.ReadRequest(bufio.NewReader((bytes.NewReader(inputTcp.LayerPayload()))))
 			if err != nil {
@@ -146,13 +142,9 @@ func (w *HTTPProvider) serve(domain, token, keyAuth string) error {
 				//we got the token!, block the packet to backend server.
 				nf.SetVerdict(id, gnfqueue.NfDrop)
 				//forge our new reply
-				log.Infof("got token packet")
-
 				replypacket := craftReplyPacketBytes(keyAuth, payload)
-				//dial validation agent
-				// Send the modified packet back into the session
-				log.Infof(string(replypacket))
-				sendPacketv4(replypacket, &srcip)
+				// Send the modified packet back to VA, ignore err as it won't crash
+				sendPacket(replypacket, &srcip)
 				// packet sent, end of function
 				return 0
 			} else {
@@ -167,7 +159,7 @@ func (w *HTTPProvider) serve(domain, token, keyAuth string) error {
 		return 0
 	}
 
-	// Register your function to listen on nflqueue queue 100
+	// Register your function to listen on nflqueue queue
 	err = nf.Register(w.context, handlepacket)
 	if err != nil {
 		fmt.Println(err)