Merge pull request #160 from MysteriumNetwork/hotfix/node-throws-out-…

…clients-with-several-digit-ids MYST-333 Fix node auth error when client ids are several number length
mysteriumnetwork · Feb 14, 2018 · 45a1ace · 45a1ace
2 parents f82562b + 16a9466
commit 45a1ace
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/openvpn/middlewares/server/auth/middleware.go b/openvpn/middlewares/server/auth/middleware.go
@@ -44,7 +44,7 @@ func (m *middleware) Stop() error {
 
 func (m *middleware) checkReAuth(line string) (cont bool, consumed bool, err error) {
 
-	rule, err := regexp.Compile("^>CLIENT:REAUTH,(\\d),(\\d)$")
+	rule, err := regexp.Compile("^>CLIENT:REAUTH,(\\d+),(\\d+)$")
 	if err != nil {
 		return false, false, err
 	}
@@ -62,7 +62,7 @@ func (m *middleware) checkReAuth(line string) (cont bool, consumed bool, err err
 
 func (m *middleware) checkConnect(line string) (cont bool, consumed bool, err error) {
 
-	rule, err := regexp.Compile("^>CLIENT:CONNECT,(\\d),(\\d)$")
+	rule, err := regexp.Compile("^>CLIENT:CONNECT,(\\d+),(\\d+)$")
 	if err != nil {
 		return false, false, err
 	}

diff --git a/openvpn/middlewares/server/auth/middleware_test.go b/openvpn/middlewares/server/auth/middleware_test.go
@@ -210,3 +210,18 @@ func Test_ConsumeLineAuthFalseChecker(t *testing.T) {
 	assert.True(t, fas.called)
 	assert.False(t, fas.authenticated)
 }
+
+func TestMiddlewareConsumesClientIdsAntKeysWithSeveralDigits(t *testing.T) {
+	var tests = []string{
+		">CLIENT:CONNECT,115,23",
+		">CLIENT:REAUTH,11,27",
+	}
+
+	fas := newFakeAuthenticatorStub()
+	middleware := NewMiddleware(fas.fakeAuthenticator)
+	for _, testLine := range tests {
+		consumed, err := middleware.ConsumeLine(testLine)
+		assert.NoError(t, err, testLine)
+		assert.Equal(t, true, consumed, testLine)
+	}
+}