From 458b84e3669eca6764b57893e2fbd94f80b237fa Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:31:35 +0000 Subject: [PATCH] fix: expect base64 string in raw tuf root (#11117) (#11128) * fix: expect base64 string in raw tuf root * fix: add tests * fix: rename kyverno yaml file --------- Signed-off-by: Vishal Choudhary Co-authored-by: Vishal Choudhary Co-authored-by: shuting --- .github/workflows/conformance.yaml | 20 +++++++++++++ cmd/internal/tuf.go | 7 ++++- pkg/cosign/sigstore.go | 2 ++ .../config/sigstore-custom-tuf/kyverno.yaml | 5 ++++ test/conformance/chainsaw/e2e-matrix.json | 3 ++ .../README.md | 4 +++ .../chainsaw-test.yaml | 20 +++++++++++++ .../pod-assert.yaml | 6 ++++ .../sigstore-image-verification-test/pod.yaml | 10 +++++++ .../policy-assert.yaml | 10 +++++++ .../policy.yaml | 29 +++++++++++++++++++ 11 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 scripts/config/sigstore-custom-tuf/kyverno.yaml create mode 100644 test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/README.md create mode 100755 test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/chainsaw-test.yaml create mode 100755 test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod-assert.yaml create mode 100755 test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod.yaml create mode 100755 test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy-assert.yaml create mode 100755 test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy.yaml diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index bbb82d430679..4bf3391cfd76 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -563,6 +563,26 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} chainsaw-tests: ${{ matrix.tests }} + sigstore-custom-tuf: + runs-on: ubuntu-latest + permissions: + packages: read + strategy: + fail-fast: false + matrix: + k8s-version: [ v1.28.13, v1.29.8, v1.30.4, v1.31.0 ] + tests: ${{ fromJSON(needs.define-matrix.outputs.tests).sigstore-custom-tuf }} + needs: [ prepare-images, define-matrix ] + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: ./.github/actions/run-tests + with: + k8s-version: ${{ matrix.k8s-version }} + kind-config: ./scripts/config/kind/vap-v1beta1.yaml + kyverno-configs: standard,sigstore-custom-tuf + token: ${{ secrets.GITHUB_TOKEN }} + chainsaw-tests: ${{ matrix.tests }} + custom-sigstore: runs-on: ubuntu-latest permissions: diff --git a/cmd/internal/tuf.go b/cmd/internal/tuf.go index 2979c5db53f1..3d6f90e7cfb1 100644 --- a/cmd/internal/tuf.go +++ b/cmd/internal/tuf.go @@ -2,6 +2,7 @@ package internal import ( "context" + "encoding/base64" "fmt" "github.com/go-logr/logr" @@ -24,7 +25,11 @@ func setupSigstoreTUF(ctx context.Context, logger logr.Logger) { checkError(logger, err, fmt.Sprintf("Failed to read alternate TUF root file %s : %v", tufRoot, err)) } } else if tufRootRaw != "" { - tufRootBytes = []byte(tufRootRaw) + root, err := base64.StdEncoding.DecodeString(tufRootRaw) + if err != nil { + checkError(logger, err, fmt.Sprintf("Failed to base64 decode TUF root %s : %v", tufRootRaw, err)) + } + tufRootBytes = root } logger.Info("Initializing TUF root") diff --git a/pkg/cosign/sigstore.go b/pkg/cosign/sigstore.go index ffff30e46a89..7527a80a16f3 100644 --- a/pkg/cosign/sigstore.go +++ b/pkg/cosign/sigstore.go @@ -83,6 +83,8 @@ func verifyBundles(bundles []*Bundle, desc *v1.Descriptor, trustedRoot *root.Tru result, err := verifier.Verify(bundle.ProtoBundle, policy) if err == nil { verificationResults = append(verificationResults, &VerificationResult{Bundle: bundle, Result: result, Desc: desc}) + } else { + logger.V(4).Info("failed to verify sigstore bundle", "err", err.Error(), "bundle", bundle) } } diff --git a/scripts/config/sigstore-custom-tuf/kyverno.yaml b/scripts/config/sigstore-custom-tuf/kyverno.yaml new file mode 100644 index 000000000000..793c437182cf --- /dev/null +++ b/scripts/config/sigstore-custom-tuf/kyverno.yaml @@ -0,0 +1,5 @@ +features: + tuf: + enabled: true + rootRaw: "{
 "signatures": [
  {
   "keyid": "4f4d1dd75f2d7f3860e3a068d7bed90dec5f0faafcbe1ace7fb7d95d29e07228",
   "sig": ""
  },
  {
   "keyid": "5e01c9a0b2641a8965a4a74e7df0bc7b2d8278a2c3ca0cf7a3f2f783d3c69800",
   "sig": ""
  },
  {
   "keyid": "eb8eff37f93af2faaba519f341decec3cecd3eeafcace32966db9723842c8a62",
   "sig": ""
  },
  {
   "keyid": "a10513a5ab61acd0c6b6fbe0504856ead18f3b17c4fabbe3fa848c79a5a187cf",
   "sig": "304502210084c9f296eb5b672e44213096653dd7fedcd247785044dec648f0f3be7b0cd51002207867822b6d1a85969a5697e774257319e3d8723fa6d403ae072980b72acfa50d"
  },
  {
   "keyid": "d6a89e23fb22801a0d1186bf1bdd007e228f65a8aa9964d24d06cb5fbb0ce91c",
   "sig": "304502200f0fb4a8b1139ec9f8d336768ff1b83f95c38a8613fccf88a19f6ed3ca02119b0221008235517c1dd27cfc84f3867cbbb8218ffaddc5d73fcf649713518bfa1a93a4aa"
  },
  {
   "keyid": "8b498a80a1b7af188c10c9abdf6aade81d14faaffcde2abcd6063baa673ebd12",
   "sig": "3044022068e59cbd0e259845da8a3f5c0f02d895a0bd0f8d010cb94a14ae3d4ce0f436bf02200ec81d83f3924b2644591d452ec539b9713d707e71878a9eca1ab545226765e7"
  },
  {
   "keyid": "88737ccdac7b49cc237e9aaead81be2a40278b886a693d8149a19cf543f093d3",
   "sig": "3046022100e09fa6cedac74d2fce0388c4616a938dd818296e5cb2e1fbbbea1d18a66308e9022100bfef306ef589b6c7ed63387f8c33885c037696344784feea22e4d6f55e876a3f"
  },
  {
   "keyid": "539dde44014c850fe6eeb8b299eb7dae2e1f4bf83454b949e98aa73542cdc65a",
   "sig": "3046022100ed3c5997388c9a09264e7becb74481e9567aa5461ec66f3d7311e461ac672551022100c4789e41c618107193f0457dc63b00373da3bef171d69eda07236b42254709f0"
  }
 ],
 "signed": {
  "_type": "root",
  "consistent_snapshot": true,
  "expires": "2024-12-20T13:25:15Z",
  "keys": {
   "4f4d1dd75f2d7f3860e3a068d7bed90dec5f0faafcbe1ace7fb7d95d29e07228": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAENki7aZVips5SgRzCd/Om0CGzQKY/\nnv84giqVDmdwb2ys82Z6soFLasvYYEEQcwqaC170n9gr93wHUgPc796uJA==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@ashtom"
   },
   "539dde44014c850fe6eeb8b299eb7dae2e1f4bf83454b949e98aa73542cdc65a": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAElD0o2sOZN9n3RKQ7PtMLAoXj+2Ai\nn4PKT/pfnzDlNLrD3VTQwCc4sR4t+OLu4KQ+qk+kXkR9YuBsu3bdJZ1OWw==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@nerdneha"
   },
   "5e01c9a0b2641a8965a4a74e7df0bc7b2d8278a2c3ca0cf7a3f2f783d3c69800": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEC9RNAsuDCNO6T7qA7Y5F8orw2tIW\nr7rUr4ffxvzTMrbkVtjR/trtE0q0+T0zQ8TWLyI6EYMwb947ej2ItfkOyA==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@jacobdepriest"
   },
   "88737ccdac7b49cc237e9aaead81be2a40278b886a693d8149a19cf543f093d3": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEBagkskNOpOTbetTX5CdnvMy+LiWn\nonRrNrqAHL4WgiebH7Uig7GLhC3bkeA/qgb926/vr9qhOPG9Buj2HatrPw==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@gregose"
   },
   "8b498a80a1b7af188c10c9abdf6aade81d14faaffcde2abcd6063baa673ebd12": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7IEoVNwrprchXGhT5sAhSax7SOd3\n8duuISghCzfmHdKJWSbV2wJRamRiUVRtmA83K/qm5cT20WXMCT5QeM/D3A==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@trevrosen"
   },
   "a10513a5ab61acd0c6b6fbe0504856ead18f3b17c4fabbe3fa848c79a5a187cf": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEC2wJ3xscyXxBLybJ9FVjwkyQMe53\nRHUz77AjMO8MzVaT8xw6ZvJqdNZiytYtigWULlINxw6frNsWJKb/f7lC8A==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@kommendorkapten"
   },
   "d6a89e23fb22801a0d1186bf1bdd007e228f65a8aa9964d24d06cb5fbb0ce91c": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDdORwcruW3gqAgaLjH/nNdGMB4kQ\nAvA+wD6DyO4P/wR8ee2ce83NZHq1ZADKhve0rlYKaKy3CqyQ5SmlZ36Zhw==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@krukow"
   },
   "eb8eff37f93af2faaba519f341decec3cecd3eeafcace32966db9723842c8a62": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAENynVdQnM9h7xU71G7PiJpQaDemub\nkbjsjYwLlPJTQVuxQO8WeIpJf8MEh5rf01t2dDIuCsZ5gRx+QvDv0UzfsA==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-keyowner": "@mph4"
   },
   "eb9799b483affac9da87ef4c9ea467928415c961349e607e5e6e485679b07f8f": {
    "keytype": "ecdsa",
    "keyval": {
     "public": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAENKNcNcX+d73lS1TRFb9Vnp8JvOoh\nzYQ+in43iGenbG8RGo9L/6FJ2hoRbVU6xskvyuErcdPbCdI4GxrQ5i8hkw==\n-----END PUBLIC KEY-----\n"
    },
    "scheme": "ecdsa-sha2-nistp256",
    "x-tuf-on-ci-online-uri": "azurekms://production-tuf-root.vault.azure.net/keys/Online-Key/aaf375fd8ed24acb949a5cc173700b05"
   }
  },
  "roles": {
   "root": {
    "keyids": [
     "a10513a5ab61acd0c6b6fbe0504856ead18f3b17c4fabbe3fa848c79a5a187cf",
     "4f4d1dd75f2d7f3860e3a068d7bed90dec5f0faafcbe1ace7fb7d95d29e07228",
     "88737ccdac7b49cc237e9aaead81be2a40278b886a693d8149a19cf543f093d3",
     "5e01c9a0b2641a8965a4a74e7df0bc7b2d8278a2c3ca0cf7a3f2f783d3c69800",
     "d6a89e23fb22801a0d1186bf1bdd007e228f65a8aa9964d24d06cb5fbb0ce91c",
     "eb8eff37f93af2faaba519f341decec3cecd3eeafcace32966db9723842c8a62",
     "8b498a80a1b7af188c10c9abdf6aade81d14faaffcde2abcd6063baa673ebd12",
     "539dde44014c850fe6eeb8b299eb7dae2e1f4bf83454b949e98aa73542cdc65a"
    ],
    "threshold": 3
   },
   "snapshot": {
    "keyids": [
     "eb9799b483affac9da87ef4c9ea467928415c961349e607e5e6e485679b07f8f"
    ],
    "threshold": 1,
    "x-tuf-on-ci-expiry-period": 21,
    "x-tuf-on-ci-signing-period": 7
   },
   "targets": {
    "keyids": [
     "a10513a5ab61acd0c6b6fbe0504856ead18f3b17c4fabbe3fa848c79a5a187cf",
     "4f4d1dd75f2d7f3860e3a068d7bed90dec5f0faafcbe1ace7fb7d95d29e07228",
     "88737ccdac7b49cc237e9aaead81be2a40278b886a693d8149a19cf543f093d3",
     "5e01c9a0b2641a8965a4a74e7df0bc7b2d8278a2c3ca0cf7a3f2f783d3c69800",
     "d6a89e23fb22801a0d1186bf1bdd007e228f65a8aa9964d24d06cb5fbb0ce91c",
     "eb8eff37f93af2faaba519f341decec3cecd3eeafcace32966db9723842c8a62",
     "8b498a80a1b7af188c10c9abdf6aade81d14faaffcde2abcd6063baa673ebd12",
     "539dde44014c850fe6eeb8b299eb7dae2e1f4bf83454b949e98aa73542cdc65a"
    ],
    "threshold": 3
   },
   "timestamp": {
    "keyids": [
     "eb9799b483affac9da87ef4c9ea467928415c961349e607e5e6e485679b07f8f"
    ],
    "threshold": 1,
    "x-tuf-on-ci-expiry-period": 7,
    "x-tuf-on-ci-signing-period": 6
   }
  },
  "spec_version": "1.0.31",
  "version": 2,
  "x-tuf-on-ci-expiry-period": 240,
  "x-tuf-on-ci-signing-period": 60
 }
}" + mirror: "https://tuf-repo.github.com" diff --git a/test/conformance/chainsaw/e2e-matrix.json b/test/conformance/chainsaw/e2e-matrix.json index bdc3c9c17d29..c5e512883dac 100644 --- a/test/conformance/chainsaw/e2e-matrix.json +++ b/test/conformance/chainsaw/e2e-matrix.json @@ -106,6 +106,9 @@ "reports": [ "^reports$" ], + "sigstore-custom-tuf": [ + "^sigstore-custom-tuf$" + ], "ttl": [ "^ttl$" ], diff --git a/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/README.md b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/README.md new file mode 100644 index 000000000000..d34ca198bde4 --- /dev/null +++ b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/README.md @@ -0,0 +1,4 @@ +## Description + +This test verifies sigstore bundle attached to an image. + diff --git a/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/chainsaw-test.yaml b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/chainsaw-test.yaml new file mode 100755 index 000000000000..a98431593f3e --- /dev/null +++ b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/chainsaw-test.yaml @@ -0,0 +1,20 @@ +apiVersion: chainsaw.kyverno.io/v1alpha1 +kind: Test +metadata: + creationTimestamp: null + name: sigstore-image-verification +spec: + steps: + - name: step-01 + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml + - name: step-02 + try: + - apply: + file: pod.yaml + - assert: + file: pod-assert.yaml + diff --git a/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod-assert.yaml b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod-assert.yaml new file mode 100755 index 000000000000..7ec43e84a5cb --- /dev/null +++ b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod-assert.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Pod +metadata: + name: test-pod + namespace: default + diff --git a/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod.yaml b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod.yaml new file mode 100755 index 000000000000..fb3763d4f2b8 --- /dev/null +++ b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/pod.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Pod +metadata: + name: test-pod + namespace: default +spec: + containers: + - image: ghcr.io/nirmata/github-signing-demo:latest + name: test-container + diff --git a/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy-assert.yaml b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy-assert.yaml new file mode 100755 index 000000000000..05883ad59158 --- /dev/null +++ b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy-assert.yaml @@ -0,0 +1,10 @@ +apiVersion: kyverno.io/v1 +kind: ClusterPolicy +metadata: + name: sigstore-image-verification +status: + conditions: + - reason: Succeeded + status: "True" + type: Ready + diff --git a/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy.yaml b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy.yaml new file mode 100755 index 000000000000..f580a5da41c5 --- /dev/null +++ b/test/conformance/chainsaw/sigstore-custom-tuf/sigstore-image-verification-test/policy.yaml @@ -0,0 +1,29 @@ +apiVersion: kyverno.io/v1 +kind: ClusterPolicy +metadata: + annotations: + pod-policies.kyverno.io/autogen-controllers: none + name: sigstore-image-verification +spec: + background: false + validationFailureAction: Enforce + webhookTimeoutSeconds: 30 + rules: + - match: + any: + - resources: + kinds: + - Pod + name: sigstore-image-verification + verifyImages: + - imageReferences: + - "*" + type: SigstoreBundle + attestors: + - entries: + - keyless: + issuer: https://token.actions.githubusercontent.com + subject: https://github.com/nirmata/github-signing-demo/.github/workflows/build-attested-image.yaml@refs/heads/main + rekor: + url: https://rekor.sigstore.dev + ignoreTlog: true