提交 3e838299 编写于 作者: 雪染

Merge branch 'secignore' into 'master'

根据第一次全量隐私扫描结果修改2个文件中的中文->英文,新增 /.secignore 文件用来配置隐私扫描的白名单



See merge request !1751541
##########################################################
# OBFlow Secret Scan Ignore List #
##########################################################
# Above the segmentation lines there are suspected privacy information #
# Please use the file name as the first line and the igored information #
# should be started with tab. #
# Under the segmentation lines there are the folders which you need to ignore #
##########################################################
**
http://license.coscl.org.cn/MulanPSL2
http://1.1.1.1:9093
http://127.0.0.1:9100/metrics
http://127.0.0.1:9091/metrics/node
https://mirrors.aliyun.com/goproxy/
https://facebook.github.io/watchman/
--------------------------------------------------------
# Should use GLOB wildcard to config and analysis the ignored folder
# The root patch shold start with '/'
/README.md
/README-CN.md
/LICENCE
/plugins/inputs/oceanbase/log/log_utils.go
/plugins/inputs/prometheus/prometheus_test.go
/docs/develop-guide.md
/docs/install-and-deploy/install-obagent.md
/docs/install-and-deploy/deploy-obagent-with-obd.md
/docs/install-and-deploy/deploy-obagent-manually.md
/.git/**
--------------------------------------------------------
# Config the ignored fold to escape the Chinese scan by GLOB wildcard
\ No newline at end of file
...@@ -39,7 +39,7 @@ func mergeConfigProperties() { ...@@ -39,7 +39,7 @@ func mergeConfigProperties() {
} }
if property.Value == meta.DefaultValue { if property.Value == meta.DefaultValue {
if meta.Masked { if meta.Masked {
// 数据需要脱敏,不打印内容 // The data needs to be desensitized, and the content will not be printed
log.Warnf("config key %s is still set as default value", key) log.Warnf("config key %s is still set as default value", key)
} else { } else {
log.Warnf("config key %s is still set as default value:%+v", key, property.DefaultValue) log.Warnf("config key %s is still set as default value:%+v", key, property.DefaultValue)
......
...@@ -35,7 +35,7 @@ var textFormatter = &TextFormatter{ ...@@ -35,7 +35,7 @@ var textFormatter = &TextFormatter{
CallerPrettyfier: func(frame *runtime.Frame) (string, string) { CallerPrettyfier: func(frame *runtime.Frame) (string, string) {
n := 0 n := 0
filename := frame.File filename := frame.File
// 获取包名 // get package name
for i := len(filename) - 1; i > 0; i-- { for i := len(filename) - 1; i > 0; i-- {
if filename[i] == '/' { if filename[i] == '/' {
n++ n++
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册