Set PusherName and PusherID to owner on deploy key to fix pushing with deploy keys #5935
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
|
I've initially set the EnvPusherName and EnvPusherID to that of the owner. This is probably a reasonable first step towards mitigating the bug in #3795 however, probably we should probably consider deploy keys slightly differently. |
GiteaBot
added
the
lgtm/need 2
Codecov Report
@@ Coverage Diff @@
## master #5935 +/- ##
==========================================
+ Coverage 38.28% 38.53% +0.25%
==========================================
Files 330 330
Lines 48518 48518
==========================================
+ Hits 18576 18698 +122
+ Misses 27268 27113 -155
- Partials 2674 2707 +33
Continue to review full report at Codecov.
|
zeripath
changed the title
techknowlogick
approved these changes
Feb 3, 2019
GiteaBot
added
lgtm/need 1
lunny
approved these changes
Feb 3, 2019
GiteaBot
added
lgtm/done
7 tasks
kolaente
reviewed
Feb 3, 2019
| @@ -250,6 +250,9 @@ func runServ(c *cli.Context) error { | |||
| if err = private.UpdateDeployKeyUpdated(key.ID, repo.ID); err != nil { | |||
| fail("Internal error", "UpdateDeployKey: %v", err) | |||
| } | |||
|
|
|||
| os.Setenv(models.EnvPusherName, username) | |||
There was a problem hiding this comment.
What about using repo.Owner.NameToLower (I think), just for consistency?
There was a problem hiding this comment.
username is repo.Owner.NameToLower - it's the lowercase'd repo username that's provided to gitea serv.
In the case of the user pushes we use user.Name for this so we probably shouldn't be lowercasing at all, and in fact we should probably change this so it's clear that the "user" pushing this is a deploy key not the owner of the repository at all. However, this is the minimal change that works when previously we didn't have a working system at all previously.
I have added a FIXME note to mark that further thought is needed here.
The gitea PushUpdate function requires that the PusherID and PusherName are real users. Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
force-pushed
the
issue-3795-deploy-key-settings
branch
from
c9cfc76
to
bc2b6ad
Compare
Signed-off-by: Andrew Thornton <art27@cantab.net>
|
OK I've added an integration test to show that this actually solves the problem in #3795 |
kolaente
approved these changes
Feb 3, 2019
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 3, 2019
…ment variables (go-gitea#5935) The gitea prerecieve and postrecieve hooks and the gitea PushUpdate function require that the PusherID and PusherName are real users. Previously, these environment variables were not being set when using a deploy key - the main result being that pushing to empty repositories meant that is_empty status was not changed. I've also added an integration test to ensure that the is_empty status is updated on pushing with a deploy key. There is a slight issue in that the deploy key is now considered a proxy for the owner - we don't have a way of separating out the deploy key from the owner at present. This can be fixed in another PR. Fix go-gitea#3795 Signed-off-by: Andrew Thornton art27@cantab.net
aswild
pushed a commit
to aswild/gitea
that referenced
this pull request
Feb 3, 2019
…ment variables (go-gitea#5935) The gitea prerecieve and postrecieve hooks and the gitea PushUpdate function require that the PusherID and PusherName are real users. Previously, these environment variables were not being set when using a deploy key - the main result being that pushing to empty repositories meant that is_empty status was not changed. I've also added an integration test to ensure that the is_empty status is updated on pushing with a deploy key. There is a slight issue in that the deploy key is now considered a proxy for the owner - we don't have a way of separating out the deploy key from the owner at present. This can be fixed in another PR. Fix go-gitea#3795 Signed-off-by: Andrew Thornton art27@cantab.net Cherry-pick: 13c0f7d
techknowlogick
pushed a commit
that referenced
this pull request
Feb 3, 2019
…ment variables (#5935) (#5944) The gitea prerecieve and postrecieve hooks and the gitea PushUpdate function require that the PusherID and PusherName are real users. Previously, these environment variables were not being set when using a deploy key - the main result being that pushing to empty repositories meant that is_empty status was not changed. I've also added an integration test to ensure that the is_empty status is updated on pushing with a deploy key. There is a slight issue in that the deploy key is now considered a proxy for the owner - we don't have a way of separating out the deploy key from the owner at present. This can be fixed in another PR. Fix #3795 Signed-off-by: Andrew Thornton art27@cantab.net
This was referenced Feb 4, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The gitea PushUpdate function requires that the PusherID and PusherName
are real users.
Fix #3795
Signed-off-by: Andrew Thornton art27@cantab.net