Improve data sanitization

essentialkaos · Oct 29, 2023 · 9325d0d · 9325d0d
1 parent 9be2f8e
commit 9325d0d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/action/auxi.go b/action/auxi.go
@@ -30,7 +30,7 @@ type OutputContainer struct {
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // escapeCharRegex is regexp for searching escape characters
-var escapeCharRegex = regexp.MustCompile(`\x1b\[[0-9\;]+m`)
+var escapeCharRegex = regexp.MustCompile("[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))")
 
 // ////////////////////////////////////////////////////////////////////////////////// //
 
@@ -156,5 +156,6 @@ func fmtValue(v string) string {
 
 // sanitizeData removes escape characters
 func sanitizeData(data []byte) []byte {
+	data = bytes.ReplaceAll(data, []byte("\r"), nil)
 	return escapeCharRegex.ReplaceAll(data, nil)
 }