From 0d4058acf589afd3c23a736a792c261429047d0a Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sat, 2 Feb 2019 00:38:24 +0000 Subject: [PATCH 1/7] Set PusherName and PusherID to owner on deploy key The gitea PushUpdate function requires that the PusherID and PusherName are real users. Signed-off-by: Andrew Thornton --- cmd/serv.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/serv.go b/cmd/serv.go index 1b65dab2b3d65..eff72470f293e 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -251,6 +251,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) + os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", repo.OwnerID)) } else { user, err = private.GetUserByKeyID(key.ID) if err != nil { From bc2b6ad192f6afd3d44569950454f5f67879018c Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 3 Feb 2019 12:21:26 +0000 Subject: [PATCH 2/7] Add deploy key push tests --- integrations/deploy_key_push_test.go | 147 +++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 integrations/deploy_key_push_test.go diff --git a/integrations/deploy_key_push_test.go b/integrations/deploy_key_push_test.go new file mode 100644 index 0000000000000..ec947a286ef4d --- /dev/null +++ b/integrations/deploy_key_push_test.go @@ -0,0 +1,147 @@ +// Copyright 2019 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 integrations + +import ( + "fmt" + "io/ioutil" + "log" + "net/http" + "net/url" + "os" + "os/exec" + "path/filepath" + "testing" + "time" + + "code.gitea.io/git" + + "code.gitea.io/gitea/modules/setting" + api "code.gitea.io/sdk/gitea" + "github.com/stretchr/testify/assert" +) + +func createEmptyRepository(username, reponame string) func(*testing.T) { + return func(t *testing.T) { + session := loginUser(t, username) + token := getTokenForLoggedInUser(t, session) + req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos?token="+token, &api.CreateRepoOption{ + AutoInit: false, + Description: "Temporary empty repo", + Name: reponame, + Private: false, + }) + session.MakeRequest(t, req, http.StatusCreated) + } +} + +func createDeployKey(username, reponame, keyname, keyFile string, readOnly bool) func(*testing.T) { + return func(t *testing.T) { + session := loginUser(t, username) + token := getTokenForLoggedInUser(t, session) + urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/keys?token=%s", username, reponame, token) + + dataPubKey, err := ioutil.ReadFile(keyFile + ".pub") + assert.NoError(t, err) + req := NewRequestWithJSON(t, "POST", urlStr, api.CreateKeyOption{ + Title: keyname, + Key: string(dataPubKey), + ReadOnly: readOnly, + }) + session.MakeRequest(t, req, http.StatusCreated) + } +} + +func initTestRepository(dstPath string) func(*testing.T) { + return func(t *testing.T) { + // Init repository in dstPath + assert.NoError(t, git.InitRepository(dstPath, false)) + assert.NoError(t, ioutil.WriteFile(filepath.Join(dstPath, "README.md"), []byte(fmt.Sprintf("# Testing Repository\n\nOriginally created in: %s", dstPath)), 0644)) + assert.NoError(t, git.AddChanges(dstPath, true)) + signature := git.Signature{ + Email: "test@example.com", + Name: "test", + When: time.Now(), + } + assert.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{ + Committer: &signature, + Author: &signature, + Message: "Initial Commit", + })) + } +} + +func pushTestRepository(dstPath, username, reponame string, u url.URL, keyFile string) func(*testing.T) { + return func(t *testing.T) { + //Setup remote link + u.Scheme = "ssh" + u.User = url.User("git") + u.Host = fmt.Sprintf("%s:%d", setting.SSH.ListenHost, setting.SSH.ListenPort) + + //Setup ssh wrapper + os.Setenv("GIT_SSH_COMMAND", + "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i "+ + filepath.Join(setting.AppWorkPath, keyFile)) + os.Setenv("GIT_SSH_VARIANT", "ssh") + + log.Printf("Adding remote: %s\n", u.String()) + _, err := git.NewCommand("remote", "add", "origin", u.String()).RunInDir(dstPath) + assert.NoError(t, err) + + log.Printf("Pushing to: %s\n", u.String()) + _, err = git.NewCommand("push").RunInDir(dstPath) + assert.NoError(t, err) + } +} + +func checkRepositoryEmptyStatus(username, reponame string, isEmpty bool) func(*testing.T) { + return func(t *testing.T) { + session := loginUser(t, username) + token := getTokenForLoggedInUser(t, session) + urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", username, reponame, token) + + req := NewRequest(t, "GET", urlStr) + resp := session.MakeRequest(t, req, http.StatusCreated) + + var repository api.Repository + DecodeJSON(t, resp, &repository) + + assert.Equal(t, isEmpty, repository.Empty) + } +} + +func TestPushDeployKeyOnEmptyRepo(t *testing.T) { + onGiteaRun(t, testPushDeployKeyOnEmptyRepo) +} + +func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) { + reponame := "deploy-key-empty-repo-1" + username := "user2" + u.Path = fmt.Sprintf("%s/%s.git", username, reponame) + keyname := fmt.Sprintf("%s-push", reponame) + + t.Run("CreateEmptyRepository", createEmptyRepository(username, reponame)) + t.Run("CheckIsEmpty", checkRepositoryEmptyStatus(username, reponame, true)) + + //Setup the push deploy key file + keyFile := filepath.Join(setting.AppDataPath, keyname) + err := exec.Command("ssh-keygen", "-f", keyFile, "-t", "rsa", "-N", "").Run() + assert.NoError(t, err) + defer os.RemoveAll(keyFile) + defer os.RemoveAll(keyFile + ".pub") + + t.Run("CreatePushDeployKey", createDeployKey(username, reponame, keyname, keyFile, false)) + + // Setup the testing repository + dstPath, err := ioutil.TempDir("", "repo-tmp-deploy-key-empty-repo-1") + assert.NoError(t, err) + defer os.RemoveAll(dstPath) + + t.Run("InitTestRepository", initTestRepository(dstPath)) + t.Run("SSHPushTestRepository", pushTestRepository(dstPath, username, reponame, *u, keyFile)) + + log.Println("Done Push") + t.Run("CheckIsNotEmpty", checkRepositoryEmptyStatus(username, reponame, false)) +} From f533b3e586736d40e195f2cad0add6eb1c239792 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 3 Feb 2019 12:51:04 +0000 Subject: [PATCH 3/7] use repo.Owner.Name instead of "username" Signed-off-by: Andrew Thornton --- cmd/serv.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/serv.go b/cmd/serv.go index eff72470f293e..ec83d3e9c0a62 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -252,7 +252,7 @@ func runServ(c *cli.Context) error { fail("Internal error", "UpdateDeployKey: %v", err) } - os.Setenv(models.EnvPusherName, username) + os.Setenv(models.EnvPusherName, repo.Owner.Name) os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", repo.OwnerID)) } else { user, err = private.GetUserByKeyID(key.ID) From 9648d87e5058974a307dd7f4a33b6ef27c0f2200 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 3 Feb 2019 12:51:19 +0000 Subject: [PATCH 4/7] Push to origin master --- integrations/deploy_key_push_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/deploy_key_push_test.go b/integrations/deploy_key_push_test.go index ec947a286ef4d..1d6f9508f709d 100644 --- a/integrations/deploy_key_push_test.go +++ b/integrations/deploy_key_push_test.go @@ -91,7 +91,7 @@ func pushTestRepository(dstPath, username, reponame string, u url.URL, keyFile s assert.NoError(t, err) log.Printf("Pushing to: %s\n", u.String()) - _, err = git.NewCommand("push").RunInDir(dstPath) + _, err = git.NewCommand("push", "-u", "origin", "master").RunInDir(dstPath) assert.NoError(t, err) } } From efa0e9b22534895ed6a80624211d3299efa48242 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 3 Feb 2019 13:02:02 +0000 Subject: [PATCH 5/7] Revert change to username - owner not loaded --- cmd/serv.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/serv.go b/cmd/serv.go index ec83d3e9c0a62..eff72470f293e 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -252,7 +252,7 @@ func runServ(c *cli.Context) error { fail("Internal error", "UpdateDeployKey: %v", err) } - os.Setenv(models.EnvPusherName, repo.Owner.Name) + os.Setenv(models.EnvPusherName, username) os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", repo.OwnerID)) } else { user, err = private.GetUserByKeyID(key.ID) From 34aedc853fc3c926cc2ce579e48a780981c51a8c Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 3 Feb 2019 13:02:15 +0000 Subject: [PATCH 6/7] Fix integration test --- integrations/deploy_key_push_test.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/integrations/deploy_key_push_test.go b/integrations/deploy_key_push_test.go index 1d6f9508f709d..8b3d6656293a2 100644 --- a/integrations/deploy_key_push_test.go +++ b/integrations/deploy_key_push_test.go @@ -103,7 +103,7 @@ func checkRepositoryEmptyStatus(username, reponame string, isEmpty bool) func(*t urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", username, reponame, token) req := NewRequest(t, "GET", urlStr) - resp := session.MakeRequest(t, req, http.StatusCreated) + resp := session.MakeRequest(t, req, http.StatusOK) var repository api.Repository DecodeJSON(t, resp, &repository) @@ -112,6 +112,17 @@ func checkRepositoryEmptyStatus(username, reponame string, isEmpty bool) func(*t } } +func deleteRepository(username, reponame string) func(*testing.T) { + return func(t *testing.T) { + session := loginUser(t, username) + token := getTokenForLoggedInUser(t, session) + urlStr := fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", username, reponame, token) + + req := NewRequest(t, "DELETE", urlStr) + session.MakeRequest(t, req, http.StatusNoContent) + } +} + func TestPushDeployKeyOnEmptyRepo(t *testing.T) { onGiteaRun(t, testPushDeployKeyOnEmptyRepo) } @@ -144,4 +155,6 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) { log.Println("Done Push") t.Run("CheckIsNotEmpty", checkRepositoryEmptyStatus(username, reponame, false)) + + t.Run("DeleteRepository", deleteRepository(username, reponame)) } From e5c509434c08f72ef7c2919ed9416de7ae08c028 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sun, 3 Feb 2019 13:13:43 +0000 Subject: [PATCH 7/7] Add FIXME note --- cmd/serv.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/serv.go b/cmd/serv.go index eff72470f293e..21a69b24d6499 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -252,6 +252,9 @@ func runServ(c *cli.Context) error { fail("Internal error", "UpdateDeployKey: %v", err) } + // FIXME: Deploy keys aren't really the owner of the repo pushing changes + // however we don't have good way of representing deploy keys in hook.go + // so for now use the owner os.Setenv(models.EnvPusherName, username) os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", repo.OwnerID)) } else {