Merge branch 'main' into dependabot/go_modules/golang.org/x/net-0.17.0

Author: ackleymi

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.8.0 (October 25, 2023)
+
+ENHANCEMENTS
+
+* Remove tag from field map [GH 544]
+* Add message.Bytes() to avoid string conversion [GH 546]
+* Check RejectInvalidMessage on FIXT validation [GH 572]
+
+BUG FIXES
+
+* Fix repeating group read tags lost [GH 462]
+* Acceptance test result must be predictable [GH 578]
+* Makes event timer stop idempotent [GH 580, 581]
+* Added WaitGroup Wait in Initiator [GH 584]
+
 ## 0.7.0 (January 2, 2023)
 
 FEATURES

_test/ReflectorClient.rb

@@ -67,11 +67,15 @@ def @reflector.waitConnectAction(cid)
     end
 
     def @reflector.waitDisconnectAction(cid)
-      socket = @sockets[cid]
-      if IO.select([socket], nil, nil, 10) == nil then 
-	    raise "Connection hangs after ten seconds."
-      elsif !socket.eof? then
-	    raise "Expected disconnection, got data"
+      begin
+        socket = @sockets[cid]
+        if IO.select([socket], nil, nil, 10) == nil then
+        raise "Connection hangs after ten seconds."
+        elsif !socket.eof? then
+        raise "Expected disconnection, got data"
+        end
+      rescue Errno::ECONNRESET
+        # Ignore, server has already disconnected the socket
       end
     end
 

_test/ReflectorServer.rb

@@ -58,10 +58,14 @@ def @reflector.waitConnectAction(cid)
     end
 
     def @reflector.waitDisconnectAction(cid)
-      if IO.select([@socket], nil, nil, 10) == nil then 
-	raise "Connection hangs after five seconds."
-      elsif !@socket.eof? then
-	raise "Expected disconnection, got data"
+      begin
+        if IO.select([@socket], nil, nil, 10) == nil then
+          raise "Connection hangs after five seconds."
+        elsif !@socket.eof? then
+          raise "Expected disconnection, got data"
+        end
+      rescue Errno::ECONNRESET
+        # Ignore, client has already disconnected the socket
       end
     end
 

datadictionary/datadictionary.go

@@ -315,6 +315,10 @@ func Parse(path string) (*DataDictionary, error) {
 func ParseSrc(xmlSrc io.Reader) (*DataDictionary, error) {
 	doc := new(XMLDoc)
 	decoder := xml.NewDecoder(xmlSrc)
+	decoder.CharsetReader = func(encoding string, input io.Reader) (io.Reader, error) {
+		return input, nil
+	}
+
 	if err := decoder.Decode(doc); err != nil {
 		return nil, errors.Wrapf(err, "problem parsing XML file")
 	}

dialer.go

@@ -18,6 +18,7 @@ package quickfix
 import (
 	"fmt"
 	"net"
+	"time"
 
 	"golang.org/x/net/proxy"
 
@@ -27,8 +28,16 @@ import (
 func loadDialerConfig(settings *SessionSettings) (dialer proxy.Dialer, err error) {
 	stdDialer := &net.Dialer{}
 	if settings.HasSetting(config.SocketTimeout) {
-		if stdDialer.Timeout, err = settings.DurationSetting(config.SocketTimeout); err != nil {
-			return
+		timeout, err := settings.DurationSetting(config.SocketTimeout)
+		if err != nil {
+			timeoutInt, err := settings.IntSetting(config.SocketTimeout)
+			if err != nil {
+				return stdDialer, err
+			}
+
+			stdDialer.Timeout = time.Duration(timeoutInt) * time.Second
+		} else {
+			stdDialer.Timeout = timeout
 		}
 	}
 	dialer = stdDialer

filestore.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/pkg/errors"
@@ -213,15 +214,15 @@ func (store *fileStore) populateCache() (creationTimePopulated bool, err error)
 	}
 
 	if senderSeqNumBytes, err := ioutil.ReadFile(store.senderSeqNumsFname); err == nil {
-		if senderSeqNum, err := strconv.Atoi(string(senderSeqNumBytes)); err == nil {
+		if senderSeqNum, err := strconv.Atoi(strings.Trim(string(senderSeqNumBytes), "\r\n")); err == nil {
 			if err = store.cache.SetNextSenderMsgSeqNum(senderSeqNum); err != nil {
 				return creationTimePopulated, errors.Wrap(err, "cache set next sender")
 			}
 		}
 	}
 
 	if targetSeqNumBytes, err := ioutil.ReadFile(store.targetSeqNumsFname); err == nil {
-		if targetSeqNum, err := strconv.Atoi(string(targetSeqNumBytes)); err == nil {
+		if targetSeqNum, err := strconv.Atoi(strings.Trim(string(targetSeqNumBytes), "\r\n")); err == nil {
 			if err = store.cache.SetNextTargetMsgSeqNum(targetSeqNum); err != nil {
 				return creationTimePopulated, errors.Wrap(err, "cache set next target")
 			}

filestore_test.go

@@ -19,10 +19,12 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
 
+	assert2 "github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
@@ -62,3 +64,14 @@ func (suite *FileStoreTestSuite) TearDownTest() {
 func TestFileStoreTestSuite(t *testing.T) {
 	suite.Run(t, new(FileStoreTestSuite))
 }
+
+func TestStringParse(t *testing.T) {
+	assert := assert2.New(t)
+	i, err := strconv.Atoi(strings.Trim("00005\n", "\r\n"))
+	assert.Nil(err)
+	assert.Equal(5, i)
+
+	i, err = strconv.Atoi(strings.Trim("00006\r", "\r\n"))
+	assert.Nil(err)
+	assert.Equal(6, i)
+}

initiator.go

@@ -61,7 +61,7 @@ func (i *Initiator) Start() (err error) {
 			i.wg.Done()
 		}(sessionID)
 	}
-
+	i.wg.Wait()
 	return
 }
 

internal/event_timer.go

@@ -10,6 +10,7 @@ type EventTimer struct {
 	timer *time.Timer
 	done  chan struct{}
 	wg    sync.WaitGroup
+	once  sync.Once
 }
 
 func NewEventTimer(task func()) *EventTimer {
@@ -45,7 +46,10 @@ func (t *EventTimer) Stop() {
 		return
 	}
 
-	close(t.done)
+	t.once.Do(func() {
+		close(t.done)
+	})
+
 	t.wg.Wait()
 }
 

internal/event_timer_test.go

@@ -0,0 +1,27 @@
+// Copyright (c) quickfixengine.org  All rights reserved.
+//
+// This file may be distributed under the terms of the quickfixengine.org
+// license as defined by quickfixengine.org and appearing in the file
+// LICENSE included in the packaging of this file.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+// THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE.
+//
+// See http://www.quickfixengine.org/LICENSE for licensing information.
+//
+// Contact [email protected] if any conditions of this licensing
+// are not clear to you.
+
+package internal
+
+import (
+	"testing"
+)
+
+func TestEventTimer_Stop_idempotent(*testing.T) {
+	t := NewEventTimer(func() {})
+
+	t.Stop()
+	t.Stop()
+}