From 03e2aed969fb6e7fce19df4846747d8348c87214 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 15 May 2024 00:05:40 +0000 Subject: [PATCH 01/12] Update dependency mermaid to v10.9.1 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 46409d071b..070e748b76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "jquery": "3.7.1", "katex": "0.16.10", "license-checker-webpack-plugin": "0.2.1", - "mermaid": "10.9.0", + "mermaid": "10.9.1", "mini-css-extract-plugin": "2.9.0", "minimatch": "9.0.4", "monaco-editor": "0.47.0", @@ -8412,9 +8412,9 @@ } }, "node_modules/mermaid": { - "version": "10.9.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.0.tgz", - "integrity": "sha512-swZju0hFox/B/qoLKK0rOxxgh8Cf7rJSfAUc1u8fezVihYMvrJAS45GzAxTVf4Q+xn9uMgitBcmWk7nWGXOs/g==", + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.9.1.tgz", + "integrity": "sha512-Mx45Obds5W1UkW1nv/7dHRsbfMM1aOKA2+Pxs/IGHNonygDHwmng8xTHyS9z4KWVi0rbko8gjiBmuwwXQ7tiNA==", "dependencies": { "@braintree/sanitize-url": "^6.0.1", "@types/d3-scale": "^4.0.3", diff --git a/package.json b/package.json index 2fc7b6a5b5..b958b762f1 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "jquery": "3.7.1", "katex": "0.16.10", "license-checker-webpack-plugin": "0.2.1", - "mermaid": "10.9.0", + "mermaid": "10.9.1", "mini-css-extract-plugin": "2.9.0", "minimatch": "9.0.4", "monaco-editor": "0.47.0", From ca5186978eb7d8ce5e80b7bcb4fdd8dd5a14e887 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 15 May 2024 02:05:32 +0000 Subject: [PATCH 02/12] Update module github.com/go-swagger/go-swagger/cmd/swagger to v0.31.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3b7b5da857..1cdc550d29 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.6.0 # renovate: datasource=go GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.58.1 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.5.1 # renovate: datasource=go -SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.6-0.20240201115257-bcc7c78b7786 # renovate: datasource=go +SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renovate: datasource=go XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasource=go GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go From 2ac3dcbd43928d214453ce951c2a89df522930ae Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 15 May 2024 15:35:19 +0200 Subject: [PATCH 03/12] test: hook post-receive for sha256 repos failing push-to-create for sha256 will be fixed in a followup PR --- .../git_helper_for_declarative_test.go | 5 +- tests/integration/git_push_test.go | 279 +++++++++--------- tests/integration/git_test.go | 2 +- tests/integration/ssh_key_test.go | 2 +- 4 files changed, 152 insertions(+), 136 deletions(-) diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index 77fe07128e..ff06dab07a 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -117,10 +117,10 @@ func doGitCloneFail(u *url.URL) func(*testing.T) { } } -func doGitInitTestRepository(dstPath string) func(*testing.T) { +func doGitInitTestRepository(dstPath string, objectFormat git.ObjectFormat) func(*testing.T) { return func(t *testing.T) { // Init repository in dstPath - assert.NoError(t, git.InitRepository(git.DefaultContext, dstPath, false, git.Sha1ObjectFormat.Name())) + assert.NoError(t, git.InitRepository(git.DefaultContext, dstPath, false, objectFormat.Name())) // forcibly set default branch to master _, _, err := git.NewCommand(git.DefaultContext, "symbolic-ref", "HEAD", git.BranchPrefix+"master").RunStdString(&git.RunOpts{Dir: dstPath}) assert.NoError(t, err) @@ -148,6 +148,7 @@ func doGitAddRemote(dstPath, remoteName string, u *url.URL) func(*testing.T) { func doGitPushTestRepository(dstPath string, args ...string) func(*testing.T) { return func(t *testing.T) { + t.Helper() _, _, err := git.NewCommand(git.DefaultContext, "push", "-u").AddArguments(git.ToTrustedCmdArgs(args)...).RunStdString(&git.RunOpts{Dir: dstPath}) assert.NoError(t, err) } diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 838ee0ff79..bbc80cc927 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -24,90 +24,101 @@ import ( "github.com/stretchr/testify/require" ) +func forEachObjectFormat(t *testing.T, f func(t *testing.T, objectFormat git.ObjectFormat)) { + for _, objectFormat := range []git.ObjectFormat{git.Sha256ObjectFormat, git.Sha1ObjectFormat} { + t.Run(objectFormat.Name(), func(t *testing.T) { + f(t, objectFormat) + }) + } +} + func TestGitPush(t *testing.T) { onGiteaRun(t, testGitPush) } func testGitPush(t *testing.T, u *url.URL) { - t.Run("Push branches at once", func(t *testing.T) { - runTestGitPush(t, u, func(t *testing.T, gitPath string) (pushed, deleted []string) { - for i := 0; i < 100; i++ { - branchName := fmt.Sprintf("branch-%d", i) - pushed = append(pushed, branchName) - doGitCreateBranch(gitPath, branchName)(t) - } - pushed = append(pushed, "master") - doGitPushTestRepository(gitPath, "origin", "--all")(t) - return pushed, deleted + forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) { + t.Run("Push branches at once", func(t *testing.T) { + runTestGitPush(t, u, objectFormat, func(t *testing.T, gitPath string) (pushed, deleted []string) { + for i := 0; i < 100; i++ { + branchName := fmt.Sprintf("branch-%d", i) + pushed = append(pushed, branchName) + doGitCreateBranch(gitPath, branchName)(t) + } + pushed = append(pushed, "master") + doGitPushTestRepository(gitPath, "origin", "--all")(t) + return pushed, deleted + }) }) - }) - t.Run("Push branches one by one", func(t *testing.T) { - runTestGitPush(t, u, func(t *testing.T, gitPath string) (pushed, deleted []string) { - for i := 0; i < 100; i++ { - branchName := fmt.Sprintf("branch-%d", i) - doGitCreateBranch(gitPath, branchName)(t) - doGitPushTestRepository(gitPath, "origin", branchName)(t) - pushed = append(pushed, branchName) - } - return pushed, deleted + t.Run("Push branches one by one", func(t *testing.T) { + runTestGitPush(t, u, objectFormat, func(t *testing.T, gitPath string) (pushed, deleted []string) { + for i := 0; i < 100; i++ { + branchName := fmt.Sprintf("branch-%d", i) + doGitCreateBranch(gitPath, branchName)(t) + doGitPushTestRepository(gitPath, "origin", branchName)(t) + pushed = append(pushed, branchName) + } + return pushed, deleted + }) }) - }) - t.Run("Delete branches", func(t *testing.T) { - runTestGitPush(t, u, func(t *testing.T, gitPath string) (pushed, deleted []string) { - doGitPushTestRepository(gitPath, "origin", "master")(t) // make sure master is the default branch instead of a branch we are going to delete - pushed = append(pushed, "master") + t.Run("Delete branches", func(t *testing.T) { + runTestGitPush(t, u, objectFormat, func(t *testing.T, gitPath string) (pushed, deleted []string) { + doGitPushTestRepository(gitPath, "origin", "master")(t) // make sure master is the default branch instead of a branch we are going to delete + pushed = append(pushed, "master") - for i := 0; i < 100; i++ { - branchName := fmt.Sprintf("branch-%d", i) - pushed = append(pushed, branchName) - doGitCreateBranch(gitPath, branchName)(t) - } - doGitPushTestRepository(gitPath, "origin", "--all")(t) + for i := 0; i < 100; i++ { + branchName := fmt.Sprintf("branch-%d", i) + pushed = append(pushed, branchName) + doGitCreateBranch(gitPath, branchName)(t) + } + doGitPushTestRepository(gitPath, "origin", "--all")(t) - for i := 0; i < 10; i++ { - branchName := fmt.Sprintf("branch-%d", i) - doGitPushTestRepository(gitPath, "origin", "--delete", branchName)(t) - deleted = append(deleted, branchName) - } - return pushed, deleted + for i := 0; i < 10; i++ { + branchName := fmt.Sprintf("branch-%d", i) + doGitPushTestRepository(gitPath, "origin", "--delete", branchName)(t) + deleted = append(deleted, branchName) + } + return pushed, deleted + }) }) - }) - t.Run("Push to deleted branch", func(t *testing.T) { - runTestGitPush(t, u, func(t *testing.T, gitPath string) (pushed, deleted []string) { - doGitPushTestRepository(gitPath, "origin", "master")(t) // make sure master is the default branch instead of a branch we are going to delete - pushed = append(pushed, "master") + t.Run("Push to deleted branch", func(t *testing.T) { + runTestGitPush(t, u, objectFormat, func(t *testing.T, gitPath string) (pushed, deleted []string) { + doGitPushTestRepository(gitPath, "origin", "master")(t) // make sure master is the default branch instead of a branch we are going to delete + pushed = append(pushed, "master") - doGitCreateBranch(gitPath, "branch-1")(t) - doGitPushTestRepository(gitPath, "origin", "branch-1")(t) - pushed = append(pushed, "branch-1") + doGitCreateBranch(gitPath, "branch-1")(t) + doGitPushTestRepository(gitPath, "origin", "branch-1")(t) + pushed = append(pushed, "branch-1") - // delete and restore - doGitPushTestRepository(gitPath, "origin", "--delete", "branch-1")(t) - doGitPushTestRepository(gitPath, "origin", "branch-1")(t) + // delete and restore + doGitPushTestRepository(gitPath, "origin", "--delete", "branch-1")(t) + doGitPushTestRepository(gitPath, "origin", "branch-1")(t) - return pushed, deleted + return pushed, deleted + }) }) }) } -func runTestGitPush(t *testing.T, u *url.URL, gitOperation func(t *testing.T, gitPath string) (pushed, deleted []string)) { +func runTestGitPush(t *testing.T, u *url.URL, objectFormat git.ObjectFormat, gitOperation func(t *testing.T, gitPath string) (pushed, deleted []string)) { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) repo, err := repo_service.CreateRepository(db.DefaultContext, user, user, repo_service.CreateRepoOptions{ - Name: "repo-to-push", - Description: "test git push", - AutoInit: false, - DefaultBranch: "main", - IsPrivate: false, + Name: "repo-to-push", + Description: "test git push", + AutoInit: false, + DefaultBranch: "main", + IsPrivate: false, + ObjectFormatName: objectFormat.Name(), }) require.NoError(t, err) require.NotEmpty(t, repo) gitPath := t.TempDir() - doGitInitTestRepository(gitPath)(t) + doGitInitTestRepository(gitPath, objectFormat)(t) oldPath := u.Path oldUser := u.User @@ -158,83 +169,87 @@ func TestOptionsGitPush(t *testing.T) { func testOptionsGitPush(t *testing.T, u *url.URL) { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - repo, err := repo_service.CreateRepository(db.DefaultContext, user, user, repo_service.CreateRepoOptions{ - Name: "repo-to-push", - Description: "test git push", - AutoInit: false, - DefaultBranch: "main", - IsPrivate: false, - }) - require.NoError(t, err) - require.NotEmpty(t, repo) - gitPath := t.TempDir() - - doGitInitTestRepository(gitPath)(t) - - u.Path = repo.FullName() + ".git" - u.User = url.UserPassword(user.LowerName, userPassword) - doGitAddRemote(gitPath, "origin", u)(t) - - t.Run("Unknown push options are rejected", func(t *testing.T) { - logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE) - logChecker.Filter("unknown option").StopMark("Git push options validation") - defer cleanup() - branchName := "branch0" - doGitCreateBranch(gitPath, branchName)(t) - doGitPushTestRepositoryFail(gitPath, "origin", branchName, "-o", "repo.template=false", "-o", "uknownoption=randomvalue")(t) - logFiltered, logStopped := logChecker.Check(5 * time.Second) - assert.True(t, logStopped) - assert.True(t, logFiltered[0]) - }) - - t.Run("Owner sets private & template to true via push options", func(t *testing.T) { - branchName := "branch1" - doGitCreateBranch(gitPath, branchName)(t) - doGitPushTestRepository(gitPath, "origin", branchName, "-o", "repo.private=true", "-o", "repo.template=true")(t) - repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, "repo-to-push") + forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) { + repo, err := repo_service.CreateRepository(db.DefaultContext, user, user, repo_service.CreateRepoOptions{ + Name: "repo-to-push", + Description: "test git push", + AutoInit: false, + DefaultBranch: "main", + IsPrivate: false, + ObjectFormatName: objectFormat.Name(), + }) require.NoError(t, err) - require.True(t, repo.IsPrivate) - require.True(t, repo.IsTemplate) + require.NotEmpty(t, repo) + + gitPath := t.TempDir() + + doGitInitTestRepository(gitPath, objectFormat)(t) + + u.Path = repo.FullName() + ".git" + u.User = url.UserPassword(user.LowerName, userPassword) + doGitAddRemote(gitPath, "origin", u)(t) + + t.Run("Unknown push options are rejected", func(t *testing.T) { + logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE) + logChecker.Filter("unknown option").StopMark("Git push options validation") + defer cleanup() + branchName := "branch0" + doGitCreateBranch(gitPath, branchName)(t) + doGitPushTestRepositoryFail(gitPath, "origin", branchName, "-o", "repo.template=false", "-o", "uknownoption=randomvalue")(t) + logFiltered, logStopped := logChecker.Check(5 * time.Second) + assert.True(t, logStopped) + assert.True(t, logFiltered[0]) + }) + + t.Run("Owner sets private & template to true via push options", func(t *testing.T) { + branchName := "branch1" + doGitCreateBranch(gitPath, branchName)(t) + doGitPushTestRepository(gitPath, "origin", branchName, "-o", "repo.private=true", "-o", "repo.template=true")(t) + repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, "repo-to-push") + require.NoError(t, err) + require.True(t, repo.IsPrivate) + require.True(t, repo.IsTemplate) + }) + + t.Run("Owner sets private & template to false via push options", func(t *testing.T) { + branchName := "branch2" + doGitCreateBranch(gitPath, branchName)(t) + doGitPushTestRepository(gitPath, "origin", branchName, "-o", "repo.private=false", "-o", "repo.template=false")(t) + repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, "repo-to-push") + require.NoError(t, err) + require.False(t, repo.IsPrivate) + require.False(t, repo.IsTemplate) + }) + + // create a collaborator with write access + collaborator := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) + u.User = url.UserPassword(collaborator.LowerName, userPassword) + doGitAddRemote(gitPath, "collaborator", u)(t) + repo_module.AddCollaborator(db.DefaultContext, repo, collaborator) + + t.Run("Collaborator with write access is allowed to push", func(t *testing.T) { + branchName := "branch3" + doGitCreateBranch(gitPath, branchName)(t) + doGitPushTestRepository(gitPath, "collaborator", branchName)(t) + }) + + t.Run("Collaborator with write access fails to change private & template via push options", func(t *testing.T) { + logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE) + logChecker.Filter("permission denied for changing repo settings").StopMark("Git push options validation") + defer cleanup() + branchName := "branch4" + doGitCreateBranch(gitPath, branchName)(t) + doGitPushTestRepositoryFail(gitPath, "collaborator", branchName, "-o", "repo.private=true", "-o", "repo.template=true")(t) + repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, "repo-to-push") + require.NoError(t, err) + require.False(t, repo.IsPrivate) + require.False(t, repo.IsTemplate) + logFiltered, logStopped := logChecker.Check(5 * time.Second) + assert.True(t, logStopped) + assert.True(t, logFiltered[0]) + }) + + require.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repo.ID)) }) - - t.Run("Owner sets private & template to false via push options", func(t *testing.T) { - branchName := "branch2" - doGitCreateBranch(gitPath, branchName)(t) - doGitPushTestRepository(gitPath, "origin", branchName, "-o", "repo.private=false", "-o", "repo.template=false")(t) - repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, "repo-to-push") - require.NoError(t, err) - require.False(t, repo.IsPrivate) - require.False(t, repo.IsTemplate) - }) - - // create a collaborator with write access - collaborator := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) - u.User = url.UserPassword(collaborator.LowerName, userPassword) - doGitAddRemote(gitPath, "collaborator", u)(t) - repo_module.AddCollaborator(db.DefaultContext, repo, collaborator) - - t.Run("Collaborator with write access is allowed to push", func(t *testing.T) { - branchName := "branch3" - doGitCreateBranch(gitPath, branchName)(t) - doGitPushTestRepository(gitPath, "collaborator", branchName)(t) - }) - - t.Run("Collaborator with write access fails to change private & template via push options", func(t *testing.T) { - logChecker, cleanup := test.NewLogChecker(log.DEFAULT, log.TRACE) - logChecker.Filter("permission denied for changing repo settings").StopMark("Git push options validation") - defer cleanup() - branchName := "branch4" - doGitCreateBranch(gitPath, branchName)(t) - doGitPushTestRepositoryFail(gitPath, "collaborator", branchName, "-o", "repo.private=true", "-o", "repo.template=true")(t) - repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, "repo-to-push") - require.NoError(t, err) - require.False(t, repo.IsPrivate) - require.False(t, repo.IsTemplate) - logFiltered, logStopped := logChecker.Check(5 * time.Second) - assert.True(t, logStopped) - assert.True(t, logFiltered[0]) - }) - - require.NoError(t, repo_service.DeleteRepositoryDirectly(db.DefaultContext, user, repo.ID)) } diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go index d19b34a528..6a227d4603 100644 --- a/tests/integration/git_test.go +++ b/tests/integration/git_test.go @@ -598,7 +598,7 @@ func doPushCreate(ctx APITestContext, u *url.URL) func(t *testing.T) { tmpDir := t.TempDir() // Now create local repository to push as our test and set its origin - t.Run("InitTestRepository", doGitInitTestRepository(tmpDir)) + t.Run("InitTestRepository", doGitInitTestRepository(tmpDir, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat t.Run("AddRemote", doGitAddRemote(tmpDir, "origin", u)) // Disable "Push To Create" and attempt to push diff --git a/tests/integration/ssh_key_test.go b/tests/integration/ssh_key_test.go index eb3a3e926a..30e7e3af41 100644 --- a/tests/integration/ssh_key_test.go +++ b/tests/integration/ssh_key_test.go @@ -64,7 +64,7 @@ func testPushDeployKeyOnEmptyRepo(t *testing.T, u *url.URL) { // Setup the testing repository dstPath := t.TempDir() - t.Run("InitTestRepository", doGitInitTestRepository(dstPath)) + t.Run("InitTestRepository", doGitInitTestRepository(dstPath, git.Sha1ObjectFormat)) // FIXME: use forEachObjectFormat // Setup remote link sshURL := createSSHUrl(ctx.GitPath(), u) From 5e73c67d6744931c7cdb7df6a6d8f3f1ae913452 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Wed, 15 May 2024 15:42:29 +0200 Subject: [PATCH 04/12] fix: hook post-receive for sha256 repos --- cmd/hook.go | 14 ++++++-------- models/repo/repo.go | 2 +- modules/git/object_format.go | 1 + modules/git/object_id.go | 20 ++++++++++++++------ modules/git/object_id_test.go | 24 ++++++++++++++++++++++++ modules/repository/push.go | 6 ++---- routers/private/hook_post_receive.go | 2 +- services/actions/notifier.go | 3 +-- 8 files changed, 50 insertions(+), 22 deletions(-) diff --git a/cmd/hook.go b/cmd/hook.go index 4f73f8e2bc..f8184f9697 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -316,12 +316,12 @@ func runHookUpdate(c *cli.Context) error { return nil } - // Deletion of the ref means that the new commit ID is only composed of '0'. - if strings.ContainsFunc(newCommitID, func(e rune) bool { return e != '0' }) { - return nil + // Empty new commit ID means deletion. + if git.IsEmptyCommitID(newCommitID, nil) { + return fail(ctx, fmt.Sprintf("The deletion of %s is skipped as it's an internal reference.", refFullName), "") } - return fail(ctx, fmt.Sprintf("The deletion of %s is skipped as it's an internal reference.", refFullName), "") + return nil } func runHookPostReceive(c *cli.Context) error { @@ -405,8 +405,7 @@ Forgejo or set your environment appropriately.`, "") newCommitIDs[count] = string(fields[1]) refFullNames[count] = git.RefName(fields[2]) - commitID, _ := git.NewIDFromString(newCommitIDs[count]) - if refFullNames[count] == git.BranchPrefix+"master" && !commitID.IsZero() && count == total { + if refFullNames[count] == git.BranchPrefix+"master" && !git.IsEmptyCommitID(newCommitIDs[count], nil) && count == total { masterPushed = true } count++ @@ -697,8 +696,7 @@ Forgejo or set your environment appropriately.`, "") if err != nil { return err } - commitID, _ := git.NewIDFromString(rs.OldOID) - if !commitID.IsZero() { + if !git.IsEmptyCommitID(rs.OldOID, nil) { err = writeDataPktLine(ctx, os.Stdout, []byte("option old-oid "+rs.OldOID)) if err != nil { return err diff --git a/models/repo/repo.go b/models/repo/repo.go index 86bd368d0b..28471159d8 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -329,7 +329,7 @@ func (repo *Repository) HTMLURL() string { // CommitLink make link to by commit full ID // note: won't check whether it's an right id func (repo *Repository) CommitLink(commitID string) (result string) { - if git.IsEmptyCommitID(commitID) { + if git.IsEmptyCommitID(commitID, nil) { result = "" } else { result = repo.Link() + "/commit/" + url.PathEscape(commitID) diff --git a/modules/git/object_format.go b/modules/git/object_format.go index c2fcf4c063..2b462589a3 100644 --- a/modules/git/object_format.go +++ b/modules/git/object_format.go @@ -122,6 +122,7 @@ func (h Sha256ObjectFormatImpl) ComputeHash(t ObjectType, content []byte) Object var ( Sha1ObjectFormat ObjectFormat = Sha1ObjectFormatImpl{} Sha256ObjectFormat ObjectFormat = Sha256ObjectFormatImpl{} + // any addition must be reflected in IsEmptyCommitID ) var SupportedObjectFormats = []ObjectFormat{ diff --git a/modules/git/object_id.go b/modules/git/object_id.go index 4f8c39ee1d..26736bb766 100644 --- a/modules/git/object_id.go +++ b/modules/git/object_id.go @@ -79,17 +79,25 @@ func NewIDFromString(hexHash string) (ObjectID, error) { return theObjectFormat.MustID(b), nil } -func IsEmptyCommitID(commitID string) bool { +// IsEmptyCommitID checks if an hexadecimal string represents an empty commit according to git (only '0'). +// If objectFormat is not nil, the length will be checked as well (otherwise the lenght must match the sha1 or sha256 length). +func IsEmptyCommitID(commitID string, objectFormat ObjectFormat) bool { if commitID == "" { return true } - - id, err := NewIDFromString(commitID) - if err != nil { + if objectFormat == nil { + if Sha1ObjectFormat.FullLength() != len(commitID) && Sha256ObjectFormat.FullLength() != len(commitID) { + return false + } + } else if objectFormat.FullLength() != len(commitID) { return false } - - return id.IsZero() + for _, c := range commitID { + if c != '0' { + return false + } + } + return true } // ComputeBlobHash compute the hash for a given blob content diff --git a/modules/git/object_id_test.go b/modules/git/object_id_test.go index 6f365d6b19..00a24e3981 100644 --- a/modules/git/object_id_test.go +++ b/modules/git/object_id_test.go @@ -23,3 +23,27 @@ func TestIsValidSHAPattern(t *testing.T) { assert.Equal(t, "d5c6407415d85df49592672aa421aed39b9db5e3", ComputeBlobHash(Sha1ObjectFormat, []byte("same length blob")).String()) assert.Equal(t, "df0b5174ed06ae65aea40d43316bcbc21d82c9e3158ce2661df2ad28d7931dd6", ComputeBlobHash(Sha256ObjectFormat, []byte("some random blob")).String()) } + +func TestIsEmptyCommitID(t *testing.T) { + assert.True(t, IsEmptyCommitID("", nil)) + assert.True(t, IsEmptyCommitID("", Sha1ObjectFormat)) + assert.True(t, IsEmptyCommitID("", Sha256ObjectFormat)) + + assert.False(t, IsEmptyCommitID("79ee38a6416c1ede423ec7ee0a8639ceea4aad20", Sha1ObjectFormat)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000", nil)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000", Sha1ObjectFormat)) + assert.False(t, IsEmptyCommitID("0000000000000000000000000000000000000000", Sha256ObjectFormat)) + + assert.False(t, IsEmptyCommitID("00000000000000000000000000000000000000000", nil)) + + assert.False(t, IsEmptyCommitID("0f0b5174ed06ae65aea40d43316bcbc21d82c9e3158ce2661df2ad28d7931dd6", nil)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000000000000000000000000000", nil)) + assert.False(t, IsEmptyCommitID("0000000000000000000000000000000000000000000000000000000000000000", Sha1ObjectFormat)) + assert.True(t, IsEmptyCommitID("0000000000000000000000000000000000000000000000000000000000000000", Sha256ObjectFormat)) + + assert.False(t, IsEmptyCommitID("1", nil)) + assert.False(t, IsEmptyCommitID("0", nil)) + + assert.False(t, IsEmptyCommitID("010", nil)) + assert.False(t, IsEmptyCommitID("0 0", nil)) +} diff --git a/modules/repository/push.go b/modules/repository/push.go index 751ee83a09..66d0417caf 100644 --- a/modules/repository/push.go +++ b/modules/repository/push.go @@ -21,14 +21,12 @@ type PushUpdateOptions struct { // IsNewRef return true if it's a first-time push to a branch, tag or etc. func (opts *PushUpdateOptions) IsNewRef() bool { - commitID, err := git.NewIDFromString(opts.OldCommitID) - return err == nil && commitID.IsZero() + return git.IsEmptyCommitID(opts.OldCommitID, nil) } // IsDelRef return true if it's a deletion to a branch or tag func (opts *PushUpdateOptions) IsDelRef() bool { - commitID, err := git.NewIDFromString(opts.NewCommitID) - return err == nil && commitID.IsZero() + return git.IsEmptyCommitID(opts.NewCommitID, nil) } // IsUpdateRef return true if it's an update operation diff --git a/routers/private/hook_post_receive.go b/routers/private/hook_post_receive.go index 10b300f3df..b78f19d51e 100644 --- a/routers/private/hook_post_receive.go +++ b/routers/private/hook_post_receive.go @@ -239,7 +239,7 @@ func HookPostReceive(ctx *gitea_context.PrivateContext) { } // If we've pushed a branch (and not deleted it) - if !git.IsEmptyCommitID(newCommitID) && refFullName.IsBranch() { + if !git.IsEmptyCommitID(newCommitID, nil) && refFullName.IsBranch() { // First ensure we have the repository loaded, we're allowed pulls requests and we can get the base repo if repo == nil { repo = loadRepository(ctx, ownerName, repoName) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 6551da39e7..3a6dd9db5b 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -515,8 +515,7 @@ func (*actionsNotifier) MergePullRequest(ctx context.Context, doer *user_model.U } func (n *actionsNotifier) PushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) { - commitID, _ := git.NewIDFromString(opts.NewCommitID) - if commitID.IsZero() { + if git.IsEmptyCommitID(opts.NewCommitID, nil) { log.Trace("new commitID is empty") return } From c16ae1ab395dd31c3a1e35f3c21ce656446808ea Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 6 May 2024 14:32:05 +0800 Subject: [PATCH 05/12] Fix some UI problems (install) (#30854) (cherry picked from commit ce8b11ae131bef6cd7df0849ed39da7984953a4b) --- templates/install.tmpl | 7 ++++--- web_src/css/install.css | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/install.tmpl b/templates/install.tmpl index d49de33a3f..682e1e6511 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -174,7 +174,7 @@
- {{ctx.Locale.Tr "install.smtp_from_helper"}} + {{ctx.Locale.TrString "install.smtp_from_helper"}}{{/* it contains lt/gt chars*/}}
@@ -320,6 +320,8 @@
+
+ {{if .EnvConfigKeys}}

{{ctx.Locale.Tr "install.env_config_keys"}}

@@ -333,12 +335,11 @@ {{end}} -
{{ctx.Locale.Tr "install.config_location_hint"}} {{.CustomConfFile}}
-
+
diff --git a/web_src/css/install.css b/web_src/css/install.css index ee2395e6c5..7ab729405e 100644 --- a/web_src/css/install.css +++ b/web_src/css/install.css @@ -13,8 +13,7 @@ .page-content.install .ui.form .field > .help, .page-content.install .ui.form .field > .ui.checkbox:first-child, .page-content.install .ui.form .field > .right-content { - margin-left: 30%; - padding-left: 5px; + margin-left: calc(30% + 5px); width: auto; } @@ -24,10 +23,11 @@ } .page-content.install form.ui.form details.optional.field[open] { - border-bottom: 1px dashed var(--color-secondary); padding-bottom: 10px; } - +.page-content.install form.ui.form details.optional.field[open]:not(:last-child) { + border-bottom: 1px dashed var(--color-secondary); +} .page-content.install form.ui.form details.optional.field[open] summary { margin-bottom: 10px; } From 208eed05ffda0318930775bcfe97895c6d34d4df Mon Sep 17 00:00:00 2001 From: Frank Villaro-Dixon Date: Wed, 15 May 2024 23:13:05 +0200 Subject: [PATCH 06/12] template: `label` fix correct input id Signed-off-by: Frank Villaro-Dixon --- templates/repo/settings/deploy_keys.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 3410c103a2..4bc3abf6fb 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -28,7 +28,7 @@
-