From fe94032f74298569512f6ece2fbe4f7ab9a24e46 Mon Sep 17 00:00:00 2001 From: Philippe Kueck Date: Thu, 23 Mar 2017 02:12:51 +0100 Subject: [PATCH] rewrite pre-commit, post-commit and options hooks (fixes #1250) (#1257) * issue #1250, replace {pre,post}-receive and update hooks with a single shell script that does not require custom hooks to be a sh-script * issue #1250, make script posix compilant * v23, add migration script to update {pre,post}-receive and update hooks * migration: use a more common name and rename v23 to v26 to avoid conflicts * gofmt'ed and added copyright header * fix SyncRepositoryHooks to also sync wiki repos --- models/migrations/migrations.go | 2 + models/migrations/v26.go | 87 +++++++++++++++++++++++++++++++++ models/repo.go | 13 ++--- 3 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 models/migrations/v26.go diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index f651a9b78..07a56e879 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -100,6 +100,8 @@ var migrations = []Migration{ NewMigration("change the key_id and primary_key_id type", changeGPGKeysColumns), // v25 -> v26 NewMigration("add show field in user openid table", addUserOpenIDShow), + // v26 -> v27 + NewMigration("generate and migrate repo and wiki Git hooks", generateAndMigrateGitHookChains), } // Migrate database to current version diff --git a/models/migrations/v26.go b/models/migrations/v26.go new file mode 100644 index 000000000..8b1c9a632 --- /dev/null +++ b/models/migrations/v26.go @@ -0,0 +1,87 @@ +// 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 migrations + +import ( + "crypto/md5" + "encoding/hex" + "fmt" + "io" + "io/ioutil" + "os" + "path/filepath" + "strings" + + "code.gitea.io/gitea/modules/setting" + + "github.com/Unknwon/com" + "github.com/go-xorm/xorm" +) + +func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) { + type Repository struct { + ID int64 + OwnerID int64 + Name string + } + type User struct { + ID int64 + Name string + } + + var ( + hookNames = []string{"pre-receive", "update", "post-receive"} + hookTpl = fmt.Sprintf("#!/usr/bin/env %s\ndata=$(cat)\nexitcodes=\"\"\nhookname=$(basename $0)\nGIT_DIR=${GIT_DIR:-$(dirname $0)}\n\nfor hook in ${GIT_DIR}/hooks/${hookname}.d/*; do\ntest -x \"${hook}\" || continue\necho \"${data}\" | \"${hook}\"\nexitcodes=\"${exitcodes} $?\"\ndone\n\nfor i in ${exitcodes}; do\n[ ${i} -eq 0 ] || exit ${i}\ndone\n", setting.ScriptType) + ) + + return x.Where("id > 0").Iterate(new(Repository), + func(idx int, bean interface{}) error { + repo := bean.(*Repository) + user := new(User) + has, err := x.Where("id = ?", repo.OwnerID).Get(user) + if err != nil { + return fmt.Errorf("query owner of repository [repo_id: %d, owner_id: %d]: %v", repo.ID, repo.OwnerID, err) + } else if !has { + return nil + } + + repoPaths := []string{ + filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name)) + ".git", + filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name)) + ".wiki.git", + } + + for _, repoPath := range repoPaths { + if com.IsExist(repoPath) { + hookDir := filepath.Join(repoPath, "hooks") + + for _, hookName := range hookNames { + oldHookPath := filepath.Join(hookDir, hookName) + + // compare md5sums of hooks + if com.IsExist(oldHookPath) { + + f, err := os.Open(oldHookPath) + if err != nil { + return fmt.Errorf("cannot open old hook file '%s': %v", oldHookPath, err) + } + defer f.Close() + h := md5.New() + if _, err := io.Copy(h, f); err != nil { + return fmt.Errorf("cannot read old hook file '%s': %v", oldHookPath, err) + } + if hex.EncodeToString(h.Sum(nil)) == "6718ef67d0834e0a7908259acd566e3f" { + return nil + } + } + + if err = ioutil.WriteFile(oldHookPath, []byte(hookTpl), 0777); err != nil { + return fmt.Errorf("write old hook file '%s': %v", oldHookPath, err) + } + } + } + } + return nil + }) +} diff --git a/models/repo.go b/models/repo.go index 54be49d90..8548accb5 100644 --- a/models/repo.go +++ b/models/repo.go @@ -845,11 +845,7 @@ func cleanUpMigrateGitConfig(configPath string) error { func createDelegateHooks(repoPath string) (err error) { var ( hookNames = []string{"pre-receive", "update", "post-receive"} - hookTpls = []string{ - fmt.Sprintf("#!/usr/bin/env %s\nORI_DIR=`pwd`\nSHELL_FOLDER=$(cd \"$(dirname \"$0\")\";pwd)\ncd \"$ORI_DIR\"\nfor i in `ls \"$SHELL_FOLDER/pre-receive.d\"`; do\n sh \"$SHELL_FOLDER/pre-receive.d/$i\"\ndone", setting.ScriptType), - fmt.Sprintf("#!/usr/bin/env %s\nORI_DIR=`pwd`\nSHELL_FOLDER=$(cd \"$(dirname \"$0\")\";pwd)\ncd \"$ORI_DIR\"\nfor i in `ls \"$SHELL_FOLDER/update.d\"`; do\n sh \"$SHELL_FOLDER/update.d/$i\" $1 $2 $3\ndone", setting.ScriptType), - fmt.Sprintf("#!/usr/bin/env %s\nORI_DIR=`pwd`\nSHELL_FOLDER=$(cd \"$(dirname \"$0\")\";pwd)\ncd \"$ORI_DIR\"\nfor i in `ls \"$SHELL_FOLDER/post-receive.d\"`; do\n sh \"$SHELL_FOLDER/post-receive.d/$i\"\ndone", setting.ScriptType), - } + hookTpl = fmt.Sprintf("#!/usr/bin/env %s\ndata=$(cat)\nexitcodes=\"\"\nhookname=$(basename $0)\nGIT_DIR=${GIT_DIR:-$(dirname $0)}\n\nfor hook in ${GIT_DIR}/hooks/${hookname}.d/*; do\ntest -x \"${hook}\" || continue\necho \"${data}\" | \"${hook}\"\nexitcodes=\"${exitcodes} $?\"\ndone\n\nfor i in ${exitcodes}; do\n[ ${i} -eq 0 ] || exit ${i}\ndone\n", setting.ScriptType) giteaHookTpls = []string{ fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' pre-receive\n", setting.ScriptType, setting.AppPath, setting.CustomConf), fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' update $1 $2 $3\n", setting.ScriptType, setting.AppPath, setting.CustomConf), @@ -868,7 +864,7 @@ func createDelegateHooks(repoPath string) (err error) { } // WARNING: This will override all old server-side hooks - if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil { + if err = ioutil.WriteFile(oldHookPath, []byte(hookTpl), 0777); err != nil { return fmt.Errorf("write old hook file '%s': %v", oldHookPath, err) } @@ -1909,6 +1905,11 @@ func SyncRepositoryHooks() error { if err := createDelegateHooks(bean.(*Repository).RepoPath()); err != nil { return fmt.Errorf("SyncRepositoryHook: %v", err) } + if bean.(*Repository).HasWiki() { + if err := createDelegateHooks(bean.(*Repository).WikiPath()); err != nil { + return fmt.Errorf("SyncRepositoryHook: %v", err) + } + } return nil }) }