Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert back to upstream github.com/cyphar/filepath-securejoin #34

Merged
merged 2 commits into from
Sep 11, 2023

Conversation

pjbgf
Copy link
Member

@pjbgf pjbgf commented Sep 8, 2023

To revert back to upstream github.com/cyphar/filepath-securejoin while keeping the current behaviour this PR had to:

  • Remove the replace directive that was using github.com/pjbgf/filepath-securejoin instead of the upstream library.
  • Bump github.com/cyphar/filepath-securejoin to the latest version.
  • Introduce osfs.WithDeduplicatePath to enable users to toggle the behaviour of deduplicating the base dir on the returned path from securejoin. If deduplication path is disabled, go-git repositories may be seen as dirty even when they aren't.

Signed-off-by: Paulo Gomes <pjbgf@linux.com>
@pjbgf pjbgf requested a review from hiddeco September 8, 2023 17:11
@pjbgf pjbgf changed the title Bump github.com/cyphar/filepath-securejoin Revert back to upstream github.com/cyphar/filepath-securejoin Sep 8, 2023
@pjbgf pjbgf requested a review from hiddeco September 8, 2023 22:13
Copy link

@makkes makkes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, just a suggestion on documentation. Thanks!!

osfs/os.go Show resolved Hide resolved
In specific workflows within the BoundOS OS type, the
returned path may have the base dir duplicated.
By default such duplications are removed automatically,
the new WithDeduplicatePath allows users to toggle that
behaviour.

Signed-off-by: Paulo Gomes <pjbgf@linux.com>
Copy link

@makkes makkes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@pjbgf pjbgf merged commit 5c1dfec into go-git:master Sep 11, 2023
@pjbgf pjbgf deleted the bump-scj branch September 11, 2023 16:14
another-rex referenced this pull request in google/osv-scanner Sep 19, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [github.com/go-git/go-billy/v5](https://github.com/go-git/go-billy)
| require | minor | `v5.4.1` -> `v5.5.0` |
| [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) |
require | minor | `v5.8.1` -> `v5.9.0` |
|
[github.com/owenrumney/go-sarif/v2](https://github.com/owenrumney/go-sarif)
| require | patch | `v2.2.0` -> `v2.2.2` |

---

### Release Notes

<details>
<summary>go-git/go-billy (github.com/go-git/go-billy/v5)</summary>

### [`v5.5.0`](https://github.com/go-git/go-billy/releases/tag/v5.5.0)

[Compare
Source](https://github.com/go-git/go-billy/compare/v5.4.1...v5.5.0)

#### What's Changed

- \*: Bump dependencies and go.mod to Go 1.18. Add codeQL workflow. by
[@&#8203;pjbgf](https://github.com/pjbgf) in
[https://github.com/go-git/go-billy/pull/30](https://github.com/go-git/go-billy/pull/30)
- osfs: Add new BoundOS type by
[@&#8203;pjbgf](https://github.com/pjbgf) in
[https://github.com/go-git/go-billy/pull/31](https://github.com/go-git/go-billy/pull/31)
- Re-introduce osfs.Default by
[@&#8203;pjbgf](https://github.com/pjbgf) in
[https://github.com/go-git/go-billy/pull/33](https://github.com/go-git/go-billy/pull/33)
- Revert back to upstream github.com/cyphar/filepath-securejoin by
[@&#8203;pjbgf](https://github.com/pjbgf) in
[https://github.com/go-git/go-billy/pull/34](https://github.com/go-git/go-billy/pull/34)

**Full Changelog**:
go-git/go-billy@v5.4.1...v5.5.0

</details>

<details>
<summary>go-git/go-git (github.com/go-git/go-git/v5)</summary>

### [`v5.9.0`](https://github.com/go-git/go-git/releases/tag/v5.9.0)

[Compare
Source](https://github.com/go-git/go-git/compare/v5.8.1...v5.9.0)

#### What's Changed

- git: worktree: add Amend option to CommitOptions by
[@&#8203;john-cai](https://github.com/john-cai) in
[https://github.com/go-git/go-git/pull/438](https://github.com/go-git/go-git/pull/438)
- git: worktree, reset ignored files that are part of the worktree:
Fixes [#&#8203;819](https://github.com/go-git/go-git/issues/819) by
[@&#8203;daolis](https://github.com/daolis) in
[https://github.com/go-git/go-git/pull/821](https://github.com/go-git/go-git/pull/821)
- plumbing: Do not swallow http message coming from VCS providers by
[@&#8203;matejrisek](https://github.com/matejrisek) in
[https://github.com/go-git/go-git/pull/835](https://github.com/go-git/go-git/pull/835)
- plumbing: transport, handle IPv6 while parsing endpoint. Fixes
[#&#8203;740](https://github.com/go-git/go-git/issues/740) by
[@&#8203;ninedraft](https://github.com/ninedraft) in
[https://github.com/go-git/go-git/pull/820](https://github.com/go-git/go-git/pull/820)
- \*: update goproxy dependency to fix CVE-2023-37788 vulnerability by
[@&#8203;svghadi](https://github.com/svghadi) in
[https://github.com/go-git/go-git/pull/832](https://github.com/go-git/go-git/pull/832)
- \*: bump dependencies and Go to 1.19 by
[@&#8203;pjbgf](https://github.com/pjbgf) in
[https://github.com/go-git/go-git/pull/837](https://github.com/go-git/go-git/pull/837)

#### New Contributors

- [@&#8203;svghadi](https://github.com/svghadi) made their first
contribution in
[https://github.com/go-git/go-git/pull/832](https://github.com/go-git/go-git/pull/832)
- [@&#8203;daolis](https://github.com/daolis) made their first
contribution in
[https://github.com/go-git/go-git/pull/821](https://github.com/go-git/go-git/pull/821)

**Full Changelog**:
go-git/go-git@v5.8.1...v5.9.0

</details>

<details>
<summary>owenrumney/go-sarif
(github.com/owenrumney/go-sarif/v2)</summary>

###
[`v2.2.2`](https://github.com/owenrumney/go-sarif/releases/tag/v2.2.2)

[Compare
Source](https://github.com/owenrumney/go-sarif/compare/v2.2.1...v2.2.2)

#### What's Changed

- fix: add omitempty annotation to messageStrings by
[@&#8203;owenrumney](https://github.com/owenrumney) in
[https://github.com/owenrumney/go-sarif/pull/68](https://github.com/owenrumney/go-sarif/pull/68)

**Full Changelog**:
owenrumney/go-sarif@v2.2.1...v2.2.2

###
[`v2.2.1`](https://github.com/owenrumney/go-sarif/releases/tag/v2.2.1)

[Compare
Source](https://github.com/owenrumney/go-sarif/compare/v2.2.0...v2.2.1)

#### What's Changed

- Bump github.com/stretchr/testify from 1.8.2 to 1.8.4 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/owenrumney/go-sarif/pull/62](https://github.com/owenrumney/go-sarif/pull/62)
- Bump github.com/zclconf/go-cty from 1.13.1 to 1.13.2 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/owenrumney/go-sarif/pull/61](https://github.com/owenrumney/go-sarif/pull/61)
- support messageStrings property by
[@&#8203;masakura](https://github.com/masakura) in
[https://github.com/owenrumney/go-sarif/pull/63](https://github.com/owenrumney/go-sarif/pull/63)
- Bump github.com/zclconf/go-cty from 1.13.2 to 1.14.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/owenrumney/go-sarif/pull/65](https://github.com/owenrumney/go-sarif/pull/65)

#### New Contributors

- [@&#8203;masakura](https://github.com/masakura) made their first
contribution in
[https://github.com/owenrumney/go-sarif/pull/63](https://github.com/owenrumney/go-sarif/pull/63)

**Full Changelog**:
owenrumney/go-sarif@v2.2.0...v2.2.1

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 6am on monday" in timezone
Australia/Sydney, Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://github.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/google/osv-scanner).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi44My4wIiwidXBkYXRlZEluVmVyIjoiMzYuODMuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants