Merge pull request #769 from gravitl/feature_v0.10.1_token_length

Feature v0.10.1 token length

go.mod

@@ -46,10 +46,13 @@ require (
 	github.com/google/go-cmp v0.5.5 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/mdlayher/genetlink v1.0.0 // indirect
 	github.com/mdlayher/netlink v1.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.0.1 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect

logic/accesskeys.go

@@ -52,13 +52,7 @@ func CreateAccessKey(accesskey models.AccessKey, network models.Network) (models
 	var accessToken models.AccessToken
 	s := servercfg.GetServerConfig()
 	servervals := models.ServerConfig{
-		CoreDNSAddr:     s.CoreDNSAddr,
-		APIConnString:   s.APIConnString,
-		APIHost:         s.APIHost,
-		APIPort:         s.APIPort,
 		GRPCConnString:  s.GRPCConnString,
-		GRPCHost:        s.GRPCHost,
-		GRPCPort:        s.GRPCPort,
 		GRPCSSL:         s.GRPCSSL,
 		CheckinInterval: s.CheckinInterval,
 	}

models/accessToken.go

@@ -3,7 +3,6 @@ package models
 type AccessToken struct {
 	ServerConfig
 	ClientConfig
-	WG
 }
 
 type ClientConfig struct {
@@ -13,21 +12,7 @@ type ClientConfig struct {
 }
 
 type ServerConfig struct {
-	CoreDNSAddr     string `json:"corednsaddr"`
-	APIConnString   string `json:"apiconn"`
-	APIHost         string `json:"apihost"`
-	APIPort         string `json:"apiport"`
 	GRPCConnString  string `json:"grpcconn"`
-	GRPCHost        string `json:"grpchost"`
-	GRPCPort        string `json:"grpcport"`
 	GRPCSSL         string `json:"grpcssl"`
 	CheckinInterval string `json:"checkininterval"`
 }
-
-type WG struct {
-	GRPCWireGuard  string `json:"grpcwg"`
-	GRPCWGAddress  string `json:"grpcwgaddr"`
-	GRPCWGPort     string `json:"grpcwgport"`
-	GRPCWGPubKey   string `json:"grpcwgpubkey"`
-	GRPCWGEndpoint string `json:"grpcwgendpoint"`
-}

netclient/config/config.go

@@ -36,7 +36,6 @@ type ClientConfig struct {
 type ServerConfig struct {
 	CoreDNSAddr     string `yaml:"corednsaddr"`
 	GRPCAddress     string `yaml:"grpcaddress"`
-	APIAddress      string `yaml:"apiaddress"`
 	AccessKey       string `yaml:"accesskey"`
 	GRPCSSL         string `yaml:"grpcssl"`
 	GRPCWireGuard   string `yaml:"grpcwg"`
@@ -175,21 +174,8 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 			return cfg, "", err
 		}
 
-		if accesstoken.ServerConfig.APIConnString != "" {
-			cfg.Server.APIAddress = accesstoken.ServerConfig.APIConnString
-		} else {
-			cfg.Server.APIAddress = accesstoken.ServerConfig.APIHost
-			if accesstoken.ServerConfig.APIPort != "" {
-				cfg.Server.APIAddress = cfg.Server.APIAddress + ":" + accesstoken.ServerConfig.APIPort
-			}
-		}
 		if accesstoken.ServerConfig.GRPCConnString != "" {
 			cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCConnString
-		} else {
-			cfg.Server.GRPCAddress = accesstoken.ServerConfig.GRPCHost
-			if accesstoken.ServerConfig.GRPCPort != "" {
-				cfg.Server.GRPCAddress = cfg.Server.GRPCAddress + ":" + accesstoken.ServerConfig.GRPCPort
-			}
 		}
 
 		cfg.Network = accesstoken.ClientConfig.Network
@@ -198,14 +184,9 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 		cfg.Node.LocalRange = accesstoken.ClientConfig.LocalRange
 		cfg.Server.GRPCSSL = accesstoken.ServerConfig.GRPCSSL
 		cfg.Server.CheckinInterval = accesstoken.ServerConfig.CheckinInterval
-		cfg.Server.GRPCWireGuard = accesstoken.WG.GRPCWireGuard
-		cfg.Server.CoreDNSAddr = accesstoken.ServerConfig.CoreDNSAddr
 		if c.String("grpcserver") != "" {
 			cfg.Server.GRPCAddress = c.String("grpcserver")
 		}
-		if c.String("apiserver") != "" {
-			cfg.Server.APIAddress = c.String("apiserver")
-		}
 		if c.String("key") != "" {
 			cfg.Server.AccessKey = c.String("key")
 		}
@@ -231,7 +212,6 @@ func GetCLIConfig(c *cli.Context) (ClientConfig, string, error) {
 
 	} else {
 		cfg.Server.GRPCAddress = c.String("grpcserver")
-		cfg.Server.APIAddress = c.String("apiserver")
 		cfg.Server.AccessKey = c.String("key")
 		cfg.Network = c.String("network")
 		cfg.Node.Network = c.String("network")

servercfg/serverconf.go

@@ -207,6 +207,8 @@ func GetGRPCConnString() string {
 		conn = os.Getenv("SERVER_GRPC_CONN_STRING")
 	} else if config.Config.Server.GRPCConnString != "" {
 		conn = config.Config.Server.GRPCConnString
+	} else {
+		conn = GetGRPCHost() + ":" + GetGRPCPort()
 	}
 	return conn
 }
@@ -414,8 +416,8 @@ func IsGRPCSSL() bool {
 		if os.Getenv("GRPC_SSL") == "on" {
 			isssl = true
 		}
-	} else if config.Config.Server.DNSMode != "" {
-		if config.Config.Server.DNSMode == "on" {
+	} else if config.Config.Server.GRPCSSL != "" {
+		if config.Config.Server.GRPCSSL == "on" {
 			isssl = true
 		}
 	}