Merge pull request #627 from haoyang1994/feat/proxy_v2

feat: change proxyproto pkg to support proxy proto v2
quickfixgo · Apr 22, 2024 · b7e2597 · b7e2597
2 parents 51e2cde + 1518a20
commit b7e2597
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/accepter_test.go b/accepter_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/quickfixgo/quickfix/config"
 
-	proxyproto "github.com/armon/go-proxyproto"
+	proxyproto "github.com/pires/go-proxyproto"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/acceptor.go b/acceptor.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"sync"
 
-	proxyproto "github.com/armon/go-proxyproto"
+	proxyproto "github.com/pires/go-proxyproto"
 
 	"github.com/quickfixgo/quickfix/config"
 )

diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.21
 require (
 	github.com/armon/go-proxyproto v0.1.0
 	github.com/mattn/go-sqlite3 v1.14.18
+	github.com/pires/go-proxyproto v0.7.0
 	github.com/pkg/errors v0.9.1
 	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.8.4

diff --git a/go.sum b/go.sum
@@ -23,6 +23,8 @@ github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/montanaflynn/stats v0.6.6 h1:Duep6KMIDpY4Yo11iFsvyqJDyfzLF9+sndUKT+v64GQ=
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
+github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
+github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

diff --git a/validation_test.go b/validation_test.go
@@ -928,10 +928,10 @@ func tcMultipleRepeatingGroupFields() validateTest {
 	dict, _ := datadictionary.Parse("spec/FIX43.xml")
 	validator := NewValidator(defaultValidatorSettings, dict, nil)
 	return validateTest{
-		TestName:             "Multiple repeating group fields in a message",
-		Validator:            validator,
-		MessageBytes:         []byte("8=FIX.4.39=17635=D34=249=TW52=20140329-22:38:4556=ISLD11=ID453=2448=PARTYID452=3523=SUBID448=PARTYID2452=378=179=ACCOUNT80=121=140=154=138=20055=INTC60=20140329-22:38:4510=178"),
-		DoNotExpectReject:    true,
+		TestName:          "Multiple repeating group fields in a message",
+		Validator:         validator,
+		MessageBytes:      []byte("8=FIX.4.39=17635=D34=249=TW52=20140329-22:38:4556=ISLD11=ID453=2448=PARTYID452=3523=SUBID448=PARTYID2452=378=179=ACCOUNT80=121=140=154=138=20055=INTC60=20140329-22:38:4510=178"),
+		DoNotExpectReject: true,
 	}
 }