Fix ssh deploy and user key constraints (#1357) #5939
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
Codecov Report
@@ Coverage Diff @@
## master #5939 +/- ##
==========================================
+ Coverage 38.54% 38.68% +0.14%
==========================================
Files 330 330
Lines 48526 48573 +47
==========================================
+ Hits 18703 18792 +89
+ Misses 27115 27061 -54
- Partials 2708 2720 +12
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
techknowlogick
approved these changes
Feb 3, 2019
cmd/serv.go
Outdated
| fail("Key access denied", "Deploy key access denied: [key_id: %d, repo_id: %d]", key.ID, repo.ID) | ||
| } | ||
|
|
||
| if deployKey.Mode < requestedMode { | ||
| fail("Key permission denied", "Cannot push with deployment key: %d to repo_id: %d", key.ID, repo.ID) |
There was a problem hiding this comment.
One tiny nit: I know this was the error message before your change, but could you update it to include something about this specific deploy key being read-only?
GiteaBot
added
lgtm/need 1
|
The deploykey should be deleted from public_key table if last repo which use it is deleted? |
|
Hi @lunny the call to deleteDeployKey manages the deletion of the PublicKey entry as necessary. |
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
force-pushed
the
issue-1357-fix-deploy-keys-semantics
branch
from
01a9fad
to
d2e9331
Compare
|
OK I've added some tests and changed the failure message as per @techknowlogick If you look at the tests - I've created them in a more declarative style similar to that of TestGit. |
lafriks
approved these changes
Feb 3, 2019
GiteaBot
added
lgtm/done
|
please backport to release/v1.7 |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 4, 2019
1. A key can either be an ssh user key or a deploy key. It cannot be both. 2. If a key is a user key - it can only be associated with one user. 3. If a key is a deploy key - it can be used in multiple repositories and the permissions it has on those repositories can be different. 4. If a repository is deleted, its deploy keys must be deleted too. We currently don't enforce any of this and multiple repositories access with different permissions doesn't work at all. This PR enforces the following constraints: - [x] You should not be able to add the same user key as another user - [x] You should not be able to add a ssh user key which is being used as a deploy key - [x] You should not be able to add a ssh deploy key which is being used as a user key - [x] If you add an ssh deploy key to another repository you should be able to use it in different modes without losing the ability to use it in the other mode. - [x] If you delete a repository you must delete all its deploy keys. Fix go-gitea#1357
5 tasks
zeripath
added a commit
that referenced
this pull request
Feb 4, 2019
Backport of #5939 1. A key can either be an ssh user key or a deploy key. It cannot be both. 2. If a key is a user key - it can only be associated with one user. 3. If a key is a deploy key - it can be used in multiple repositories and the permissions it has on those repositories can be different. 4. If a repository is deleted, its deploy keys must be deleted too. We currently don't enforce any of this and multiple repositories access with different permissions doesn't work at all. This PR enforces the following constraints: - [x] You should not be able to add the same user key as another user - [x] You should not be able to add a ssh user key which is being used as a deploy key - [x] You should not be able to add a ssh deploy key which is being used as a user key - [x] If you add an ssh deploy key to another repository you should be able to use it in different modes without losing the ability to use it in the other mode. - [x] If you delete a repository you must delete all its deploy keys. Fix #1357
6 tasks
7 tasks
7 tasks
This was referenced Mar 25, 2019
7 tasks
7 tasks
7 tasks
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.
My understanding is that the intention is:
We currently don't enforce any of this and multiple repositories access with different permissions doesn't work at all. This PR enforces the following constraints:
Fix #1357