Browse Source
Writable deploy keys (closes #671) (#3225)
Writable deploy keys (closes #671) (#3225)
* Add is_writable checkbox to deploy keys interface * Add writable key option to deploy key form * Add support for writable ssh keys in the interface * Rename IsWritable to ReadOnly * Test: create read-only and read-write deploy keys via api * Add DeployKey access mode migration * Update gitea sdk via govendor * Fix deploykey migration * Add unittests for writable deploy keys * Move template text to locale * Remove implicit column update * Remove duplicate locales * Replace ReadOnly field with IsReadOnly method * Fix deploy_keys related integration test * Rename v54 migration with v55 * Fix migration hellrelease/v1.4
committed by
Lauris BH
13 changed files with 184 additions and 13 deletions
-
53integrations/api_keys_test.go
-
1models/fixtures/deploy_key.yml
-
2models/migrations/migrations.go
-
23models/migrations/v55.go
-
21models/ssh_key.go
-
7modules/auth/user_form.go
-
4options/locale/locale_en-US.ini
-
2routers/api/v1/repo/key.go
-
2routers/repo/setting.go
-
61routers/repo/settings_test.go
-
11templates/repo/settings/deploy_keys.tmpl
-
4vendor/code.gitea.io/sdk/gitea/repo_key.go
-
6vendor/vendor.json
@ -0,0 +1 @@ |
|||
[] # empty |
@ -0,0 +1,23 @@ |
|||
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|||
// Use of this source code is governed by a MIT-style
|
|||
// license that can be found in the LICENSE file.
|
|||
|
|||
package migrations |
|||
|
|||
import ( |
|||
"fmt" |
|||
|
|||
"code.gitea.io/gitea/models" |
|||
"github.com/go-xorm/xorm" |
|||
) |
|||
|
|||
func addModeToDeploKeys(x *xorm.Engine) error { |
|||
type DeployKey struct { |
|||
Mode models.AccessMode `xorm:"NOT NULL DEFAULT 1"` |
|||
} |
|||
|
|||
if err := x.Sync2(new(DeployKey)); err != nil { |
|||
return fmt.Errorf("Sync2: %v", err) |
|||
} |
|||
return nil |
|||
} |
@ -0,0 +1,61 @@ |
|||
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|||
// Use of this source code is governed by a MIT-style
|
|||
// license that can be found in the LICENSE file.
|
|||
|
|||
package repo |
|||
|
|||
import ( |
|||
"net/http" |
|||
"testing" |
|||
|
|||
"code.gitea.io/gitea/models" |
|||
"code.gitea.io/gitea/modules/auth" |
|||
"code.gitea.io/gitea/modules/test" |
|||
|
|||
"github.com/stretchr/testify/assert" |
|||
) |
|||
|
|||
func TestAddReadOnlyDeployKey(t *testing.T) { |
|||
models.PrepareTestEnv(t) |
|||
|
|||
ctx := test.MockContext(t, "user2/repo1/settings/keys") |
|||
|
|||
test.LoadUser(t, ctx, 2) |
|||
test.LoadRepo(t, ctx, 2) |
|||
|
|||
addKeyForm := auth.AddKeyForm{ |
|||
Title: "read-only", |
|||
Content: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n", |
|||
} |
|||
DeployKeysPost(ctx, addKeyForm) |
|||
assert.EqualValues(t, http.StatusFound, ctx.Resp.Status()) |
|||
|
|||
models.AssertExistsAndLoadBean(t, &models.DeployKey{ |
|||
Name: addKeyForm.Title, |
|||
Content: addKeyForm.Content, |
|||
Mode: models.AccessModeRead, |
|||
}) |
|||
} |
|||
|
|||
func TestAddReadWriteOnlyDeployKey(t *testing.T) { |
|||
models.PrepareTestEnv(t) |
|||
|
|||
ctx := test.MockContext(t, "user2/repo1/settings/keys") |
|||
|
|||
test.LoadUser(t, ctx, 2) |
|||
test.LoadRepo(t, ctx, 2) |
|||
|
|||
addKeyForm := auth.AddKeyForm{ |
|||
Title: "read-write", |
|||
Content: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDAu7tvIvX6ZHrRXuZNfkR3XLHSsuCK9Zn3X58lxBcQzuo5xZgB6vRwwm/QtJuF+zZPtY5hsQILBLmF+BZ5WpKZp1jBeSjH2G7lxet9kbcH+kIVj0tPFEoyKI9wvWqIwC4prx/WVk2wLTJjzBAhyNxfEq7C9CeiX9pQEbEqJfkKCQ== nocomment\n", |
|||
IsWritable: true, |
|||
} |
|||
DeployKeysPost(ctx, addKeyForm) |
|||
assert.EqualValues(t, http.StatusFound, ctx.Resp.Status()) |
|||
|
|||
models.AssertExistsAndLoadBean(t, &models.DeployKey{ |
|||
Name: addKeyForm.Title, |
|||
Content: addKeyForm.Content, |
|||
Mode: models.AccessModeWrite, |
|||
}) |
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue