extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-12-23 23:39:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add better handling for SLSA errors

Browse Source
This commit is contained in:
David Dworken 2022-10-02 20:14:54 -07:00
parent b7c64b61c8
commit 30e6f048ab
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/lib/lib.go
View File

@ -703,13 +703,17 @@ func Update(ctx *context.Context) error {
}
// Verify the SLSA attestation
var slsaError error
if runtime.GOOS == "darwin" {
err = verifyBinaryMac(ctx, "/tmp/hishtory-client", downloadData)
slsaError = verifyBinaryMac(ctx, "/tmp/hishtory-client", downloadData)
} else {
err = verifyBinary(ctx, "/tmp/hishtory-client", "/tmp/hishtory-client.intoto.jsonl", downloadData.Version)
slsaError = verifyBinary(ctx, "/tmp/hishtory-client", "/tmp/hishtory-client.intoto.jsonl", downloadData.Version)
}
if err != nil {
return fmt.Errorf("failed to verify SLSA provenance of the updated binary, aborting update (to bypass, set `export HISHTORY_DISABLE_SLSA_ATTESTATION=true`): %v", err)
if slsaError != nil {
err = handleSlsaFailure(slsaError)
if err != nil {
return err
}
}
// Unlink the existing binary so we can overwrite it even though it is still running

12
client/lib/slsa.go
View File

@ -1,6 +1,7 @@
package lib
import (
"bufio"
"context"
"crypto/sha256"
"encoding/hex"
@ -77,3 +78,14 @@ func getFileHash(binaryPath string) (string, error) {
hash := hex.EncodeToString(hasher.Sum(nil))
return hash, nil
}
func handleSlsaFailure(srcErr error) error {
fmt.Printf("\nFailed to verify SLSA provenance! This is likely due to a SLSA bug (SLSA is a brand new standard, and like all new things, has bugs). Ignoring this failure means falling back to the way most software does updates. Do you want to ignore this failure and update anyways? [y/N]")
reader := bufio.NewReader(os.Stdin)
resp, err := reader.ReadString('\n')
if err == nil && strings.TrimSpace(resp) == "y" {
fmt.Println("Proceeding with update...")
return nil
}
return fmt.Errorf("failed to verify SLSA provenance of the updated binary, aborting update (to bypass, set `export HISHTORY_DISABLE_SLSA_ATTESTATION=true`): %v", srcErr)
}

7
hishtory.go
View File

@ -5,6 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"log"
"os"
"strings"
"time"
@ -105,8 +106,10 @@ func main() {
}
fmt.Printf("Commit Hash: %s\n", GitCommit)
case "update":
// TODO: Add banner integration to update
lib.CheckFatalError(lib.Update(hctx.MakeContext()))
err := lib.Update(hctx.MakeContext())
if err != nil {
log.Fatalf("Failed to update hishtory: %v", err)
}
case "-h":
fallthrough
case "help":