From 29a40c97f367a432e4038f20f09d7bf76ce4ab93 Mon Sep 17 00:00:00 2001 From: niphor Date: Tue, 24 Jun 2014 14:28:47 +0800 Subject: [PATCH 1/2] RepoRootPath must be absolute path --- modules/setting/setting.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 12989963..cb7734bb 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -182,6 +182,12 @@ func NewConfigContext() { log.Fatal("Fail to get home directory: %v", err) } RepoRootPath = Cfg.MustValue("repository", "ROOT", filepath.Join(homeDir, "gogs-repositories")) + if !filepath.IsAbs(RepoRootPath) { + RepoRootPath = filepath.Join(workDir, RepoRootPath) + } else { + RepoRootPath = filepath.Clean(RepoRootPath) + } + if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil { log.Fatal("Fail to create repository root path(%s): %v", RepoRootPath, err) } From d5d04a66f36f86e2369cb66d54f2095385d7dc70 Mon Sep 17 00:00:00 2001 From: Eryx Date: Tue, 24 Jun 2014 16:53:42 +0800 Subject: [PATCH 2/2] Fix #252 --- models/publickey.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/publickey.go b/models/publickey.go index 35768b48..603ff364 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -161,7 +161,7 @@ func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error { } defer fr.Close() - fw, err := os.Create(tmpP) + fw, err := os.OpenFile(tmpP, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600) if err != nil { return err }