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

Fix GitParse trimming whitespace from filename #2201

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

rgmz
Copy link
Contributor

@rgmz rgmz commented Dec 11, 2023

Description:

This fixes #2199.

Checklist:

  • Tests passing (make test-community)?
  • Lint passing (make lint this requires golangci-lint)?

@rgmz rgmz requested a review from a team as a code owner December 11, 2023 14:21
@CLAassistant
Copy link

CLAassistant commented Dec 11, 2023

CLA assistant check
All committers have signed the CLA.

@rgmz rgmz force-pushed the fix/gitparse-filename-space branch from 0eed7f0 to 52a0536 Compare December 11, 2023 14:22
@rgmz rgmz force-pushed the fix/gitparse-filename-space branch from 52a0536 to 1e6649e Compare December 14, 2023 16:09
@@ -608,7 +608,7 @@ func pathFromBinaryLine(line []byte) string {
return ""
}
bRaw := sbytes[1]
return strings.TrimSpace(string(bRaw[:len(bRaw)-7])) // drop the "b/" and " differ"
return string(bRaw[:len(bRaw)-8]) // drop the "b/" and " differ\n"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nice find!

@ahrav ahrav merged commit e72fdb6 into trufflesecurity:main Dec 14, 2023
8 of 9 checks passed
@rgmz rgmz deleted the fix/gitparse-filename-space branch December 14, 2023 19:58
haraldh referenced this pull request in matter-labs/vault-auth-tee Dec 15, 2023
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[trufflesecurity/trufflehog](https://togithub.com/trufflesecurity/trufflehog)
| action | patch | `v3.63.3` -> `v3.63.4` |

---

### Release Notes

<details>
<summary>trufflesecurity/trufflehog
(trufflesecurity/trufflehog)</summary>

###
[`v3.63.4`](https://togithub.com/trufflesecurity/trufflehog/releases/tag/v3.63.4)

[Compare
Source](https://togithub.com/trufflesecurity/trufflehog/compare/v3.63.3...v3.63.4)

#### What's Changed

- Bump github.com/docker/docker from 24.0.0+incompatible to
24.0.7+incompatible by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/trufflesecurity/trufflehog/pull/2213](https://togithub.com/trufflesecurity/trufflehog/pull/2213)
- Fix emoji in README by [@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2217](https://togithub.com/trufflesecurity/trufflehog/pull/2217)
- Upgrade sevenzip to v1.4.5 by
[@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2215](https://togithub.com/trufflesecurity/trufflehog/pull/2215)
- Encode '%' when generating Git URLs by
[@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2214](https://togithub.com/trufflesecurity/trufflehog/pull/2214)
- Fix GitParse trimming whitespace from filename by
[@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2201](https://togithub.com/trufflesecurity/trufflehog/pull/2201)
- \[fixup] - Avoid reading decompressed data into memory by
[@&#8203;ahrav](https://togithub.com/ahrav) in
[https://github.com/trufflesecurity/trufflehog/pull/2196](https://togithub.com/trufflesecurity/trufflehog/pull/2196)
- Update GitLab v1 verification to check for valid JSON response by
[@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2218](https://togithub.com/trufflesecurity/trufflehog/pull/2218)
- Check for SourceUnit support dynamically in the SourceManager by
[@&#8203;mcastorina](https://togithub.com/mcastorina) in
[https://github.com/trufflesecurity/trufflehog/pull/2205](https://togithub.com/trufflesecurity/trufflehog/pull/2205)
- Fix GitHub source showing 0 members by
[@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2202](https://togithub.com/trufflesecurity/trufflehog/pull/2202)
- Don't run 'test' workflow in forks by
[@&#8203;rgmz](https://togithub.com/rgmz) in
[https://github.com/trufflesecurity/trufflehog/pull/2221](https://togithub.com/trufflesecurity/trufflehog/pull/2221)

**Full Changelog**:
trufflesecurity/trufflehog@v3.63.3...v3.63.4

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
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.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- 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/matter-labs/vault-auth-tee).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy45My4xIiwidXBkYXRlZEluVmVyIjoiMzcuOTMuMSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Git handle binary error: Not a valid object name
3 participants