Browse Source

Concat host/port with net package

This makes sure IPv6 addresses are treated properly
Karmanyaah Malhotra 4 years ago
parent
commit
b4fbbeb869
1 changed files with 4 additions and 3 deletions
  1. 4 3
      controllers/networkHttpController.go

+ 4 - 3
controllers/networkHttpController.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http"
 	"strings"
 	"strings"
 	"time"
 	"time"
@@ -629,8 +630,8 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 	}
 	}
 
 
 	netID := network.NetID
 	netID := network.NetID
-	grpcaddress := servercfg.GetGRPCHost() + ":" + servercfg.GetGRPCPort()
-	apiaddress := servercfg.GetAPIHost() + ":" + servercfg.GetAPIPort()
+	grpcaddress := net.JoinHostPort(servercfg.GetGRPCHost(), servercfg.GetGRPCPort())
+	apiaddress := net.JoinHostPort(servercfg.GetAPIHost(), servercfg.GetAPIPort())
 	wgport := servercfg.GetGRPCWGPort()
 	wgport := servercfg.GetGRPCWGPort()
 
 
 	accessstringdec := wgport + "|" +grpcaddress + "|" + apiaddress + "|" + netID + "|" + accesskey.Value + "|" + privAddr
 	accessstringdec := wgport + "|" +grpcaddress + "|" + apiaddress + "|" + netID + "|" + accesskey.Value + "|" + privAddr
@@ -668,7 +669,7 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 func GetSignupToken(netID string) (models.AccessKey, error) {
 func GetSignupToken(netID string) (models.AccessKey, error) {
 
 
 	var accesskey models.AccessKey
 	var accesskey models.AccessKey
-        address := servercfg.GetGRPCHost() + ":" + servercfg.GetGRPCPort()
+	address := net.JoinHostPort(servercfg.GetGRPCHost(), servercfg.GetGRPCPort())
 
 
         accessstringdec := address + "|" + netID + "|" + "" + "|"
         accessstringdec := address + "|" + netID + "|" + "" + "|"
         accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec))
         accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec))