fix obfuscation (#53)

tbauriedel · web-flow · commit 1039da707d21 · 2022-10-17T08:27:00.000+02:00
diff --git a/modules/icinga2/collector.go b/modules/icinga2/collector.go
@@ -45,7 +45,6 @@ var obfuscators = []*obfuscate.Obfuscator{
 	obfuscate.NewOutput(`(?i)(?:password|salt|token)\s*=\s*(.*)`, "icinga2", "variable"),
 	obfuscate.NewFile(`(?i)(?:password|salt|token)\s*=\s*(.*)`, `conf`),
 	obfuscate.NewFile(`(?i)(?:password|community)(.*)`, `log`),
-	obfuscate.NewFile(`(?i)(?:bind_pw)\s*=\s*(.*)`, `ini`),
 }
 
 func DetectIcinga() bool {
diff --git a/modules/icingaweb2/collector.go b/modules/icingaweb2/collector.go
@@ -54,7 +54,7 @@ var journalctlLogs = map[string]collection.JournalElement{
 }
 
 var obfuscators = []*obfuscate.Obfuscator{
-	obfuscate.NewFile(`(?i)(?:password|token)\s*=\s*(.*)`, `ini`),
+	obfuscate.NewFile(`(?i)(?:bind_pw|password|token)\s*=\s*(.*)`, `ini`),
 }
 
 // Detect if icingaweb2 is installed on the system.

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ var obfuscators = []*obfuscate.Obfuscator{`
`45`	`45`	obfuscate.NewOutput(`(?i)(?:password\|salt\|token)\s=\s(.*)`, "icinga2", "variable"),
`46`	`46`	obfuscate.NewFile(`(?i)(?:password\|salt\|token)\s=\s(.*)`, `conf`),
`47`	`47`	obfuscate.NewFile(`(?i)(?:password\|community)(.*)`, `log`),
`48`		- obfuscate.NewFile(`(?i)(?:bind_pw)\s=\s(.*)`, `ini`),
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`func DetectIcinga() bool {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ var journalctlLogs = map[string]collection.JournalElement{`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`var obfuscators = []*obfuscate.Obfuscator{`
`57`		- obfuscate.NewFile(`(?i)(?:password\|token)\s=\s(.*)`, `ini`),
	`57`	+ obfuscate.NewFile(`(?i)(?:bind_pw\|password\|token)\s=\s(.*)`, `ini`),
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// Detect if icingaweb2 is installed on the system.`