forked from pingcap/tidb
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
session: refine error message desensitization (pingcap#19409)
- Loading branch information
1 parent
fa6baa9
commit 70a567e
Showing
12 changed files
with
113 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Copyright 2020 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package redact | ||
|
|
||
| import ( | ||
| "github.com/pingcap/parser/terror" | ||
| "github.com/pingcap/tidb/config" | ||
| ) | ||
|
|
||
| // TError is a alias, use to avoid `Error` method name in conflict with field name. | ||
| type TError = terror.Error | ||
|
|
||
| type redactError struct { | ||
| *TError | ||
| redactPositions []int | ||
| } | ||
|
|
||
| // GenWithStackByArgs generates a new *Error with the same class and code, and new arguments. | ||
| func (e *redactError) GenWithStackByArgs(args ...interface{}) error { | ||
| redactErrorArg(args, e.redactPositions) | ||
| return e.TError.GenWithStackByArgs(args...) | ||
| } | ||
|
|
||
| // FastGen generates a new *Error with the same class and code, and a new arguments. | ||
| func (e *redactError) FastGenByArgs(args ...interface{}) error { | ||
| redactErrorArg(args, e.redactPositions) | ||
| return e.TError.GenWithStackByArgs(args...) | ||
| } | ||
|
|
||
| // Equal checks if err is equal to e. | ||
| func (e *redactError) Equal(err error) bool { | ||
| if redactErr, ok := err.(*redactError); ok { | ||
| return e.TError.Equal(redactErr.TError) | ||
| } | ||
| return e.TError.Equal(err) | ||
| } | ||
|
|
||
| // Cause implement the Cause interface. | ||
| func (e *redactError) Cause() error { | ||
| return e.TError | ||
| } | ||
|
|
||
| func redactErrorArg(args []interface{}, position []int) { | ||
| if config.RedactLogEnabled() { | ||
| for _, pos := range position { | ||
| if len(args) > pos { | ||
| args[pos] = "?" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // NewRedactError returns a new redact error. | ||
| func NewRedactError(err *terror.Error, redactPositions ...int) *redactError { | ||
| return &redactError{err, redactPositions} | ||
| } |