zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-07 01:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

restructuring continued

Browse Source
This commit is contained in:
0xdcarns
2022-01-10 17:52:21 -05:00
parent c033be41bb
commit 64e7791011
13 changed files with 178 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
controllers/auth_grpc.go
View File

@@ -72,7 +72,7 @@ func grpcAuthorize(ctx context.Context) error {
authToken := authHeader[0]
mac, network, err := logic.VerifyToken(authToken)
nodeID, mac, network, err := logic.VerifyToken(authToken)
if err != nil {
return err
}
@@ -83,9 +83,10 @@ func grpcAuthorize(ctx context.Context) error {
return status.Errorf(codes.Unauthenticated, "Unauthorized. Network does not exist: "+network)
}
emptynode := models.Node{}
node, err := logic.GetNodeByMacAddress(network, mac)
node, err := logic.GetNodeByIDorMacAddress(nodeID, mac, network)
if database.IsEmptyRecord(err) {
if node, err = logic.GetDeletedNodeByMacAddress(network, mac); err == nil {
// == DELETE replace logic after 2 major version updates ==
if node, err = logic.GetDeletedNodeByID(node.ID); err == nil {
if functions.RemoveDeletedNode(node.ID) {
return status.Errorf(codes.Unauthenticated, models.NODE_DELETE)
}
@@ -112,17 +113,18 @@ func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nod
return nil, err
}
macaddress := reqNode.MacAddress
nodeID := reqNode.ID
network := reqNode.Network
password := reqNode.Password
macaddress := reqNode.MacAddress
var result models.NodeAuth
var err error
// err := errors.New("generic server error")
if macaddress == "" {
if nodeID == "" {
//TODO: Set Error response
err = errors.New("missing mac address")
err = errors.New("missing node ID")
return nil, err
} else if password == "" {
err = errors.New("missing password")
@@ -137,7 +139,7 @@ func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nod
if err = json.Unmarshal([]byte(value), &result); err != nil {
continue // finish going through nodes
}
if result.MacAddress == macaddress && result.Network == network {
if result.ID == nodeID && result.Network == network {
break
}
}
@@ -150,7 +152,7 @@ func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nod
return nil, err
} else {
//Create a new JWT for the node
tokenString, err := logic.CreateJWT(macaddress, result.Network)
tokenString, err := logic.CreateJWT(result.ID, macaddress, result.Network)
if err != nil {
return nil, err