sem: add tidbredact log to restricted variables (#24701)

pingcap · May 18, 2021 · b515e14 · b515e14
1 parent fbbf2b4
commit b515e14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/util/sem/sem.go b/util/sem/sem.go
@@ -138,6 +138,7 @@ func IsInvisibleSysVar(varNameInLower string) bool {
  variable.TiDBCheckMb4ValueInUTF8,
  variable.TiDBConfig,
  variable.TiDBEnableSlowLog,
+ variable.TiDBEnableTelemetry,
  variable.TiDBExpensiveQueryTimeThreshold,
  variable.TiDBForcePriority,
  variable.TiDBGeneralLog,
@@ -146,12 +147,13 @@ func IsInvisibleSysVar(varNameInLower string) bool {
  variable.TiDBOptWriteRowID,
  variable.TiDBPProfSQLCPU,
  variable.TiDBRecordPlanInSlowLog,
+ variable.TiDBRowFormatVersion,
  variable.TiDBSlowQueryFile,
  variable.TiDBSlowLogThreshold,
  variable.TiDBEnableCollectExecutionInfo,
  variable.TiDBMemoryUsageAlarmRatio,
- variable.TiDBEnableTelemetry,
- variable.TiDBRowFormatVersion:
+ variable.TiDBRedactLog,
+ variable.TiDBSlowLogMasking:
  return true
  }
  return false

diff --git a/util/sem/sem_test.go b/util/sem/sem_test.go
@@ -98,4 +98,6 @@ func (s *testSecurity) TestIsInvisibleSysVar(c *C) {
  c.Assert(IsInvisibleSysVar(variable.TiDBMemoryUsageAlarmRatio), IsTrue)
  c.Assert(IsInvisibleSysVar(variable.TiDBEnableTelemetry), IsTrue)
  c.Assert(IsInvisibleSysVar(variable.TiDBRowFormatVersion), IsTrue)
+ c.Assert(IsInvisibleSysVar(variable.TiDBRedactLog), IsTrue)
+ c.Assert(IsInvisibleSysVar(variable.TiDBSlowLogMasking), IsTrue)
 }