diff options
| author | zeripath <art27@cantab.net> | 2019-02-03 23:56:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 23:56:53 +0000 |
| commit | 01c10a951b9db0b9f020ef657ca71eb5e5882a84 (patch) | |
| tree | 6cb29db94edda9d90e9a509028bada2a61ade928 /options | |
| parent | 634cbaad2b8d091a2a3065de81e0b2b76daa5ef7 (diff) | |
| download | gitea-01c10a951b9db0b9f020ef657ca71eb5e5882a84.tar.gz gitea-01c10a951b9db0b9f020ef657ca71eb5e5882a84.zip | |
Fix ssh deploy and user key constraints (#1357) (#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
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 653d34c931..2d32fac9c7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -419,7 +419,7 @@ ssh_helper = <strong>Need help?</strong> Have a look at GitHub's guide to <a hre gpg_helper = <strong>Need help?</strong> Have a look at GitHub's guide <a href="%s">about GPG</a>. add_new_key = Add SSH Key add_new_gpg_key = Add GPG Key -ssh_key_been_used = This SSH key is already added to your account. +ssh_key_been_used = This SSH key has already been added to the server. ssh_key_name_used = An SSH key with same name is already added to your account. gpg_key_id_used = A public GPG key with same ID already exists. gpg_no_key_email_found = This GPG key is not usable with any email address associated with your account. |