From ecb39b6a99a0e4e2f3e6f89bbc2c5527db5dae9f Mon Sep 17 00:00:00 2001 From: zhao Date: Thu, 15 Jul 2021 18:30:16 +0800 Subject: [PATCH 1/9] support for https --- configs/conf.yaml | 57 ++++++++-------------------------- go.mod | 1 + pkg/config/conf_test.yaml | 4 +-- pkg/config/config_load.go | 1 + pkg/config/config_load_test.go | 6 ++-- pkg/model/base.go | 3 ++ pkg/model/bootstrap.go | 4 +-- pkg/model/http.go | 2 ++ pkg/pixiu/listener.go | 31 ++++++++++++++++++ pkg/pixiu/pixiu_start.go | 2 +- 10 files changed, 59 insertions(+), 52 deletions(-) diff --git a/configs/conf.yaml b/configs/conf.yaml index 68220c716..41b1219e9 100644 --- a/configs/conf.yaml +++ b/configs/conf.yaml @@ -24,54 +24,23 @@ static_resources: socket_address: protocol_type: "HTTP" address: "0.0.0.0" - port: 8888 - filter_chains: - - filter_chain_match: - domains: - - api.dubbo.com - - api.pixiu.com - filters: - - name: dgp.filters.http_connect_manager - config: - route_config: - routes: - - match: - prefix: "/api/v1" - headers: - - name: "X-DGP-WAY" - value: "dubbo" - route: - cluster: "test-dubbo" - cluster_not_found_response_code: 505 - cors: - allow_origin: - - "*" - enabled: true - authority_config: - authority_rules: - - strategy: "Blacklist" - limit: "IP" - items: - - "127.0.0.1" - - strategy: "Whitelist" - limit: "App" - items: - - "test_dubbo" - http_filters: - - name: dgp.filters.http.authority_filter - config: - - name: dgp.filters.http.api - config: - - name: dgp.filters.http.router - config: - - name: dgp.filters.remote_call - config: - server_name: "test_http_dubbo" - generate_request_id: false + port: 80 config: idle_timeout: 5s read_timeout: 5s write_timeout: 5s + - name: "net/http" + address: + socket_address: + protocol_type: "HTTPS" + address: "0.0.0.0" + port: 4430 + config: + idle_timeout: 5s + read_timeout: 5s + write_timeout: 5s + cert_file: D:\Go\dubbo-go-pixiu\configs\server.crt + key_file: D:\Go\dubbo-go-pixiu\configs\server.key clusters: - name: "test_dubbo" lb_policy: "RoundRobin" diff --git a/go.mod b/go.mod index c9ed41e75..9f100e9dd 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( github.com/goinggo/mapstructure v0.0.0-20140717182941-194205d9b4a9 github.com/golang/protobuf v1.5.2 // indirect github.com/hashicorp/consul/api v1.5.0 + github.com/mitchellh/mapstructure v1.4.1 github.com/pkg/errors v0.9.1 github.com/prometheus/common v0.29.0 // indirect github.com/shirou/gopsutil v3.21.3+incompatible // indirect diff --git a/pkg/config/conf_test.yaml b/pkg/config/conf_test.yaml index 889a92275..e741c7714 100644 --- a/pkg/config/conf_test.yaml +++ b/pkg/config/conf_test.yaml @@ -22,9 +22,9 @@ static_resources: - name: "net/http" address: socket_address: - protocol_type: "HTTP" + protocol_type: "HTTPS" address: "0.0.0.0" - port: 8888 + port: 443 filter_chains: - filter_chain_match: domains: diff --git a/pkg/config/config_load.go b/pkg/config/config_load.go index 4dffb46cf..489bddf88 100644 --- a/pkg/config/config_load.go +++ b/pkg/config/config_load.go @@ -124,6 +124,7 @@ func GetHttpConfig(cfg *model.Bootstrap) (err error) { hc := &model.HttpConfig{} if l.Config != nil { if v, ok := l.Config.(map[string]interface{}); ok { + logger.Info("http config:" , v , ok) switch l.Name { case constant.DefaultHTTPType: if err := mapstructure.Decode(v, hc); err != nil { diff --git a/pkg/config/config_load_test.go b/pkg/config/config_load_test.go index d589cd5f6..e14c18d20 100644 --- a/pkg/config/config_load_test.go +++ b/pkg/config/config_load_test.go @@ -38,14 +38,14 @@ func TestMain(m *testing.M) { log.Println("Prepare Bootstrap") b = model.Bootstrap{ StaticResources: model.StaticResources{ - Listeners: []model.Listener{ + Listeners: []*model.Listener{ { Name: "net/http", Address: model.Address{ SocketAddress: model.SocketAddress{ - ProtocolStr: "HTTP", + ProtocolStr: "HTTPS", Address: "0.0.0.0", - Port: 8888, + Port: 443, }, }, Config: model.HttpConfig{ diff --git a/pkg/model/base.go b/pkg/model/base.go index 6baad7073..aae81d532 100644 --- a/pkg/model/base.go +++ b/pkg/model/base.go @@ -56,6 +56,7 @@ const ( HTTP ProtocolType = 0 + iota // support for 1.0 TCP UDP + HTTPS ) // ProtocolTypeName @@ -63,6 +64,7 @@ var ProtocolTypeName = map[int32]string{ 0: "HTTP", 1: "TCP", 2: "UDP", + 3: "HTTPS", } // ProtocolTypeValue @@ -70,6 +72,7 @@ var ProtocolTypeValue = map[string]int32{ "HTTP": 0, "TCP": 1, "UDP": 2, + "HTTPS": 3, } // Address the address diff --git a/pkg/model/bootstrap.go b/pkg/model/bootstrap.go index 0cb2c264f..568a8d422 100644 --- a/pkg/model/bootstrap.go +++ b/pkg/model/bootstrap.go @@ -26,7 +26,7 @@ type Bootstrap struct { } // GetListeners -func (bs *Bootstrap) GetListeners() []Listener { +func (bs *Bootstrap) GetListeners() []*Listener { return bs.StaticResources.Listeners } @@ -55,7 +55,7 @@ func (bs *Bootstrap) ExistCluster(name string) bool { // StaticResources type StaticResources struct { - Listeners []Listener `yaml:"listeners" json:"listeners" mapstructure:"listeners"` + Listeners []*Listener `yaml:"listeners" json:"listeners" mapstructure:"listeners"` Clusters []*Cluster `yaml:"clusters" json:"clusters" mapstructure:"clusters"` TimeoutConfig TimeoutConfig `yaml:"timeout_config" json:"timeout_config" mapstructure:"timeout_config"` ShutdownConfig *ShutdownConfig `yaml:"shutdown_config" json:"shutdown_config" mapstructure:"shutdown_config"` diff --git a/pkg/model/http.go b/pkg/model/http.go index 13d38ab60..d29672614 100644 --- a/pkg/model/http.go +++ b/pkg/model/http.go @@ -88,4 +88,6 @@ type HttpConfig struct { ReadTimeoutStr string `json:"read_timeout,omitempty" yaml:"read_timeout,omitempty" mapstructure:"read_timeout"` WriteTimeoutStr string `json:"write_timeout,omitempty" yaml:"write_timeout,omitempty" mapstructure:"write_timeout"` MaxHeaderBytes int `json:"max_header_bytes,omitempty" yaml:"max_header_bytes,omitempty" mapstructure:"max_header_bytes"` + CertFile string `yaml:"cert_file" json:"cert_file" mapstructure:"cert_file"` + KeyFile string `yaml:"key_file" json:"key_file" mapstructure:"key_file"` } diff --git a/pkg/pixiu/listener.go b/pkg/pixiu/listener.go index 5d71eed3c..d5c56972c 100644 --- a/pkg/pixiu/listener.go +++ b/pkg/pixiu/listener.go @@ -20,6 +20,7 @@ package pixiu import ( "github.com/apache/dubbo-go-pixiu/pkg/filter/header" "github.com/apache/dubbo-go-pixiu/pkg/filter/plugins" + "github.com/mitchellh/mapstructure" ) import ( @@ -58,11 +59,41 @@ func (l *ListenerService) Start() { switch l.Address.SocketAddress.Protocol { case model.HTTP: l.httpListener() + case model.HTTPS: + l.httpsListener() default: panic("unsupported protocol start: " + l.Address.SocketAddress.ProtocolStr) } } +func (l *ListenerService) httpsListener() { + hl := NewDefaultHttpListener() + hl.pool.New = func() interface{} { + return l.allocateContext() + } + // user customize http config + var hc model.HttpConfig + if l.Config != nil { + if ok := mapstructure.Decode(l.Config , &hc); ok != nil { + logger.Error("Config error" , ok) + } + } + + mux := http.NewServeMux() + mux.HandleFunc("/", hl.ServeHTTP) + srv := http.Server{ + Addr: resolveAddress(l.Address.SocketAddress.Address + ":" + strconv.Itoa(l.Address.SocketAddress.Port)), + Handler: mux, + ReadTimeout: resolveStr2Time(hc.ReadTimeoutStr, 20*time.Second), + WriteTimeout: resolveStr2Time(hc.WriteTimeoutStr, 20*time.Second), + IdleTimeout: resolveStr2Time(hc.IdleTimeoutStr, 20*time.Second), + MaxHeaderBytes: resolveInt2IntProp(hc.MaxHeaderBytes, 1<<20), + } + + logger.Infof("[dubbo-go-pixiu] httpsListener start at : %s", srv.Addr) + err := srv.ListenAndServeTLS(hc.CertFile , hc.KeyFile) + logger.Info("[dubbo-go-pixiu] httpsListener result:" , err) +} func (l *ListenerService) httpListener() { hl := NewDefaultHttpListener() hl.pool.New = func() interface{} { diff --git a/pkg/pixiu/pixiu_start.go b/pkg/pixiu/pixiu_start.go index 81e212d1e..a73f33b37 100644 --- a/pkg/pixiu/pixiu_start.go +++ b/pkg/pixiu/pixiu_start.go @@ -60,7 +60,7 @@ func (p *PX) Start() { listeners := conf.GetListeners() for _, s := range listeners { - ls := ListenerService{Listener: &s} + ls := ListenerService{Listener: s} go ls.Start() } From 8e53d1cd7e43df1920eab9d21250c472a6052166 Mon Sep 17 00:00:00 2001 From: zhao Date: Thu, 15 Jul 2021 18:43:11 +0800 Subject: [PATCH 2/9] support for https --- configs/conf.yaml | 44 +++++++++++++++++++++++++++++++++++++++++++ pkg/model/http.go | 15 +++++++++++++++ pkg/pixiu/listener.go | 17 ++++------------- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/configs/conf.yaml b/configs/conf.yaml index 41b1219e9..bbfa466c8 100644 --- a/configs/conf.yaml +++ b/configs/conf.yaml @@ -25,6 +25,50 @@ static_resources: protocol_type: "HTTP" address: "0.0.0.0" port: 80 + port: 8888 + filter_chains: + - filter_chain_match: + domains: + - api.dubbo.com + - api.pixiu.com + filters: + - name: dgp.filters.http_connect_manager + config: + route_config: + routes: + - match: + prefix: "/api/v1" + headers: + - name: "X-DGP-WAY" + value: "dubbo" + route: + cluster: "test-dubbo" + cluster_not_found_response_code: 505 + cors: + allow_origin: + - "*" + enabled: true + authority_config: + authority_rules: + - strategy: "Blacklist" + limit: "IP" + items: + - "127.0.0.1" + - strategy: "Whitelist" + limit: "App" + items: + - "test_dubbo" + http_filters: + - name: dgp.filters.http.authority_filter + config: + - name: dgp.filters.http.api + config: + - name: dgp.filters.http.router + config: + - name: dgp.filters.remote_call + config: + server_name: "test_http_dubbo" + generate_request_id: false config: idle_timeout: 5s read_timeout: 5s diff --git a/pkg/model/http.go b/pkg/model/http.go index d29672614..600d961f1 100644 --- a/pkg/model/http.go +++ b/pkg/model/http.go @@ -17,6 +17,11 @@ package model +import ( + "github.com/apache/dubbo-go-pixiu/pkg/logger" + "github.com/mitchellh/mapstructure" +) + // HttpConnectionManager type HttpConnectionManager struct { RouteConfig RouteConfiguration `yaml:"route_config" json:"route_config" mapstructure:"route_config"` @@ -91,3 +96,13 @@ type HttpConfig struct { CertFile string `yaml:"cert_file" json:"cert_file" mapstructure:"cert_file"` KeyFile string `yaml:"key_file" json:"key_file" mapstructure:"key_file"` } + +func MapInStruct(cfg interface{}) *HttpConfig { + var hc *HttpConfig + if cfg != nil { + if ok := mapstructure.Decode(cfg , &hc); ok != nil { + logger.Error("Config error" , ok) + } + } + return hc +} \ No newline at end of file diff --git a/pkg/pixiu/listener.go b/pkg/pixiu/listener.go index d5c56972c..944397bd1 100644 --- a/pkg/pixiu/listener.go +++ b/pkg/pixiu/listener.go @@ -20,7 +20,6 @@ package pixiu import ( "github.com/apache/dubbo-go-pixiu/pkg/filter/header" "github.com/apache/dubbo-go-pixiu/pkg/filter/plugins" - "github.com/mitchellh/mapstructure" ) import ( @@ -71,12 +70,8 @@ func (l *ListenerService) httpsListener() { return l.allocateContext() } // user customize http config - var hc model.HttpConfig - if l.Config != nil { - if ok := mapstructure.Decode(l.Config , &hc); ok != nil { - logger.Error("Config error" , ok) - } - } + var hc *model.HttpConfig + hc = model.MapInStruct(l.Config) mux := http.NewServeMux() mux.HandleFunc("/", hl.ServeHTTP) @@ -101,12 +96,8 @@ func (l *ListenerService) httpListener() { } // user customize http config - var hc model.HttpConfig - if l.Config != nil { - if c, ok := l.Config.(*model.HttpConfig); ok { - hc = *c - } - } + var hc *model.HttpConfig + hc = model.MapInStruct(l.Config) mux := http.NewServeMux() mux.HandleFunc("/", hl.ServeHTTP) From 339787adc79cdf680fc52069205660cc0bee56b5 Mon Sep 17 00:00:00 2001 From: zhao Date: Fri, 16 Jul 2021 15:47:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configs/conf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/conf.yaml b/configs/conf.yaml index bbfa466c8..dcdead498 100644 --- a/configs/conf.yaml +++ b/configs/conf.yaml @@ -25,7 +25,6 @@ static_resources: protocol_type: "HTTP" address: "0.0.0.0" port: 80 - port: 8888 filter_chains: - filter_chain_match: domains: From 3e378b48bdbc59af60b5caeaab89250af0778340 Mon Sep 17 00:00:00 2001 From: zhao Date: Fri, 16 Jul 2021 16:13:21 +0800 Subject: [PATCH 4/9] change test --- pkg/config/config_load_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/config/config_load_test.go b/pkg/config/config_load_test.go index e14c18d20..c829d5fdd 100644 --- a/pkg/config/config_load_test.go +++ b/pkg/config/config_load_test.go @@ -160,6 +160,7 @@ func TestLoad(t *testing.T) { conf := Load("conf_test.yaml") assert.Equal(t, 1, len(conf.StaticResources.Listeners)) assert.Equal(t, 1, len(conf.StaticResources.Clusters)) + Adapter(&b) assert.Equal(t, *conf, b) } From 54cf04564ba7cdb7271dcc5ad1913fb4d067f9ca Mon Sep 17 00:00:00 2001 From: zhao Date: Sat, 17 Jul 2021 08:20:48 +0800 Subject: [PATCH 5/9] go fmt --- pkg/config/config_load.go | 2 +- pkg/model/base.go | 6 +++--- pkg/model/bootstrap.go | 2 +- pkg/model/http.go | 10 +++++----- pkg/pixiu/listener.go | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/config/config_load.go b/pkg/config/config_load.go index 489bddf88..be663304a 100644 --- a/pkg/config/config_load.go +++ b/pkg/config/config_load.go @@ -124,7 +124,7 @@ func GetHttpConfig(cfg *model.Bootstrap) (err error) { hc := &model.HttpConfig{} if l.Config != nil { if v, ok := l.Config.(map[string]interface{}); ok { - logger.Info("http config:" , v , ok) + logger.Info("http config:", v, ok) switch l.Name { case constant.DefaultHTTPType: if err := mapstructure.Decode(v, hc); err != nil { diff --git a/pkg/model/base.go b/pkg/model/base.go index aae81d532..d4815a097 100644 --- a/pkg/model/base.go +++ b/pkg/model/base.go @@ -69,9 +69,9 @@ var ProtocolTypeName = map[int32]string{ // ProtocolTypeValue var ProtocolTypeValue = map[string]int32{ - "HTTP": 0, - "TCP": 1, - "UDP": 2, + "HTTP": 0, + "TCP": 1, + "UDP": 2, "HTTPS": 3, } diff --git a/pkg/model/bootstrap.go b/pkg/model/bootstrap.go index 568a8d422..ec3c607b6 100644 --- a/pkg/model/bootstrap.go +++ b/pkg/model/bootstrap.go @@ -55,7 +55,7 @@ func (bs *Bootstrap) ExistCluster(name string) bool { // StaticResources type StaticResources struct { - Listeners []*Listener `yaml:"listeners" json:"listeners" mapstructure:"listeners"` + Listeners []*Listener `yaml:"listeners" json:"listeners" mapstructure:"listeners"` Clusters []*Cluster `yaml:"clusters" json:"clusters" mapstructure:"clusters"` TimeoutConfig TimeoutConfig `yaml:"timeout_config" json:"timeout_config" mapstructure:"timeout_config"` ShutdownConfig *ShutdownConfig `yaml:"shutdown_config" json:"shutdown_config" mapstructure:"shutdown_config"` diff --git a/pkg/model/http.go b/pkg/model/http.go index 600d961f1..6d1d0e987 100644 --- a/pkg/model/http.go +++ b/pkg/model/http.go @@ -93,16 +93,16 @@ type HttpConfig struct { ReadTimeoutStr string `json:"read_timeout,omitempty" yaml:"read_timeout,omitempty" mapstructure:"read_timeout"` WriteTimeoutStr string `json:"write_timeout,omitempty" yaml:"write_timeout,omitempty" mapstructure:"write_timeout"` MaxHeaderBytes int `json:"max_header_bytes,omitempty" yaml:"max_header_bytes,omitempty" mapstructure:"max_header_bytes"` - CertFile string `yaml:"cert_file" json:"cert_file" mapstructure:"cert_file"` - KeyFile string `yaml:"key_file" json:"key_file" mapstructure:"key_file"` + CertFile string `yaml:"cert_file" json:"cert_file" mapstructure:"cert_file"` + KeyFile string `yaml:"key_file" json:"key_file" mapstructure:"key_file"` } func MapInStruct(cfg interface{}) *HttpConfig { var hc *HttpConfig if cfg != nil { - if ok := mapstructure.Decode(cfg , &hc); ok != nil { - logger.Error("Config error" , ok) + if ok := mapstructure.Decode(cfg, &hc); ok != nil { + logger.Error("Config error", ok) } } return hc -} \ No newline at end of file +} diff --git a/pkg/pixiu/listener.go b/pkg/pixiu/listener.go index 944397bd1..69cdc5e08 100644 --- a/pkg/pixiu/listener.go +++ b/pkg/pixiu/listener.go @@ -86,8 +86,8 @@ func (l *ListenerService) httpsListener() { } logger.Infof("[dubbo-go-pixiu] httpsListener start at : %s", srv.Addr) - err := srv.ListenAndServeTLS(hc.CertFile , hc.KeyFile) - logger.Info("[dubbo-go-pixiu] httpsListener result:" , err) + err := srv.ListenAndServeTLS(hc.CertFile, hc.KeyFile) + logger.Info("[dubbo-go-pixiu] httpsListener result:", err) } func (l *ListenerService) httpListener() { hl := NewDefaultHttpListener() From bdc3582f0e3eb99be67a481beee63d2bc76f4d1e Mon Sep 17 00:00:00 2001 From: zhao Date: Mon, 19 Jul 2021 09:45:20 +0800 Subject: [PATCH 6/9] fix https --- configs/conf.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/conf.yaml b/configs/conf.yaml index dcdead498..1caa6bb20 100644 --- a/configs/conf.yaml +++ b/configs/conf.yaml @@ -82,8 +82,8 @@ static_resources: idle_timeout: 5s read_timeout: 5s write_timeout: 5s - cert_file: D:\Go\dubbo-go-pixiu\configs\server.crt - key_file: D:\Go\dubbo-go-pixiu\configs\server.key + cert_file: configs/ca/server.crt + key_file: configs/ca/server.key clusters: - name: "test_dubbo" lb_policy: "RoundRobin" @@ -109,7 +109,7 @@ static_resources: port: 6060 accessLog: enable: true - outputpath: C:\Users\60125\Desktop\dubbo-go\logs\dubbo-go-pixiu-access + outputpath: logs/dubbo-go-pixiu-access metric: enable: true prometheus_port: 2222 From a42d5537ebec26b173198d4f806e13e39ad3b516 Mon Sep 17 00:00:00 2001 From: zhao Date: Mon, 19 Jul 2021 10:28:17 +0800 Subject: [PATCH 7/9] fix https --- configs/ca/ca.crt | Bin 0 -> 10240 bytes configs/ca/ca.srl | 1 + configs/ca/server.crt | 20 ++++++++++++++++++++ configs/ca/server.csr | 17 +++++++++++++++++ configs/ca/server.key | 27 +++++++++++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 configs/ca/ca.crt create mode 100644 configs/ca/ca.srl create mode 100644 configs/ca/server.crt create mode 100644 configs/ca/server.csr create mode 100644 configs/ca/server.key diff --git a/configs/ca/ca.crt b/configs/ca/ca.crt new file mode 100644 index 0000000000000000000000000000000000000000..66c1782eba5498bafc8bc7d48ba10e874f014719 GIT binary patch literal 10240 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 literal 0 HcmV?d00001 diff --git a/configs/ca/ca.srl b/configs/ca/ca.srl new file mode 100644 index 000000000..f02025758 --- /dev/null +++ b/configs/ca/ca.srl @@ -0,0 +1 @@ +F0D39AEDDFEF59C1 diff --git a/configs/ca/server.crt b/configs/ca/server.crt new file mode 100644 index 000000000..af9b45a1d --- /dev/null +++ b/configs/ca/server.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDSDCCAjACCQDw05rt3+9ZwTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJj +bjELMAkGA1UECAwCc2gxCzAJBgNVBAcMAnNoMREwDwYDVQQKDAhkdWJiby1nbzER +MA8GA1UECwwIZHViYm8tZ28xFzAVBgNVBAMMDiouZHViYm8tZ28uY29tMB4XDTIx +MDcxNzEwMTI1OVoXDTMxMDcxNTEwMTI1OVowZjELMAkGA1UEBhMCY24xCzAJBgNV +BAgMAnNoMQswCQYDVQQHDAJzaDERMA8GA1UECgwIZHViYm8tZ28xETAPBgNVBAsM +CGR1YmJvLWdvMRcwFQYDVQQDDA4qLmR1YmJvLWdvLmNvbTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAMKRXN8uymm9AKLUSbCzqCUOc+zPnqn3UiDgIc++ ++CcpUNOYQ/mn9UyZxoMJa/0kOu/o6Cjp4QRcvZbUzpQqAkfMvnZRuAm4fPLnguex +YuqgVjArrSj6yEZlh9sZArD+s0os8yLlMouA6onCMJj2kvkNOXF2wcWfYJ1IdrKO +SJEDKAGV6rX8N4rjkW6L9DK8JE/Jfk/CFhGzEEbkgIh9rceWxOTMwzULyEpHOylD +QeNE69OhOGhqR1fu8xwZox4Dd476z/NMxG7D6Ikd6pVqkYbBaMf+Vzlxa4o4pc0E +N3t0jdE0OQY6yrmkJhVyp3UqUGc8YgLktoJY+6qwSlCdtx0CAwEAATANBgkqhkiG +9w0BAQUFAAOCAQEAdscSEQVZys1NxgsylmdDBe0UZ2WAv6sFz5ByxFHyBsicz+C7 +4g/Gc3heAjOLJCQZeJP7DQAwMlkGkBIASJu6nOfGXL877yLI9HFR8lPgP4TUTyLH +nF4DDDlt+ERhjAoNhZM5FcrInga5rpZmzfo7mGEk/MnQdslNvMAww0Ck+daOBLC2 +URT6+bNoxkpz7F/quJ6HN3d7as/pU8pTFsG3GojWAJlJzhBMCB47qsNN+BFYM5qj ++mG/QMA4aM9Iv/EHMTAx36d4oDvlG1u+GSxsKJuJCPyzkKr6fm/liMjvN47TqhQ4 +bwSXXj30EvknP8W6h/+1cEcDzvEmE3hi/n3wIA== +-----END CERTIFICATE----- diff --git a/configs/ca/server.csr b/configs/ca/server.csr new file mode 100644 index 000000000..b51491835 --- /dev/null +++ b/configs/ca/server.csr @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICqzCCAZMCAQAwZjELMAkGA1UEBhMCY24xCzAJBgNVBAgMAnNoMQswCQYDVQQH +DAJzaDERMA8GA1UECgwIZHViYm8tZ28xETAPBgNVBAsMCGR1YmJvLWdvMRcwFQYD +VQQDDA4qLmR1YmJvLWdvLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBAMKRXN8uymm9AKLUSbCzqCUOc+zPnqn3UiDgIc+++CcpUNOYQ/mn9UyZxoMJ +a/0kOu/o6Cjp4QRcvZbUzpQqAkfMvnZRuAm4fPLnguexYuqgVjArrSj6yEZlh9sZ +ArD+s0os8yLlMouA6onCMJj2kvkNOXF2wcWfYJ1IdrKOSJEDKAGV6rX8N4rjkW6L +9DK8JE/Jfk/CFhGzEEbkgIh9rceWxOTMwzULyEpHOylDQeNE69OhOGhqR1fu8xwZ +ox4Dd476z/NMxG7D6Ikd6pVqkYbBaMf+Vzlxa4o4pc0EN3t0jdE0OQY6yrmkJhVy +p3UqUGc8YgLktoJY+6qwSlCdtx0CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBM +ers4zq7vTzonKvQnXH+Wh+arjxA/BTFBtuUCZkLCuTJEf6jBNHP9BYOqb4bfzCgC +ICWlSHFhdoMT5IW91dZ632KkhhLrey3PVPpzhjCtRsr66+//fFR8HLCZhzus4HWS +xTAbWRuk42t9yl5+BO5VtN6VGir41nIBY+Z7/Rw7LDSjhBWo8HLrFK1xHJeV7N5I +K4UqCHTf6CiapRRAkJqmzAAV6Da/9IG2R/eCQ8IDeAnp7TgQf5yC2uIy61720D/y +r03476yZeHFZf274iiBGCMJzXQsb1dF/0Ub6YaliLTW7mlexgFEUpMI7+kf8l66V +YOyvIR2lJHd1VIGwIMU2 +-----END CERTIFICATE REQUEST----- diff --git a/configs/ca/server.key b/configs/ca/server.key new file mode 100644 index 000000000..3c465b782 --- /dev/null +++ b/configs/ca/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEAwpFc3y7Kab0AotRJsLOoJQ5z7M+eqfdSIOAhz774JylQ05hD ++af1TJnGgwlr/SQ67+joKOnhBFy9ltTOlCoCR8y+dlG4Cbh88ueC57Fi6qBWMCut +KPrIRmWH2xkCsP6zSizzIuUyi4DqicIwmPaS+Q05cXbBxZ9gnUh2so5IkQMoAZXq +tfw3iuORbov0MrwkT8l+T8IWEbMQRuSAiH2tx5bE5MzDNQvISkc7KUNB40Tr06E4 +aGpHV+7zHBmjHgN3jvrP80zEbsPoiR3qlWqRhsFox/5XOXFrijilzQQ3e3SN0TQ5 +BjrKuaQmFXKndSpQZzxiAuS2glj7qrBKUJ23HQIDAQABAoIBAD1Gypj/g4AJpkmh +0hN0gWAqTRgnyzB8U8FG1V84Ja8vs+Tv73iRDRAy3fIm5Xu0DVvBXlyES/mzu4Hl +Q6omENHMCa/5zJxDHhbiErglhaGfHYXOO5rMYIbLMx4toktb69tQjMJQrLqCv1rj +baq+/Uqyf4TcgepbZ3IhgEB7zx7b8p3982sswsY55ZR/vhsqKCV5OCDIMqa8QF4Y +R49kT4lpeYmAzg9OyDGoKps+7MFQrFYX8F4Tk7ygY1DQwpKUnUUe7DuIQnlUzjl3 +srmCKKiT7ID7fe0aAL4yuYXOk+K3YS5dOHcd7Olu84hLXJiH5Dp8XvcS14BUhZ7e +JFKBDAECgYEA8SIO/fNQK4pm+sdArYk4KeM5FqsPptXhOG5/00KJ4zvnOpjaMJhX +9bvik9nckp38E8dk5zfI2NhxhAXyHF/Bshyv6jIiFDYnOwP32Y93aQP0lCO074wL +sBQfeKbVp0h5ADM4z7BDPWlRSI4hcG0XBSWlMBSdf+6OzU0u1K22xTkCgYEAzpBW +ryC8JZCaNaGr44AismQ2VqatbkExAsfQkDRXbRqn9moum/AXJxce2Hu8UM4/Jicr +9tIeoX89iKvu7RoMyX4/LBMSGveg8zKFK8yJjmGAwus7hu0AWeu8Z5YByrnJ5HeA +r1WwdQL6ypYEJ+auH/b3U20QqD/lGLE0a+d/xQUCgYBpQUOoCFBDYTuIVfdeiJoy +dpPR2EORwKR53IoBbnb/8IMDafs74RPsGOJTRXLpsPp6q7vYzdnnBbuvNGU1i3ri +Q3FqWg3UIrtHIHlMxzoJZgeZrmhpdAkaB/6gzLpQNetTcghnZ/pB0ToA4MGp8IRu +47rSXP1O/ZPp+7nobhdsyQKBgDk43PqYu+ZAH6gZyE82kOYQQslQVR0E7DnT9p/s +EAgGaV8m3RCPuyo2CnJ4HJvZ9r5v/YrbfGbKo9Y3ovGF1OMAmSlxgwN7c9fLN/8B +I14Q/qWAmrXu87j1R/T+JjLtstMak8h+mWpgz+7NDgurqLLsLGms/f9N6/4iIN5/ +e/KtAoGAf2ZOInJBTPH79AZ3QHsvEiSVhDwnu182TusX27SoFAHSM/tu6L2yKoFv +Ss+C99iUKcbfvtfTSKbiILvQjgYcK0z5Q7nP3Emd5DV+r5sNSM4e0oMtN+qK/Aq/ +zVTuXjaiubyeNYCHEO3IFvCUC6c3SSR2Q5tL6A7cbMF0VEfMIWo= +-----END RSA PRIVATE KEY----- From 2ba8b817c3535ec02a384dc5b4d20d321f7af4d1 Mon Sep 17 00:00:00 2001 From: zhaoyadong00 Date: Mon, 2 Aug 2021 15:33:28 +0800 Subject: [PATCH 8/9] Delete self signed certificate --- configs/ca/ca.crt | Bin 10240 -> 0 bytes configs/ca/ca.srl | 1 - configs/ca/server.crt | 20 -------------------- configs/ca/server.csr | 17 ----------------- configs/ca/server.key | 27 --------------------------- 5 files changed, 65 deletions(-) delete mode 100644 configs/ca/ca.crt delete mode 100644 configs/ca/ca.srl delete mode 100644 configs/ca/server.crt delete mode 100644 configs/ca/server.csr delete mode 100644 configs/ca/server.key diff --git a/configs/ca/ca.crt b/configs/ca/ca.crt deleted file mode 100644 index 66c1782eba5498bafc8bc7d48ba10e874f014719..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10240 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 diff --git a/configs/ca/ca.srl b/configs/ca/ca.srl deleted file mode 100644 index f02025758..000000000 --- a/configs/ca/ca.srl +++ /dev/null @@ -1 +0,0 @@ -F0D39AEDDFEF59C1 diff --git a/configs/ca/server.crt b/configs/ca/server.crt deleted file mode 100644 index af9b45a1d..000000000 --- a/configs/ca/server.crt +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDSDCCAjACCQDw05rt3+9ZwTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJj -bjELMAkGA1UECAwCc2gxCzAJBgNVBAcMAnNoMREwDwYDVQQKDAhkdWJiby1nbzER -MA8GA1UECwwIZHViYm8tZ28xFzAVBgNVBAMMDiouZHViYm8tZ28uY29tMB4XDTIx -MDcxNzEwMTI1OVoXDTMxMDcxNTEwMTI1OVowZjELMAkGA1UEBhMCY24xCzAJBgNV -BAgMAnNoMQswCQYDVQQHDAJzaDERMA8GA1UECgwIZHViYm8tZ28xETAPBgNVBAsM -CGR1YmJvLWdvMRcwFQYDVQQDDA4qLmR1YmJvLWdvLmNvbTCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBAMKRXN8uymm9AKLUSbCzqCUOc+zPnqn3UiDgIc++ -+CcpUNOYQ/mn9UyZxoMJa/0kOu/o6Cjp4QRcvZbUzpQqAkfMvnZRuAm4fPLnguex -YuqgVjArrSj6yEZlh9sZArD+s0os8yLlMouA6onCMJj2kvkNOXF2wcWfYJ1IdrKO -SJEDKAGV6rX8N4rjkW6L9DK8JE/Jfk/CFhGzEEbkgIh9rceWxOTMwzULyEpHOylD -QeNE69OhOGhqR1fu8xwZox4Dd476z/NMxG7D6Ikd6pVqkYbBaMf+Vzlxa4o4pc0E -N3t0jdE0OQY6yrmkJhVyp3UqUGc8YgLktoJY+6qwSlCdtx0CAwEAATANBgkqhkiG -9w0BAQUFAAOCAQEAdscSEQVZys1NxgsylmdDBe0UZ2WAv6sFz5ByxFHyBsicz+C7 -4g/Gc3heAjOLJCQZeJP7DQAwMlkGkBIASJu6nOfGXL877yLI9HFR8lPgP4TUTyLH -nF4DDDlt+ERhjAoNhZM5FcrInga5rpZmzfo7mGEk/MnQdslNvMAww0Ck+daOBLC2 -URT6+bNoxkpz7F/quJ6HN3d7as/pU8pTFsG3GojWAJlJzhBMCB47qsNN+BFYM5qj -+mG/QMA4aM9Iv/EHMTAx36d4oDvlG1u+GSxsKJuJCPyzkKr6fm/liMjvN47TqhQ4 -bwSXXj30EvknP8W6h/+1cEcDzvEmE3hi/n3wIA== ------END CERTIFICATE----- diff --git a/configs/ca/server.csr b/configs/ca/server.csr deleted file mode 100644 index b51491835..000000000 --- a/configs/ca/server.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICqzCCAZMCAQAwZjELMAkGA1UEBhMCY24xCzAJBgNVBAgMAnNoMQswCQYDVQQH -DAJzaDERMA8GA1UECgwIZHViYm8tZ28xETAPBgNVBAsMCGR1YmJvLWdvMRcwFQYD -VQQDDA4qLmR1YmJvLWdvLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAMKRXN8uymm9AKLUSbCzqCUOc+zPnqn3UiDgIc+++CcpUNOYQ/mn9UyZxoMJ -a/0kOu/o6Cjp4QRcvZbUzpQqAkfMvnZRuAm4fPLnguexYuqgVjArrSj6yEZlh9sZ -ArD+s0os8yLlMouA6onCMJj2kvkNOXF2wcWfYJ1IdrKOSJEDKAGV6rX8N4rjkW6L -9DK8JE/Jfk/CFhGzEEbkgIh9rceWxOTMwzULyEpHOylDQeNE69OhOGhqR1fu8xwZ -ox4Dd476z/NMxG7D6Ikd6pVqkYbBaMf+Vzlxa4o4pc0EN3t0jdE0OQY6yrmkJhVy -p3UqUGc8YgLktoJY+6qwSlCdtx0CAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQBM -ers4zq7vTzonKvQnXH+Wh+arjxA/BTFBtuUCZkLCuTJEf6jBNHP9BYOqb4bfzCgC -ICWlSHFhdoMT5IW91dZ632KkhhLrey3PVPpzhjCtRsr66+//fFR8HLCZhzus4HWS -xTAbWRuk42t9yl5+BO5VtN6VGir41nIBY+Z7/Rw7LDSjhBWo8HLrFK1xHJeV7N5I -K4UqCHTf6CiapRRAkJqmzAAV6Da/9IG2R/eCQ8IDeAnp7TgQf5yC2uIy61720D/y -r03476yZeHFZf274iiBGCMJzXQsb1dF/0Ub6YaliLTW7mlexgFEUpMI7+kf8l66V -YOyvIR2lJHd1VIGwIMU2 ------END CERTIFICATE REQUEST----- diff --git a/configs/ca/server.key b/configs/ca/server.key deleted file mode 100644 index 3c465b782..000000000 --- a/configs/ca/server.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEAwpFc3y7Kab0AotRJsLOoJQ5z7M+eqfdSIOAhz774JylQ05hD -+af1TJnGgwlr/SQ67+joKOnhBFy9ltTOlCoCR8y+dlG4Cbh88ueC57Fi6qBWMCut -KPrIRmWH2xkCsP6zSizzIuUyi4DqicIwmPaS+Q05cXbBxZ9gnUh2so5IkQMoAZXq -tfw3iuORbov0MrwkT8l+T8IWEbMQRuSAiH2tx5bE5MzDNQvISkc7KUNB40Tr06E4 -aGpHV+7zHBmjHgN3jvrP80zEbsPoiR3qlWqRhsFox/5XOXFrijilzQQ3e3SN0TQ5 -BjrKuaQmFXKndSpQZzxiAuS2glj7qrBKUJ23HQIDAQABAoIBAD1Gypj/g4AJpkmh -0hN0gWAqTRgnyzB8U8FG1V84Ja8vs+Tv73iRDRAy3fIm5Xu0DVvBXlyES/mzu4Hl -Q6omENHMCa/5zJxDHhbiErglhaGfHYXOO5rMYIbLMx4toktb69tQjMJQrLqCv1rj -baq+/Uqyf4TcgepbZ3IhgEB7zx7b8p3982sswsY55ZR/vhsqKCV5OCDIMqa8QF4Y -R49kT4lpeYmAzg9OyDGoKps+7MFQrFYX8F4Tk7ygY1DQwpKUnUUe7DuIQnlUzjl3 -srmCKKiT7ID7fe0aAL4yuYXOk+K3YS5dOHcd7Olu84hLXJiH5Dp8XvcS14BUhZ7e -JFKBDAECgYEA8SIO/fNQK4pm+sdArYk4KeM5FqsPptXhOG5/00KJ4zvnOpjaMJhX -9bvik9nckp38E8dk5zfI2NhxhAXyHF/Bshyv6jIiFDYnOwP32Y93aQP0lCO074wL -sBQfeKbVp0h5ADM4z7BDPWlRSI4hcG0XBSWlMBSdf+6OzU0u1K22xTkCgYEAzpBW -ryC8JZCaNaGr44AismQ2VqatbkExAsfQkDRXbRqn9moum/AXJxce2Hu8UM4/Jicr -9tIeoX89iKvu7RoMyX4/LBMSGveg8zKFK8yJjmGAwus7hu0AWeu8Z5YByrnJ5HeA -r1WwdQL6ypYEJ+auH/b3U20QqD/lGLE0a+d/xQUCgYBpQUOoCFBDYTuIVfdeiJoy -dpPR2EORwKR53IoBbnb/8IMDafs74RPsGOJTRXLpsPp6q7vYzdnnBbuvNGU1i3ri -Q3FqWg3UIrtHIHlMxzoJZgeZrmhpdAkaB/6gzLpQNetTcghnZ/pB0ToA4MGp8IRu -47rSXP1O/ZPp+7nobhdsyQKBgDk43PqYu+ZAH6gZyE82kOYQQslQVR0E7DnT9p/s -EAgGaV8m3RCPuyo2CnJ4HJvZ9r5v/YrbfGbKo9Y3ovGF1OMAmSlxgwN7c9fLN/8B -I14Q/qWAmrXu87j1R/T+JjLtstMak8h+mWpgz+7NDgurqLLsLGms/f9N6/4iIN5/ -e/KtAoGAf2ZOInJBTPH79AZ3QHsvEiSVhDwnu182TusX27SoFAHSM/tu6L2yKoFv -Ss+C99iUKcbfvtfTSKbiILvQjgYcK0z5Q7nP3Emd5DV+r5sNSM4e0oMtN+qK/Aq/ -zVTuXjaiubyeNYCHEO3IFvCUC6c3SSR2Q5tL6A7cbMF0VEfMIWo= ------END RSA PRIVATE KEY----- From f4b184e7ee6ac3e92972bccc06b39bae73f0408b Mon Sep 17 00:00:00 2001 From: zhaoyadong00 Date: Mon, 2 Aug 2021 16:42:14 +0800 Subject: [PATCH 9/9] Screen file --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 60a944432..cca6cc2dc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ pkg/registry/zookeeper-4unittest/contrib/fatjar coverage.txt +/*.exe +test