zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

repaired potential null pointer in pull

Browse Source
This commit is contained in:
0xdcarns
2021-10-08 09:09:54 -04:00
parent fb6bffd0b9
commit c2a4000126
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
netclient/functions/checkin.go
View File

@@ -159,7 +159,6 @@ func Pull(network string, manual bool) (*models.Node, error) {
return nil, err return nil, err
} }
servercfg := cfg.Server servercfg := cfg.Server
var header metadata.MD
if cfg.Node.IPForwarding == "yes" && !ncutils.IsWindows() { if cfg.Node.IPForwarding == "yes" && !ncutils.IsWindows() {
if err = local.SetIPForwarding(); err != nil { if err = local.SetIPForwarding(); err != nil {
@@ -167,7 +166,11 @@ func Pull(network string, manual bool) (*models.Node, error) {
} }
} }
var resNode models.Node // just need to fill this with either server calls or client calls var resNode models.Node // just need to fill this with either server calls or client calls
var header metadata.MD
var wcclient nodepb.NodeServiceClient
var ctx context.Context var ctx context.Context
if cfg.Node.IsServer != "yes" { if cfg.Node.IsServer != "yes" {
conn, err := grpc.Dial(cfg.Server.GRPCAddress, conn, err := grpc.Dial(cfg.Server.GRPCAddress,
ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL)) ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL))
@@ -176,9 +179,9 @@ func Pull(network string, manual bool) (*models.Node, error) {
return nil, err return nil, err
} }
defer conn.Close() defer conn.Close()
wcclient := nodepb.NewNodeServiceClient(conn) wcclient = nodepb.NewNodeServiceClient(conn)
ctx, err := auth.SetJWT(wcclient, network) ctx, err = auth.SetJWT(wcclient, network)
if err != nil { if err != nil {
ncutils.PrintLog("Failed to authenticate: "+err.Error(), 1) ncutils.PrintLog("Failed to authenticate: "+err.Error(), 1)
return nil, err return nil, err
@@ -188,6 +191,7 @@ func Pull(network string, manual bool) (*models.Node, error) {
Data: node.MacAddress + "###" + node.Network, Data: node.MacAddress + "###" + node.Network,
Type: nodepb.STRING_TYPE, Type: nodepb.STRING_TYPE,
} }
readres, err := wcclient.ReadNode(ctx, req, grpc.Header(&header)) readres, err := wcclient.ReadNode(ctx, req, grpc.Header(&header))
if err != nil { if err != nil {
return nil, err return nil, err
@@ -222,6 +226,9 @@ func Pull(network string, manual bool) (*models.Node, error) {
return &resNode, err return &resNode, err
} }
if resNode.IsServer != "yes" { if resNode.IsServer != "yes" {
if wcclient == nil || ctx == nil {
return &cfg.Node, errors.New("issue initializing gRPC client")
}
req := &nodepb.Object{ req := &nodepb.Object{
Data: string(nodeData), Data: string(nodeData),
Type: nodepb.NODE_TYPE, Type: nodepb.NODE_TYPE,