mirror of
				https://github.com/TeaOSLab/EdgeCommon.git
				synced 2025-11-04 05:00:24 +08:00 
			
		
		
		
	SSH登录支持Passphrase
This commit is contained in:
		@@ -37,6 +37,7 @@ type NodeGrant struct {
 | 
			
		||||
	Password    string `protobuf:"bytes,5,opt,name=password,proto3" json:"password,omitempty"`
 | 
			
		||||
	Su          bool   `protobuf:"varint,6,opt,name=su,proto3" json:"su,omitempty"`
 | 
			
		||||
	PrivateKey  string `protobuf:"bytes,7,opt,name=privateKey,proto3" json:"privateKey,omitempty"`
 | 
			
		||||
	Passphrase  string `protobuf:"bytes,10,opt,name=passphrase,proto3" json:"passphrase,omitempty"`
 | 
			
		||||
	Description string `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"`
 | 
			
		||||
	NodeId      int64  `protobuf:"varint,9,opt,name=nodeId,proto3" json:"nodeId,omitempty"`
 | 
			
		||||
}
 | 
			
		||||
@@ -122,6 +123,13 @@ func (x *NodeGrant) GetPrivateKey() string {
 | 
			
		||||
	return ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (x *NodeGrant) GetPassphrase() string {
 | 
			
		||||
	if x != nil {
 | 
			
		||||
		return x.Passphrase
 | 
			
		||||
	}
 | 
			
		||||
	return ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (x *NodeGrant) GetDescription() string {
 | 
			
		||||
	if x != nil {
 | 
			
		||||
		return x.Description
 | 
			
		||||
@@ -141,7 +149,7 @@ var File_models_model_node_grant_proto protoreflect.FileDescriptor
 | 
			
		||||
var file_models_model_node_grant_proto_rawDesc = []byte{
 | 
			
		||||
	0x0a, 0x1d, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e,
 | 
			
		||||
	0x6f, 0x64, 0x65, 0x5f, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
 | 
			
		||||
	0x02, 0x70, 0x62, 0x22, 0xe9, 0x01, 0x0a, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e,
 | 
			
		||||
	0x02, 0x70, 0x62, 0x22, 0x89, 0x02, 0x0a, 0x09, 0x4e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e,
 | 
			
		||||
	0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
 | 
			
		||||
	0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
 | 
			
		||||
	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18,
 | 
			
		||||
@@ -152,7 +160,9 @@ var file_models_model_node_grant_proto_rawDesc = []byte{
 | 
			
		||||
	0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x73, 0x75, 0x18, 0x06, 0x20, 0x01, 0x28,
 | 
			
		||||
	0x08, 0x52, 0x02, 0x73, 0x75, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
 | 
			
		||||
	0x4b, 0x65, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61,
 | 
			
		||||
	0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
 | 
			
		||||
	0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72,
 | 
			
		||||
	0x61, 0x73, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x73, 0x73, 0x70,
 | 
			
		||||
	0x68, 0x72, 0x61, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
 | 
			
		||||
	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63,
 | 
			
		||||
	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49,
 | 
			
		||||
	0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x42,
 | 
			
		||||
 
 | 
			
		||||
@@ -40,6 +40,7 @@ type CreateNodeGrantRequest struct {
 | 
			
		||||
	Username    string `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`
 | 
			
		||||
	Password    string `protobuf:"bytes,4,opt,name=password,proto3" json:"password,omitempty"`
 | 
			
		||||
	PrivateKey  string `protobuf:"bytes,5,opt,name=privateKey,proto3" json:"privateKey,omitempty"`
 | 
			
		||||
	Passphrase  string `protobuf:"bytes,8,opt,name=passphrase,proto3" json:"passphrase,omitempty"`
 | 
			
		||||
	Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"`
 | 
			
		||||
	NodeId      int64  `protobuf:"varint,7,opt,name=nodeId,proto3" json:"nodeId,omitempty"`
 | 
			
		||||
}
 | 
			
		||||
@@ -111,6 +112,13 @@ func (x *CreateNodeGrantRequest) GetPrivateKey() string {
 | 
			
		||||
	return ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (x *CreateNodeGrantRequest) GetPassphrase() string {
 | 
			
		||||
	if x != nil {
 | 
			
		||||
		return x.Passphrase
 | 
			
		||||
	}
 | 
			
		||||
	return ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (x *CreateNodeGrantRequest) GetDescription() string {
 | 
			
		||||
	if x != nil {
 | 
			
		||||
		return x.Description
 | 
			
		||||
@@ -184,6 +192,7 @@ type UpdateNodeGrantRequest struct {
 | 
			
		||||
	Username    string `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"`
 | 
			
		||||
	Password    string `protobuf:"bytes,4,opt,name=password,proto3" json:"password,omitempty"`
 | 
			
		||||
	PrivateKey  string `protobuf:"bytes,5,opt,name=privateKey,proto3" json:"privateKey,omitempty"`
 | 
			
		||||
	Passphrase  string `protobuf:"bytes,9,opt,name=passphrase,proto3" json:"passphrase,omitempty"`
 | 
			
		||||
	Description string `protobuf:"bytes,6,opt,name=description,proto3" json:"description,omitempty"`
 | 
			
		||||
	NodeId      int64  `protobuf:"varint,7,opt,name=nodeId,proto3" json:"nodeId,omitempty"`
 | 
			
		||||
}
 | 
			
		||||
@@ -262,6 +271,13 @@ func (x *UpdateNodeGrantRequest) GetPrivateKey() string {
 | 
			
		||||
	return ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (x *UpdateNodeGrantRequest) GetPassphrase() string {
 | 
			
		||||
	if x != nil {
 | 
			
		||||
		return x.Passphrase
 | 
			
		||||
	}
 | 
			
		||||
	return ""
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (x *UpdateNodeGrantRequest) GetDescription() string {
 | 
			
		||||
	if x != nil {
 | 
			
		||||
		return x.Description
 | 
			
		||||
@@ -932,7 +948,7 @@ var file_service_node_grant_proto_rawDesc = []byte{
 | 
			
		||||
	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64,
 | 
			
		||||
	0x65, 0x5f, 0x67, 0x72, 0x61, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x6d,
 | 
			
		||||
	0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
 | 
			
		||||
	0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd6, 0x01, 0x0a, 0x16, 0x43, 0x72, 0x65,
 | 
			
		||||
	0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf6, 0x01, 0x0a, 0x16, 0x43, 0x72, 0x65,
 | 
			
		||||
	0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
 | 
			
		||||
	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
 | 
			
		||||
	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
 | 
			
		||||
@@ -942,15 +958,17 @@ var file_service_node_grant_proto_rawDesc = []byte{
 | 
			
		||||
	0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70,
 | 
			
		||||
	0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61,
 | 
			
		||||
	0x74, 0x65, 0x4b, 0x65, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x69,
 | 
			
		||||
	0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
 | 
			
		||||
	0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x73, 0x73, 0x70,
 | 
			
		||||
	0x68, 0x72, 0x61, 0x73, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x73,
 | 
			
		||||
	0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72,
 | 
			
		||||
	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65,
 | 
			
		||||
	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64,
 | 
			
		||||
	0x65, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49,
 | 
			
		||||
	0x64, 0x22, 0x3b, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x47,
 | 
			
		||||
	0x72, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x20, 0x0a, 0x0b,
 | 
			
		||||
	0x6e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 | 
			
		||||
	0x03, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x22, 0xf8,
 | 
			
		||||
	0x01, 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61,
 | 
			
		||||
	0x03, 0x52, 0x0b, 0x6e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x22, 0x98,
 | 
			
		||||
	0x02, 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61,
 | 
			
		||||
	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x6f, 0x64,
 | 
			
		||||
	0x65, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
 | 
			
		||||
	0x6e, 0x6f, 0x64, 0x65, 0x47, 0x72, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
 | 
			
		||||
@@ -962,6 +980,8 @@ var file_service_node_grant_proto_rawDesc = []byte{
 | 
			
		||||
	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12,
 | 
			
		||||
	0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x18, 0x05, 0x20,
 | 
			
		||||
	0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12,
 | 
			
		||||
	0x1e, 0x0a, 0x0a, 0x70, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x18, 0x09, 0x20,
 | 
			
		||||
	0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x73, 0x73, 0x70, 0x68, 0x72, 0x61, 0x73, 0x65, 0x12,
 | 
			
		||||
	0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06,
 | 
			
		||||
	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
 | 
			
		||||
	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28,
 | 
			
		||||
 
 | 
			
		||||
@@ -11,6 +11,7 @@ message NodeGrant {
 | 
			
		||||
	string password = 5;
 | 
			
		||||
	bool su = 6;
 | 
			
		||||
	string privateKey = 7;
 | 
			
		||||
	string passphrase = 10;
 | 
			
		||||
	string description = 8;
 | 
			
		||||
	int64 nodeId = 9;
 | 
			
		||||
}
 | 
			
		||||
@@ -41,6 +41,7 @@ message CreateNodeGrantRequest {
 | 
			
		||||
	string username = 3;
 | 
			
		||||
	string password = 4;
 | 
			
		||||
	string privateKey = 5;
 | 
			
		||||
	string passphrase = 8;
 | 
			
		||||
	string description = 6;
 | 
			
		||||
	int64 nodeId = 7;
 | 
			
		||||
}
 | 
			
		||||
@@ -57,6 +58,7 @@ message UpdateNodeGrantRequest {
 | 
			
		||||
	string username = 3;
 | 
			
		||||
	string password = 4;
 | 
			
		||||
	string privateKey = 5;
 | 
			
		||||
	string passphrase = 9;
 | 
			
		||||
	string description = 6;
 | 
			
		||||
	int64 nodeId = 7;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user