Merge pull request #204 from NodeFactoryIo/hotfix/tunnel

Avoid duplicated http and ws ports inside addr pool

Author: mpetrunic

CHANGELOG.md

@@ -6,6 +6,7 @@
 ### Added
 
 ### Fix
+- Fix duplicated ports inside tunnel address pool [\#204](https://github.com/NodeFactoryIo/vedran/pull/204) ([mpetrun5](https://github.com/mpetrun5))
 
 ### Changed
 

internal/loadbalancer/server.go

@@ -100,7 +100,7 @@ func StartLoadBalancerServer(
 	r := router.CreateNewApiRouter(apiController, privateKey)
 	prometheus.RecordMetrics(*repos)
 	if props.CertFile != "" {
-		tlsConfig := &tls.Config{MinVersion: tls.VersionTLS10}
+		tlsConfig := &tls.Config{MinVersion: 0}
 		server := &http.Server{
 			Addr:      fmt.Sprintf(":%d", props.Port),
 			Handler:   handlers.CORS()(r),

pkg/http-tunnel/integration_test.go

@@ -67,7 +67,6 @@ func Test_IntegrationTest(t *testing.T) {
 	assert.True(t, strings.Contains(logStr, "msg=\"try connect\""))
 	assert.True(t, strings.Contains(logStr, "msg=\"handshake for address 127.0.0.1:5223\""))
 	assert.True(t, strings.Contains(logStr, "msg=\"REGISTRY SUBSCRIBE\""))
-	assert.True(t, strings.Contains(logStr, "msg=\"REGISTRY SET (OLD FOUND)\""))
 	assert.True(t, strings.Contains(logStr, "msg=\"REGISTRY SET (NEW SET)\""))
 	assert.True(t, strings.Contains(logStr, "msg=\"test-id connected\""))
 

pkg/http-tunnel/server/addrpool.go

@@ -53,6 +53,18 @@ func (ap *AddrPool) Init(rang string) error {
 func (ap *AddrPool) Acquire(cname string, pname string) (int, error) {
 	ap.mutex.Lock()
 	defer ap.mutex.Unlock()
+	var existingPort int
+
+	if pname == "http" {
+		existingPort, _ = ap.GetHTTPPort(cname)
+	} else {
+		existingPort, _ = ap.GetWSPort(cname)
+	}
+
+	if existingPort != 0 {
+		return existingPort, nil
+	}
+
 	assignedPort := 0
 	// search for the first unnused port
 	for i := ap.first; i < ap.last; i++ {

pkg/http-tunnel/server/addrpool_test.go

@@ -73,7 +73,29 @@ func TestAddrPool_Acquire(t *testing.T) {
 			fields:  fields{100, 100, 1, make(map[int]*RemoteID)},
 		},
 		{
-			name:    "Returns port if available",
+			name:    "Returns existing http port if exists",
+			args:    args{cname: "test-id", pname: "http"},
+			wantErr: false,
+			want:    100,
+			fields: fields{100, 102, 1, map[int]*RemoteID{100: {
+				ClientID: "test-id",
+				PortName: "http",
+				Port:     100,
+			}}},
+		},
+		{
+			name:    "Returns existing ws port if exists",
+			args:    args{cname: "test-id", pname: "ws"},
+			wantErr: false,
+			want:    100,
+			fields: fields{100, 102, 1, map[int]*RemoteID{100: {
+				ClientID: "test-id",
+				PortName: "ws",
+				Port:     100,
+			}}},
+		},
+		{
+			name:    "Acquires port if available",
 			args:    args{cname: "test-id", pname: "default"},
 			wantErr: false,
 			want:    100,

pkg/http-tunnel/server/registry.go

@@ -6,9 +6,10 @@ package server
 
 import (
 	"fmt"
-	log "github.com/sirupsen/logrus"
 	"net"
 	"sync"
+
+	log "github.com/sirupsen/logrus"
 )
 
 // RegistryItem holds information about hosts and listeners associated with a
@@ -149,12 +150,6 @@ func (r *registry) set(i *RegistryItem, identifier string) error {
 		return errClientNotSubscribed
 	}
 
-	r.logger.WithFields(log.Fields{
-		"client-name": identifier,
-		"client-id":   j.ClientID,
-		"data":        j,
-	}).Debug("REGISTRY SET (OLD FOUND)")
-
 	i.ClientID = j.ClientID
 
 	r.logger.WithFields(log.Fields{

pkg/http-tunnel/server/server.go

@@ -223,13 +223,13 @@ func (s *Server) handleClient(conn net.Conn) {
 
 	resp, err = s.httpClient.Do(req)
 	if err != nil {
-		alogger.Error("handshake failed 1", err)
+		alogger.Error("handshake failed 1 ", err)
 		goto reject
 	}
 
 	if resp.StatusCode != http.StatusOK {
 		err = fmt.Errorf("Status %s", resp.Status)
-		alogger.Error("handshake failed 2", err)
+		alogger.Error("handshake failed 2 ", err)
 		goto reject
 	}
 
@@ -238,7 +238,7 @@ func (s *Server) handleClient(conn net.Conn) {
 		token = resp.Header.Get("X-Auth-Header")
 		if token == "" {
 			err = errors.New("Auth header missing")
-			alogger.Error("handshake failed", err)
+			alogger.Error("handshake failed ", err)
 			goto reject
 		}