github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-28 02:19:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Suppress checksum warning on "message repeated X times" lines

Browse Source
This commit is contained in:
Arjan H
2021-08-23 10:26:10 +02:00
parent 64f7f23ec5
commit 0c2454955c
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install
View File

@@ -553,6 +553,9 @@ config_boulder() {
sudo -u labca -H patch -p1 < $cloneDir/bad-key-revoker_main.patch &>>$installLog
cp cmd/bad-key-revoker/main.go "$boulderLabCADir/.backup/"
sudo -u labca -H patch -p1 < $cloneDir/log-validator_main.patch &>>$installLog
cp cmd/log-validator/main.go "$boulderLabCADir/.backup/"
sudo -u labca -H patch -p1 -o "$boulderLabCADir/entrypoint.sh" < $cloneDir/entrypoint.patch &>>$installLog
sudo -u labca -H patch -p1 -o "$boulderLabCADir/startservers.py" < $cloneDir/startservers.patch &>>$installLog
sudo -u labca -H patch -p1 < $cloneDir/startservers.patch &>>$installLog

15
log-validator_main.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/cmd/log-validator/main.go b/cmd/log-validator/main.go
index fdab2ac6..bb136880 100644
--- a/cmd/log-validator/main.go
+++ b/cmd/log-validator/main.go
@@ -52,8 +52,8 @@ func lineValid(text string) error {
if strings.Contains(text, errorPrefix) {
return nil
}
- // Check the extracted checksum against the computed checksum
- if computedChecksum := blog.LogLineChecksum(line); checksum != computedChecksum {
+ // Check the extracted checksum against the computed checksum, but ignore "message repeated X times" lines
+ if computedChecksum := blog.LogLineChecksum(line); checksum != computedChecksum && checksum != "message" {
return fmt.Errorf("%s invalid checksum (expected %q, got %q)", errorPrefix, computedChecksum, checksum)
}
return nil