diff --git a/install b/install index db5d3fa..34cc563 100755 --- a/install +++ b/install @@ -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 diff --git a/log-validator_main.patch b/log-validator_main.patch new file mode 100644 index 0000000..dc811d5 --- /dev/null +++ b/log-validator_main.patch @@ -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