perf: add pg_ssl_mode field

jumpserver · Sep 13, 2024 · 2582e63 · 2582e63
1 parent 1131a82
commit 2582e63
Show file tree

Hide file tree

Showing 10 changed files with 57,282 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -77,7 +77,7 @@ proto_go_dir=./protobuf-go
 protobuf_py_dir=./protobuf-py/protobuf
 
 .PHONY: proto
-proto: proto-go
+proto: proto-go proto-java
 
 .PHONY: proto-go
 proto-go:
@@ -96,3 +96,11 @@ proto-py:
 	--pyi_out=./protobuf-py/protobuf \
 	--grpc_python_out=./protobuf-py/protobuf \
 	${proto_files}
+
+.PHONY: proto-java
+proto-java:
+	@mkdir -p ./protobuf-java
+	protoc --proto_path=${proto_path} --java_out=./protobuf-java \
+	--grpc_out=./protobuf-java \
+	--plugin=protoc-gen-grpc=$(shell which protoc-gen-grpc-java) \
+	${proto_files}
diff --git a/cmd/impl/convert_pb.go b/cmd/impl/convert_pb.go
@@ -51,6 +51,7 @@ func ConvertToProtobufAsset(asset model.Asset) *pb.Asset {
 		Protocols: ConvertToProtobufProtocols(protocols),
 		Specific: &pb.Asset_Specific{
 			DbName:           specific.DBName,
+			PgSslMode:        specific.PgSSLMode,
 			UseSsl:           specific.UseSSL,
 			CaCert:           secretInfo.CaCert,
 			ClientCert:       secretInfo.ClientCert,

diff --git a/pkg/jms-sdk-go/model/asset.go b/pkg/jms-sdk-go/model/asset.go
@@ -15,6 +15,8 @@ type SpecInfo struct {
 	// database
 	DBName string `json:"db_name"`
 
+	PgSSLMode string `json:"pg_ssl_mode"`
+
 	UseSSL           bool `json:"use_ssl"`
 	AllowInvalidCert bool `json:"allow_invalid_cert"`
 
@@ -127,3 +129,10 @@ const (
 	ProtocolK8S    = "k8s"
 	ProtocolMysql  = "mysql"
 )
+
+const (
+	PGSSLPrefer     = "prefer"
+	PGSSLRequire    = "require"
+	PGSSLVerifyCa   = "verify-ca"
+	PGSSLVerifyFull = "verify-full"
+)
diff --git a/protobuf-go/protobuf/common.pb.go b/protobuf-go/protobuf/common.pb.go
diff --git a/protobuf-go/protobuf/service.pb.go b/protobuf-go/protobuf/service.pb.go
diff --git a/protobuf-go/protobuf/service_grpc.pb.go b/protobuf-go/protobuf/service_grpc.pb.go