diff --git a/controllers/common.go b/controllers/common.go index 5a6c9866..d43fa7d8 100644 --- a/controllers/common.go +++ b/controllers/common.go @@ -137,6 +137,9 @@ func UpdateNode(nodechange models.Node, node models.Node) (models.Node, error) { if nodechange.ListenPort != 0 { node.ListenPort = nodechange.ListenPort } + if nodechange.ExpirationDateTime != 0 { + node.ExpirationDateTime = nodechange.ExpirationDateTime + } if nodechange.PreUp != "" { node.PreUp = nodechange.PreUp } @@ -197,6 +200,7 @@ func UpdateNode(nodechange models.Node, node models.Node) (models.Node, error) { {"listenport", node.ListenPort}, {"publickey", node.PublicKey}, {"keyupdatetimestamp", node.KeyUpdateTimeStamp}, + {"expdatetime", node.ExpirationDateTime}, {"endpoint", node.Endpoint}, {"postup", node.PostUp}, {"preup", node.PreUp}, @@ -387,23 +391,17 @@ func NodeCheckIn(node models.Node, groupName string) (models.CheckInResponse, er if nkeyupdate < gkeyupdate { response.NeedKeyUpdate = true } - /* - if postchanges { - parentnode, err = UpdateNode(node, parentnode) - if err != nil{ - err = fmt.Errorf("%w; Couldnt Update Node: ", err) - return response, err - } else { - response.NodeUpdated = true - } - } - */ + if time.Now().Unix() > parentnode.ExpirationDateTime { + response.NeedDelete = true + _, err = DeleteNode(node.MacAddress, groupName) + } else { err = TimestampNode(parentnode, true, false, false) if err != nil{ err = fmt.Errorf("%w; Couldnt Timestamp Node: ", err) return response, err } + } response.Success = true return response, err diff --git a/controllers/nodeGrpcController.go b/controllers/nodeGrpcController.go index 04cd2571..df84e7b9 100644 --- a/controllers/nodeGrpcController.go +++ b/controllers/nodeGrpcController.go @@ -171,6 +171,7 @@ func (s *NodeServiceServer) CheckIn(ctx context.Context, req *nodepb.CheckInReq) Checkinresponse: &nodepb.CheckInResponse{ Success: checkinresponse.Success, Needpeerupdate: checkinresponse.NeedPeerUpdate, + Needdelete: checkinresponse.NeedDelete, Needconfigupdate: checkinresponse.NeedConfigUpdate, Needkeyupdate: checkinresponse.NeedKeyUpdate, Nodemessage: checkinresponse.NodeMessage, diff --git a/grpc/node.pb.go b/grpc/node.pb.go index fdc55209..5bb25a63 100644 --- a/grpc/node.pb.go +++ b/grpc/node.pb.go @@ -312,6 +312,7 @@ type CheckInResponse struct { Nodemessage string `protobuf:"bytes,4,opt,name=nodemessage,proto3" json:"nodemessage,omitempty"` Ispending bool `protobuf:"varint,5,opt,name=ispending,proto3" json:"ispending,omitempty"` Needkeyupdate bool `protobuf:"varint,6,opt,name=needkeyupdate,proto3" json:"needkeyupdate,omitempty"` + Needdelete bool `protobuf:"varint,7,opt,name=needdelete,proto3" json:"needdelete,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -384,6 +385,13 @@ func (m *CheckInResponse) GetNeedkeyupdate() bool { return false } +func (m *CheckInResponse) GetNeeddelete() bool { + if m != nil { + return m.Needdelete + } + return false +} + type PeersResponse struct { Publickey string `protobuf:"bytes,5,opt,name=publickey,proto3" json:"publickey,omitempty"` Endpoint string `protobuf:"bytes,6,opt,name=endpoint,proto3" json:"endpoint,omitempty"` @@ -978,57 +986,58 @@ func init() { func init() { proto.RegisterFile("grpc/node.proto", fileDescriptor_d13bd996b67da4ef) } var fileDescriptor_d13bd996b67da4ef = []byte{ - // 827 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x5b, 0x6f, 0xe3, 0x44, - 0x14, 0x56, 0xba, 0xb9, 0x9e, 0x34, 0x4d, 0x77, 0xda, 0x45, 0x23, 0x6b, 0xb5, 0x8a, 0x2c, 0x84, - 0xb2, 0x88, 0x26, 0xa5, 0x48, 0x88, 0x37, 0x24, 0x8a, 0x84, 0x40, 0xb0, 0x42, 0x46, 0xbc, 0xf0, - 0x36, 0xb1, 0x4f, 0xbc, 0x56, 0x9c, 0x99, 0x89, 0xc7, 0xce, 0xaa, 0x3f, 0x90, 0x9f, 0xc2, 0x3f, - 0xe0, 0x91, 0x07, 0x34, 0x17, 0xc7, 0x97, 0x86, 0x6c, 0xe9, 0x5b, 0xce, 0x37, 0xe7, 0x7e, 0xbe, - 0x73, 0x62, 0x98, 0xc6, 0x99, 0x0c, 0x97, 0x5c, 0x44, 0xb8, 0x90, 0x99, 0xc8, 0x05, 0xe9, 0xea, - 0xdf, 0xfe, 0x4f, 0x70, 0xfe, 0xb3, 0x88, 0x13, 0x1e, 0xe0, 0xae, 0x40, 0x95, 0x93, 0x37, 0x00, - 0x5b, 0x16, 0xb2, 0x28, 0xca, 0x50, 0x29, 0xda, 0x99, 0x75, 0xe6, 0xa3, 0xa0, 0x86, 0x10, 0x0f, - 0x86, 0x92, 0x29, 0xf5, 0x41, 0x64, 0x11, 0x3d, 0x33, 0xaf, 0x07, 0xd9, 0xff, 0x12, 0x26, 0xce, - 0x97, 0x92, 0x82, 0x2b, 0x24, 0x33, 0x18, 0xb3, 0x30, 0x44, 0xa5, 0x72, 0xb1, 0x41, 0xee, 0xbc, - 0xd5, 0x21, 0xff, 0xef, 0x2e, 0x74, 0xdf, 0x89, 0x08, 0xc9, 0x05, 0x9c, 0x25, 0x91, 0xd3, 0x38, - 0x4b, 0x22, 0x42, 0xa0, 0xcb, 0xd9, 0x16, 0x5d, 0x0c, 0xf3, 0x9b, 0x50, 0x18, 0x94, 0x89, 0xbd, - 0x30, 0x70, 0x29, 0xea, 0xac, 0xd3, 0x44, 0xe5, 0xc8, 0xa5, 0xc8, 0x72, 0xda, 0x9d, 0x75, 0xe6, - 0xbd, 0xa0, 0x86, 0x90, 0xd7, 0x30, 0x92, 0xc5, 0x2a, 0x4d, 0xc2, 0x0d, 0x3e, 0xd0, 0x9e, 0xb1, - 0xad, 0x00, 0x5d, 0x13, 0xf2, 0x48, 0x8a, 0x84, 0xe7, 0xb4, 0x6f, 0x6b, 0x2a, 0xe5, 0x56, 0x3f, - 0x06, 0x27, 0xfb, 0x31, 0x6c, 0xf6, 0x43, 0x47, 0xd5, 0x3d, 0x8e, 0x33, 0x51, 0x48, 0x3a, 0xb2, - 0x51, 0x0f, 0x80, 0x7e, 0x4d, 0x94, 0x44, 0x1e, 0x25, 0x3c, 0xa6, 0x30, 0xeb, 0xcc, 0x87, 0x41, - 0x05, 0x90, 0x4f, 0xa0, 0x2f, 0x85, 0xca, 0x0b, 0x49, 0xc7, 0xc6, 0xd0, 0x49, 0xe4, 0x1a, 0x7a, - 0x32, 0xc3, 0x42, 0xd2, 0x73, 0x03, 0x5b, 0x41, 0xfb, 0xda, 0x20, 0x4a, 0x96, 0x26, 0x7b, 0xa4, - 0x13, 0x53, 0x7e, 0x05, 0xe8, 0x1a, 0x14, 0xdb, 0x63, 0x28, 0xf8, 0x3a, 0x89, 0xe9, 0x85, 0x09, - 0x55, 0x43, 0xb4, 0xb5, 0x9d, 0x89, 0xee, 0xce, 0xd4, 0xe6, 0x79, 0x00, 0x4c, 0x9e, 0x3c, 0xc7, - 0x6c, 0xcd, 0x42, 0xa4, 0x97, 0xf6, 0xf5, 0x00, 0xe8, 0x11, 0xa7, 0x4c, 0xe5, 0xe1, 0x7b, 0x0c, - 0x37, 0x09, 0xa7, 0x2f, 0xed, 0x88, 0x6b, 0x10, 0xf1, 0xe1, 0x5c, 0x8b, 0x5b, 0x11, 0x25, 0xeb, - 0x04, 0x23, 0x4a, 0x8c, 0x4a, 0x03, 0x23, 0x73, 0x98, 0x3a, 0x75, 0xe3, 0x79, 0xcf, 0x52, 0x7a, - 0x65, 0xaa, 0x68, 0xc3, 0xc6, 0x9b, 0x08, 0x59, 0x5a, 0x4e, 0xe4, 0xda, 0x79, 0xab, 0x61, 0x3a, - 0x27, 0xdd, 0xad, 0xf0, 0x3d, 0xe3, 0x31, 0x2a, 0xfa, 0xca, 0xe6, 0x54, 0x83, 0xfc, 0xbf, 0x3a, - 0x30, 0xbd, 0xd7, 0x9e, 0x7f, 0xac, 0xc8, 0x4a, 0x61, 0xa0, 0x0a, 0x53, 0xb5, 0xa1, 0xe1, 0x30, - 0x28, 0x45, 0xf2, 0x19, 0x5c, 0x70, 0xc4, 0x48, 0x22, 0x66, 0x85, 0x8c, 0x58, 0x6e, 0x59, 0x39, - 0x0c, 0x5a, 0x28, 0xf9, 0x1c, 0x2e, 0x35, 0x62, 0xbb, 0xea, 0x34, 0x5f, 0x18, 0xcd, 0x47, 0xb8, - 0xce, 0x51, 0x53, 0x61, 0x8b, 0x4a, 0xb1, 0x18, 0x0d, 0x65, 0x47, 0x41, 0x1d, 0x6a, 0xf2, 0xa3, - 0xd7, 0xe6, 0xc7, 0xa7, 0x30, 0xd1, 0x3e, 0x37, 0xf8, 0xe0, 0x02, 0xf5, 0x8d, 0x46, 0x13, 0xf4, - 0xff, 0xec, 0xc0, 0xe4, 0x57, 0xc4, 0x4c, 0x1d, 0xaa, 0x7c, 0xfe, 0x26, 0x3c, 0x7f, 0xfb, 0xda, - 0x33, 0x1b, 0x1c, 0x99, 0xd9, 0x49, 0x06, 0xfb, 0x4b, 0x98, 0xdc, 0x67, 0xc8, 0x72, 0xd4, 0xb7, - 0x22, 0xc0, 0x1d, 0x79, 0x03, 0xe6, 0x7c, 0x99, 0x49, 0x8d, 0xef, 0x60, 0x61, 0xee, 0x9a, 0x79, - 0xb4, 0x67, 0xad, 0x65, 0xa0, 0x9e, 0x62, 0xf0, 0xbb, 0xe9, 0xd9, 0xff, 0x88, 0x50, 0x37, 0xf8, - 0x78, 0x84, 0x7b, 0x18, 0x07, 0xc8, 0xa2, 0xca, 0xff, 0xe9, 0x43, 0x7b, 0x0d, 0x3d, 0x7b, 0x38, - 0xec, 0x05, 0xb4, 0x82, 0x7f, 0x53, 0x77, 0xf2, 0xf1, 0x98, 0xbf, 0xc0, 0xe4, 0x7b, 0x4c, 0xb1, - 0x5e, 0xd5, 0xe9, 0xa8, 0xaf, 0x61, 0x64, 0x02, 0xbd, 0xab, 0x6e, 0x6f, 0x05, 0xf8, 0x6f, 0x9b, - 0xee, 0xd4, 0x7f, 0xef, 0x8c, 0xae, 0xf6, 0x07, 0xcc, 0x1d, 0xf7, 0x9e, 0x5b, 0xed, 0x37, 0x75, - 0x27, 0x8a, 0xbc, 0x85, 0x9e, 0xde, 0x36, 0xe5, 0xca, 0xbd, 0xb2, 0xe5, 0x36, 0xf8, 0x1d, 0x58, - 0x0d, 0xff, 0x0b, 0x80, 0xc3, 0x7e, 0xef, 0x9e, 0xd0, 0xa6, 0x4a, 0x5b, 0x91, 0x6f, 0x0f, 0xc7, - 0x28, 0x73, 0x5e, 0x9d, 0xe1, 0x2b, 0x6b, 0xd8, 0x3a, 0x1c, 0x41, 0x5b, 0xfb, 0xee, 0x9f, 0x33, - 0x18, 0x6b, 0xef, 0xbf, 0x61, 0xb6, 0x4f, 0x42, 0x24, 0xb7, 0xd0, 0x33, 0xff, 0x8b, 0x84, 0x58, - 0x07, 0xf5, 0x3f, 0x5c, 0xef, 0xaa, 0x81, 0xb9, 0x2d, 0xfd, 0x1a, 0xa0, 0xa2, 0x2f, 0x71, 0x2a, - 0x8d, 0x0d, 0xf0, 0x8e, 0x80, 0x8a, 0xdc, 0xc2, 0xb0, 0xa4, 0x07, 0x79, 0x69, 0x15, 0x6a, 0x9c, - 0xf3, 0x1e, 0x41, 0x4a, 0x47, 0xaa, 0x68, 0x5c, 0x46, 0x6a, 0x6c, 0x82, 0x77, 0x04, 0x34, 0x76, - 0x15, 0x15, 0x4a, 0xbb, 0x06, 0xd7, 0xbc, 0x23, 0xa0, 0x22, 0x77, 0x30, 0x2c, 0x47, 0x5a, 0x66, - 0x58, 0xe3, 0x89, 0xf7, 0x08, 0x52, 0xb7, 0x1d, 0x72, 0x03, 0x03, 0xd7, 0x73, 0x72, 0xd9, 0x1a, - 0xc1, 0xce, 0x6b, 0x23, 0xea, 0xbb, 0xe5, 0x1f, 0x37, 0xb1, 0x10, 0x71, 0x8a, 0x8b, 0x58, 0xa4, - 0x8c, 0xc7, 0x0b, 0x91, 0xc5, 0x4b, 0xf3, 0xcd, 0xb3, 0x2a, 0xd6, 0xcb, 0xfc, 0x41, 0xa2, 0x5a, - 0x6e, 0xb8, 0xf8, 0xc0, 0xcd, 0xd7, 0x90, 0x5c, 0xad, 0xfa, 0xe6, 0xf1, 0xab, 0x7f, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x32, 0x60, 0x03, 0x3b, 0x23, 0x09, 0x00, 0x00, + // 839 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0xe3, 0x44, + 0x14, 0x56, 0xb2, 0x49, 0xe3, 0x9c, 0x34, 0x6d, 0x77, 0xda, 0x45, 0x23, 0x6b, 0xb5, 0x8a, 0x2c, + 0x84, 0xb2, 0x88, 0x26, 0xa5, 0x48, 0x88, 0x3b, 0x24, 0x8a, 0x84, 0x40, 0xb0, 0x42, 0x46, 0xdc, + 0x70, 0x37, 0xb1, 0x4f, 0xbc, 0x56, 0x9c, 0x99, 0x89, 0xc7, 0xce, 0xaa, 0x0f, 0xc0, 0xa3, 0xf1, + 0x46, 0x5c, 0x72, 0x81, 0xe6, 0xc7, 0xf1, 0x4f, 0x43, 0xb7, 0xf4, 0x2e, 0xe7, 0x9b, 0xf3, 0x7f, + 0xbe, 0x73, 0x62, 0x38, 0x4f, 0x72, 0x19, 0x2d, 0xb9, 0x88, 0x71, 0x21, 0x73, 0x51, 0x08, 0x32, + 0xd0, 0xbf, 0x83, 0x9f, 0xe0, 0xf4, 0x67, 0x91, 0xa4, 0x3c, 0xc4, 0x5d, 0x89, 0xaa, 0x20, 0x6f, + 0x00, 0xb6, 0x2c, 0x62, 0x71, 0x9c, 0xa3, 0x52, 0xb4, 0x37, 0xeb, 0xcd, 0xc7, 0x61, 0x03, 0x21, + 0x3e, 0x78, 0x92, 0x29, 0xf5, 0x41, 0xe4, 0x31, 0xed, 0x9b, 0xd7, 0x83, 0x1c, 0x7c, 0x09, 0x53, + 0xe7, 0x4b, 0x49, 0xc1, 0x15, 0x92, 0x19, 0x4c, 0x58, 0x14, 0xa1, 0x52, 0x85, 0xd8, 0x20, 0x77, + 0xde, 0x9a, 0x50, 0xf0, 0xf7, 0x00, 0x06, 0xef, 0x44, 0x8c, 0xe4, 0x0c, 0xfa, 0x69, 0xec, 0x34, + 0xfa, 0x69, 0x4c, 0x08, 0x0c, 0x38, 0xdb, 0xa2, 0x8b, 0x61, 0x7e, 0x13, 0x0a, 0xa3, 0x2a, 0xb1, + 0x17, 0x06, 0xae, 0x44, 0x9d, 0x75, 0x96, 0xaa, 0x02, 0xb9, 0x14, 0x79, 0x41, 0x07, 0xb3, 0xde, + 0x7c, 0x18, 0x36, 0x10, 0xf2, 0x1a, 0xc6, 0xb2, 0x5c, 0x65, 0x69, 0xb4, 0xc1, 0x7b, 0x3a, 0x34, + 0xb6, 0x35, 0xa0, 0x6b, 0x42, 0x1e, 0x4b, 0x91, 0xf2, 0x82, 0x9e, 0xd8, 0x9a, 0x2a, 0xb9, 0xd3, + 0x8f, 0xd1, 0xa3, 0xfd, 0xf0, 0xda, 0xfd, 0xd0, 0x51, 0x75, 0x8f, 0x93, 0x5c, 0x94, 0x92, 0x8e, + 0x6d, 0xd4, 0x03, 0xa0, 0x5f, 0x53, 0x25, 0x91, 0xc7, 0x29, 0x4f, 0x28, 0xcc, 0x7a, 0x73, 0x2f, + 0xac, 0x01, 0xf2, 0x09, 0x9c, 0x48, 0xa1, 0x8a, 0x52, 0xd2, 0x89, 0x31, 0x74, 0x12, 0xb9, 0x82, + 0xa1, 0xcc, 0xb1, 0x94, 0xf4, 0xd4, 0xc0, 0x56, 0xd0, 0xbe, 0x36, 0x88, 0x92, 0x65, 0xe9, 0x1e, + 0xe9, 0xd4, 0x94, 0x5f, 0x03, 0xba, 0x06, 0xc5, 0xf6, 0x18, 0x09, 0xbe, 0x4e, 0x13, 0x7a, 0x66, + 0x42, 0x35, 0x10, 0x6d, 0x6d, 0x67, 0xa2, 0xbb, 0x73, 0x6e, 0xf3, 0x3c, 0x00, 0x26, 0x4f, 0x5e, + 0x60, 0xbe, 0x66, 0x11, 0xd2, 0x0b, 0xfb, 0x7a, 0x00, 0xf4, 0x88, 0x33, 0xa6, 0x8a, 0xe8, 0x3d, + 0x46, 0x9b, 0x94, 0xd3, 0x97, 0x76, 0xc4, 0x0d, 0x88, 0x04, 0x70, 0xaa, 0xc5, 0xad, 0x88, 0xd3, + 0x75, 0x8a, 0x31, 0x25, 0x46, 0xa5, 0x85, 0x91, 0x39, 0x9c, 0x3b, 0x75, 0xe3, 0x79, 0xcf, 0x32, + 0x7a, 0x69, 0xaa, 0xe8, 0xc2, 0xc6, 0x9b, 0x88, 0x58, 0x56, 0x4d, 0xe4, 0xca, 0x79, 0x6b, 0x60, + 0x3a, 0x27, 0xdd, 0xad, 0xe8, 0x3d, 0xe3, 0x09, 0x2a, 0xfa, 0xca, 0xe6, 0xd4, 0x80, 0x82, 0x3f, + 0xfb, 0x70, 0x7e, 0xa7, 0x3d, 0xff, 0x58, 0x93, 0x95, 0xc2, 0x48, 0x95, 0xa6, 0x6a, 0x43, 0x43, + 0x2f, 0xac, 0x44, 0xf2, 0x19, 0x9c, 0x71, 0xc4, 0x58, 0x22, 0xe6, 0xa5, 0x8c, 0x59, 0x61, 0x59, + 0xe9, 0x85, 0x1d, 0x94, 0x7c, 0x0e, 0x17, 0x1a, 0xb1, 0x5d, 0x75, 0x9a, 0x2f, 0x8c, 0xe6, 0x03, + 0x5c, 0xe7, 0xa8, 0xa9, 0xb0, 0x45, 0xa5, 0x58, 0x82, 0x86, 0xb2, 0xe3, 0xb0, 0x09, 0xb5, 0xf9, + 0x31, 0xec, 0xf2, 0xe3, 0x53, 0x98, 0x6a, 0x9f, 0x1b, 0xbc, 0x77, 0x81, 0x4e, 0x8c, 0x46, 0x1b, + 0xd4, 0x93, 0xd7, 0x40, 0x8c, 0x19, 0x16, 0x68, 0xd8, 0xeb, 0x85, 0x0d, 0x24, 0xf8, 0xab, 0x07, + 0xd3, 0x5f, 0x11, 0x73, 0x75, 0xe8, 0xc2, 0xf3, 0x37, 0xe5, 0xf9, 0xdb, 0xd9, 0x9d, 0xe9, 0xe8, + 0xc8, 0x4c, 0x1f, 0x65, 0x78, 0xb0, 0x84, 0xe9, 0x5d, 0x8e, 0xac, 0x40, 0x7d, 0x4b, 0x42, 0xdc, + 0x91, 0x37, 0x60, 0xce, 0x9b, 0x99, 0xe4, 0xe4, 0x16, 0x16, 0xe6, 0xee, 0x99, 0x47, 0x7b, 0xf6, + 0x3a, 0x06, 0xea, 0x29, 0x06, 0xbf, 0x9b, 0x9e, 0xfe, 0x8f, 0x08, 0x4d, 0x83, 0x8f, 0x47, 0xb8, + 0x83, 0x49, 0x88, 0x2c, 0xae, 0xfd, 0x3f, 0x7e, 0x88, 0xaf, 0x60, 0x68, 0x0f, 0x8b, 0xbd, 0x90, + 0x56, 0x08, 0xae, 0x9b, 0x4e, 0x3e, 0x1e, 0xf3, 0x17, 0x98, 0x7e, 0x6f, 0x98, 0xf0, 0xd4, 0xa8, + 0xaf, 0x61, 0x6c, 0x02, 0xbd, 0xab, 0x6f, 0x73, 0x0d, 0x04, 0x6f, 0xdb, 0xee, 0xd4, 0x7f, 0xef, + 0x94, 0xae, 0xf6, 0x07, 0x2c, 0x1c, 0xf7, 0x9e, 0x5b, 0xed, 0x37, 0x4d, 0x27, 0x8a, 0xbc, 0x85, + 0xa1, 0xde, 0x46, 0xe5, 0xca, 0xbd, 0xb4, 0xe5, 0xb6, 0xf8, 0x1d, 0x5a, 0x8d, 0xe0, 0x0b, 0x80, + 0xc3, 0xfe, 0xef, 0x9e, 0xd0, 0xa6, 0x5a, 0x5b, 0x91, 0x6f, 0x0f, 0xc7, 0x2a, 0x77, 0x5e, 0x9d, + 0xe1, 0x2b, 0x6b, 0xd8, 0x39, 0x2c, 0x61, 0x57, 0xfb, 0xf6, 0x9f, 0x3e, 0x4c, 0xb4, 0xf7, 0xdf, + 0x30, 0xdf, 0xa7, 0x11, 0x92, 0x1b, 0x18, 0x9a, 0xff, 0x4d, 0x42, 0xac, 0x83, 0xe6, 0x1f, 0xb2, + 0x7f, 0xd9, 0xc2, 0xdc, 0x96, 0x7e, 0x0d, 0x50, 0xd3, 0x97, 0x38, 0x95, 0xd6, 0x06, 0xf8, 0x47, + 0x40, 0x45, 0x6e, 0xc0, 0xab, 0xe8, 0x41, 0x5e, 0x5a, 0x85, 0x06, 0xe7, 0xfc, 0x07, 0x90, 0xd2, + 0x91, 0x6a, 0x1a, 0x57, 0x91, 0x5a, 0x9b, 0xe0, 0x1f, 0x01, 0x8d, 0x5d, 0x4d, 0x85, 0xca, 0xae, + 0xc5, 0x35, 0xff, 0x08, 0xa8, 0xc8, 0x2d, 0x78, 0xd5, 0x48, 0xab, 0x0c, 0x1b, 0x3c, 0xf1, 0x1f, + 0x40, 0xea, 0xa6, 0x47, 0xae, 0x61, 0xe4, 0x7a, 0x4e, 0x2e, 0x3a, 0x23, 0xd8, 0xf9, 0x5d, 0x44, + 0x7d, 0xb7, 0xfc, 0xe3, 0x3a, 0x11, 0x22, 0xc9, 0x70, 0x91, 0x88, 0x8c, 0xf1, 0x64, 0x21, 0xf2, + 0x64, 0x69, 0xbe, 0x89, 0x56, 0xe5, 0x7a, 0x59, 0xdc, 0x4b, 0x54, 0xcb, 0x0d, 0x17, 0x1f, 0xb8, + 0xf9, 0x5a, 0x92, 0xab, 0xd5, 0x89, 0x79, 0xfc, 0xea, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, + 0xd7, 0x8e, 0x6d, 0x43, 0x09, 0x00, 0x00, } diff --git a/grpc/node.proto b/grpc/node.proto index a0f0bd63..b3bb3631 100644 --- a/grpc/node.proto +++ b/grpc/node.proto @@ -50,6 +50,7 @@ message CheckInResponse { string nodemessage = 4; bool ispending = 5; bool needkeyupdate = 6; + bool needdelete = 7; } message PeersResponse { diff --git a/models/node.go b/models/node.go index 0f5d6406..34a43e53 100644 --- a/models/node.go +++ b/models/node.go @@ -32,6 +32,7 @@ type Node struct { Interface string `json:"interface" bson:"interface"` LastModified int64 `json:"lastmodified" bson:"lastmodified"` KeyUpdateTimeStamp int64 `json:"keyupdatetimestamp" bson:"keyupdatetimestamp"` + ExpirationDateTime int64 `json:"expdatetime" bson:"expdatetime"` LastPeerUpdate int64 `json:"lastpeerupdate" bson:"lastpeerupdate"` LastCheckIn int64 `json:"lastcheckin" bson:"lastcheckin"` MacAddress string `json:"macaddress" bson:"macaddress" validate:"required,macaddress_valid,macaddress_unique"` @@ -82,6 +83,11 @@ func(node *Node) SetLastPeerUpdate(){ node.LastPeerUpdate = time.Now().Unix() } +func(node *Node) SetExpirationDateTime(){ + node.ExpirationDateTime = time.Unix(1<<63-62135596801, 999999999).Unix() +} + + func(node *Node) SetDefaultName(){ if node.Name == "" { nodeid := StringWithCharset(5, charset) @@ -97,6 +103,8 @@ func(node *Node) SetDefaults() { //TODO: Maybe I should make Group a part of the node struct. Then we can just query the Group object for stuff. parentGroup, _ := node.GetGroup() + node.ExpirationDateTime = time.Unix(1<<63-62135596801, 999999999).Unix() + if node.ListenPort == 0 { node.ListenPort = parentGroup.DefaultListenPort } diff --git a/models/structs.go b/models/structs.go index 61d3cd5c..5b4fceb0 100644 --- a/models/structs.go +++ b/models/structs.go @@ -85,6 +85,7 @@ type CheckInResponse struct{ NeedPeerUpdate bool `json:"needpeerupdate" bson:"needpeerupdate"` NeedConfigUpdate bool `json:"needconfigupdate" bson:"needconfigupdate"` NeedKeyUpdate bool `json:"needkeyupdate" bson:"needkeyupdate"` + NeedDelete bool `json:"needdelete" bson:"needdelete"` NodeMessage string `json:"nodemessage" bson:"nodemessage"` IsPending bool `json:"ispending" bson:"ispending"` } diff --git a/netclient/functions/common.go b/netclient/functions/common.go index 73859671..b27d48f0 100644 --- a/netclient/functions/common.go +++ b/netclient/functions/common.go @@ -327,7 +327,7 @@ func Install(accesskey string, password string, server string, group string, noa return err } fmt.Println("retrived peers, setting wireguard config.") - err = storePrivKey(privkeystring) + err = storePrivKey(privkeystring, group) if err != nil { return err } @@ -613,7 +613,7 @@ func setWGKeyConfig(network string, serveraddr string) error { node.Publickey = publickey.String() - err = storePrivKey(privkeystring) + err = storePrivKey(privkeystring, network) if err != nil { return err } @@ -657,7 +657,7 @@ func setWGConfig(network string) error { if err != nil { return err } - privkey, err := retrievePrivKey() + privkey, err := retrievePrivKey(network) if err != nil { return err } @@ -670,14 +670,14 @@ func setWGConfig(network string) error { return err } -func storePrivKey(key string) error{ +func storePrivKey(key string, network string) error{ d1 := []byte(key) - err := ioutil.WriteFile("/etc/netclient/wgkey", d1, 0644) + err := ioutil.WriteFile("/etc/netclient/wgkey-" + network, d1, 0644) return err } -func retrievePrivKey() (string, error) { - dat, err := ioutil.ReadFile("/etc/netclient/wgkey") +func retrievePrivKey(network string) (string, error) { + dat, err := ioutil.ReadFile("/etc/netclient/wgkey-" + network) return string(dat), err } @@ -929,6 +929,14 @@ func CheckIn(network string) error { } setupcheck = false } + if checkinres.Checkinresponse.Needdelete { + fmt.Println("This machine got the delete signal. Deleting.") + err := Remove(network) + if err != nil { + return err + log.Fatalf("Error: %v", err) + } + } if setupcheck { iface := nodecfg.Interface _, err := net.InterfaceByName(iface)