mirror of
https://github.com/idanoo/autobrr
synced 2025-07-23 16:59:12 +00:00
refactor(logs): improve log sanitization performance (#779)
* refactor log sanitization for better performance * Fix token error, add mutex for safer concurrency * serve sanitized version directly from memory * further improvements made it check for "module":"irc" before running the irc regex checks * Revert "further improvements" This reverts commit 260037c3a58e1e760613167d3e15136b313c0612. * update irc regexes to handle special characters - added prefixes to the irc patterns - improved tests * more improvements for irc regexes * fixed errors * another edge case bites the dust * regex improvements * lock to 1 worker if cpu cores is 2 or less * removed unused code * revert to single thread Moved regex patterns and replacements into a separate array for easier maintenance and readability. Optimized the regex patterns that share the same replacement string to avoid redundancy. Modify SanitizeLogFile to accept io.Writer for direct output * style * only check relevant lines - only check relevant lines - dont break unless length=0 * revert breaking change * handle api and auth cases --------- Co-authored-by: Kyle Sanderson <kyle.leet@gmail.com>
This commit is contained in:
soup
GitHub
parent
5fed0921c5
commit
c2fcd91da7
2 changed files with 201 additions and 136 deletions
|
|
@ -1,8 +1,10 @@
|
||||||
package http
|
package http
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bufio"
|
||||||
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"io/ioutil"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
|
@ -87,48 +89,103 @@ func (h logsHandler) files(w http.ResponseWriter, r *http.Request) {
|
||||||
render.JSON(w, r, response)
|
render.JSON(w, r, response)
|
||||||
}
|
}
|
||||||
|
|
||||||
var ( // regexes for sanitizing log files
|
var (
|
||||||
keyValueRegex = regexp.MustCompile(`(torrent_pass|passkey|authkey|secret_key|apikey)=([a-zA-Z0-9]+)`)
|
regexReplacements = []struct {
|
||||||
combinedRegex = regexp.MustCompile(`(https?://[^\s]+/((rss/download/[a-zA-Z0-9]+/)|torrent/download/((auto\.[a-zA-Z0-9]+\.|[a-zA-Z0-9]+\.))))([a-zA-Z0-9]+)`)
|
pattern *regexp.Regexp
|
||||||
inviteRegex = regexp.MustCompile(`(Voyager autobot [\p{L}0-9]+ |Satsuki enter #announce [\p{L}0-9]+ |Millie announce |DBBot announce |ENDOR !invite [\p{L}0-9]+ |Vertigo ENTER #GGn-Announce [\p{L}0-9]+ |midgards announce |HeBoT !invite |NBOT !invite |Muffit bot #nbl-announce [\p{L}0-9]+ |hermes enter #announce [\p{L}0-9]+ |LiMEY_ !invite |PS-Info pass |PT-BOT invite |Hummingbird ENTER [\p{L}0-9]+ |Drone enter #red-announce [\p{L}0-9]+ |SceneHD \.invite |erica letmeinannounce [\p{L}0-9]+ |Synd1c4t3 invite |UHDBot invite |Sauron bot #ant-announce [\p{L}0-9]+ |RevoTT !invite [\p{L}0-9]+ |Cerberus identify [\p{L}0-9]+ )([\p{L}0-9]+)`)
|
repl string
|
||||||
nickservRegex = regexp.MustCompile(`(NickServ IDENTIFY )([\p{L}0-9!#%&*+/:;<=>?@^_` + "`" + `{|}~]+)`)
|
}{
|
||||||
saslRegex = regexp.MustCompile(`(--> AUTHENTICATE )([\p{L}0-9!#%&*+/:;<=>?@^_` + "`" + `{|}~]+)`)
|
{
|
||||||
|
pattern: regexp.MustCompile(`(torrent_pass|passkey|authkey|auth|secret_key|api|apikey)=([a-zA-Z0-9]+)`),
|
||||||
|
repl: "${1}=REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(https?://[^\s]+/((rss/download/[a-zA-Z0-9]+/)|torrent/download/((auto\.[a-zA-Z0-9]+\.|[a-zA-Z0-9]+\.))))([a-zA-Z0-9]+)`),
|
||||||
|
repl: "${1}REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(NickServ IDENTIFY )([\p{L}0-9!#%&*+/:;<=>?@^_` + "`" + `{|}~]+)`),
|
||||||
|
repl: "${1}REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(AUTHENTICATE )([\p{L}0-9!#%&*+/:;<=>?@^_` + "`" + `{|}~]+)`),
|
||||||
|
repl: "${1}REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(
|
||||||
|
`(?m)(` +
|
||||||
|
`(?:Voyager autobot\s+\w+|Satsuki enter #announce\s+\w+|Sauron bot #ant-announce\s+\w+|Millie announce|DBBot announce|PT-BOT invite|midgards announce|HeBoT !invite|NBOT !invite|PS-Info pass|Synd1c4t3 invite|UHDBot invite|ENDOR !invite(\s+)\w+|immortal invite(\s+)\w+|Muffit bot #nbl-announce\s+\w+|hermes enter #announce\s+\w+|Drone enter #red-announce\s+\w+|RevoTT !invite\s+\w+|erica letmeinannounce\s+\w+|Cerberus identify\s+\w+)` +
|
||||||
|
`)(?:\s+[a-zA-Z0-9]+)`),
|
||||||
|
repl: "$1 REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(LiMEY_ !invite\s+)([a-zA-Z0-9]+)(\s+\w+)`),
|
||||||
|
repl: "${1}REDACTED${3}",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(Vertigo ENTER #GGn-Announce\s+)(\w+).([a-zA-Z0-9]+)`),
|
||||||
|
repl: "$1$2 REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(Hummingbird ENTER\s+\w+).([a-zA-Z0-9]+)(\s+#ptp-announce-dev)`),
|
||||||
|
repl: "$1 REDACTED$3",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
pattern: regexp.MustCompile(`(SceneHD..invite).([a-zA-Z0-9]+)(\s+#announce)`),
|
||||||
|
repl: "$1 REDACTED$3",
|
||||||
|
},
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func SanitizeLogFile(filePath string) (string, error) {
|
func SanitizeLogFile(filePath string, output io.Writer) error {
|
||||||
data, err := ioutil.ReadFile(filePath)
|
inFile, err := os.Open(filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return err
|
||||||
|
}
|
||||||
|
defer inFile.Close()
|
||||||
|
|
||||||
|
reader := bufio.NewReader(inFile)
|
||||||
|
writer := bufio.NewWriter(output)
|
||||||
|
defer writer.Flush()
|
||||||
|
|
||||||
|
for {
|
||||||
|
// Read the next line from the file
|
||||||
|
line, err := reader.ReadString('\n')
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
if err != io.EOF {
|
||||||
|
log.Printf("Error reading line from input file: %v", err)
|
||||||
|
}
|
||||||
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
sanitizedData := string(data)
|
// Sanitize the line using regexReplacements array
|
||||||
|
bIRC := strings.Contains(line, `"module":"irc"`)
|
||||||
|
bFilter := (strings.Contains(line, `"module":"feed"`) ||
|
||||||
|
strings.Contains(line, `"module":"filter"`)) ||
|
||||||
|
strings.Contains(line, `"repo":"release"`) ||
|
||||||
|
strings.Contains(line, `"module":"action"`)
|
||||||
|
|
||||||
// torrent_pass, passkey, authkey, secret_key, apikey, rsskey
|
for i := 0; i < len(regexReplacements); i++ {
|
||||||
sanitizedData = keyValueRegex.ReplaceAllString(sanitizedData, "${1}=REDACTED")
|
// Apply the first two patterns only if the line contains "module":"feed",
|
||||||
sanitizedData = combinedRegex.ReplaceAllString(sanitizedData, "${1}REDACTED")
|
// "module":"filter", "repo":"release", or "module":"action"
|
||||||
|
if i < 2 {
|
||||||
// irc related
|
if bFilter {
|
||||||
sanitizedData = inviteRegex.ReplaceAllString(sanitizedData, "${1}REDACTED")
|
line = regexReplacements[i].pattern.ReplaceAllString(line, regexReplacements[i].repl)
|
||||||
sanitizedData = nickservRegex.ReplaceAllString(sanitizedData, "${1}REDACTED")
|
}
|
||||||
sanitizedData = saslRegex.ReplaceAllString(sanitizedData, "${1}REDACTED")
|
} else if bIRC {
|
||||||
|
// Check for "module":"irc" before applying other patterns
|
||||||
tmpFile, err := ioutil.TempFile("", "sanitized-log-*.log")
|
line = regexReplacements[i].pattern.ReplaceAllString(line, regexReplacements[i].repl)
|
||||||
if err != nil {
|
}
|
||||||
return "", err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = tmpFile.WriteString(sanitizedData)
|
// Write the sanitized line to the writer
|
||||||
if err != nil {
|
if _, err = writer.WriteString(line); err != nil {
|
||||||
tmpFile.Close()
|
log.Printf("Error writing line to output: %v", err)
|
||||||
return "", err
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = tmpFile.Close()
|
return nil
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return tmpFile.Name(), nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h logsHandler) downloadFile(w http.ResponseWriter, r *http.Request) {
|
func (h logsHandler) downloadFile(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
@ -168,9 +225,11 @@ func (h logsHandler) downloadFile(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
filePath := filepath.Join(logsDir, logFile)
|
filePath := filepath.Join(logsDir, logFile)
|
||||||
|
|
||||||
// Sanitize the log file
|
w.Header().Set("Content-Disposition", "attachment; filename="+strconv.Quote(logFile))
|
||||||
sanitizedFilePath, err := SanitizeLogFile(filePath)
|
w.Header().Set("Content-Type", "application/octet-stream")
|
||||||
if err != nil {
|
|
||||||
|
// Sanitize the log file and directly write the output to the HTTP socket
|
||||||
|
if err := SanitizeLogFile(filePath, w); err != nil {
|
||||||
render.Status(r, http.StatusInternalServerError)
|
render.Status(r, http.StatusInternalServerError)
|
||||||
render.JSON(w, r, errorResponse{
|
render.JSON(w, r, errorResponse{
|
||||||
Message: err.Error(),
|
Message: err.Error(),
|
||||||
|
|
@ -178,12 +237,6 @@ func (h logsHandler) downloadFile(w http.ResponseWriter, r *http.Request) {
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer os.Remove(sanitizedFilePath)
|
|
||||||
|
|
||||||
w.Header().Set("Content-Disposition", "attachment; filename="+strconv.Quote(logFile))
|
|
||||||
w.Header().Set("Content-Type", "application/octet-stream")
|
|
||||||
|
|
||||||
http.ServeFile(w, r, sanitizedFilePath)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type logFile struct {
|
type logFile struct {
|
||||||
|
|
|
||||||
|
|
@ -1,135 +1,147 @@
|
||||||
package http
|
package http
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSanitizeLogFile(t *testing.T) {
|
func TestSanitizeLogFile(t *testing.T) {
|
||||||
testCases := []struct {
|
testCases := []struct {
|
||||||
|
name string
|
||||||
input string
|
input string
|
||||||
expected string
|
expected string
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
input: "https://beyond-hd.me/torrent/download/auto.t0rrent1d.rssk3y",
|
name: "BHD_URL",
|
||||||
expected: "https://beyond-hd.me/torrent/download/auto.t0rrent1d.REDACTED",
|
input: "\"module\":\"filter\" https://beyond-hd.me/torrent/download/auto.t0rrent1d.rssk3y",
|
||||||
|
expected: "\"module\":\"filter\" https://beyond-hd.me/torrent/download/auto.t0rrent1d.REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "https://aither.cc/torrent/download/t0rrent1d.rssk3y",
|
name: "Standard_UNIT3D_URL",
|
||||||
expected: "https://aither.cc/torrent/download/t0rrent1d.REDACTED",
|
input: "\"module\":\"filter\" https://aither.cc/torrent/download/t0rrent1d.rssk3y",
|
||||||
|
expected: "\"module\":\"filter\" https://aither.cc/torrent/download/t0rrent1d.REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "https://www.torrentleech.org/rss/download/t0rrent1d/rssk3y/Dark+Places+1974+1080p+BluRay+x264-GAZER.torrent",
|
name: "TL_URL",
|
||||||
expected: "https://www.torrentleech.org/rss/download/t0rrent1d/REDACTED/Dark+Places+1974+1080p+BluRay+x264-GAZER.torrent",
|
input: "\"module\":\"filter\" https://www.torrentleech.org/rss/download/t0rrent1d/rssk3y/Dark+Places+1974+1080p+BluRay+x264-GAZER.torrent",
|
||||||
|
expected: "\"module\":\"filter\" https://www.torrentleech.org/rss/download/t0rrent1d/REDACTED/Dark+Places+1974+1080p+BluRay+x264-GAZER.torrent",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "https://alpharatio.cc/torrents.php?action=download&id=t0rrent1d&authkey=4uthk3y&torrent_pass=t0rrentp4ss",
|
name: "auth_key_torrent_pass",
|
||||||
expected: "https://alpharatio.cc/torrents.php?action=download&id=t0rrent1d&authkey=REDACTED&torrent_pass=REDACTED",
|
input: "\"module\":\"filter\" https://alpharatio.cc/torrents.php?action=download&id=t0rrent1d&authkey=4uthk3y&torrent_pass=t0rrentp4ss",
|
||||||
|
expected: "\"module\":\"filter\" https://alpharatio.cc/torrents.php?action=download&id=t0rrent1d&authkey=REDACTED&torrent_pass=REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Voyager autobot us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" LiMEY_ !invite 1irck3y us3rn4me",
|
||||||
expected: "Voyager autobot us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" LiMEY_ !invite REDACTED us3rn4me",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Satsuki enter #announce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" Voyager autobot us3rn4me 1irck3y",
|
||||||
expected: "Satsuki enter #announce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" Voyager autobot us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Millie announce 1RCK3Y",
|
input: "\"module\":\"irc\" Satsuki enter #announce us3rn4me 1irck3y",
|
||||||
expected: "Millie announce REDACTED",
|
expected: "\"module\":\"irc\" Satsuki enter #announce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "DBBot announce 1RCK3Y",
|
input: "\"module\":\"irc\" Sauron bot #ant-announce us3rn4me IRCKEY",
|
||||||
expected: "DBBot announce REDACTED",
|
expected: "\"module\":\"irc\" Sauron bot #ant-announce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "ENDOR !invite us3rnøme 1RCK3Y",
|
input: "\"module\":\"irc\" Millie announce IRCKEY",
|
||||||
expected: "ENDOR !invite us3rnøme REDACTED",
|
expected: "\"module\":\"irc\" Millie announce REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Vertigo ENTER #GGn-Announce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" DBBot announce IRCKEY",
|
||||||
expected: "Vertigo ENTER #GGn-Announce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" DBBot announce REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "midgards announce 1RCK3Y",
|
input: "\"module\":\"irc\" PT-BOT invite IRCKEY",
|
||||||
expected: "midgards announce REDACTED",
|
expected: "\"module\":\"irc\" PT-BOT invite REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "HeBoT !invite 1RCK3Y",
|
input: "\"module\":\"irc\" midgards announce IRCKEY",
|
||||||
expected: "HeBoT !invite REDACTED",
|
expected: "\"module\":\"irc\" midgards announce REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "NBOT !invite 1RCK3Y",
|
input: "\"module\":\"irc\" HeBoT !invite IRCKEY",
|
||||||
expected: "NBOT !invite REDACTED",
|
expected: "\"module\":\"irc\" HeBoT !invite REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Muffit bot #nbl-announce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" NBOT !invite IRCKEY",
|
||||||
expected: "Muffit bot #nbl-announce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" NBOT !invite REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "hermes enter #announce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" PS-Info pass IRCKEY",
|
||||||
expected: "hermes enter #announce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" PS-Info pass REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "LiMEY_ !invite 1RCK3Y us3rn4me",
|
input: "\"module\":\"irc\" Synd1c4t3 invite IRCKEY",
|
||||||
expected: "LiMEY_ !invite REDACTED us3rn4me",
|
expected: "\"module\":\"irc\" Synd1c4t3 invite REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "PS-Info pass 1RCK3Y",
|
input: "\"module\":\"irc\" UHDBot invite IRCKEY",
|
||||||
expected: "PS-Info pass REDACTED",
|
expected: "\"module\":\"irc\" UHDBot invite REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "PT-BOT invite 1RCK3Y",
|
input: "\"module\":\"irc\" ENDOR !invite us3rn4me IRCKEY",
|
||||||
expected: "PT-BOT invite REDACTED",
|
expected: "\"module\":\"irc\" ENDOR !invite us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Hummingbird ENTER us3rn4me 1RCK3Y #ptp-announce-dev",
|
input: "\"module\":\"irc\" Vertigo ENTER #GGn-Announce us3rn4me IRCKEY",
|
||||||
expected: "Hummingbird ENTER us3rn4me REDACTED #ptp-announce-dev",
|
expected: "\"module\":\"irc\" Vertigo ENTER #GGn-Announce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Drone enter #red-announce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" immortal invite us3rn4me IRCKEY",
|
||||||
expected: "Drone enter #red-announce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" immortal invite us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "SceneHD .invite 1RCK3Y #announce",
|
input: "\"module\":\"irc\" Muffit bot #nbl-announce us3rn4me IRCKEY",
|
||||||
expected: "SceneHD .invite REDACTED #announce",
|
expected: "\"module\":\"irc\" Muffit bot #nbl-announce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "erica letmeinannounce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" hermes enter #announce us3rn4me IRCKEY",
|
||||||
expected: "erica letmeinannounce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" hermes enter #announce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Synd1c4t3 invite 1RCK3Y",
|
input: "\"module\":\"irc\" Hummingbird ENTER us3rn4me IRCKEY #ptp-announce-dev",
|
||||||
expected: "Synd1c4t3 invite REDACTED",
|
expected: "\"module\":\"irc\" Hummingbird ENTER us3rn4me REDACTED #ptp-announce-dev",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "UHDBot invite 1RCK3Y",
|
input: "\"module\":\"irc\" Drone enter #red-announce us3rn4me IRCKEY",
|
||||||
expected: "UHDBot invite REDACTED",
|
expected: "\"module\":\"irc\" Drone enter #red-announce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Sauron bot #ant-announce us3rn4me 1RCK3Y",
|
input: "\"module\":\"irc\" RevoTT !invite us3rn4me IRCKEY",
|
||||||
expected: "Sauron bot #ant-announce us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" RevoTT !invite us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "RevoTT !invite us3rn4me P4SSK3Y",
|
input: "\"module\":\"irc\" SceneHD .invite IRCKEY #announce",
|
||||||
expected: "RevoTT !invite us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" SceneHD .invite REDACTED #announce",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "Cerberus identify us3rn4me P1D",
|
input: "\"module\":\"irc\" erica letmeinannounce us3rn4me IRCKEY",
|
||||||
expected: "Cerberus identify us3rn4me REDACTED",
|
expected: "\"module\":\"irc\" erica letmeinannounce us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "NickServ IDENTIFY dasøl13sa#!",
|
input: "\"module\":\"irc\" Cerberus identify us3rn4me IRCKEY",
|
||||||
expected: "NickServ IDENTIFY REDACTED",
|
expected: "\"module\":\"irc\" Cerberus identify us3rn4me REDACTED",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: "--> AUTHENTICATE poasd!232kljøasdj!%",
|
input: "\"module\":\"irc\" NickServ IDENTIFY Nvbkødn~vzjHkPEimnJ6PmJw8ayiE#wg",
|
||||||
expected: "--> AUTHENTICATE REDACTED",
|
expected: "\"module\":\"irc\" NickServ IDENTIFY REDACTED",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
input: "\"module\":\"irc\" PRIVMSG NickServ IDENTIFY zAPEJEA8ryYnpj3AiE3KJ",
|
||||||
|
expected: "\"module\":\"irc\" PRIVMSG NickServ IDENTIFY REDACTED",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, testCase := range testCases {
|
for _, testCase := range testCases {
|
||||||
|
t.Run(testCase.name, func(t *testing.T) {
|
||||||
// Create a temporary file with sample log data
|
// Create a temporary file with sample log data
|
||||||
tmpFile, err := ioutil.TempFile("", "test-log-*.log")
|
tmpFile, err := ioutil.TempFile("", "test-log-*.log")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -137,8 +149,8 @@ func TestSanitizeLogFile(t *testing.T) {
|
||||||
}
|
}
|
||||||
defer os.Remove(tmpFile.Name())
|
defer os.Remove(tmpFile.Name())
|
||||||
|
|
||||||
// Write sample log data to the temporary file
|
// Write the test case input to the temporary file
|
||||||
_, err = tmpFile.WriteString(testCase.input)
|
_, err = tmpFile.WriteString(testCase.input + "\n")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tmpFile.Close()
|
tmpFile.Close()
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
@ -148,22 +160,22 @@ func TestSanitizeLogFile(t *testing.T) {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Call SanitizeLogFile on the temporary file
|
// Create a bytes.Buffer to store the sanitized content
|
||||||
sanitizedTmpFilePath, err := SanitizeLogFile(tmpFile.Name())
|
sanitizedContent := &bytes.Buffer{}
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
defer os.Remove(sanitizedTmpFilePath)
|
|
||||||
|
|
||||||
// Read the content of the sanitized temporary file
|
// Call SanitizeLogFile on the temporary file
|
||||||
sanitizedData, err := ioutil.ReadFile(sanitizedTmpFilePath)
|
err = SanitizeLogFile(tmpFile.Name(), sanitizedContent)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Read the content of the sanitized content
|
||||||
|
sanitizedData := sanitizedContent.String()
|
||||||
|
|
||||||
// Check if the sanitized data matches the expected content
|
// Check if the sanitized data matches the expected content
|
||||||
if string(sanitizedData) != testCase.expected {
|
if !strings.Contains(sanitizedData, testCase.expected+"\n") {
|
||||||
t.Errorf("Sanitized data does not match expected data for input: %s\nExpected:\n%s\nActual:\n%s", testCase.input, testCase.expected, sanitizedData)
|
t.Errorf("Sanitized data does not match expected data\nExpected:\n%s\nActual:\n%s", testCase.expected, sanitizedData)
|
||||||
}
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue