-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Prevent double use of git cat-file
session.
#29298
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KN4CK3R
added
type/bug
backport/v1.21
This PR should be backported to Gitea 1.21
labels
Feb 21, 2024
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Feb 21, 2024
pull-request-size
bot
added
the
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
label
Feb 21, 2024
KN4CK3R
commented
Feb 21, 2024
@@ -27,10 +27,12 @@ type Repository struct { | |||
|
|||
gpgSettings *GPGSettings | |||
|
|||
batchInUse bool |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No atomic because this is single thread code.
wxiaoguang
reviewed
Feb 21, 2024
wxiaoguang
approved these changes
Feb 21, 2024
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Feb 21, 2024
lunny
approved these changes
Feb 21, 2024
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Feb 21, 2024
KN4CK3R
added a commit
to KN4CK3R/gitea
that referenced
this pull request
Feb 21, 2024
Fixes the reason why go-gitea#29101 is hard to replicate. Related go-gitea#29297 Create a repo with a file with minimum size 4097 bytes (I use 10000) and execute the following code: ```go gitRepo, err := gitrepo.OpenRepository(db.DefaultContext, <repo>) assert.NoError(t, err) commit, err := gitRepo.GetCommit(<sha>) assert.NoError(t, err) entry, err := commit.GetTreeEntryByPath(<file>) assert.NoError(t, err) b := entry.Blob() // Create a reader r, err := b.DataAsync() assert.NoError(t, err) defer r.Close() // Create a second reader r2, err := b.DataAsync() assert.NoError(t, err) // Should be no error but is ErrNotExist defer r2.Close() ``` The problem is the check in `CatFileBatch`: https://github.com/go-gitea/gitea/blob/79217ea63c1f77de7ca79813ae45950724e63d02/modules/git/repo_base_nogogit.go#L81-L87 `Buffered() > 0` is used to check if there is a "operation" in progress at the moment. This is a problem because we can't control the internal buffer in the `bufio.Reader`. The code above demonstrates a sequence which initiates an operation for which the code thinks there is no active processing. The second call to `DataAsync()` therefore reuses the existing instances instead of creating a new batch reader.
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 22, 2024
* giteaofficial/main: (32 commits) [skip ci] Updated translations via Crowdin Prevent double use of `git cat-file` session. (go-gitea#29298) Revert go-gitea#28753 because UI broken. (go-gitea#29293) Fix error display when merging PRs (go-gitea#29288) Refactor markup rendering to accept general "protocol:" prefix (go-gitea#29276) Remove jQuery from the installation page (go-gitea#29284) Always write proc-receive hook for all git versions (go-gitea#29287) Do not use `ctx.Doer` when reset password (go-gitea#29289) Update Discord logo (go-gitea#29285) [skip ci] Updated translations via Crowdin Remove jQuery .map() and enable eslint rules for it (go-gitea#29272) Explained where create issue/PR template (go-gitea#29035) (go-gitea#29266) Remove jQuery from repo wiki creation page (go-gitea#29271) Do not show delete button when time tracker is disabled (go-gitea#29257) Left align the input labels for the link account page (go-gitea#29255) [skip ci] Updated translations via Crowdin Remove jQuery from the repo migration form (go-gitea#29229) Fix content size does not match error when uploading lfs file (go-gitea#29259) Workaround to clean up old reviews on creating a new one (go-gitea#28554) Deduplicate translations for contributors graph (go-gitea#29256) ...
silverwind
pushed a commit
that referenced
this pull request
Feb 22, 2024
Backport #29298 Fixes the reason why #29101 is hard to replicate. Related #29297 Create a repo with a file with minimum size 4097 bytes (I use 10000) and execute the following code: ```go gitRepo, err := gitrepo.OpenRepository(db.DefaultContext, <repo>) assert.NoError(t, err) commit, err := gitRepo.GetCommit(<sha>) assert.NoError(t, err) entry, err := commit.GetTreeEntryByPath(<file>) assert.NoError(t, err) b := entry.Blob() // Create a reader r, err := b.DataAsync() assert.NoError(t, err) defer r.Close() // Create a second reader r2, err := b.DataAsync() assert.NoError(t, err) // Should be no error but is ErrNotExist defer r2.Close() ``` The problem is the check in `CatFileBatch`: https://github.com/go-gitea/gitea/blob/79217ea63c1f77de7ca79813ae45950724e63d02/modules/git/repo_base_nogogit.go#L81-L87 `Buffered() > 0` is used to check if there is a "operation" in progress at the moment. This is a problem because we can't control the internal buffer in the `bufio.Reader`. The code above demonstrates a sequence which initiates an operation for which the code thinks there is no active processing. The second call to `DataAsync()` therefore reuses the existing instances instead of creating a new batch reader.
I was unable to create a backport for 1.21. @KN4CK3R, please send one manually. 🍵
|
GiteaBot
added
the
backport/manual
No power to the bots! Create your backport yourself!
label
Feb 22, 2024
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Feb 22, 2024
Fixes go-gitea#29101 Related go-gitea#29298 Discard all read data to prevent misinterpreting existing data. Some discard calls were missing in error cases. --------- Co-authored-by: yp05327 <576951401@qq.com>
Automatically locked because of our CONTRIBUTING guidelines |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport/done
All backports for this PR have been created
backport/manual
No power to the bots! Create your backport yourself!
backport/v1.21
This PR should be backported to Gitea 1.21
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
type/bug
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the reason why #29101 is hard to replicate.
Related #29297
Create a repo with a file with minimum size 4097 bytes (I use 10000) and execute the following code:
The problem is the check in
CatFileBatch
:gitea/modules/git/repo_base_nogogit.go
Lines 81 to 87 in 79217ea
Buffered() > 0
is used to check if there is a "operation" in progress at the moment. This is a problem because we can't control the internal buffer in thebufio.Reader
. The code above demonstrates a sequence which initiates an operation for which the code thinks there is no active processing. The second call toDataAsync()
therefore reuses the existing instances instead of creating a new batch reader.