Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 9e5c1a7
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 08:06:05 2024 +0000

    fix: update function signature for UserEnv

    Signed-off-by: Junjie Gao <[email protected]>

commit 40f93f1
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 07:57:59 2024 +0000

    fix: update test case name

    Signed-off-by: Junjie Gao <[email protected]>

commit a22f8d1
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 07:47:58 2024 +0000

    fix: resolve comment for Patrick

    Signed-off-by: Junjie Gao <[email protected]>

commit cecd18e
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 06:56:37 2024 +0000

    fix: restore code

    Signed-off-by: Junjie Gao <[email protected]>

commit 5ee8970
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 06:54:40 2024 +0000

    fix: test cases

    Signed-off-by: Junjie Gao <[email protected]>

commit 169aead
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 06:40:55 2024 +0000

    fix: add test cases for expired crl

    Signed-off-by: Junjie Gao <[email protected]>

commit fc29f0c
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 05:51:49 2024 +0000

    fix: simplify code

    Signed-off-by: Junjie Gao <[email protected]>

commit 45849ab
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 03:44:54 2024 +0000

    fix: update comments

    Signed-off-by: Junjie Gao <[email protected]>

commit d91eeb2
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 03:35:39 2024 +0000

    fix: remove the unit test for NewFileCache error

    Signed-off-by: Junjie Gao <[email protected]>

commit 4d596ba
Merge: 280e3d6 72b87d9
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 03:21:19 2024 +0000

    Squashed commit of the following:

    commit 72b87d9
    Author: Patrick Zheng <[email protected]>
    Date:   Tue Nov 12 09:10:11 2024 +0800

        feat: crl cache with log (notaryproject#1078)

        Signed-off-by: Patrick Zheng <[email protected]>

    commit 6745543
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Nov 11 09:50:19 2024 -0800

        build(deps): Bump github.com/golang-jwt/jwt/v4 from 4.5.0 to 4.5.1 in /test/e2e/plugin (notaryproject#1077)

        Bumps [github.com/golang-jwt/jwt/v4](https://github.com/golang-jwt/jwt)
        from 4.5.0 to 4.5.1.
        <details>
        <summary>Release notes</summary>
        <p><em>Sourced from <a
        href="https://github.com/golang-jwt/jwt/releases">github.com/golang-jwt/jwt/v4's
        releases</a>.</em></p>
        <blockquote>
        <h2>v4.5.1</h2>
        <h1>Security</h1>
        <p>Unclear documentation of the error behavior in
        <code>ParseWithClaims</code> in &lt;= 4.5.0 could lead to situation
        where users are potentially not checking errors in the way they should
        be. Especially, if a token is both expired and invalid, the errors
        returned by <code>ParseWithClaims</code> return both error codes. If
        users only check for the <code>jwt.ErrTokenExpired </code> using
        <code>error.Is</code>, they will ignore the embedded
        <code>jwt.ErrTokenSignatureInvalid</code> and thus potentially accept
        invalid tokens.</p>
        <p>This issue was documented in <a
        href="https://github.com/golang-jwt/jwt/security/advisories/GHSA-29wx-vh33-7x7r">https://github.com/golang-jwt/jwt/security/advisories/GHSA-29wx-vh33-7x7r</a>
        and fixed in this release.</p>
        <p>Note: <code>v5</code> was not affected by this issue. So upgrading to
        this release version is also recommended.</p>
        <h1>What's Changed</h1>
        <ul>
        <li>Back-ported error-handling logic in <code>ParseWithClaims</code>
        from <code>v5</code> branch. This fixes <a
        href="https://github.com/golang-jwt/jwt/security/advisories/GHSA-29wx-vh33-7x7r">https://github.com/golang-jwt/jwt/security/advisories/GHSA-29wx-vh33-7x7r</a>.</li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/golang-jwt/jwt/compare/v4.5.0...v4.5.1">https://github.com/golang-jwt/jwt/compare/v4.5.0...v4.5.1</a></p>
        </blockquote>
        </details>
        <details>
        <summary>Commits</summary>
        <ul>
        <li><a
        href="https://github.com/golang-jwt/jwt/commit/7b1c1c00a171c6c79bbdb40e4ce7d197060c1c2c"><code>7b1c1c0</code></a>
        Merge commit from fork</li>
        <li>See full diff in <a
        href="https://github.com/golang-jwt/jwt/compare/v4.5.0...v4.5.1">compare
        view</a></li>
        </ul>
        </details>
        <br />

        [![Dependabot compatibility
        score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/golang-jwt/jwt/v4&package-manager=go_modules&previous-version=4.5.0&new-version=4.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

        Dependabot will resolve any conflicts with this PR as long as you don't
        alter it yourself. You can also trigger a rebase manually by commenting
        `@dependabot rebase`.

        [//]: # (dependabot-automerge-start)
        [//]: # (dependabot-automerge-end)

        ---

        <details>
        <summary>Dependabot commands and options</summary>
        <br />

        You can trigger Dependabot actions by commenting on this PR:
        - `@dependabot rebase` will rebase this PR
        - `@dependabot recreate` will recreate this PR, overwriting any edits
        that have been made to it
        - `@dependabot merge` will merge this PR after your CI passes on it
        - `@dependabot squash and merge` will squash and merge this PR after
        your CI passes on it
        - `@dependabot cancel merge` will cancel a previously requested merge
        and block automerging
        - `@dependabot reopen` will reopen this PR if it is closed
        - `@dependabot close` will close this PR and stop Dependabot recreating
        it. You can achieve the same result by closing it manually
        - `@dependabot show <dependency name> ignore conditions` will show all
        of the ignore conditions of the specified dependency
        - `@dependabot ignore this major version` will close this PR and stop
        Dependabot creating any more for this major version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this minor version` will close this PR and stop
        Dependabot creating any more for this minor version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this dependency` will close this PR and stop
        Dependabot creating any more for this dependency (unless you reopen the
        PR or upgrade to it yourself)
        You can disable automated security fix PRs for this repo from the
        [Security Alerts
        page](https://github.com/notaryproject/notation/network/alerts).

        </details>

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 7412191
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Nov 11 09:50:02 2024 -0800

        build(deps): Bump actions/checkout from 4.1.7 to 4.2.2 (notaryproject#1074)

        [//]: # (dependabot-start)
        ⚠️  **Dependabot is rebasing this PR** ⚠️

        Rebasing might not happen immediately, so don't worry if this takes some
        time.

        Note: if you make any changes to this PR yourself, they will take
        precedence over the rebase.

        ---

        [//]: # (dependabot-end)

        Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7
        to 4.2.2.
        <details>
        <summary>Release notes</summary>
        <p><em>Sourced from <a
        href="https://github.com/actions/checkout/releases">actions/checkout's
        releases</a>.</em></p>
        <blockquote>
        <h2>v4.2.2</h2>
        <h2>What's Changed</h2>
        <ul>
        <li><code>url-helper.ts</code> now leverages well-known environment
        variables by <a href="https://github.com/jww3"><code>@​jww3</code></a>
        in <a
        href="https://github.com/actions/checkout/pull/1941">actions/checkout#1941</a></li>
        <li>Expand unit test coverage for <code>isGhes</code> by <a
        href="https://github.com/jww3"><code>@​jww3</code></a> in <a
        href="https://github.com/actions/checkout/pull/1946">actions/checkout#1946</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/checkout/compare/v4.2.1...v4.2.2">https://github.com/actions/checkout/compare/v4.2.1...v4.2.2</a></p>
        <h2>v4.2.1</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Check out other refs/* by commit if provided, fall back to ref by <a
        href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
        href="https://github.com/actions/checkout/pull/1924">actions/checkout#1924</a></li>
        </ul>
        <h2>New Contributors</h2>
        <ul>
        <li><a href="https://github.com/Jcambass"><code>@​Jcambass</code></a>
        made their first contribution in <a
        href="https://github.com/actions/checkout/pull/1919">actions/checkout#1919</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/checkout/compare/v4.2.0...v4.2.1">https://github.com/actions/checkout/compare/v4.2.0...v4.2.1</a></p>
        <h2>v4.2.0</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Add Ref and Commit outputs by <a
        href="https://github.com/lucacome"><code>@​lucacome</code></a> in <a
        href="https://github.com/actions/checkout/pull/1180">actions/checkout#1180</a></li>
        <li>Dependabot updates in <a
        href="https://github.com/actions/checkout/pull/1777">actions/checkout#1777</a>
        &amp; <a
        href="https://github.com/actions/checkout/pull/1872">actions/checkout#1872</a></li>
        </ul>
        <h2>New Contributors</h2>
        <ul>
        <li><a href="https://github.com/yasonk"><code>@​yasonk</code></a> made
        their first contribution in <a
        href="https://github.com/actions/checkout/pull/1869">actions/checkout#1869</a></li>
        <li><a href="https://github.com/lucacome"><code>@​lucacome</code></a>
        made their first contribution in <a
        href="https://github.com/actions/checkout/pull/1180">actions/checkout#1180</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/checkout/compare/v4.1.7...v4.2.0">https://github.com/actions/checkout/compare/v4.1.7...v4.2.0</a></p>
        </blockquote>
        </details>
        <details>
        <summary>Changelog</summary>
        <p><em>Sourced from <a
        href="https://github.com/actions/checkout/blob/main/CHANGELOG.md">actions/checkout's
        changelog</a>.</em></p>
        <blockquote>
        <h1>Changelog</h1>
        <h2>v4.2.2</h2>
        <ul>
        <li><code>url-helper.ts</code> now leverages well-known environment
        variables by <a href="https://github.com/jww3"><code>@​jww3</code></a>
        in <a
        href="https://github.com/actions/checkout/pull/1941">actions/checkout#1941</a></li>
        <li>Expand unit test coverage for <code>isGhes</code> by <a
        href="https://github.com/jww3"><code>@​jww3</code></a> in <a
        href="https://github.com/actions/checkout/pull/1946">actions/checkout#1946</a></li>
        </ul>
        <h2>v4.2.1</h2>
        <ul>
        <li>Check out other refs/* by commit if provided, fall back to ref by <a
        href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
        href="https://github.com/actions/checkout/pull/1924">actions/checkout#1924</a></li>
        </ul>
        <h2>v4.2.0</h2>
        <ul>
        <li>Add Ref and Commit outputs by <a
        href="https://github.com/lucacome"><code>@​lucacome</code></a> in <a
        href="https://github.com/actions/checkout/pull/1180">actions/checkout#1180</a></li>
        <li>Dependency updates by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a>- <a
        href="https://github.com/actions/checkout/pull/1777">actions/checkout#1777</a>,
        <a
        href="https://github.com/actions/checkout/pull/1872">actions/checkout#1872</a></li>
        </ul>
        <h2>v4.1.7</h2>
        <ul>
        <li>Bump the minor-npm-dependencies group across 1 directory with 4
        updates by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1739">actions/checkout#1739</a></li>
        <li>Bump actions/checkout from 3 to 4 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1697">actions/checkout#1697</a></li>
        <li>Check out other refs/* by commit by <a
        href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
        href="https://github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
        <li>Pin actions/checkout's own workflows to a known, good, stable
        version. by <a href="https://github.com/jww3"><code>@​jww3</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1776">actions/checkout#1776</a></li>
        </ul>
        <h2>v4.1.6</h2>
        <ul>
        <li>Check platform to set archive extension appropriately by <a
        href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1732">actions/checkout#1732</a></li>
        </ul>
        <h2>v4.1.5</h2>
        <ul>
        <li>Update NPM dependencies by <a
        href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1703">actions/checkout#1703</a></li>
        <li>Bump github/codeql-action from 2 to 3 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1694">actions/checkout#1694</a></li>
        <li>Bump actions/setup-node from 1 to 4 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1696">actions/checkout#1696</a></li>
        <li>Bump actions/upload-artifact from 2 to 4 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1695">actions/checkout#1695</a></li>
        <li>README: Suggest <code>user.email</code> to be
        <code>41898282+github-actions[bot]@users.noreply.github.com</code> by <a
        href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1707">actions/checkout#1707</a></li>
        </ul>
        <h2>v4.1.4</h2>
        <ul>
        <li>Disable <code>extensions.worktreeConfig</code> when disabling
        <code>sparse-checkout</code> by <a
        href="https://github.com/jww3"><code>@​jww3</code></a> in <a
        href="https://github.com/actions/checkout/pull/1692">actions/checkout#1692</a></li>
        <li>Add dependabot config by <a
        href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1688">actions/checkout#1688</a></li>
        <li>Bump the minor-actions-dependencies group with 2 updates by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1693">actions/checkout#1693</a></li>
        <li>Bump word-wrap from 1.2.3 to 1.2.5 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/checkout/pull/1643">actions/checkout#1643</a></li>
        </ul>
        <h2>v4.1.3</h2>
        <ul>
        <li>Check git version before attempting to disable
        <code>sparse-checkout</code> by <a
        href="https://github.com/jww3"><code>@​jww3</code></a> in <a
        href="https://github.com/actions/checkout/pull/1656">actions/checkout#1656</a></li>
        <li>Add SSH user parameter by <a
        href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1685">actions/checkout#1685</a></li>
        <li>Update <code>actions/checkout</code> version in
        <code>update-main-version.yml</code> by <a
        href="https://github.com/jww3"><code>@​jww3</code></a> in <a
        href="https://github.com/actions/checkout/pull/1650">actions/checkout#1650</a></li>
        </ul>
        <h2>v4.1.2</h2>
        <ul>
        <li>Fix: Disable sparse checkout whenever <code>sparse-checkout</code>
        option is not present <a
        href="https://github.com/dscho"><code>@​dscho</code></a> in <a
        href="https://github.com/actions/checkout/pull/1598">actions/checkout#1598</a></li>
        </ul>
        <h2>v4.1.1</h2>
        <ul>
        <li>Correct link to GitHub Docs by <a
        href="https://github.com/peterbe"><code>@​peterbe</code></a> in <a
        href="https://github.com/actions/checkout/pull/1511">actions/checkout#1511</a></li>
        <li>Link to release page from what's new section by <a
        href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
        <a
        href="https://github.com/actions/checkout/pull/1514">actions/checkout#1514</a></li>
        </ul>
        <h2>v4.1.0</h2>
        <ul>
        <li><a href="https://github.com/actions/checkout/pull/1396">Add
        support for partial checkout filters</a></li>
        </ul>
        <!-- raw HTML omitted -->
        </blockquote>
        <p>... (truncated)</p>
        </details>
        <details>
        <summary>Commits</summary>
        <ul>
        <li><a
        href="https://github.com/actions/checkout/commit/11bd71901bbe5b1630ceea73d27597364c9af683"><code>11bd719</code></a>
        Prepare 4.2.2 Release (<a
        href="https://github.com/actions/checkout/issues/1953">#1953</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/e3d2460bbb42d7710191569f88069044cfb9d8cf"><code>e3d2460</code></a>
        Expand unit test coverage (<a
        href="https://github.com/actions/checkout/issues/1946">#1946</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/163217dfcd28294438ea1c1c149cfaf66eec283e"><code>163217d</code></a>
        <code>url-helper.ts</code> now leverages well-known environment
        variables. (<a
        href="https://github.com/actions/checkout/issues/1941">#1941</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871"><code>eef6144</code></a>
        Prepare 4.2.1 release (<a
        href="https://github.com/actions/checkout/issues/1925">#1925</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/6b42224f41ee5dfe5395e27c8b2746f1f9955030"><code>6b42224</code></a>
        Add workflow file for publishing releases to immutable action package
        (<a
        href="https://github.com/actions/checkout/issues/1919">#1919</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/de5a000abf73b6f4965bd1bcdf8f8d94a56ea815"><code>de5a000</code></a>
        Check out other refs/* by commit if provided, fall back to ref (<a
        href="https://github.com/actions/checkout/issues/1924">#1924</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/d632683dd7b4114ad314bca15554477dd762a938"><code>d632683</code></a>
        Prepare 4.2.0 release (<a
        href="https://github.com/actions/checkout/issues/1878">#1878</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/6d193bf28034eafb982f37bd894289fe649468fc"><code>6d193bf</code></a>
        Bump braces from 3.0.2 to 3.0.3 (<a
        href="https://github.com/actions/checkout/issues/1777">#1777</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/db0cee9a514becbbd4a101a5fbbbf47865ee316c"><code>db0cee9</code></a>
        Bump the minor-npm-dependencies group across 1 directory with 4 updates
        (<a
        href="https://github.com/actions/checkout/issues/1872">#1872</a>)</li>
        <li><a
        href="https://github.com/actions/checkout/commit/b6849436894e144dbce29d7d7fda2ae3bf9d8365"><code>b684943</code></a>
        Add Ref and Commit outputs (<a
        href="https://github.com/actions/checkout/issues/1180">#1180</a>)</li>
        <li>Additional commits viewable in <a
        href="https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...11bd71901bbe5b1630ceea73d27597364c9af683">compare
        view</a></li>
        </ul>
        </details>
        <br />

        [![Dependabot compatibility
        score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=4.1.7&new-version=4.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

        Dependabot will resolve any conflicts with this PR as long as you don't
        alter it yourself. You can also trigger a rebase manually by commenting
        `@dependabot rebase`.

        [//]: # (dependabot-automerge-start)
        [//]: # (dependabot-automerge-end)

        ---

        <details>
        <summary>Dependabot commands and options</summary>
        <br />

        You can trigger Dependabot actions by commenting on this PR:
        - `@dependabot rebase` will rebase this PR
        - `@dependabot recreate` will recreate this PR, overwriting any edits
        that have been made to it
        - `@dependabot merge` will merge this PR after your CI passes on it
        - `@dependabot squash and merge` will squash and merge this PR after
        your CI passes on it
        - `@dependabot cancel merge` will cancel a previously requested merge
        and block automerging
        - `@dependabot reopen` will reopen this PR if it is closed
        - `@dependabot close` will close this PR and stop Dependabot recreating
        it. You can achieve the same result by closing it manually
        - `@dependabot show <dependency name> ignore conditions` will show all
        of the ignore conditions of the specified dependency
        - `@dependabot ignore this major version` will close this PR and stop
        Dependabot creating any more for this major version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this minor version` will close this PR and stop
        Dependabot creating any more for this minor version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this dependency` will close this PR and stop
        Dependabot creating any more for this dependency (unless you reopen the
        PR or upgrade to it yourself)

        </details>

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 5a584d1
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Nov 11 09:49:52 2024 -0800

        build(deps): Bump actions/upload-artifact from 4.4.0 to 4.4.3 (notaryproject#1066)

        Bumps
        [actions/upload-artifact](https://github.com/actions/upload-artifact)
        from 4.4.0 to 4.4.3.
        <details>
        <summary>Release notes</summary>
        <p><em>Sourced from <a
        href="https://github.com/actions/upload-artifact/releases">actions/upload-artifact's
        releases</a>.</em></p>
        <blockquote>
        <h2>v4.4.3</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Undo indirect dependency updates from <a
        href="https://github.com/actions/upload-artifact/issues/627">#627</a>
        by <a href="https://github.com/joshmgross"><code>@​joshmgross</code></a>
        in <a
        href="https://github.com/actions/upload-artifact/pull/632">actions/upload-artifact#632</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/upload-artifact/compare/v4.4.2...v4.4.3">https://github.com/actions/upload-artifact/compare/v4.4.2...v4.4.3</a></p>
        <h2>v4.4.2</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Bump <code>@actions/artifact</code> to 2.1.11 by <a
        href="https://github.com/robherley"><code>@​robherley</code></a> in <a
        href="https://github.com/actions/upload-artifact/pull/627">actions/upload-artifact#627</a>
        <ul>
        <li>Includes fix for relative symlinks not resolving properly</li>
        </ul>
        </li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/upload-artifact/compare/v4.4.1...v4.4.2">https://github.com/actions/upload-artifact/compare/v4.4.1...v4.4.2</a></p>
        <h2>v4.4.1</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Add a section about hidden files by <a
        href="https://github.com/joshmgross"><code>@​joshmgross</code></a> in <a
        href="https://github.com/actions/upload-artifact/pull/607">actions/upload-artifact#607</a></li>
        <li>Add workflow file for publishing releases to immutable action
        package by <a
        href="https://github.com/Jcambass"><code>@​Jcambass</code></a> in <a
        href="https://github.com/actions/upload-artifact/pull/621">actions/upload-artifact#621</a></li>
        <li>Update <code>@​actions/artifact</code> to latest version, includes
        symlink and timeout fixes by <a
        href="https://github.com/robherley"><code>@​robherley</code></a> in <a
        href="https://github.com/actions/upload-artifact/pull/625">actions/upload-artifact#625</a></li>
        </ul>
        <h2>New Contributors</h2>
        <ul>
        <li><a href="https://github.com/Jcambass"><code>@​Jcambass</code></a>
        made their first contribution in <a
        href="https://github.com/actions/upload-artifact/pull/621">actions/upload-artifact#621</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/upload-artifact/compare/v4.4.0...v4.4.1">https://github.com/actions/upload-artifact/compare/v4.4.0...v4.4.1</a></p>
        </blockquote>
        </details>
        <details>
        <summary>Commits</summary>
        <ul>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882"><code>b4b15b8</code></a>
        Merge pull request <a
        href="https://github.com/actions/upload-artifact/issues/632">#632</a>
        from actions/joshmgross/undo-dependency-changes</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/92b01ebffaf2e2520c64ab2845d3f9bd5c06941a"><code>92b01eb</code></a>
        Undo indirect dependency updates from <a
        href="https://github.com/actions/upload-artifact/issues/627">#627</a></li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/84480863f228bb9747b473957fcc9e309aa96097"><code>8448086</code></a>
        Merge pull request <a
        href="https://github.com/actions/upload-artifact/issues/627">#627</a>
        from actions/robherley/v4.4.2</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/b1d4642b699cfe7e338a864cc36849b29ad04a75"><code>b1d4642</code></a>
        add explicit relative and absolute symlinks to workflow</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/d50e66084c4d29dc5d3326b7a0e67bed9ef4bb1e"><code>d50e660</code></a>
        bump version</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/aabe6f8050b860cae7a9065282dde2b3227836aa"><code>aabe6f8</code></a>
        build with <code>@​actions/artifact</code> v2.1.11</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/604373da6381bf24206979c74d06a550515601b9"><code>604373d</code></a>
        Merge pull request <a
        href="https://github.com/actions/upload-artifact/issues/625">#625</a>
        from actions/robherley/artifact-2.1.10</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/0150148bdf458be2451ee90b000ecdcca8216ed8"><code>0150148</code></a>
        paste right core version</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/a009b25faa61b2b26de294984570f1371b13a895"><code>a009b25</code></a>
        update licenses</li>
        <li><a
        href="https://github.com/actions/upload-artifact/commit/9f6f6f402e14cb0fe462513c8fa31e6ec061e8b5"><code>9f6f6f4</code></a>
        update <code>@​actions/core</code> and <code>@​actions/artifact</code>
        to latest versions</li>
        <li>Additional commits viewable in <a
        href="https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882">compare
        view</a></li>
        </ul>
        </details>
        <br />

        [![Dependabot compatibility
        score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/upload-artifact&package-manager=github_actions&previous-version=4.4.0&new-version=4.4.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

        Dependabot will resolve any conflicts with this PR as long as you don't
        alter it yourself. You can also trigger a rebase manually by commenting
        `@dependabot rebase`.

        [//]: # (dependabot-automerge-start)
        [//]: # (dependabot-automerge-end)

        ---

        <details>
        <summary>Dependabot commands and options</summary>
        <br />

        You can trigger Dependabot actions by commenting on this PR:
        - `@dependabot rebase` will rebase this PR
        - `@dependabot recreate` will recreate this PR, overwriting any edits
        that have been made to it
        - `@dependabot merge` will merge this PR after your CI passes on it
        - `@dependabot squash and merge` will squash and merge this PR after
        your CI passes on it
        - `@dependabot cancel merge` will cancel a previously requested merge
        and block automerging
        - `@dependabot reopen` will reopen this PR if it is closed
        - `@dependabot close` will close this PR and stop Dependabot recreating
        it. You can achieve the same result by closing it manually
        - `@dependabot show <dependency name> ignore conditions` will show all
        of the ignore conditions of the specified dependency
        - `@dependabot ignore this major version` will close this PR and stop
        Dependabot creating any more for this major version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this minor version` will close this PR and stop
        Dependabot creating any more for this minor version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this dependency` will close this PR and stop
        Dependabot creating any more for this dependency (unless you reopen the
        PR or upgrade to it yourself)

        </details>

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 5a763b7
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Nov 11 09:49:43 2024 -0800

        build(deps): Bump actions/cache from 4.0.2 to 4.1.2 (notaryproject#1073)

        Bumps [actions/cache](https://github.com/actions/cache) from 4.0.2 to
        4.1.2.
        <details>
        <summary>Release notes</summary>
        <p><em>Sourced from <a
        href="https://github.com/actions/cache/releases">actions/cache's
        releases</a>.</em></p>
        <blockquote>
        <h2>v4.1.2</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Add Bun example by <a
        href="https://github.com/idleberg"><code>@​idleberg</code></a> in <a
        href="https://github.com/actions/cache/pull/1456">actions/cache#1456</a></li>
        <li>Revise <code>isGhes</code> logic by <a
        href="https://github.com/jww3"><code>@​jww3</code></a> in <a
        href="https://github.com/actions/cache/pull/1474">actions/cache#1474</a></li>
        <li>Bump braces from 3.0.2 to 3.0.3 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/cache/pull/1475">actions/cache#1475</a></li>
        <li>Add dependabot.yml to enable automatic dependency upgrades by <a
        href="https://github.com/Link"><code>@​Link</code></a>- in <a
        href="https://github.com/actions/cache/pull/1476">actions/cache#1476</a></li>
        <li>Bump actions/checkout from 3 to 4 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/cache/pull/1478">actions/cache#1478</a></li>
        <li>Bump actions/stale from 3 to 9 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/cache/pull/1479">actions/cache#1479</a></li>
        <li>Bump github/codeql-action from 2 to 3 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/cache/pull/1483">actions/cache#1483</a></li>
        <li>Bump actions/setup-node from 3 to 4 by <a
        href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
        href="https://github.com/actions/cache/pull/1481">actions/cache#1481</a></li>
        <li>Prepare <code>4.1.2</code> release by <a
        href="https://github.com/Link"><code>@​Link</code></a>- in <a
        href="https://github.com/actions/cache/pull/1477">actions/cache#1477</a></li>
        </ul>
        <h2>New Contributors</h2>
        <ul>
        <li><a href="https://github.com/idleberg"><code>@​idleberg</code></a>
        made their first contribution in <a
        href="https://github.com/actions/cache/pull/1456">actions/cache#1456</a></li>
        <li><a href="https://github.com/jww3"><code>@​jww3</code></a> made their
        first contribution in <a
        href="https://github.com/actions/cache/pull/1474">actions/cache#1474</a></li>
        <li><a href="https://github.com/Link"><code>@​Link</code></a>- made
        their first contribution in <a
        href="https://github.com/actions/cache/pull/1476">actions/cache#1476</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/cache/compare/v4...v4.1.2">https://github.com/actions/cache/compare/v4...v4.1.2</a></p>
        <h2>v4.1.1</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Restore original behavior of <code>cache-hit</code> output by <a
        href="https://github.com/joshmgross"><code>@​joshmgross</code></a> in <a
        href="https://github.com/actions/cache/pull/1467">actions/cache#1467</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/cache/compare/v4.1.0...v4.1.1">https://github.com/actions/cache/compare/v4.1.0...v4.1.1</a></p>
        <h2>v4.1.0</h2>
        <h2>What's Changed</h2>
        <ul>
        <li>Fix cache-hit output when cache missed by <a
        href="https://github.com/fchimpan"><code>@​fchimpan</code></a> in <a
        href="https://github.com/actions/cache/pull/1404">actions/cache#1404</a></li>
        <li>Deprecate <code>save-always</code> input by <a
        href="https://github.com/joshmgross"><code>@​joshmgross</code></a> in <a
        href="https://github.com/actions/cache/pull/1452">actions/cache#1452</a></li>
        </ul>
        <h2>New Contributors</h2>
        <ul>
        <li><a href="https://github.com/ottlinger"><code>@​ottlinger</code></a>
        made their first contribution in <a
        href="https://github.com/actions/cache/pull/1437">actions/cache#1437</a></li>
        <li><a href="https://github.com/Olegt0rr"><code>@​Olegt0rr</code></a>
        made their first contribution in <a
        href="https://github.com/actions/cache/pull/1377">actions/cache#1377</a></li>
        <li><a href="https://github.com/fchimpan"><code>@​fchimpan</code></a>
        made their first contribution in <a
        href="https://github.com/actions/cache/pull/1404">actions/cache#1404</a></li>
        <li><a href="https://github.com/x612skm"><code>@​x612skm</code></a> made
        their first contribution in <a
        href="https://github.com/actions/cache/pull/1434">actions/cache#1434</a></li>
        <li><a href="https://github.com/todgru"><code>@​todgru</code></a> made
        their first contribution in <a
        href="https://github.com/actions/cache/pull/1311">actions/cache#1311</a></li>
        <li><a href="https://github.com/Jcambass"><code>@​Jcambass</code></a>
        made their first contribution in <a
        href="https://github.com/actions/cache/pull/1463">actions/cache#1463</a></li>
        <li><a
        href="https://github.com/mackey0225"><code>@​mackey0225</code></a> made
        their first contribution in <a
        href="https://github.com/actions/cache/pull/1462">actions/cache#1462</a></li>
        <li><a href="https://github.com/quatquatt"><code>@​quatquatt</code></a>
        made their first contribution in <a
        href="https://github.com/actions/cache/pull/1445">actions/cache#1445</a></li>
        </ul>
        <p><strong>Full Changelog</strong>: <a
        href="https://github.com/actions/cache/compare/v4.0.2...v4.1.0">https://github.com/actions/cache/compare/v4.0.2...v4.1.0</a></p>
        </blockquote>
        </details>
        <details>
        <summary>Changelog</summary>
        <p><em>Sourced from <a
        href="https://github.com/actions/cache/blob/main/RELEASES.md">actions/cache's
        changelog</a>.</em></p>
        <blockquote>
        <h1>Releases</h1>
        <h3>4.1.2</h3>
        <ul>
        <li>Add GitHub Enterprise Cloud instances hostname filters to inform API
        endpoint choices - <a
        href="https://github.com/actions/cache/pull/1474">#1474</a></li>
        <li>Security fix: Bump braces from 3.0.2 to 3.0.3 - <a
        href="https://github.com/actions/cache/pull/1475">#1475</a></li>
        </ul>
        <h3>4.1.1</h3>
        <ul>
        <li>Restore original behavior of <code>cache-hit</code> output - <a
        href="https://github.com/actions/cache/pull/1467">#1467</a></li>
        </ul>
        <h3>4.1.0</h3>
        <ul>
        <li>Ensure <code>cache-hit</code> output is set when a cache is missed -
        <a
        href="https://github.com/actions/cache/pull/1404">#1404</a></li>
        <li>Deprecate <code>save-always</code> input - <a
        href="https://github.com/actions/cache/pull/1452">#1452</a></li>
        </ul>
        <h3>4.0.2</h3>
        <ul>
        <li>Fixed restore <code>fail-on-cache-miss</code> not working.</li>
        </ul>
        <h3>4.0.1</h3>
        <ul>
        <li>Updated <code>isGhes</code> check</li>
        </ul>
        <h3>4.0.0</h3>
        <ul>
        <li>Updated minimum runner version support from node 12 -&gt; node
        20</li>
        </ul>
        <h3>3.3.3</h3>
        <ul>
        <li>Updates <code>@​actions/cache</code> to v3.2.3 to fix accidental
        mutated path arguments to <code>getCacheVersion</code> <a
        href="https://github.com/actions/toolkit/pull/1378">actions/toolkit#1378</a></li>
        <li>Additional audit fixes of npm package(s)</li>
        </ul>
        <h3>3.3.2</h3>
        <ul>
        <li>Fixes bug with Azure SDK causing blob downloads to get stuck.</li>
        </ul>
        <h3>3.3.1</h3>
        <ul>
        <li>Reduced segment size to 128MB and segment timeout to 10 minutes to
        fail fast in case the cache download is stuck.</li>
        </ul>
        <h3>3.3.0</h3>
        <ul>
        <li>Added option to lookup cache without downloading it.</li>
        </ul>
        <h3>3.2.6</h3>
        <ul>
        <li>Fix zstd not being used after zstd version upgrade to 1.5.4 on
        hosted runners.</li>
        </ul>
        <h3>3.2.5</h3>
        <!-- raw HTML omitted -->
        </blockquote>
        <p>... (truncated)</p>
        </details>
        <details>
        <summary>Commits</summary>
        <ul>
        <li><a
        href="https://github.com/actions/cache/commit/6849a6489940f00c2f30c0fb92c6274307ccb58a"><code>6849a64</code></a>
        Release 4.1.2 <a
        href="https://github.com/actions/cache/issues/1477">#1477</a></li>
        <li><a
        href="https://github.com/actions/cache/commit/5a1720c49e91718f5d0ce7f154997c93e0f6159a"><code>5a1720c</code></a>
        Merge branch 'Link-/prep-4.1.2' of <a
        href="https://github.com/actions/cache">https://github.com/actions/cache</a>
        into Link...</li>
        <li><a
        href="https://github.com/actions/cache/commit/d9fef48d24d529bac46adcc1e42f49649de07ca9"><code>d9fef48</code></a>
        Merge branch 'main' into Link-/prep-4.1.2</li>
        <li><a
        href="https://github.com/actions/cache/commit/a50e8d027b022a55ef85ffa721ebd97d2b22bcda"><code>a50e8d0</code></a>
        Merge branch 'main' into Link-/prep-4.1.2</li>
        <li><a
        href="https://github.com/actions/cache/commit/acc9ae5c1401b6c072a7c89ff4c48ea7e30f4dbf"><code>acc9ae5</code></a>
        Merge pull request <a
        href="https://github.com/actions/cache/issues/1481">#1481</a>
        from actions/dependabot/github_actions/actions/setup...</li>
        <li><a
        href="https://github.com/actions/cache/commit/1ea5f18c31265ef251b3eb51ce8b857be5e7b044"><code>1ea5f18</code></a>
        Merge branch 'main' into Link-/prep-4.1.2</li>
        <li><a
        href="https://github.com/actions/cache/commit/cc679ff3baee71867c711040a5c21af61b262806"><code>cc679ff</code></a>
        Merge branch 'main' into
        dependabot/github_actions/actions/setup-node-4</li>
        <li><a
        href="https://github.com/actions/cache/commit/366d43d6f8aa1f3e5d28b2c98959d557d78ffa3f"><code>366d43d</code></a>
        Merge pull request <a
        href="https://github.com/actions/cache/issues/1483">#1483</a>
        from actions/dependabot/github_actions/github/codeql...</li>
        <li><a
        href="https://github.com/actions/cache/commit/02bf31969bcc471fd5f91b5896ae17beb0973413"><code>02bf319</code></a>
        Bump github/codeql-action from 2 to 3</li>
        <li><a
        href="https://github.com/actions/cache/commit/6f6220be5af96ba6940aca960265218cae17e8fd"><code>6f6220b</code></a>
        Merge branch 'main' into
        dependabot/github_actions/actions/setup-node-4</li>
        <li>Additional commits viewable in <a
        href="https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...6849a6489940f00c2f30c0fb92c6274307ccb58a">compare
        view</a></li>
        </ul>
        </details>
        <br />

        [![Dependabot compatibility
        score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/cache&package-manager=github_actions&previous-version=4.0.2&new-version=4.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

        Dependabot will resolve any conflicts with this PR as long as you don't
        alter it yourself. You can also trigger a rebase manually by commenting
        `@dependabot rebase`.

        [//]: # (dependabot-automerge-start)
        [//]: # (dependabot-automerge-end)

        ---

        <details>
        <summary>Dependabot commands and options</summary>
        <br />

        You can trigger Dependabot actions by commenting on this PR:
        - `@dependabot rebase` will rebase this PR
        - `@dependabot recreate` will recreate this PR, overwriting any edits
        that have been made to it
        - `@dependabot merge` will merge this PR after your CI passes on it
        - `@dependabot squash and merge` will squash and merge this PR after
        your CI passes on it
        - `@dependabot cancel merge` will cancel a previously requested merge
        and block automerging
        - `@dependabot reopen` will reopen this PR if it is closed
        - `@dependabot close` will close this PR and stop Dependabot recreating
        it. You can achieve the same result by closing it manually
        - `@dependabot show <dependency name> ignore conditions` will show all
        of the ignore conditions of the specified dependency
        - `@dependabot ignore this major version` will close this PR and stop
        Dependabot creating any more for this major version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this minor version` will close this PR and stop
        Dependabot creating any more for this minor version (unless you reopen
        the PR or upgrade to it yourself)
        - `@dependabot ignore this dependency` will close this PR and stop
        Dependabot creating any more for this dependency (unless you reopen the
        PR or upgrade to it yourself)

        </details>

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Merge remote-tracking branch 'upstream/main' into test/crl_e2e

commit 280e3d6
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 03:18:41 2024 +0000

    fix: update test cases

    Signed-off-by: Junjie Gao <[email protected]>

commit a1437f2
Author: Junjie Gao <[email protected]>
Date:   Tue Nov 12 01:19:28 2024 +0000

    fix: update to add cache error test case

    Signed-off-by: Junjie Gao <[email protected]>

commit 0e2495e
Author: Junjie Gao <[email protected]>
Date:   Mon Nov 11 08:06:02 2024 +0000

    fix: update comment

    Signed-off-by: Junjie Gao <[email protected]>

commit 0dd7725
Author: Junjie Gao <[email protected]>
Date:   Mon Nov 11 05:56:26 2024 +0000

    fix: resolve comment for Patrick

    Signed-off-by: Junjie Gao <[email protected]>

commit 096710c
Author: Junjie Gao <[email protected]>
Date:   Mon Nov 11 01:54:20 2024 +0000

    fix: update comments for scripts

    Signed-off-by: Junjie Gao <[email protected]>

commit bcadb27
Author: Junjie Gao <[email protected]>
Date:   Fri Nov 8 07:51:46 2024 +0000

    fix: update old test cases

    Signed-off-by: Junjie Gao <[email protected]>

commit bfb56a8
Author: Junjie Gao <[email protected]>
Date:   Fri Nov 8 07:46:44 2024 +0000

    fix: update test name

    Signed-off-by: Junjie Gao <[email protected]>

commit d621aa0
Author: Junjie Gao <[email protected]>
Date:   Fri Nov 8 07:43:04 2024 +0000

    fix: update comment

    Signed-off-by: Junjie Gao <[email protected]>

commit e6acd0f
Author: Junjie Gao <[email protected]>
Date:   Fri Nov 8 07:41:55 2024 +0000

    fix: restore run.sh command

    Signed-off-by: Junjie Gao <[email protected]>

commit 21aa7af
Merge: 3d8fb76 83c6c89
Author: Junjie Gao <[email protected]>
Date:   Fri Nov 8 07:40:33 2024 +0000

    Merge remote-tracking branch 'upstream/main' into test/crl_e2e

    Signed-off-by: Junjie Gao <[email protected]>

commit 3d8fb76
Author: Junjie Gao <[email protected]>
Date:   Fri Nov 8 07:39:11 2024 +0000

    test: add CRL e2e test

    Signed-off-by: Junjie Gao <[email protected]>

Signed-off-by: Junjie Gao <[email protected]>
  • Loading branch information
@JeyJeyGao
JeyJeyGao committed Nov 13, 2024
1 parent 72b87d9 commit bb7e980
Show file tree
Hide file tree
Showing 23 changed files with 910 additions and 63 deletions.
12 changes: 7 additions & 5 deletions cmd/notation/verify.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,13 @@ func getVerifier(ctx context.Context) (notation.Verifier, error) {
}
fileCache, err := crl.NewFileCache(cacheRoot)
if err != nil {
return nil, err
}
crlFetcher.Cache = &clicrl.CacheWithLog{
Cache: fileCache,
DiscardCacheError: crlFetcher.DiscardCacheError,
// discard NewFileCache error as cache errors are not critical
fmt.Fprintf(os.Stderr, "Warning: %v\n", err)
} else {
crlFetcher.Cache = &clicrl.CacheWithLog{
Cache: fileCache,
DiscardCacheError: crlFetcher.DiscardCacheError,
}
}
revocationCodeSigningValidator, err := revocation.NewWithOptions(revocation.Options{
OCSPHTTPClient: ocspHttpClient,
Expand Down
13 changes: 0 additions & 13 deletions cmd/notation/verify_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"testing"

"github.com/notaryproject/notation-go/dir"
Expand Down Expand Up @@ -119,18 +118,6 @@ func TestGetVerifier(t *testing.T) {
t.Fatalf("expected %s, but got %s", expectedErrMsg, err)
}
})

t.Run("failed to new crl file cache", func(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("skipping test on Windows")
}
dir.UserCacheDir = "/cache"
expectedErrMsg := "failed to create crl file cache: mkdir /cache: permission denied"
_, err := getVerifier(context.Background())
if err == nil || err.Error() != expectedErrMsg {
t.Fatalf("expected %s, but got %s", expectedErrMsg, err)
}
})
}

func dummyOCIPolicyDocument() trustpolicy.OCIDocument {
Expand Down
13 changes: 7 additions & 6 deletions test/e2e/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ go 1.23

require (
github.com/notaryproject/notation-core-go v1.2.0-rc.1
github.com/onsi/ginkgo/v2 v2.20.2
github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240926015724-84c2ec076201
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.34.2
github.com/opencontainers/image-spec v1.1.0
oras.land/oras-go/v2 v2.5.0
Expand All @@ -15,16 +16,16 @@ require (
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/notaryproject/tspclient-go v0.2.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/veraison/go-cose v1.1.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.26.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
30 changes: 16 additions & 14 deletions test/e2e/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,16 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/notaryproject/notation-core-go v1.2.0-rc.1 h1:VMFlG+9a1JoNAQ3M96g8iqCq0cDRtE7XBaiTD8Ouvqw=
github.com/notaryproject/notation-core-go v1.2.0-rc.1/go.mod h1:b/70rA4OgOHlg0A7pb8zTWKJadFO6781zS3a37KHEJQ=
github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240926015724-84c2ec076201 h1:2QBYa9Df+vMwMiaHaFqPoUiwfx5vcPEgM7KbusivTpw=
github.com/notaryproject/notation-go v1.2.0-beta.1.0.20240926015724-84c2ec076201/go.mod h1:F6zMQl3PhVdCsI1xlIjK66kCorUQhWkoMtlZdvJWxFI=
github.com/notaryproject/tspclient-go v0.2.0 h1:g/KpQGmyk/h7j60irIRG1mfWnibNOzJ8WhLqAzuiQAQ=
github.com/notaryproject/tspclient-go v0.2.0/go.mod h1:LGyA/6Kwd2FlM0uk8Vc5il3j0CddbWSHBj/4kxQDbjs=
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
Expand All @@ -30,18 +32,18 @@ github.com/veraison/go-cose v1.1.0 h1:AalPS4VGiKavpAzIlBjrn7bhqXiXi4jbMYY/2+UC+4
github.com/veraison/go-cose v1.1.0/go.mod h1:7ziE85vSq4ScFTg6wyoMXjucIGOf4JkFEZi/an96Ct4=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
Expand Down
21 changes: 15 additions & 6 deletions test/e2e/internal/notation/host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func Opts(options ...utils.HostOption) []utils.HostOption {
func BaseOptions() []utils.HostOption {
return Opts(
AuthOption("", ""),
AddKeyOption("e2e.key", "e2e.crt"),
AddKeyOption(filepath.Join(NotationE2ELocalKeysDir, "e2e.key"), filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustStoreOption("e2e", filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustPolicyOption("trustpolicy.json"),
)
Expand All @@ -141,18 +141,27 @@ func TimestampOptions(verifyTimestamp string) []utils.HostOption {

return Opts(
AuthOption("", ""),
AddKeyOption("e2e.key", "e2e.crt"),
AddKeyOption(filepath.Join(NotationE2ELocalKeysDir, "e2e.key"), filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustStoreOption("e2e", filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTimestampTrustStoreOption("e2e", filepath.Join(NotationE2EConfigPath, "timestamp", "globalsignTSARoot.cer")),
AddTimestampTrustStoreOption("e2e", filepath.Join(NotationE2EConfigPath, "timestamp", "DigiCertTSARootSHA384.cer")),
trustPolicyOption,
)
}

func CRLOptions() []utils.HostOption {
return Opts(
AuthOption("", ""),
AddKeyOption(filepath.Join(NotationE2EConfigPath, "crl", "leaf.key"), filepath.Join(NotationE2EConfigPath, "crl", "certchain_with_crl.pem")),
AddTrustStoreOption("e2e", filepath.Join(NotationE2EConfigPath, "crl", "root.crt")),
AddTrustPolicyOption("trustpolicy.json"),
)
}

func BaseOptionsWithExperimental() []utils.HostOption {
return Opts(
AuthOption("", ""),
AddKeyOption("e2e.key", "e2e.crt"),
AddKeyOption(filepath.Join(NotationE2ELocalKeysDir, "e2e.key"), filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustStoreOption("e2e", filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustPolicyOption("trustpolicy.json"),
EnableExperimental(),
Expand All @@ -163,7 +172,7 @@ func BaseOptionsWithExperimental() []utils.HostOption {
// testing environment.
func TestLoginOptions() []utils.HostOption {
return Opts(
AddKeyOption("e2e.key", "e2e.crt"),
AddKeyOption(filepath.Join(NotationE2ELocalKeysDir, "e2e.key"), filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustStoreOption("e2e", filepath.Join(NotationE2ELocalKeysDir, "e2e.crt")),
AddTrustPolicyOption("trustpolicy.json"),
AddConfigJsonOption("pass_credential_helper_config.json"),
Expand Down Expand Up @@ -193,9 +202,9 @@ func AuthOption(username, password string) utils.HostOption {

// AddKeyOption adds the test signingkeys.json, key and cert files to
// the notation directory.
func AddKeyOption(keyName, certName string) utils.HostOption {
func AddKeyOption(keyPath, certPath string) utils.HostOption {
return func(vhost *utils.VirtualHost) error {
return AddKeyPairs(vhost.AbsolutePath(NotationDirName), keyName, certName)
return AddKeyPairs(vhost.AbsolutePath(NotationDirName), keyPath, certPath)
}
}

Expand Down
20 changes: 11 additions & 9 deletions test/e2e/internal/notation/key.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,35 +53,37 @@ type SigningKeys struct {

// AddKeyPairs creates the signingkeys.json file and the localkeys directory
// with e2e.key and e2e.crt
func AddKeyPairs(dir, keyName, certName string) error {
func AddKeyPairs(destNotationConfigDir, srcKeyPath, srcCertPath string) error {
keyName := filepath.Base(srcKeyPath)
certName := filepath.Base(srcCertPath)
// create signingkeys.json files
if err := saveJSON(
generateSigningKeys(dir),
filepath.Join(dir, SigningKeysFileName)); err != nil {
generateSigningKeys(destNotationConfigDir, keyName, certName),
filepath.Join(destNotationConfigDir, SigningKeysFileName)); err != nil {
return err
}

// create localkeys directory
localKeysDir := filepath.Join(dir, LocalKeysDirName)
localKeysDir := filepath.Join(destNotationConfigDir, LocalKeysDirName)
os.MkdirAll(localKeysDir, 0700)

// copy key and cert files
if err := copyFile(filepath.Join(NotationE2ELocalKeysDir, keyName), filepath.Join(localKeysDir, "e2e.key")); err != nil {
if err := copyFile(srcKeyPath, filepath.Join(localKeysDir, keyName)); err != nil {
return err
}
return copyFile(filepath.Join(NotationE2ELocalKeysDir, certName), filepath.Join(localKeysDir, "e2e.crt"))
return copyFile(srcCertPath, filepath.Join(localKeysDir, certName))
}

// generateSigningKeys generates the signingkeys.json for notation.
func generateSigningKeys(dir string) *SigningKeys {
func generateSigningKeys(dir, keyName, certName string) *SigningKeys {
return &SigningKeys{
Default: "e2e",
Keys: []KeySuite{
{
Name: "e2e",
X509KeyPair: &X509KeyPair{
KeyPath: filepath.Join(dir, "localkeys", "e2e.key"),
CertificatePath: filepath.Join(dir, "localkeys", "e2e.crt"),
KeyPath: filepath.Join(dir, "localkeys", keyName),
CertificatePath: filepath.Join(dir, "localkeys", certName),
},
},
},
Expand Down
79 changes: 79 additions & 0 deletions test/e2e/internal/utils/crl.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
// Copyright The Notary Project Authors.
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package utils

import (
"fmt"
"net/http"
)

// LeafCRLRevoke sends http post request to http://localhost:10086/leaf/revoke
func LeafCRLRevoke() error {
url := "http://localhost:10086/leaf/revoke"
resp, err := http.Post(url, "application/json", nil)
if err != nil {
return err
}
defer resp.Body.Close()
fmt.Printf("CRL of leaf certificate revoked with status code: %d\n", resp.StatusCode)
return nil
}

// LeafCRLUnrevoke sends http post request to http://localhost:10086/leaf/unrevoke
func LeafCRLUnrevoke() error {
url := "http://localhost:10086/leaf/unrevoke"
resp, err := http.Post(url, "application/json", nil)
if err != nil {
return err
}
defer resp.Body.Close()
fmt.Printf("CRL of leaf certificate unrevoked with status code: %d\n", resp.StatusCode)
return nil
}

// LeafCRLExpired sends http post request to http://localhost:10086/leaf/expired
func LeafCRLExpired() error {
url := "http://localhost:10086/leaf/expired"
resp, err := http.Post(url, "application/json", nil)
if err != nil {
return err
}
defer resp.Body.Close()
fmt.Printf("CRL of leaf certificate expired with status code: %d\n", resp.StatusCode)
return nil
}

// IntermediateCRLRevoke sends http post request to http://localhost:10086/intermediate/revoke
func IntermediateCRLRevoke() error {
url := "http://localhost:10086/intermediate/revoke"
resp, err := http.Post(url, "application/json", nil)
if err != nil {
return nil
}
defer resp.Body.Close()
fmt.Printf("CRL of intermediate certificate revoked with status code: %d\n", resp.StatusCode)
return nil
}

// IntermediateCRLUnrevoke sends http post request to http://localhost:10086/intermediate/unrevoke
func IntermediateCRLUnrevoke() error {
url := "http://localhost:10086/intermediate/unrevoke"
resp, err := http.Post(url, "application/json", nil)
if err != nil {
return nil
}
defer resp.Body.Close()
fmt.Printf("CRL of intermediate certificate unrevoked with status code: %d\n", resp.StatusCode)
return nil
}
10 changes: 6 additions & 4 deletions test/e2e/internal/utils/host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func NewVirtualHost(binPath string, options ...HostOption) (*VirtualHost, error)
vhost.userDir = ginkgo.GinkgoT().TempDir()

// set user dir environment variables
vhost.UpdateEnv(UserConfigEnv(vhost.userDir))
vhost.UpdateEnv(UserEnv(vhost.userDir))

// set options
vhost.SetOption(options...)
Expand Down Expand Up @@ -77,11 +77,13 @@ func (h *VirtualHost) SetOption(options ...HostOption) {
// HostOption is a function to set the host configuration.
type HostOption func(vhost *VirtualHost) error

// UserConfigEnv creates environment variable for changing
// user config dir (By setting $XDG_CONFIG_HOME).
func UserConfigEnv(dir string) map[string]string {
// UserEnv creates environment variable for changing
// user config dir by setting $XDG_CONFIG_HOME and user cache dir by
// setting $NOTATION_CACHE.
func UserEnv(dir string) map[string]string {
// create and set user dir for linux
return map[string]string{
"XDG_CONFIG_HOME": dir,
"NOTATION_CACHE": filepath.Join(dir, ".cache"),
}
}
11 changes: 9 additions & 2 deletions test/e2e/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ if [ ! -f "$NOTATION_E2E_OLD_BINARY_PATH" ]; then
fi

# install dependency
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.11.0
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.21.0

# build e2e plugin and tar.gz
PLUGIN_NAME=notation-e2e-plugin
Expand All @@ -95,9 +95,16 @@ esac

setup_registry

# run the CRL server in the background
python3 ./scripts/crl_server.py &
CRL_SERVER_PID=$!

# defer cleanup registry
function cleanup {
echo "Cleaning up..."
cleanup_registry
echo "Stopping CRL server..."
kill $CRL_SERVER_PID
}
trap cleanup EXIT

Expand All @@ -111,4 +118,4 @@ export NOTATION_E2E_PLUGIN_TAR_GZ_PATH=$CWD/plugin/bin/$PLUGIN_NAME.tar.gz
export NOTATION_E2E_MALICIOUS_PLUGIN_ARCHIVE_PATH=$CWD/testdata/malicious-plugin

# run tests
ginkgo -r -p -v
ginkgo -r -p -v
Loading

0 comments on commit bb7e980

Please sign in to comment.