From 06759041a8da677347a46c7ddca06e5629ff6949 Mon Sep 17 00:00:00 2001
From: Gucheng Wang <nomeguy@qq.com>
Date: Fri, 8 Jul 2022 23:24:54 +0800
Subject: [PATCH] Fix socks5Proxy config typo.

---
 conf/app.conf                              | 2 +-
 manifests/casdoor/templates/configmap.yaml | 2 +-
 proxy/proxy.go                             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 25eb61a1..2f9c8f5e 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -12,7 +12,7 @@ redisEndpoint =
 defaultStorageProvider = 
 isCloudIntranet = false
 authState = "casdoor"
-sock5Proxy = "127.0.0.1:10808"
+socks5Proxy = "127.0.0.1:10808"
 verificationCodeTimeout = 10
 initScore = 2000
 logPostOnly = true
diff --git a/manifests/casdoor/templates/configmap.yaml b/manifests/casdoor/templates/configmap.yaml
index 337aac1d..542e0acd 100644
--- a/manifests/casdoor/templates/configmap.yaml
+++ b/manifests/casdoor/templates/configmap.yaml
@@ -16,7 +16,7 @@ data:
     defaultStorageProvider = 
     isCloudIntranet = false
     authState = "casdoor"
-    sock5Proxy = "127.0.0.1:10808"
+    socks5Proxy = "127.0.0.1:10808"
     verificationCodeTimeout = 10
     initScore = 2000
     logPostOnly = true
diff --git a/proxy/proxy.go b/proxy/proxy.go
index f02e539d..ff89b1ae 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -54,17 +54,17 @@ func isAddressOpen(address string) bool {
 }
 
 func getProxyHttpClient() *http.Client {
-	sock5Proxy := conf.GetConfigString("sock5Proxy")
-	if sock5Proxy == "" {
+	socks5Proxy := conf.GetConfigString("socks5Proxy")
+	if socks5Proxy == "" {
 		return &http.Client{}
 	}
 
-	if !isAddressOpen(sock5Proxy) {
+	if !isAddressOpen(socks5Proxy) {
 		return &http.Client{}
 	}
 
 	// https://stackoverflow.com/questions/33585587/creating-a-go-socks5-client
-	dialer, err := proxy.SOCKS5("tcp", sock5Proxy, nil, proxy.Direct)
+	dialer, err := proxy.SOCKS5("tcp", socks5Proxy, nil, proxy.Direct)
 	if err != nil {
 		panic(err)
 	}