Fix verify header report false on summary packet

log.go

@@ -4,6 +4,11 @@ import "github.com/sirupsen/logrus"
 
 var log logrus.FieldLogger
 
+func init() {
+	// Give a default logger at the start to avoid null pointer error
+	log = logrus.New()
+}
+
 func SetLogger(logger logrus.FieldLogger) {
 	log = logger
 }

map_test.go

@@ -6,14 +6,12 @@ import (
 	"os"
 	"testing"
 
-	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestSingleIp(t *testing.T) {
-	log = logrus.New()
 	ip := net.UDPAddr{IP: net.ParseIP("192.168.0.5"), Port: 514}
 
 	// If the map is not set

packageudp_test.go

@@ -5,13 +5,10 @@ import (
 	"net"
 	"testing"
 
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestPackageUdp(t *testing.T) {
-	log = logrus.New()
-
 	// No mapping enabled
 	ip := net.UDPAddr{IP: net.ParseIP("192.168.0.7"), Port: 12345}
 	config := Config{}

queue_test.go

@@ -6,13 +6,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
 
 // TestQueueInsert tests the good validation
 func TestQueueInsert(t *testing.T) {
-	log = logrus.New()
 	queuePath := path.Join(t.TempDir(), "shoveler-queue")
 	config := Config{QueueDir: queuePath}
 	queue := NewConfirmationQueue(&config)

verify.go

@@ -1,7 +1,6 @@
 package shoveler
 
 import (
-	"bytes"
 	"encoding/binary"
 )
 
@@ -11,7 +10,7 @@ type Header struct {
 	Code        byte
 	Pseq        uint8
 	Plen        uint16
-	ServerStart uint32
+	ServerStart int32
 }
 
 // verifyPacket will verify the packet matches the expected
@@ -23,13 +22,18 @@ func VerifyPacket(packet []byte) bool {
 		log.Infoln("Packet not large enough for XRootD header of 8 bytes, dropping.")
 		return false
 	}
-	header := Header{}
-	buffer := bytes.NewBuffer(packet[:8])
-	err := binary.Read(buffer, binary.BigEndian, &header)
-	if err != nil {
-		log.Warningln("Failed to read the binary packet into header structure:", err)
-		return false
+
+	// XML '<' character indicates a summary packet
+	if len(packet) > 0 && packet[0] == '<' {
+		return true
 	}
+
+	header := Header{}
+	header.Code = packet[0]
+	header.Pseq = packet[1]
+	header.Plen = binary.BigEndian.Uint16(packet[2:4])
+	header.ServerStart = int32(binary.BigEndian.Uint32(packet[4:8]))
+
 	// If the beginning of the packet doesn't match some expectations, then continue
 	if len(packet) != int(header.Plen) {
 		log.Warningln("Packet length does not match header.  Packet:", len(packet), "Header:", int(header.Plen))

verify_test.go

@@ -28,6 +28,16 @@ func TestGoodVerify(t *testing.T) {
 
 }
 
+func TestVerifySummaryPacket(t *testing.T) {
+	summaryPacket := `<statistics  
+     tod="int64" ver="chars" src=”chars” tos=”int64”
+     pgm=”chars” ins=”chars” pid=”int” site=”chars”>
+	</statistics>
+	`
+
+	assert.True(t, VerifyPacket([]byte(summaryPacket)), "Failed to verify packet")
+}
+
 // TestBadVerify tests the validation if the packets are not good (random bits)
 func TestBadVerify(t *testing.T) {
 	badHeader := Header{}