diff --git a/config/dnsconfig/netmaker.hosts b/config/dnsconfig/netmaker.hosts index 2937835d..e69de29b 100644 --- a/config/dnsconfig/netmaker.hosts +++ b/config/dnsconfig/netmaker.hosts @@ -1 +0,0 @@ -10.10.10.1 nethub.default diff --git a/functions/helpers.go b/functions/helpers.go index 1e5b986a..80838684 100644 --- a/functions/helpers.go +++ b/functions/helpers.go @@ -44,9 +44,9 @@ func CreateServerToken(netID string) (string, error) { if *network.IsLocal { privAddr = network.LocalRange } - accessstringdec := address + "|"+ address + "|" + address + "|" + netID + "|" + accesskey.Value + "|" + privAddr + log.Println("Access String: " + accessstringdec) accesskey.AccessString = base64.StdEncoding.EncodeToString([]byte(accessstringdec)) network.AccessKeys = append(network.AccessKeys, accesskey) diff --git a/netclient/command/commands.go b/netclient/command/commands.go index ec6842a4..ee5b8f81 100644 --- a/netclient/command/commands.go +++ b/netclient/command/commands.go @@ -135,10 +135,6 @@ func Uninstall(cfg config.GlobalConfig) error { err = functions.Unregister(cfg) return err } -func Reregister(cfg config.GlobalConfig) error { - err := functions.Reregister(cfg) - return err -} func Unregister(cfg config.GlobalConfig) error { err := functions.Unregister(cfg) return err diff --git a/netclient/config/config.go b/netclient/config/config.go index 0e155482..329d4ca5 100644 --- a/netclient/config/config.go +++ b/netclient/config/config.go @@ -273,6 +273,13 @@ func ModGlobalConfig(cfg models.IntClient) error{ if cfg.ServerKey != ""{ modconfig.Client.ServerKey = cfg.ServerKey } + if cfg.AccessKey != ""{ + modconfig.Client.AccessKey = cfg.AccessKey + } + if cfg.ClientID != ""{ + modconfig.Client.ClientID = cfg.ClientID + } + err = WriteGlobal(&modconfig) return err } diff --git a/netclient/functions/register.go b/netclient/functions/register.go index 80b7361d..f96fe179 100644 --- a/netclient/functions/register.go +++ b/netclient/functions/register.go @@ -52,6 +52,8 @@ func Register(cfg config.GlobalConfig) error { return errors.New("request to server failed: " + res.Status) } bodyBytes, err := ioutil.ReadAll(res.Body) + //bodyString := string(bodyBytes) + //spew.Dump(bodyString) if err != nil { return err } @@ -74,6 +76,7 @@ func Register(cfg config.GlobalConfig) error { func Unregister(cfg config.GlobalConfig) error { client := &http.Client{ Timeout: 7 * time.Second,} publicaddress := cfg.Client.ServerPublicEndpoint + ":" + cfg.Client.ServerAPIPort + log.Println("sending delete request to: " + "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID) req, err := http.NewRequest("DELETE", "http://"+publicaddress+"/api/intclient/"+cfg.Client.ClientID, nil) if err != nil { log.Println(err) @@ -94,17 +97,3 @@ func Unregister(cfg config.GlobalConfig) error { } return err } - -func Reregister(cfg config.GlobalConfig) error { - err := Unregister(cfg) - if err != nil { - log.Println("failed to un-register") - return err - } - err = Register(cfg) - if err != nil { - log.Println("failed to re-register after unregistering") - } - return err -} - diff --git a/netclient/main.go b/netclient/main.go index 8e84a75f..bbba211e 100644 --- a/netclient/main.go +++ b/netclient/main.go @@ -199,22 +199,6 @@ func main() { return err }, }, - { - Name: "reregister", - Usage: "Re-Register with Netmaker Server for secure GRPC communications.", - Flags: cliFlags, - Action: func(c *cli.Context) error { - cfg, err := config.ReadGlobalConfig() - if err != nil { - return err - } - var gconf config.GlobalConfig - gconf = *cfg - - err = command.Reregister(gconf) - return err - }, - }, { Name: "join", Usage: "Join a Netmaker network.", diff --git a/serverctl/serverctl.go b/serverctl/serverctl.go index 430c97dd..8d00383e 100644 --- a/serverctl/serverctl.go +++ b/serverctl/serverctl.go @@ -208,7 +208,7 @@ func AddNetwork(network string) (bool, error) { return false, err } token, err := functions.CreateServerToken(network) - if err != nil { + if err != nil { log.Println("could not create server token for " + network) return false, err }