lightning: Don't log "received task config" in server mode (pingcap#5…

…2336) close pingcap#36374
jiyfhust · Apr 3, 2024 · 555ce02 · 555ce02
1 parent c8a5740
commit 555ce02
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 44 deletions.
diff --git a/lightning/pkg/server/lightning.go b/lightning/pkg/server/lightning.go
@@ -757,8 +757,7 @@ func (l *Lightning) handlePostTask(w http.ResponseWriter, req *http.Request) {
 		writeJSONError(w, http.StatusBadRequest, "cannot read request", err)
 		return
 	}
-	filteredData := common.HideSensitive(string(data))
-	log.L().Info("received task config", zap.String("content", filteredData))
+	log.L().Info("received task config")
 
 	cfg := config.NewConfig()
 	if err = cfg.LoadFromGlobal(l.globalCfg); err != nil {

diff --git a/pkg/lightning/common/BUILD.bazel b/pkg/lightning/common/BUILD.bazel
@@ -112,7 +112,7 @@ go_test(
     ],
     embed = [":common"],
     flaky = True,
-    shard_count = 30,
+    shard_count = 29,
     deps = [
         "//br/pkg/errors",
         "//pkg/ddl",

diff --git a/pkg/lightning/common/util.go b/pkg/lightning/common/util.go
@@ -26,7 +26,6 @@ import (
 	"net"
 	"net/http"
 	"os"
-	"regexp"
 	"strconv"
 	"strings"
 	"syscall"
@@ -697,11 +696,3 @@ func IsRaftKV2(ctx context.Context, db *sql.DB) (bool, error) {
 	}
 	return false, rows.Err()
 }
-
-var passwordRegexp = regexp.MustCompile(`(password[\s]*=[\s]*(\\")?)(.*?)((\\")?\\n)`)
-
-// HideSensitive replace password with ******.
-func HideSensitive(input string) string {
-	output := passwordRegexp.ReplaceAllString(input, "$1******$4")
-	return output
-}
diff --git a/pkg/lightning/common/util_test.go b/pkg/lightning/common/util_test.go
@@ -302,35 +302,3 @@ CREATE TABLE multi_indexes (
 		require.Equal(t, tt.multiSQLs, multiSQLs)
 	}
 }
-
-func TestHideSensitive(t *testing.T) {
-	strs := []struct {
-		old string
-		new string
-	}{
-		{
-			`host = "127.0.0.1"\n  user = "root"\n  password = "/Q7B9DizNLLTTfiZHv9WoEAKamfpIUs="\n  port = 3306\n`,
-			`host = "127.0.0.1"\n  user = "root"\n  password = ******\n  port = 3306\n`,
-		},
-		{
-			`host = "127.0.0.1"\n  user = "root"\n  password = ""\n  port = 3306\n`,
-			`host = "127.0.0.1"\n  user = "root"\n  password = ******\n  port = 3306\n`,
-		},
-		{
-			`host = "127.0.0.1"\n  user = "root"\n  password= "/Q7B9DizNLLTTfiZHv9WoEAKamfpIUs="\n  port = 3306\n`,
-			`host = "127.0.0.1"\n  user = "root"\n  password= ******\n  port = 3306\n`,
-		},
-		{
-			`host = "127.0.0.1"\n  user = "root"\n  password =""\n  port = 3306\n`,
-			`host = "127.0.0.1"\n  user = "root"\n  password =******\n  port = 3306\n`,
-		},
-		{
-			`host = "127.0.0.1"\n  user = "root"\n  password=""\n  port = 3306\n`,
-			`host = "127.0.0.1"\n  user = "root"\n  password=******\n  port = 3306\n`,
-		},
-	}
-	for i, str := range strs {
-		t.Logf("case #%d\n", i)
-		require.Equal(t, str.new, common.HideSensitive(str.old))
-	}
-}