Move TSA blob tests into Go test suite

Run the e2e_signblob_tsa_mtls.sh tests in Go. The e2e-tsa-mtls job in
the e2e-tests workflow is fully removed since these are now all covered
in e2e-cross.

Signed-off-by: Colleen Murphy <colleenmurphy@google.com>

.github/workflows/e2e-tests.yml

@@ -48,33 +48,14 @@ jobs:
       - name: Run cross platform e2e tests
         run: go test -tags=e2e,cross -v ./test/...
 
-  e2e-tsa-mtls:
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
-        with:
-          go-version: '1.21'
-          check-latest: true
-
-      - uses: imjasonh/setup-crane@00c9e93efa4e1138c9a7a5c594acd6c75a2fbf0c # v0.3
-
-      - name: Run e2e_signblob_tsa_mtls.sh
-        shell: bash
-        run: make && PATH="$PWD:$PATH" ./test/e2e_signblob_tsa_mtls.sh
-
   e2e-test-pkcs11:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.21' 
+          go-version: '1.21'
           check-latest: true
 
       - name: Run pkcs11 end-to-end tests

test/e2e_tsa_test.go

@@ -22,6 +22,7 @@ import (
 	"encoding/pem"
 	"net/http/httptest"
 	"path"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -49,23 +50,8 @@ func TestTSAMTLS(t *testing.T) {
 
 	// Set up TSA server with TLS
 	timestampCACert, timestampServerCert, timestampServerKey, timestampClientCert, timestampClientKey := generateMTLSKeys(t, td)
-	viper.Set("timestamp-signer", "memory")
-	viper.Set("timestamp-signer-hash", "sha256")
-	viper.Set("disable-ntp-monitoring", true)
-	viper.Set("tls-host", "0.0.0.0")
-	viper.Set("tls-port", 3000)
-	viper.Set("tls-ca", timestampCACert)
-	viper.Set("tls-key", timestampServerKey)
-	viper.Set("tls-certificate", timestampServerCert)
-	tsaAPIServer := tsaserver.NewRestAPIServer("localhost", 3000, []string{"https"}, false, 10*time.Second, 10*time.Second)
-	tsaServer := httptest.NewServer(tsaAPIServer.GetHandler())
-	t.Cleanup(tsaServer.Close)
-	tsaClient, err := tsaclient.GetTimestampClient(tsaServer.URL)
-	must(err, t)
-	tsaChain, err := tsaClient.Timestamp.GetTimestampCertChain(nil)
-	must(err, t)
-	timestampServerURL := tsaServer.URL + "/api/v1/timestamp"
-	timestampChainFile := mkfile(tsaChain.Payload, td, t)
+	timestampServerURL, timestampChainFile, tsaCleanup := setUpTSAServerWithTLS(t, td, timestampCACert, timestampServerKey, timestampServerCert)
+	t.Cleanup(tsaCleanup)
 
 	ko := options.KeyOpts{
 		KeyRef:          pemKeyRef,
@@ -98,6 +84,52 @@ func TestTSAMTLS(t *testing.T) {
 	must(verifyCmd.Exec(context.Background(), []string{imgName}), t)
 }
 
+func TestSignBlobTSAMTLS(t *testing.T) {
+	td := t.TempDir()
+	blob := time.Now().Format("Mon Jan 2 15:04:05 MST 2006")
+	blobPath := mkfile(blob, td, t)
+	timestampPath := filepath.Join(td, "timestamp.txt")
+	bundlePath := filepath.Join(td, "cosign.bundle")
+
+	_, privKey, pubKey := keypair(t, td)
+
+	// Set up TSA server with TLS
+	timestampCACert, timestampServerCert, timestampServerKey, timestampClientCert, timestampClientKey := generateMTLSKeys(t, td)
+	timestampServerURL, timestampChainFile, tsaCleanup := setUpTSAServerWithTLS(t, td, timestampCACert, timestampServerKey, timestampServerCert)
+	t.Cleanup(tsaCleanup)
+
+	signingKO := options.KeyOpts{
+		KeyRef:               privKey,
+		PassFunc:             passFunc,
+		TSAServerURL:         timestampServerURL,
+		TSAClientCACert:      timestampCACert,
+		TSAClientCert:        timestampClientCert,
+		TSAClientKey:         timestampClientKey,
+		TSAServerName:        "server.example.com",
+		RFC3161TimestampPath: timestampPath,
+		BundlePath:           bundlePath,
+	}
+	sig, err := sign.SignBlobCmd(ro, signingKO, blobPath, true, "", "", false)
+	must(err, t)
+
+	verifyKO := options.KeyOpts{
+		KeyRef:               pubKey,
+		TSACertChainPath:     timestampChainFile,
+		RFC3161TimestampPath: timestampPath,
+		BundlePath:           bundlePath,
+	}
+
+	verifyCmd := cliverify.VerifyBlobCmd{
+		KeyOpts: verifyKO,
+		CertVerifyOptions: options.CertVerifyOptions{
+			CertIdentityRegexp:   ".*",
+			CertOidcIssuerRegexp: ".*",
+		},
+		IgnoreTlog: true,
+	}
+	must(verifyCmd.Exec(context.Background(), blobPath), t)
+}
+
 func generateSigningKeys(t *testing.T, td string) (string, string, string) {
 	rootCert, rootKey, _ := GenerateRootCa()
 	pemRoot := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: rootCert.Raw})
@@ -141,3 +173,23 @@ func generateMTLSKeys(t *testing.T, td string) (string, string, string, string,
 	clientPemKeyRef := mkfile(string(clientKeyPem), td, t)
 	return pemRootRef, serverPemLeafRef, serverPemKeyRef, clientPemLeafRef, clientPemKeyRef
 }
+
+func setUpTSAServerWithTLS(t *testing.T, td, timestampCACert, timestampServerKey, timestampServerCert string) (string, string, func()) {
+	viper.Set("timestamp-signer", "memory")
+	viper.Set("timestamp-signer-hash", "sha256")
+	viper.Set("disable-ntp-monitoring", true)
+	viper.Set("tls-host", "0.0.0.0")
+	viper.Set("tls-port", 3000)
+	viper.Set("tls-ca", timestampCACert)
+	viper.Set("tls-key", timestampServerKey)
+	viper.Set("tls-certificate", timestampServerCert)
+	tsaAPIServer := tsaserver.NewRestAPIServer("localhost", 3000, []string{"https"}, false, 10*time.Second, 10*time.Second)
+	tsaServer := httptest.NewServer(tsaAPIServer.GetHandler())
+	tsaClient, err := tsaclient.GetTimestampClient(tsaServer.URL)
+	must(err, t)
+	tsaChain, err := tsaClient.Timestamp.GetTimestampCertChain(nil)
+	must(err, t)
+	timestampServerURL := tsaServer.URL + "/api/v1/timestamp"
+	timestampChainFile := mkfile(tsaChain.Payload, td, t)
+	return timestampServerURL, timestampChainFile, tsaServer.Close
+}