From 9658b06d5a46f7d214f934ebae4c295be2ba7be4 Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 14:41:10 +0000
Subject: [PATCH 01/26] update codis proxy to accept tls connection

---
 codis/config/proxy.toml   | 11 +++++----
 codis/pkg/models/proxy.go |  3 +++
 codis/pkg/proxy/config.go |  6 +++++
 codis/pkg/proxy/proxy.go  | 49 ++++++++++++++++++++++++++++++++-------
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/codis/config/proxy.toml b/codis/config/proxy.toml
index 5f46885413..1cee0cf056 100644
--- a/codis/config/proxy.toml
+++ b/codis/config/proxy.toml
@@ -21,6 +21,9 @@ admin_addr = "0.0.0.0:11080"
 
 # Set bind address for proxy, proto_type can be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
 proto_type = "tcp4"
+#proxy_tls = true
+#proxy_tls_cert = "./cert.pem"
+#proxy_tls_key = "./key.pem"
 proxy_addr = "0.0.0.0:19000"
 
 # Set jodis address & session timeout
@@ -105,10 +108,10 @@ session_break_on_failure = false
 # Slowlog-log-slower-than(us), from receive command to send response, 0 is allways print slow log
 slowlog_log_slower_than = 100000
 
-# quick command list e.g. get, set
-quick_cmd_list = ""
-# slow command list e.g. hgetall, mset
-slow_cmd_list = ""
+# quick command list
+quick_cmd_list = "get,set"
+# slow command list
+slow_cmd_list = "mget, mset"
 
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""
diff --git a/codis/pkg/models/proxy.go b/codis/pkg/models/proxy.go
index 69e308adef..b4d3a965ab 100644
--- a/codis/pkg/models/proxy.go
+++ b/codis/pkg/models/proxy.go
@@ -11,6 +11,9 @@ type Proxy struct {
 
 	ProtoType string `json:"proto_type"`
 	ProxyAddr string `json:"proxy_addr"`
+	ProxyTLS  bool   `json:"proxy_tls"`
+	ProxyTLSCert string `json:"proxy_tls_cert"`
+	ProxyTLSKey string `json:"proxy_tls_key"`
 
 	JodisPath string `json:"jodis_path,omitempty"`
 
diff --git a/codis/pkg/proxy/config.go b/codis/pkg/proxy/config.go
index 50e218450a..e066d31e39 100644
--- a/codis/pkg/proxy/config.go
+++ b/codis/pkg/proxy/config.go
@@ -37,6 +37,9 @@ admin_addr = "0.0.0.0:11080"
 
 # Set bind address for proxy, proto_type can be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
 proto_type = "tcp4"
+#proxy_tls = true
+#proxy_tls_cert = "./cert.pem"
+#proxy_tls_key = "./key.pem"
 proxy_addr = "0.0.0.0:19000"
 
 # Set jodis address & session timeout
@@ -166,6 +169,9 @@ type Config struct {
 
 	ProxyDataCenter      string         `toml:"proxy_datacenter" json:"proxy_datacenter"`
 	ProxyMaxClients      int            `toml:"proxy_max_clients" json:"proxy_max_clients"`
+	ProxyTLS	     bool 	    `toml:"proxy_tls" json:"proxy_tls"`
+	ProxyTLSCert         string         `toml:"proxy_tls_cert" json:"proxy_tls_cert"`
+	ProxyTLSKey          string         `toml:"proxy_tls_key" json:"proxy_tls_key"`
 	ProxyMaxOffheapBytes bytesize.Int64 `toml:"proxy_max_offheap_size" json:"proxy_max_offheap_size"`
 	ProxyHeapPlaceholder bytesize.Int64 `toml:"proxy_heap_placeholder" json:"proxy_heap_placeholder"`
 
diff --git a/codis/pkg/proxy/proxy.go b/codis/pkg/proxy/proxy.go
index 31ebb344dd..17e99e8ccd 100644
--- a/codis/pkg/proxy/proxy.go
+++ b/codis/pkg/proxy/proxy.go
@@ -4,6 +4,7 @@
 package proxy
 
 import (
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
@@ -103,17 +104,49 @@ func New(config *Config) (*Proxy, error) {
 
 func (p *Proxy) setup(config *Config) error {
 	proto := config.ProtoType
-	if l, err := net.Listen(proto, config.ProxyAddr); err != nil {
-		return errors.Trace(err)
-	} else {
-		p.lproxy = l
 
-		x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
+	if config.ProxyTLS {
+
+		cert, err := tls.LoadX509KeyPair(config.ProxyTLSCert, config.ProxyTLSKey)
 		if err != nil {
-			return err
+			return errors.Trace(err)
+    		}
+
+		// Set up TLS configuration to use TLS 1.3
+		tlsConfig := &tls.Config{
+			Certificates: []tls.Certificate{cert},
+			MinVersion:   tls.VersionTLS12,
+		}
+
+		l, err := tls.Listen(proto, config.ProxyAddr, tlsConfig)
+		if err != nil {
+			return errors.Trace(err)
+    		}
+
+                p.lproxy = l
+
+                x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
+                if err != nil {
+                        return err
+                }
+                p.model.ProtoType = proto
+                p.model.ProxyAddr = x
+
+	}else{
+
+		if l, err := net.Listen(proto, config.ProxyAddr); err != nil {
+			return errors.Trace(err)
+		} else {
+			p.lproxy = l
+
+			x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
+			if err != nil {
+				return err
+			}
+			p.model.ProtoType = proto
+			p.model.ProxyAddr = x
 		}
-		p.model.ProtoType = proto
-		p.model.ProxyAddr = x
+
 	}
 
 	proto = "tcp"

From 6ec04e30430f222a6094cc3d75c0f3d2ad31bc0c Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 16:30:06 +0000
Subject: [PATCH 02/26] tls for proxy works, tls for fe in progress

---
 codis/Makefile                |  10 +++++-----
 codis/admin/codis-fe-admin.sh |   6 ++++--
 codis/cert.pem                |  21 +++++++++++++++++++++
 codis/cmd/fe/main.go          |   2 +-
 codis/config/dashboard.toml   |   6 ++++--
 codis/config/proxy.toml       |  10 +++++-----
 codis/key.pem                 |  28 ++++++++++++++++++++++++++++
 codis/pkg/proxy/.proxy.go.swo | Bin 0 -> 36864 bytes
 codis/pkg/proxy/config.go     |   4 ++--
 codis/pkg/proxy/proxy.go      |   4 +++-
 codis/pkg/topom/config.go     |   6 ++++--
 11 files changed, 77 insertions(+), 20 deletions(-)
 create mode 100644 codis/cert.pem
 create mode 100644 codis/key.pem
 create mode 100644 codis/pkg/proxy/.proxy.go.swo

diff --git a/codis/Makefile b/codis/Makefile
index ef20162da3..5c00c2ca30 100644
--- a/codis/Makefile
+++ b/codis/Makefile
@@ -12,25 +12,25 @@ codis-deps:
 
 codis-dashboard: codis-deps
 	$(info build codis-dashboard)
-	@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-dashboard .
+	@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-dashboard .
 	@${PRJ_ROOT}/bin/codis-dashboard --default-config > ${PRJ_ROOT}/config/dashboard.toml
 
 codis-proxy: codis-deps
 	$(info build codis-proxy)
-	@cd ${PRJ_ROOT}/cmd/proxy && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-proxy .
+	@cd ${PRJ_ROOT}/cmd/proxy && go mod tidy && go build -ldflags "-w -s"  -o ${PRJ_ROOT}/bin/codis-proxy .
 	@${PRJ_ROOT}/bin/codis-proxy --default-config > ${PRJ_ROOT}/config/proxy.toml
 
 codis-admin: codis-deps
 	$(info build codis-admin)
-	@cd ${PRJ_ROOT}/cmd/admin && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-admin .
+	@cd ${PRJ_ROOT}/cmd/admin && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-admin .
 
 codis-ha: codis-deps
 	$(info build codis-ha)
-	@cd ${PRJ_ROOT}/cmd/ha && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-ha .
+	@cd ${PRJ_ROOT}/cmd/ha && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-ha .
 
 codis-fe: codis-deps
 	$(info build codis-fe)
-	@cd ${PRJ_ROOT}/cmd/fe && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-fe .
+	@cd ${PRJ_ROOT}/cmd/fe && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-fe .
 	@rm -rf ${PRJ_ROOT}/bin/assets && cp -rf ${PRJ_ROOT}/cmd/fe/assets ./bin/
 
 clean:
diff --git a/codis/admin/codis-fe-admin.sh b/codis/admin/codis-fe-admin.sh
index b9e6872446..ef1bd63e0e 100755
--- a/codis/admin/codis-fe-admin.sh
+++ b/codis/admin/codis-fe-admin.sh
@@ -15,8 +15,10 @@ CODIS_FE_ASSETS_DIR=$CODIS_BIN_DIR/assets
 CODIS_FE_LOG_FILE=$CODIS_LOG_DIR/codis-fe.log
 CODIS_FE_DAEMON_FILE=$CODIS_LOG_DIR/codis-fe.out
 
-COORDINATOR_NAME="filesystem"
-COORDINATOR_ADDR="/tmp/codis"
+#COORDINATOR_NAME="filesystem"
+#COORDINATOR_ADDR="/tmp/codis"
+COORDINATOR_NAME="etcd"
+COORDINATOR_ADDR="127.0.0.1:2379"
 CODIS_FE_ADDR="0.0.0.0:9090"
 
 echo $CODIS_FE_CONF_FILE
diff --git a/codis/cert.pem b/codis/cert.pem
new file mode 100644
index 0000000000..8c6dbf1382
--- /dev/null
+++ b/codis/cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUC/IGKPPBWnAG7MZNPhCUaPmg0oEwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDAyMDExNTI0MDBaFw0zNDAx
+MjkxNTI0MDBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQClOgprziC/+nQeHXV5qJA9gdttnx7NV9Cbfc7xox6w
+HRCaavLxdKh//E2o6F492U0i+GSqRYWrQKqWix0myLiZwXEL16mkhL7ANLFSnA8C
+qsMIJf3u6+rN1OtlIVoKP1zWMFRV0inVCZMC0W6KFeVpuTqewc/FC5w/Zh3shPj1
+FJQCOas5SNbpxp9jQQsInur+NeP71r2GcZWD6+H2TCGouMTLFxdL62dbMOGLfm3a
+Yq2d+HVhSMmEkuxXEgaIzxJ04toqQntnq4fnRkkFB7CoXG7AQqHIxKb4bjjnD100
+qDTTPc1wDEhlye/kUbxztF6dv58AUH1ayg1N7pz3EwazAgMBAAGjUzBRMB0GA1Ud
+DgQWBBQtXOfPGePViVYEkHUujTcdtU8RuDAfBgNVHSMEGDAWgBQtXOfPGePViVYE
+kHUujTcdtU8RuDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA5
+HMCZGl8a/fkG8O8XfdNpKvpb7WWINW5pqNf/Ep1wiqx3Y5/2I+NaCn7NhvxkliPU
+hF/m3ijJ1eXLVjADMwBuW0vaqS0U29c5k/vWto2xx2Uv7dVffvbGTDUitAygGBTi
+9r7A1GnU3PLdA96kUb5RT80tILOSakQYj+KN5QuV4LYmIoUIPlJfn0DOT4D/AoIC
+vn/L77gctOQUfzu/l9saN1uwhgBZ06eQv14BJKnUdpmmMDREiP7lAJtQet1dukh6
+DvS3QUqf91pkOC6tXMHTAAFQ/op+eJVKUMKfFo1oRkXU1sg1/fD25FKO1xaS6afy
+/nr/PY00p+k4s6jw+Fif
+-----END CERTIFICATE-----
diff --git a/codis/cmd/fe/main.go b/codis/cmd/fe/main.go
index 663cc47086..5b884f6a27 100644
--- a/codis/cmd/fe/main.go
+++ b/codis/cmd/fe/main.go
@@ -56,7 +56,7 @@ func init() {
 func main() {
 	const usage = `
 Usage:
-	codis-fe [--ncpu=N] [--log=FILE] [--log-level=LEVEL] [--assets-dir=PATH] [--pidfile=FILE] (--dashboard-list=FILE|--zookeeper=ADDR [--zookeeper-auth=USR:PWD]|--etcd=ADDR [--etcd-auth=USR:PWD]|--filesystem=ROOT) --listen=ADDR
+	codis-fe [--ncpu=N] [--log=FILE] [--log-level=LEVEL] [--assets-dir=PATH] [--pidfile=FILE] (--dashboard-list=FILE|--zookeeper=ADDR [--zookeeper-auth=USR:PWD]|--etcd=ADDR [--etcd-auth=USR:PWD]|--filesystem=ROOT) --listen=ADDR [--tls-cert=FILE] [--tls-key=FILE] [--tls=BOOL]
 	codis-fe  --version
 
 Options:
diff --git a/codis/config/dashboard.toml b/codis/config/dashboard.toml
index ebd910ec62..217cf0e785 100644
--- a/codis/config/dashboard.toml
+++ b/codis/config/dashboard.toml
@@ -8,8 +8,10 @@
 # Set Coordinator, only accept "zookeeper" & "etcd" & "filesystem".
 # for zookeeper/etcd, coorinator_auth accept "user:password" 
 # Quick Start
-coordinator_name = "filesystem"
-coordinator_addr = "/tmp/codis"
+coordinator_name = "etcd"
+coordinator_addr = "127.0.0.1:2379"
+#coordinator_name = "filesystem"
+#coordinator_addr = "/tmp/codis"
 #coordinator_name = "zookeeper"
 #coordinator_addr = "127.0.0.1:2181"
 #coordinator_auth = ""
diff --git a/codis/config/proxy.toml b/codis/config/proxy.toml
index 1cee0cf056..054b0d4aea 100644
--- a/codis/config/proxy.toml
+++ b/codis/config/proxy.toml
@@ -21,9 +21,9 @@ admin_addr = "0.0.0.0:11080"
 
 # Set bind address for proxy, proto_type can be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
 proto_type = "tcp4"
-#proxy_tls = true
-#proxy_tls_cert = "./cert.pem"
-#proxy_tls_key = "./key.pem"
+proxy_tls = true
+proxy_tls_cert = "/usr/local/src/pika/codis/cert.pem"
+proxy_tls_key = "/usr/local/src/pika/codis/key.pem"
 proxy_addr = "0.0.0.0:19000"
 
 # Set jodis address & session timeout
@@ -35,8 +35,8 @@ proxy_addr = "0.0.0.0:19000"
 #          /zk/codis/db_{PRODUCT_NAME}/proxy-{HASHID} (compatible with Codis2.0)
 #        or else
 #          /jodis/{PRODUCT_NAME}/proxy-{HASHID}
-jodis_name = ""
-jodis_addr = ""
+jodis_name = "etcd"
+jodis_addr = "127.0.0.1:2379"
 jodis_auth = ""
 jodis_timeout = "20s"
 jodis_compatible = false
diff --git a/codis/key.pem b/codis/key.pem
new file mode 100644
index 0000000000..ca0a096252
--- /dev/null
+++ b/codis/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClOgprziC/+nQe
+HXV5qJA9gdttnx7NV9Cbfc7xox6wHRCaavLxdKh//E2o6F492U0i+GSqRYWrQKqW
+ix0myLiZwXEL16mkhL7ANLFSnA8CqsMIJf3u6+rN1OtlIVoKP1zWMFRV0inVCZMC
+0W6KFeVpuTqewc/FC5w/Zh3shPj1FJQCOas5SNbpxp9jQQsInur+NeP71r2GcZWD
+6+H2TCGouMTLFxdL62dbMOGLfm3aYq2d+HVhSMmEkuxXEgaIzxJ04toqQntnq4fn
+RkkFB7CoXG7AQqHIxKb4bjjnD100qDTTPc1wDEhlye/kUbxztF6dv58AUH1ayg1N
+7pz3EwazAgMBAAECggEANou0MAXTGv2wQtbf1uN2hs+tZIGg1hJ0/DgqzuvWcDaQ
+KiI/hMXJ8MKW0rmvjwSDahWNiga8i54kEuHnJEwkYSIS02GFkBoArQxYM9jwPaWp
+EDIWpD7++6ecdHzvsC1d1RoMZW6lv75S6Z3BO9XhsCblus5p7HeaQ/XO0CvP0nxJ
+SxT1Mj6U0dkiGVPWmmsKuWacYUkbYLeOh0s+T298vm5sRaECvewqwGSQYO8EJVaW
+c/sFfJPPwONRGK3+Ggt/Puq6z+6i8baiXnMYHBhHhxdHN8fgRjGW+J+fYddOmd90
+Sfr+OeECnqXKvIQdnH3WOOzvSF8oP0/Si7dEu8mF1QKBgQC1erZifnvnKPTn2Y7t
+lfdbP9tbuBo4e6PXKf7oy3gEMb7DBoXlLrytnyKS2CnNfw3y+Cptk6sHvCRlf00h
+1WSQqLf7+6LvwqZunhLD+lIqbBeYb6FnjU32HTyTA37nojO9G7F+4uUktWtAp5TV
+zp04k/lK4jFC63/GWc9/iHauZQKBgQDpEtYgGcmtCv2+9pKHfKIqC3Ma2HzV9EsW
+VTgVjRZWxSIxeblPI8GqCEPB0Wjn/GcZ83MIpGH4RlPkZVM1z8DkWEBn9OxQysCl
+t8UEIysAParbwdXQ4bLeVmRO8eEXhSSRQgyIPGHQ+oNECbZftnkMIMZqNIP5Tz3C
+mg4zfjDjNwKBgCDWwrgR8TPEGoT1vkJJt8fgRz5SkxQTc3NU2xae8um3YrCBtqrh
+CS1VtXji+rV/vzNvKqZHaVRt/BwNrBRqO9ddYGWNhE9kZp9vpS+nVUTt6FsiIA/P
+5wKZCcQEhus9U6VtpHG0dwhsd6rsaCdESvjY9exR/93/JVDsIXsPY4JtAoGAXCjg
+lkzcHBpuf2YMRpqXnLxuRT05D3jLgAcuaAcjwCeu/5U8GvjuiQc/k5H0Q1bghbhn
+0hD91Cgq3/LY1jxR73id7v0/vCqPxndF5f7p7+xydPbOTwwPqC7M9xJZiO1SqkVN
+o0kM/I8x/GNCw9HpR0xmaHRfguM8bohv+Rh6yD0CgYAfEVhTk+fXshrMeH9qdEwH
+AzfQaQtPpQISgoTADT2ZDkZSSDOuVtMK0L/ZvAAeL+jbQh3RJayARfp2o8BnD12U
+YIaBq9OC8JUZbG71e93zY/zv4HmZdK/RymmwM2jv9UxTnQPpnHRuVcYF0HZpZSWJ
+Xf12eCJQmM/HGdynEvZtcw==
+-----END PRIVATE KEY-----
diff --git a/codis/pkg/proxy/.proxy.go.swo b/codis/pkg/proxy/.proxy.go.swo
new file mode 100644
index 0000000000000000000000000000000000000000..d688c56659c64646ee4e4d3a842b2703533e320c
GIT binary patch
literal 36864
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
NnAqB9*R3tn{|B0IHDv$*

literal 0
HcmV?d00001

diff --git a/codis/pkg/proxy/config.go b/codis/pkg/proxy/config.go
index e066d31e39..82b75cabfc 100644
--- a/codis/pkg/proxy/config.go
+++ b/codis/pkg/proxy/config.go
@@ -51,8 +51,8 @@ proxy_addr = "0.0.0.0:19000"
 #          /zk/codis/db_{PRODUCT_NAME}/proxy-{HASHID} (compatible with Codis2.0)
 #        or else
 #          /jodis/{PRODUCT_NAME}/proxy-{HASHID}
-jodis_name = ""
-jodis_addr = ""
+jodis_name = "etcd"
+jodis_addr = "127.0.0.1:2379"
 jodis_auth = ""
 jodis_timeout = "20s"
 jodis_compatible = false
diff --git a/codis/pkg/proxy/proxy.go b/codis/pkg/proxy/proxy.go
index 17e99e8ccd..4fa69c896d 100644
--- a/codis/pkg/proxy/proxy.go
+++ b/codis/pkg/proxy/proxy.go
@@ -106,6 +106,7 @@ func (p *Proxy) setup(config *Config) error {
 	proto := config.ProtoType
 
 	if config.ProxyTLS {
+		log.Printf("ufsdigushdgisdghfdg = %s = %s", config.ProxyTLSCert, config.ProxyTLSKey)
 
 		cert, err := tls.LoadX509KeyPair(config.ProxyTLSCert, config.ProxyTLSKey)
 		if err != nil {
@@ -133,10 +134,11 @@ func (p *Proxy) setup(config *Config) error {
                 p.model.ProxyAddr = x
 
 	}else{
+		log.Printf("fgdusgifhfdgfgfidudsfgi")
 
 		if l, err := net.Listen(proto, config.ProxyAddr); err != nil {
 			return errors.Trace(err)
-		} else {
+		}else{ 
 			p.lproxy = l
 
 			x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
diff --git a/codis/pkg/topom/config.go b/codis/pkg/topom/config.go
index 4d7234b662..98bb0eb561 100644
--- a/codis/pkg/topom/config.go
+++ b/codis/pkg/topom/config.go
@@ -25,8 +25,10 @@ const DefaultConfig = `
 # Set Coordinator, only accept "zookeeper" & "etcd" & "filesystem".
 # for zookeeper/etcd, coorinator_auth accept "user:password" 
 # Quick Start
-coordinator_name = "filesystem"
-coordinator_addr = "/tmp/codis"
+coordinator_name = "etcd"
+coordinator_addr = "127.0.0.1:2379"
+#coordinator_name = "filesystem"
+#coordinator_addr = "/tmp/codis"
 #coordinator_name = "zookeeper"
 #coordinator_addr = "127.0.0.1:2181"
 #coordinator_auth = ""

From 10b22fce8e5c726c44945df989fff0a0cfac1504 Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 17:24:11 +0000
Subject: [PATCH 03/26] codis fe tls done

---
 codis/admin/codis-fe-admin.sh |  5 +++-
 codis/cmd/fe/main.go          | 44 +++++++++++++++++++++++++++++++----
 codis/config/proxy.toml       |  6 ++---
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/codis/admin/codis-fe-admin.sh b/codis/admin/codis-fe-admin.sh
index ef1bd63e0e..fa84ef91f3 100755
--- a/codis/admin/codis-fe-admin.sh
+++ b/codis/admin/codis-fe-admin.sh
@@ -20,6 +20,9 @@ CODIS_FE_DAEMON_FILE=$CODIS_LOG_DIR/codis-fe.out
 COORDINATOR_NAME="etcd"
 COORDINATOR_ADDR="127.0.0.1:2379"
 CODIS_FE_ADDR="0.0.0.0:9090"
+CODIS_FE_TLS=1
+CODIS_FE_TLS_KEY="/usr/local/src/pika/codis/key.pem"
+CODIS_FE_TLS_CERT="/usr/local/src/pika/codis/cert.pem"
 
 echo $CODIS_FE_CONF_FILE
 
@@ -38,7 +41,7 @@ start)
       fi
     fi
     nohup "$CODIS_FE_BIN" "--assets-dir=${CODIS_FE_ASSETS_DIR}" "--$COORDINATOR_NAME=$COORDINATOR_ADDR" \
-    "--log=$CODIS_FE_LOG_FILE" "--pidfile=$CODIS_FE_PID_FILE" "--log-level=INFO" "--listen=$CODIS_FE_ADDR" > "$CODIS_FE_DAEMON_FILE" 2>&1 < /dev/null &
+    "--tls=$CODIS_FE_TLS" "--tls-key=$CODIS_FE_TLS_KEY" "--tls-cert=$CODIS_FE_TLS_CERT" "--log=$CODIS_FE_LOG_FILE" "--pidfile=$CODIS_FE_PID_FILE" "--log-level=INFO" "--listen=$CODIS_FE_ADDR" > "$CODIS_FE_DAEMON_FILE" 2>&1 < /dev/null &
     ;;
 start-foreground)
     $CODIS_FE_BIN "--assets-dir=${CODIS_FE_ASSETS_DIR}" "--$COORDINATOR_NAME=$COORDINATOR_ADDR" \
diff --git a/codis/cmd/fe/main.go b/codis/cmd/fe/main.go
index 5b884f6a27..9e5601b23d 100644
--- a/codis/cmd/fe/main.go
+++ b/codis/cmd/fe/main.go
@@ -4,6 +4,7 @@
 package main
 
 import (
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -56,7 +57,7 @@ func init() {
 func main() {
 	const usage = `
 Usage:
-	codis-fe [--ncpu=N] [--log=FILE] [--log-level=LEVEL] [--assets-dir=PATH] [--pidfile=FILE] (--dashboard-list=FILE|--zookeeper=ADDR [--zookeeper-auth=USR:PWD]|--etcd=ADDR [--etcd-auth=USR:PWD]|--filesystem=ROOT) --listen=ADDR [--tls-cert=FILE] [--tls-key=FILE] [--tls=BOOL]
+	codis-fe [--ncpu=N] [--log=FILE] [--log-level=LEVEL] [--assets-dir=PATH] [--pidfile=FILE] (--dashboard-list=FILE|--zookeeper=ADDR [--zookeeper-auth=USR:PWD]|--etcd=ADDR [--etcd-auth=USR:PWD]|--filesystem=ROOT) --listen=ADDR [--tls-cert=FILE] [--tls-key=FILE] [--tls=N]
 	codis-fe  --version
 
 Options:
@@ -196,10 +197,45 @@ Options:
 	m.MapTo(r, (*martini.Routes)(nil))
 	m.Action(r.Handle)
 
-	l, err := net.Listen("tcp", listen)
-	if err != nil {
-		log.PanicErrorf(err, "listen %s failed", listen)
+
+	var l net.Listener 
+	//var err error
+
+	if n, ok := utils.ArgumentInteger(d, "--tls"); ok {
+		if n == 1 {
+
+			log.Warnf("nfyDFUSIUDSH")
+			//listen := ":443" // Replace with your listening address and port
+			// Load server certificate and key
+			cert, err := tls.LoadX509KeyPair(utils.ArgumentMust(d, "--tls-cert"), utils.ArgumentMust(d, "--tls-key"))
+			if err != nil {
+				log.PanicErrorf(err, "failed to load key pair: %s", err)
+			}
+
+			// Create a TLS config
+			tlsConfig := &tls.Config{
+				Certificates: []tls.Certificate{cert},
+			}
+
+			// Create a TLS listener
+			l, err = tls.Listen("tcp", listen, tlsConfig)
+			if err != nil {
+				log.PanicErrorf(err, "listen %s failed", listen)
+			}
+
+
+		}
+	}else{
+
+		log.Warnf("SDNAUDHDKSAJDHSD")
+		l, err = net.Listen("tcp", listen)
+		if err != nil {
+			log.PanicErrorf(err, "listen %s failed", listen)
+		}
+
 	}
+
+
 	defer l.Close()
 
 	if s, ok := utils.Argument(d, "--pidfile"); ok {
diff --git a/codis/config/proxy.toml b/codis/config/proxy.toml
index 054b0d4aea..11418bffe0 100644
--- a/codis/config/proxy.toml
+++ b/codis/config/proxy.toml
@@ -21,9 +21,9 @@ admin_addr = "0.0.0.0:11080"
 
 # Set bind address for proxy, proto_type can be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
 proto_type = "tcp4"
-proxy_tls = true
-proxy_tls_cert = "/usr/local/src/pika/codis/cert.pem"
-proxy_tls_key = "/usr/local/src/pika/codis/key.pem"
+#proxy_tls = true
+#proxy_tls_cert = "./cert.pem"
+#proxy_tls_key = "./key.pem"
 proxy_addr = "0.0.0.0:19000"
 
 # Set jodis address & session timeout

From 083b737910df113510fd44b1d081160d80952881 Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 17:25:55 +0000
Subject: [PATCH 04/26] codis tls fe minor update

---
 codis/config/proxy.toml   | 4 ++--
 codis/pkg/proxy/config.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/codis/config/proxy.toml b/codis/config/proxy.toml
index 11418bffe0..b403e70e1a 100644
--- a/codis/config/proxy.toml
+++ b/codis/config/proxy.toml
@@ -22,8 +22,8 @@ admin_addr = "0.0.0.0:11080"
 # Set bind address for proxy, proto_type can be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
 proto_type = "tcp4"
 #proxy_tls = true
-#proxy_tls_cert = "./cert.pem"
-#proxy_tls_key = "./key.pem"
+#proxy_tls_cert = "/usr/local/src/pika/codis/cert.pem"
+#proxy_tls_key = "/usr/local/src/pika/codis/key.pem"
 proxy_addr = "0.0.0.0:19000"
 
 # Set jodis address & session timeout
diff --git a/codis/pkg/proxy/config.go b/codis/pkg/proxy/config.go
index 82b75cabfc..79c75b49e5 100644
--- a/codis/pkg/proxy/config.go
+++ b/codis/pkg/proxy/config.go
@@ -38,8 +38,8 @@ admin_addr = "0.0.0.0:11080"
 # Set bind address for proxy, proto_type can be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
 proto_type = "tcp4"
 #proxy_tls = true
-#proxy_tls_cert = "./cert.pem"
-#proxy_tls_key = "./key.pem"
+#proxy_tls_cert = "/usr/local/src/pika/codis/cert.pem"
+#proxy_tls_key = "/usr/local/src/pika/codis/key.pem"
 proxy_addr = "0.0.0.0:19000"
 
 # Set jodis address & session timeout

From 4517f87ae6dc03cce6a01eea98d9e66fefd1c797 Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 17:34:05 +0000
Subject: [PATCH 05/26] codis fe minor update

---
 codis/admin/.codis-fe-admin.sh.swo | Bin 0 -> 12288 bytes
 codis/cmd/fe/main.go               |  37 ++++++++++++-----------------
 2 files changed, 15 insertions(+), 22 deletions(-)
 create mode 100644 codis/admin/.codis-fe-admin.sh.swo

diff --git a/codis/admin/.codis-fe-admin.sh.swo b/codis/admin/.codis-fe-admin.sh.swo
new file mode 100644
index 0000000000000000000000000000000000000000..0f231cafe3770a2e09dbdd0d2ab7702a43b4de98
GIT binary patch
literal 12288
zcmeI2&u`;I6vt=xz|Sp<;0&6&QQ0Ed`LPn+wxlAh(-O8#s-#6i%PQ;IlhmqXTeefE
z+Aaq!oRBymZb*ArsYgKKfH<v$#DNQY;mRKX0s#_x*cIaIu^l^Uy4wSnMdRudC-dIS
zoB7Ur6GioQ;qBTwy`q!|uICB4a`#)-y;(kg=M_Rc#|gsbM_tDDqdX#ezVCZ^%h5F}
z?|XXQHFveV?ii+@*NmQNNAKkhlle!*-#Oc`!b>P16gZOt6XbHKSO{IGq)GbX3tMOE
zC7gr;LII(GP(Uak6c7ps1%v`Zf&YgBfqRa8fTf&|m$Mq*&yC#UkK!g25DEwdgaSeV
zp@2|8C?FIN3J3*+0zv_yz+<R@W)Skt6NLQnBqopl|0loyf4xY^FW?7o3;4hTYhW5Y
zc#e?!;3selZh|Aw055}=z&{g&{0zPax4}nXAE;mgTmXMvAmmSQ7kmxA0$+kJz-{n3
zH~>v>5!`tec5n=Cfmv|%8H@=^;K!%Y2Yd!T0S<TzRKUHb2>A_s2ads~;A8M1I0Qa0
z!8OnTZ-6=Q8n_32{sy5=zXNdz1%v`Z0il3U;PFv_F`xOGP6)-t^c{yvTfWw1^E6kW
z2Y#S=!6AQ@JC4V?p3}DtG&t^|$9VgZL>H$^<kcBI!omW-Nx6bVxtV|TEyi40%$giG
zvh0|hfW$)$4Z+?w16trt9h2YU`L#A18yi(MZt{9Gx7<)`t@cW_y-`!!E48(1Y}++0
zi^_8}cS+X*DxLI`qKM4$SvG=XJCr|#h$jze;9wz+OE2k8-!iD}1hiw?23{;SCiINN
zM+$bB&EJ?EdW}v}xidCCz0RE?-NP`hX?N4uilR`7gzZDpNV04>UD;xL%qpwZrL9$o
zhHa)FFuR;Cv!bfaXgX=zQmr2PYQE0`Up7pyoI4okS827Xo2|B5YhqX7g>H?eTB}z!
z8_jmTvR(}bPh0r-^j%C4S(3?*(a8pupPAL>T8j^kR(Y504_n$-tM3e~I`e`N^K!Mh
z87<c7W=w01Rlf1u<eEmfIT>@37fH`px>|ju5jBlfjxJ{ROs!Pc8}&F!X>qzpU#EG4
z?d9!0vTT~~qwVbU-E1eQ%>(?Wa#LJ`k{G-}W2R(6pQxO3y3^}vNLbDCm}cx#uW#F7
zmT5k9Jx6E0Pj8%7A2$@jN1{mMsG157afV>2BB4YJbhr*qt%8gruLUacoElpU$h8@w
zYd)&4NKG3@ZLC3W7wJr8H>t`nDUiw}DM4ezK(EJP36Gi9$a15;5}hMtP#VbEc9?u+
z>GWro!+cd-){}<2A*CPI3pH@EQ@N0i5tdn5Dk%JKey%WA2m=h4VOc7cX1PakzI1tZ
zZrFpDuEYY}kjT`@uKA$nMvq#Ln4^ASG5PyATd=TnR+)N8DlHa#@YJ^A^n<iRQlqDO
z<4ntppPofY2NYAdpZTbm(t(re9`#F(a0LfK>WxuOb4;T1{YRw4ucEHUp%n#-vpZ%t
z9xq<;SjTWVQToIaAM3RpW^m*-2ve5ujb-2*iBD#3IFc5q`<{XCmyCDliKMr+9y{TF
l!t-FM(t5MqYHT%^t8%Vzgx#E)<k^f#<e9xkw>3Or|1as&l9&Jh

literal 0
HcmV?d00001

diff --git a/codis/cmd/fe/main.go b/codis/cmd/fe/main.go
index 9e5601b23d..964d121766 100644
--- a/codis/cmd/fe/main.go
+++ b/codis/cmd/fe/main.go
@@ -197,37 +197,30 @@ Options:
 	m.MapTo(r, (*martini.Routes)(nil))
 	m.Action(r.Handle)
 
-
 	var l net.Listener 
-	//var err error
 
-	if n, ok := utils.ArgumentInteger(d, "--tls"); ok {
-		if n == 1 {
+	if n, ok := utils.ArgumentInteger(d, "--tls"); ok && n == 1 {
 
-			log.Warnf("nfyDFUSIUDSH")
-			//listen := ":443" // Replace with your listening address and port
-			// Load server certificate and key
-			cert, err := tls.LoadX509KeyPair(utils.ArgumentMust(d, "--tls-cert"), utils.ArgumentMust(d, "--tls-key"))
-			if err != nil {
-				log.PanicErrorf(err, "failed to load key pair: %s", err)
-			}
+		// Load server certificate and key
+		cert, err := tls.LoadX509KeyPair(utils.ArgumentMust(d, "--tls-cert"), utils.ArgumentMust(d, "--tls-key"))
+		if err != nil {
+			log.PanicErrorf(err, "failed to load key pair: %s", err)
+		}
 
-			// Create a TLS config
-			tlsConfig := &tls.Config{
-				Certificates: []tls.Certificate{cert},
-			}
+		// Create a TLS config
+		tlsConfig := &tls.Config{
+			Certificates: []tls.Certificate{cert},
+		}
 
-			// Create a TLS listener
-			l, err = tls.Listen("tcp", listen, tlsConfig)
-			if err != nil {
-				log.PanicErrorf(err, "listen %s failed", listen)
-			}
+		// Create a TLS listener
+		l, err = tls.Listen("tcp", listen, tlsConfig)
+		if err != nil {
+			log.PanicErrorf(err, "listen %s failed", listen)
+		}
 
 
-		}
 	}else{
 
-		log.Warnf("SDNAUDHDKSAJDHSD")
 		l, err = net.Listen("tcp", listen)
 		if err != nil {
 			log.PanicErrorf(err, "listen %s failed", listen)

From 342d8931b69d27b4f49f5e6db275060275ec1ada Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 18:36:09 +0000
Subject: [PATCH 06/26] @chenmin1992 remove my own topom

---
 codis/pkg/models/store.go | 13 +++++++++++++
 codis/pkg/models/topom.go |  8 ++++++++
 codis/pkg/topom/topom.go  |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/codis/pkg/models/store.go b/codis/pkg/models/store.go
index aceb5bc83a..00f20e214f 100644
--- a/codis/pkg/models/store.go
+++ b/codis/pkg/models/store.go
@@ -123,6 +123,19 @@ func (s *Store) Release() error {
 	return s.client.Delete(s.LockPath())
 }
 
+func (s *Store) ReleaseByToken(token string) error {
+	if b, err := s.client.Read(s.LockPath(),false); err != nil {
+		return err
+	} else if b != nil {
+		if t, err := Decode(b); err != nil {
+			return err
+		} else if t.Token == token {
+			return s.Release()
+		}
+	}
+	return nil
+}
+
 func (s *Store) LoadTopom(must bool) (*Topom, error) {
 	return LoadTopom(s.client, s.product, must)
 }
diff --git a/codis/pkg/models/topom.go b/codis/pkg/models/topom.go
index 746141fbae..63aa1c8d5a 100644
--- a/codis/pkg/models/topom.go
+++ b/codis/pkg/models/topom.go
@@ -18,3 +18,11 @@ type Topom struct {
 func (t *Topom) Encode() []byte {
 	return jsonEncode(t)
 }
+
+func Decode(b []byte) (*Topom, error) {
+	s := &Topom{}
+	if err := jsonDecode(s, b); err != nil {
+		return nil,err
+	}
+	return s,nil
+}
diff --git a/codis/pkg/topom/topom.go b/codis/pkg/topom/topom.go
index 582452aa1d..4bf2e98c89 100644
--- a/codis/pkg/topom/topom.go
+++ b/codis/pkg/topom/topom.go
@@ -168,7 +168,7 @@ func (s *Topom) Close() error {
 	defer s.store.Close()
 
 	if s.online {
-		if err := s.store.Release(); err != nil {
+		if err := s.store.ReleaseByToken(s.model.Token); err != nil {
 			log.ErrorErrorf(err, "store: release lock of %s failed", s.config.ProductName)
 			return errors.Errorf("store: release lock of %s failed", s.config.ProductName)
 		}

From 8ad0b61b05564aec18f53b9590b7e9d8d162c6df Mon Sep 17 00:00:00 2001
From: Kolin Fluence <kolinfluence@gmail.com>
Date: Thu, 1 Feb 2024 18:43:07 +0000
Subject: [PATCH 07/26] optimize code

---
 codis/pkg/proxy/proxy.go | 55 ++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/codis/pkg/proxy/proxy.go b/codis/pkg/proxy/proxy.go
index 4fa69c896d..6d5762b0c0 100644
--- a/codis/pkg/proxy/proxy.go
+++ b/codis/pkg/proxy/proxy.go
@@ -105,52 +105,53 @@ func New(config *Config) (*Proxy, error) {
 func (p *Proxy) setup(config *Config) error {
 	proto := config.ProtoType
 
+	var l net.Listener
+	var err error
+
 	if config.ProxyTLS {
-		log.Printf("ufsdigushdgisdghfdg = %s = %s", config.ProxyTLSCert, config.ProxyTLSKey)
+		log.Printf("TLS configuration: cert = %s, key = %s", config.ProxyTLSCert, config.ProxyTLSKey)
 
+		// Load the TLS certificate
 		cert, err := tls.LoadX509KeyPair(config.ProxyTLSCert, config.ProxyTLSKey)
 		if err != nil {
 			return errors.Trace(err)
-    		}
+		}
 
-		// Set up TLS configuration to use TLS 1.3
+		// Set up TLS configuration to use TLS 1.2 or higher
 		tlsConfig := &tls.Config{
 			Certificates: []tls.Certificate{cert},
 			MinVersion:   tls.VersionTLS12,
 		}
 
-		l, err := tls.Listen(proto, config.ProxyAddr, tlsConfig)
+		// Create a TLS listener
+		l, err = tls.Listen(proto, config.ProxyAddr, tlsConfig)
 		if err != nil {
 			return errors.Trace(err)
-    		}
-
-                p.lproxy = l
-
-                x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
-                if err != nil {
-                        return err
-                }
-                p.model.ProtoType = proto
-                p.model.ProxyAddr = x
-
-	}else{
-		log.Printf("fgdusgifhfdgfgfidudsfgi")
+		}
+	} else {
+		log.Printf("Setting up a non-TLS listener")
 
-		if l, err := net.Listen(proto, config.ProxyAddr); err != nil {
+		// Create a non-TLS listener
+		l, err = net.Listen(proto, config.ProxyAddr)
+		if err != nil {
 			return errors.Trace(err)
-		}else{ 
-			p.lproxy = l
-
-			x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
-			if err != nil {
-				return err
-			}
-			p.model.ProtoType = proto
-			p.model.ProxyAddr = x
 		}
+	}
+
+	// Common setup for both TLS and non-TLS
+	p.lproxy = l
 
+	// Replace unspecified IP address with the specific host proxy address
+	x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
+	if err != nil {
+		return err
 	}
 
+	// Update proxy model
+	p.model.ProtoType = proto
+	p.model.ProxyAddr = x
+
+
 	proto = "tcp"
 	if l, err := net.Listen(proto, config.AdminAddr); err != nil {
 		return errors.Trace(err)

From e233d106105031dc7b86a23dc07b15c39cb98883 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:05:46 -0400
Subject: [PATCH 08/26] Delete codis/pkg/proxy/.proxy.go.swo

---
 codis/pkg/proxy/.proxy.go.swo | Bin 36864 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 codis/pkg/proxy/.proxy.go.swo

diff --git a/codis/pkg/proxy/.proxy.go.swo b/codis/pkg/proxy/.proxy.go.swo
deleted file mode 100644
index d688c56659c64646ee4e4d3a842b2703533e320c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36864
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
NnAqB9*R3tn{|B0IHDv$*


From e99e5870ba3353ec5ee35e0e448951fa652716dc Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:07:13 -0400
Subject: [PATCH 09/26] Delete codis/admin/.codis-fe-admin.sh.swo

---
 codis/admin/.codis-fe-admin.sh.swo | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 codis/admin/.codis-fe-admin.sh.swo

diff --git a/codis/admin/.codis-fe-admin.sh.swo b/codis/admin/.codis-fe-admin.sh.swo
deleted file mode 100644
index 0f231cafe3770a2e09dbdd0d2ab7702a43b4de98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2&u`;I6vt=xz|Sp<;0&6&QQ0Ed`LPn+wxlAh(-O8#s-#6i%PQ;IlhmqXTeefE
z+Aaq!oRBymZb*ArsYgKKfH<v$#DNQY;mRKX0s#_x*cIaIu^l^Uy4wSnMdRudC-dIS
zoB7Ur6GioQ;qBTwy`q!|uICB4a`#)-y;(kg=M_Rc#|gsbM_tDDqdX#ezVCZ^%h5F}
z?|XXQHFveV?ii+@*NmQNNAKkhlle!*-#Oc`!b>P16gZOt6XbHKSO{IGq)GbX3tMOE
zC7gr;LII(GP(Uak6c7ps1%v`Zf&YgBfqRa8fTf&|m$Mq*&yC#UkK!g25DEwdgaSeV
zp@2|8C?FIN3J3*+0zv_yz+<R@W)Skt6NLQnBqopl|0loyf4xY^FW?7o3;4hTYhW5Y
zc#e?!;3selZh|Aw055}=z&{g&{0zPax4}nXAE;mgTmXMvAmmSQ7kmxA0$+kJz-{n3
zH~>v>5!`tec5n=Cfmv|%8H@=^;K!%Y2Yd!T0S<TzRKUHb2>A_s2ads~;A8M1I0Qa0
z!8OnTZ-6=Q8n_32{sy5=zXNdz1%v`Z0il3U;PFv_F`xOGP6)-t^c{yvTfWw1^E6kW
z2Y#S=!6AQ@JC4V?p3}DtG&t^|$9VgZL>H$^<kcBI!omW-Nx6bVxtV|TEyi40%$giG
zvh0|hfW$)$4Z+?w16trt9h2YU`L#A18yi(MZt{9Gx7<)`t@cW_y-`!!E48(1Y}++0
zi^_8}cS+X*DxLI`qKM4$SvG=XJCr|#h$jze;9wz+OE2k8-!iD}1hiw?23{;SCiINN
zM+$bB&EJ?EdW}v}xidCCz0RE?-NP`hX?N4uilR`7gzZDpNV04>UD;xL%qpwZrL9$o
zhHa)FFuR;Cv!bfaXgX=zQmr2PYQE0`Up7pyoI4okS827Xo2|B5YhqX7g>H?eTB}z!
z8_jmTvR(}bPh0r-^j%C4S(3?*(a8pupPAL>T8j^kR(Y504_n$-tM3e~I`e`N^K!Mh
z87<c7W=w01Rlf1u<eEmfIT>@37fH`px>|ju5jBlfjxJ{ROs!Pc8}&F!X>qzpU#EG4
z?d9!0vTT~~qwVbU-E1eQ%>(?Wa#LJ`k{G-}W2R(6pQxO3y3^}vNLbDCm}cx#uW#F7
zmT5k9Jx6E0Pj8%7A2$@jN1{mMsG157afV>2BB4YJbhr*qt%8gruLUacoElpU$h8@w
zYd)&4NKG3@ZLC3W7wJr8H>t`nDUiw}DM4ezK(EJP36Gi9$a15;5}hMtP#VbEc9?u+
z>GWro!+cd-){}<2A*CPI3pH@EQ@N0i5tdn5Dk%JKey%WA2m=h4VOc7cX1PakzI1tZ
zZrFpDuEYY}kjT`@uKA$nMvq#Ln4^ASG5PyATd=TnR+)N8DlHa#@YJ^A^n<iRQlqDO
z<4ntppPofY2NYAdpZTbm(t(re9`#F(a0LfK>WxuOb4;T1{YRw4ucEHUp%n#-vpZ%t
z9xq<;SjTWVQToIaAM3RpW^m*-2ve5ujb-2*iBD#3IFc5q`<{XCmyCDliKMr+9y{TF
l!t-FM(t5MqYHT%^t8%Vzgx#E)<k^f#<e9xkw>3Or|1as&l9&Jh


From c631795cfdc35d7fdd6381ca2228f9ddfe73e22d Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:13:42 -0400
Subject: [PATCH 10/26] Update store.go

---
 codis/pkg/models/store.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/codis/pkg/models/store.go b/codis/pkg/models/store.go
index 00f20e214f..2ec683accd 100644
--- a/codis/pkg/models/store.go
+++ b/codis/pkg/models/store.go
@@ -124,15 +124,21 @@ func (s *Store) Release() error {
 }
 
 func (s *Store) ReleaseByToken(token string) error {
-	if b, err := s.client.Read(s.LockPath(),false); err != nil {
+	b, err := s.client.Read(s.LockPath(),false)
+	if err != nil {
 		return err
-	} else if b != nil {
-		if t, err := Decode(b); err != nil {
+	}
+	
+	if b != nil {
+		t, err := Decode(b); 
+		if err != nil {
 			return err
-		} else if t.Token == token {
+		}
+		if t.Token == token {
 			return s.Release()
 		}
 	}
+	
 	return nil
 }
 

From 7b765b76e99bd9ce8c01168e0e7d9db0f41c1a89 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:16:44 -0400
Subject: [PATCH 11/26] Update config.go

---
 codis/pkg/topom/config.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/codis/pkg/topom/config.go b/codis/pkg/topom/config.go
index 98bb0eb561..d1e0d44e5f 100644
--- a/codis/pkg/topom/config.go
+++ b/codis/pkg/topom/config.go
@@ -25,10 +25,8 @@ const DefaultConfig = `
 # Set Coordinator, only accept "zookeeper" & "etcd" & "filesystem".
 # for zookeeper/etcd, coorinator_auth accept "user:password" 
 # Quick Start
-coordinator_name = "etcd"
-coordinator_addr = "127.0.0.1:2379"
-#coordinator_name = "filesystem"
-#coordinator_addr = "/tmp/codis"
+coordinator_name = "filesystem"
+coordinator_addr = "/tmp/codis"
 #coordinator_name = "zookeeper"
 #coordinator_addr = "127.0.0.1:2181"
 #coordinator_auth = ""
@@ -52,9 +50,10 @@ migration_async_numkeys = 500
 migration_timeout = "30s"
 
 # Set configs for redis sentinel.
-sentinel_check_server_state_interval = "5s"
-sentinel_check_master_failover_interval = "1s"
-sentinel_master_dead_check_times = 5
+sentinel_check_server_state_interval = "10s"
+sentinel_check_master_failover_interval = "2s"
+sentinel_master_dead_check_times = 10
+sentinel_check_offline_server_interval = "2s"
 sentinel_client_timeout = "10s"
 sentinel_quorum = 2
 sentinel_parallel_syncs = 1
@@ -88,6 +87,7 @@ type Config struct {
 	SentinelCheckServerStateInterval    timesize.Duration `toml:"sentinel_check_server_state_interval" json:"sentinel_client_timeout"`
 	SentinelCheckMasterFailoverInterval timesize.Duration `toml:"sentinel_check_master_failover_interval" json:"sentinel_check_master_failover_interval"`
 	SentinelMasterDeadCheckTimes        int8              `toml:"sentinel_master_dead_check_times" json:"sentinel_master_dead_check_times"`
+	SentinelCheckOfflineServerInterval  timesize.Duration `toml:"sentinel_check_offline_server_interval" json:"sentinel_check_offline_server_interval"`
 	SentinelClientTimeout               timesize.Duration `toml:"sentinel_client_timeout" json:"sentinel_client_timeout"`
 	SentinelQuorum                      int               `toml:"sentinel_quorum" json:"sentinel_quorum"`
 	SentinelParallelSyncs               int               `toml:"sentinel_parallel_syncs" json:"sentinel_parallel_syncs"`

From 6eb8e3a004ff14c4007679e2a8a31af8ec73be1f Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:23:05 -0400
Subject: [PATCH 12/26] Update Makefile

---
 codis/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/codis/Makefile b/codis/Makefile
index 5c00c2ca30..ef20162da3 100644
--- a/codis/Makefile
+++ b/codis/Makefile
@@ -12,25 +12,25 @@ codis-deps:
 
 codis-dashboard: codis-deps
 	$(info build codis-dashboard)
-	@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-dashboard .
+	@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-dashboard .
 	@${PRJ_ROOT}/bin/codis-dashboard --default-config > ${PRJ_ROOT}/config/dashboard.toml
 
 codis-proxy: codis-deps
 	$(info build codis-proxy)
-	@cd ${PRJ_ROOT}/cmd/proxy && go mod tidy && go build -ldflags "-w -s"  -o ${PRJ_ROOT}/bin/codis-proxy .
+	@cd ${PRJ_ROOT}/cmd/proxy && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-proxy .
 	@${PRJ_ROOT}/bin/codis-proxy --default-config > ${PRJ_ROOT}/config/proxy.toml
 
 codis-admin: codis-deps
 	$(info build codis-admin)
-	@cd ${PRJ_ROOT}/cmd/admin && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-admin .
+	@cd ${PRJ_ROOT}/cmd/admin && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-admin .
 
 codis-ha: codis-deps
 	$(info build codis-ha)
-	@cd ${PRJ_ROOT}/cmd/ha && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-ha .
+	@cd ${PRJ_ROOT}/cmd/ha && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-ha .
 
 codis-fe: codis-deps
 	$(info build codis-fe)
-	@cd ${PRJ_ROOT}/cmd/fe && go mod tidy && go build -ldflags "-w -s" -o ${PRJ_ROOT}/bin/codis-fe .
+	@cd ${PRJ_ROOT}/cmd/fe && go mod tidy && go build -o ${PRJ_ROOT}/bin/codis-fe .
 	@rm -rf ${PRJ_ROOT}/bin/assets && cp -rf ${PRJ_ROOT}/cmd/fe/assets ./bin/
 
 clean:

From f2cfcee0ce3e5b178527368da21dcbb3c25fd85c Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:24:47 -0400
Subject: [PATCH 13/26] Update config.go

---
 codis/pkg/proxy/config.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codis/pkg/proxy/config.go b/codis/pkg/proxy/config.go
index 79c75b49e5..f9ef6b9f7d 100644
--- a/codis/pkg/proxy/config.go
+++ b/codis/pkg/proxy/config.go
@@ -51,8 +51,8 @@ proxy_addr = "0.0.0.0:19000"
 #          /zk/codis/db_{PRODUCT_NAME}/proxy-{HASHID} (compatible with Codis2.0)
 #        or else
 #          /jodis/{PRODUCT_NAME}/proxy-{HASHID}
-jodis_name = "etcd"
-jodis_addr = "127.0.0.1:2379"
+jodis_name = ""
+jodis_addr = ""
 jodis_auth = ""
 jodis_timeout = "20s"
 jodis_compatible = false

From b8bda63c109f02cd6f2450b6de52eb08835fbfe7 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:26:43 -0400
Subject: [PATCH 14/26] Update proxy.toml

---
 codis/config/proxy.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/codis/config/proxy.toml b/codis/config/proxy.toml
index b403e70e1a..134cf0c357 100644
--- a/codis/config/proxy.toml
+++ b/codis/config/proxy.toml
@@ -108,10 +108,10 @@ session_break_on_failure = false
 # Slowlog-log-slower-than(us), from receive command to send response, 0 is allways print slow log
 slowlog_log_slower_than = 100000
 
-# quick command list
-quick_cmd_list = "get,set"
-# slow command list
-slow_cmd_list = "mget, mset"
+# quick command list e.g. get, set
+quick_cmd_list = ""
+# slow command list e.g. hgetall, mset
+slow_cmd_list = ""
 
 # Set metrics server (such as http://localhost:28000), proxy will report json formatted metrics to specified server in a predefined period.
 metrics_report_server = ""

From 6a8a404145eddc0d37f61dfd77f6f5a7ccfd0ed2 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:27:04 -0400
Subject: [PATCH 15/26] Update proxy.toml

---
 codis/config/proxy.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codis/config/proxy.toml b/codis/config/proxy.toml
index 134cf0c357..0a28d77dae 100644
--- a/codis/config/proxy.toml
+++ b/codis/config/proxy.toml
@@ -35,8 +35,8 @@ proxy_addr = "0.0.0.0:19000"
 #          /zk/codis/db_{PRODUCT_NAME}/proxy-{HASHID} (compatible with Codis2.0)
 #        or else
 #          /jodis/{PRODUCT_NAME}/proxy-{HASHID}
-jodis_name = "etcd"
-jodis_addr = "127.0.0.1:2379"
+jodis_name = ""
+jodis_addr = ""
 jodis_auth = ""
 jodis_timeout = "20s"
 jodis_compatible = false

From 10038c36c2da202b26ebee95f19ccadcda7573ee Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:28:31 -0400
Subject: [PATCH 16/26] Update codis-fe-admin.sh

---
 codis/admin/codis-fe-admin.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/codis/admin/codis-fe-admin.sh b/codis/admin/codis-fe-admin.sh
index fa84ef91f3..7ca15d76ea 100755
--- a/codis/admin/codis-fe-admin.sh
+++ b/codis/admin/codis-fe-admin.sh
@@ -15,10 +15,8 @@ CODIS_FE_ASSETS_DIR=$CODIS_BIN_DIR/assets
 CODIS_FE_LOG_FILE=$CODIS_LOG_DIR/codis-fe.log
 CODIS_FE_DAEMON_FILE=$CODIS_LOG_DIR/codis-fe.out
 
-#COORDINATOR_NAME="filesystem"
-#COORDINATOR_ADDR="/tmp/codis"
-COORDINATOR_NAME="etcd"
-COORDINATOR_ADDR="127.0.0.1:2379"
+COORDINATOR_NAME="filesystem"
+COORDINATOR_ADDR="/tmp/codis"
 CODIS_FE_ADDR="0.0.0.0:9090"
 CODIS_FE_TLS=1
 CODIS_FE_TLS_KEY="/usr/local/src/pika/codis/key.pem"

From 7f78d000ae7fc5fad91022b81b7dd69d7f987864 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:29:15 -0400
Subject: [PATCH 17/26] Update dashboard.toml

---
 codis/config/dashboard.toml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/codis/config/dashboard.toml b/codis/config/dashboard.toml
index 217cf0e785..ebd910ec62 100644
--- a/codis/config/dashboard.toml
+++ b/codis/config/dashboard.toml
@@ -8,10 +8,8 @@
 # Set Coordinator, only accept "zookeeper" & "etcd" & "filesystem".
 # for zookeeper/etcd, coorinator_auth accept "user:password" 
 # Quick Start
-coordinator_name = "etcd"
-coordinator_addr = "127.0.0.1:2379"
-#coordinator_name = "filesystem"
-#coordinator_addr = "/tmp/codis"
+coordinator_name = "filesystem"
+coordinator_addr = "/tmp/codis"
 #coordinator_name = "zookeeper"
 #coordinator_addr = "127.0.0.1:2181"
 #coordinator_auth = ""

From 8d00a6fae698c3325fa266b3baca0993c7c389e6 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Thu, 14 Mar 2024 09:30:43 -0400
Subject: [PATCH 18/26] Update topom.go

---
 codis/pkg/topom/topom.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/codis/pkg/topom/topom.go b/codis/pkg/topom/topom.go
index 4bf2e98c89..a11380556c 100644
--- a/codis/pkg/topom/topom.go
+++ b/codis/pkg/topom/topom.go
@@ -168,7 +168,8 @@ func (s *Topom) Close() error {
 	defer s.store.Close()
 
 	if s.online {
-		if err := s.store.ReleaseByToken(s.model.Token); err != nil {
+		err := s.store.ReleaseByToken(s.model.Token); 
+		if err != nil {
 			log.ErrorErrorf(err, "store: release lock of %s failed", s.config.ProductName)
 			return errors.Errorf("store: release lock of %s failed", s.config.ProductName)
 		}

From e8f24ebba7512b5759efa4b97486fd941dc005df Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:40:21 -0400
Subject: [PATCH 19/26] Update main.go

---
 codis/cmd/fe/main.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/codis/cmd/fe/main.go b/codis/cmd/fe/main.go
index 964d121766..c7e04879c9 100644
--- a/codis/cmd/fe/main.go
+++ b/codis/cmd/fe/main.go
@@ -202,7 +202,11 @@ Options:
 	if n, ok := utils.ArgumentInteger(d, "--tls"); ok && n == 1 {
 
 		// Load server certificate and key
-		cert, err := tls.LoadX509KeyPair(utils.ArgumentMust(d, "--tls-cert"), utils.ArgumentMust(d, "--tls-key"))
+		certFile, keyFile := utils.ArgumentMust(d, "--tls-cert"), utils.ArgumentMust(d, "--tls-key")
+		if certFile == "" || keyFile == "" {
+			log.Panic("TLS certificate or key file path must be provided")
+		}
+		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
 			log.PanicErrorf(err, "failed to load key pair: %s", err)
 		}

From 86afbe7c50fb3163df33c04febfc66e20e8ee641 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:41:31 -0400
Subject: [PATCH 20/26] Update store.go

---
 codis/pkg/models/store.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codis/pkg/models/store.go b/codis/pkg/models/store.go
index 2ec683accd..44f65ad6af 100644
--- a/codis/pkg/models/store.go
+++ b/codis/pkg/models/store.go
@@ -130,11 +130,11 @@ func (s *Store) ReleaseByToken(token string) error {
 	}
 	
 	if b != nil {
-		t, err := Decode(b); 
+		t, err := Decode(b)
 		if err != nil {
 			return err
 		}
-		if t.Token == token {
+		if t != nil && t.Token == token {
 			return s.Release()
 		}
 	}

From 1a4e5c41986fbb194331138d07ad8cfe42811850 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:42:10 -0400
Subject: [PATCH 21/26] Update proxy.go

---
 codis/pkg/proxy/proxy.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/codis/pkg/proxy/proxy.go b/codis/pkg/proxy/proxy.go
index 6d5762b0c0..8aba5c8fbc 100644
--- a/codis/pkg/proxy/proxy.go
+++ b/codis/pkg/proxy/proxy.go
@@ -144,6 +144,7 @@ func (p *Proxy) setup(config *Config) error {
 	// Replace unspecified IP address with the specific host proxy address
 	x, err := utils.ReplaceUnspecifiedIP(proto, l.Addr().String(), config.HostProxy)
 	if err != nil {
+		log.Errorf("Failed to replace unspecified IP: %s", err)
 		return err
 	}
 

From b9cf0ae9687ac7e41e52dbf2c03e2993c2f94ab2 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:47:48 -0400
Subject: [PATCH 22/26] Update topom.go

---
 codis/pkg/models/topom.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codis/pkg/models/topom.go b/codis/pkg/models/topom.go
index 63aa1c8d5a..83530119e4 100644
--- a/codis/pkg/models/topom.go
+++ b/codis/pkg/models/topom.go
@@ -22,7 +22,7 @@ func (t *Topom) Encode() []byte {
 func Decode(b []byte) (*Topom, error) {
 	s := &Topom{}
 	if err := jsonDecode(s, b); err != nil {
-		return nil,err
+		return nil, fmt.Errorf("json decode error: %w", err)
 	}
 	return s,nil
 }

From a592cc60e0e9e028f28a468f3348705537c787ff Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:48:19 -0400
Subject: [PATCH 23/26] Rename cert.pem to cert.pem-dummy

---
 codis/{cert.pem => cert.pem-dummy} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename codis/{cert.pem => cert.pem-dummy} (100%)

diff --git a/codis/cert.pem b/codis/cert.pem-dummy
similarity index 100%
rename from codis/cert.pem
rename to codis/cert.pem-dummy

From b7c8ba10a3a233c4fdcade5331677a0cbd48e2c3 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:48:36 -0400
Subject: [PATCH 24/26] Rename key.pem to key.pem-dummy

---
 codis/{key.pem => key.pem-dummy} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename codis/{key.pem => key.pem-dummy} (100%)

diff --git a/codis/key.pem b/codis/key.pem-dummy
similarity index 100%
rename from codis/key.pem
rename to codis/key.pem-dummy

From 5cfa14226819f2362d7b336a2abeb75da791b09b Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:49:06 -0400
Subject: [PATCH 25/26] Delete codis/key.pem-dummy

---
 codis/key.pem-dummy | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 codis/key.pem-dummy

diff --git a/codis/key.pem-dummy b/codis/key.pem-dummy
deleted file mode 100644
index ca0a096252..0000000000
--- a/codis/key.pem-dummy
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClOgprziC/+nQe
-HXV5qJA9gdttnx7NV9Cbfc7xox6wHRCaavLxdKh//E2o6F492U0i+GSqRYWrQKqW
-ix0myLiZwXEL16mkhL7ANLFSnA8CqsMIJf3u6+rN1OtlIVoKP1zWMFRV0inVCZMC
-0W6KFeVpuTqewc/FC5w/Zh3shPj1FJQCOas5SNbpxp9jQQsInur+NeP71r2GcZWD
-6+H2TCGouMTLFxdL62dbMOGLfm3aYq2d+HVhSMmEkuxXEgaIzxJ04toqQntnq4fn
-RkkFB7CoXG7AQqHIxKb4bjjnD100qDTTPc1wDEhlye/kUbxztF6dv58AUH1ayg1N
-7pz3EwazAgMBAAECggEANou0MAXTGv2wQtbf1uN2hs+tZIGg1hJ0/DgqzuvWcDaQ
-KiI/hMXJ8MKW0rmvjwSDahWNiga8i54kEuHnJEwkYSIS02GFkBoArQxYM9jwPaWp
-EDIWpD7++6ecdHzvsC1d1RoMZW6lv75S6Z3BO9XhsCblus5p7HeaQ/XO0CvP0nxJ
-SxT1Mj6U0dkiGVPWmmsKuWacYUkbYLeOh0s+T298vm5sRaECvewqwGSQYO8EJVaW
-c/sFfJPPwONRGK3+Ggt/Puq6z+6i8baiXnMYHBhHhxdHN8fgRjGW+J+fYddOmd90
-Sfr+OeECnqXKvIQdnH3WOOzvSF8oP0/Si7dEu8mF1QKBgQC1erZifnvnKPTn2Y7t
-lfdbP9tbuBo4e6PXKf7oy3gEMb7DBoXlLrytnyKS2CnNfw3y+Cptk6sHvCRlf00h
-1WSQqLf7+6LvwqZunhLD+lIqbBeYb6FnjU32HTyTA37nojO9G7F+4uUktWtAp5TV
-zp04k/lK4jFC63/GWc9/iHauZQKBgQDpEtYgGcmtCv2+9pKHfKIqC3Ma2HzV9EsW
-VTgVjRZWxSIxeblPI8GqCEPB0Wjn/GcZ83MIpGH4RlPkZVM1z8DkWEBn9OxQysCl
-t8UEIysAParbwdXQ4bLeVmRO8eEXhSSRQgyIPGHQ+oNECbZftnkMIMZqNIP5Tz3C
-mg4zfjDjNwKBgCDWwrgR8TPEGoT1vkJJt8fgRz5SkxQTc3NU2xae8um3YrCBtqrh
-CS1VtXji+rV/vzNvKqZHaVRt/BwNrBRqO9ddYGWNhE9kZp9vpS+nVUTt6FsiIA/P
-5wKZCcQEhus9U6VtpHG0dwhsd6rsaCdESvjY9exR/93/JVDsIXsPY4JtAoGAXCjg
-lkzcHBpuf2YMRpqXnLxuRT05D3jLgAcuaAcjwCeu/5U8GvjuiQc/k5H0Q1bghbhn
-0hD91Cgq3/LY1jxR73id7v0/vCqPxndF5f7p7+xydPbOTwwPqC7M9xJZiO1SqkVN
-o0kM/I8x/GNCw9HpR0xmaHRfguM8bohv+Rh6yD0CgYAfEVhTk+fXshrMeH9qdEwH
-AzfQaQtPpQISgoTADT2ZDkZSSDOuVtMK0L/ZvAAeL+jbQh3RJayARfp2o8BnD12U
-YIaBq9OC8JUZbG71e93zY/zv4HmZdK/RymmwM2jv9UxTnQPpnHRuVcYF0HZpZSWJ
-Xf12eCJQmM/HGdynEvZtcw==
------END PRIVATE KEY-----

From 0d607faabbc230632f3a9b76dc5eec35a4b305c6 Mon Sep 17 00:00:00 2001
From: Kol Influence <104323920+kolinfluence@users.noreply.github.com>
Date: Fri, 5 Jul 2024 03:49:17 -0400
Subject: [PATCH 26/26] Delete codis/cert.pem-dummy

---
 codis/cert.pem-dummy | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 codis/cert.pem-dummy

diff --git a/codis/cert.pem-dummy b/codis/cert.pem-dummy
deleted file mode 100644
index 8c6dbf1382..0000000000
--- a/codis/cert.pem-dummy
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDazCCAlOgAwIBAgIUC/IGKPPBWnAG7MZNPhCUaPmg0oEwDQYJKoZIhvcNAQEL
-BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
-GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yNDAyMDExNTI0MDBaFw0zNDAx
-MjkxNTI0MDBaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
-HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQClOgprziC/+nQeHXV5qJA9gdttnx7NV9Cbfc7xox6w
-HRCaavLxdKh//E2o6F492U0i+GSqRYWrQKqWix0myLiZwXEL16mkhL7ANLFSnA8C
-qsMIJf3u6+rN1OtlIVoKP1zWMFRV0inVCZMC0W6KFeVpuTqewc/FC5w/Zh3shPj1
-FJQCOas5SNbpxp9jQQsInur+NeP71r2GcZWD6+H2TCGouMTLFxdL62dbMOGLfm3a
-Yq2d+HVhSMmEkuxXEgaIzxJ04toqQntnq4fnRkkFB7CoXG7AQqHIxKb4bjjnD100
-qDTTPc1wDEhlye/kUbxztF6dv58AUH1ayg1N7pz3EwazAgMBAAGjUzBRMB0GA1Ud
-DgQWBBQtXOfPGePViVYEkHUujTcdtU8RuDAfBgNVHSMEGDAWgBQtXOfPGePViVYE
-kHUujTcdtU8RuDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA5
-HMCZGl8a/fkG8O8XfdNpKvpb7WWINW5pqNf/Ep1wiqx3Y5/2I+NaCn7NhvxkliPU
-hF/m3ijJ1eXLVjADMwBuW0vaqS0U29c5k/vWto2xx2Uv7dVffvbGTDUitAygGBTi
-9r7A1GnU3PLdA96kUb5RT80tILOSakQYj+KN5QuV4LYmIoUIPlJfn0DOT4D/AoIC
-vn/L77gctOQUfzu/l9saN1uwhgBZ06eQv14BJKnUdpmmMDREiP7lAJtQet1dukh6
-DvS3QUqf91pkOC6tXMHTAAFQ/op+eJVKUMKfFo1oRkXU1sg1/fD25FKO1xaS6afy
-/nr/PY00p+k4s6jw+Fif
------END CERTIFICATE-----