aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/auth/auth.go1
-rw-r--r--modules/base/conf.go7
-rw-r--r--modules/base/template.go8
-rw-r--r--modules/log/log.go5
-rw-r--r--modules/middleware/context.go14
-rw-r--r--modules/middleware/repo.go74
6 files changed, 88 insertions, 21 deletions
diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index ac03a8f1..361f55b2 100644
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -172,6 +172,7 @@ type InstallForm struct {
DatabasePath string `form:"database_path"`
RepoRootPath string `form:"repo_path"`
RunUser string `form:"run_user"`
+ Domain string `form:"domain"`
AppUrl string `form:"app_url"`
AdminName string `form:"admin_name" binding:"Required"`
AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(30)"`
diff --git a/modules/base/conf.go b/modules/base/conf.go
index fd77cfd3..f696d083 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -272,18 +272,19 @@ func NewConfigContext() {
Domain = Cfg.MustValue("server", "DOMAIN")
SecretKey = Cfg.MustValue("security", "SECRET_KEY")
+ InstallLock = Cfg.MustBool("security", "INSTALL_LOCK", false)
+
RunUser = Cfg.MustValue("", "RUN_USER")
curUser := os.Getenv("USERNAME")
if len(curUser) == 0 {
curUser = os.Getenv("USER")
}
- if RunUser != curUser {
+ // Does not check run user when the install lock is off.
+ if InstallLock && RunUser != curUser {
fmt.Printf("Expect user(%s) but current user is: %s\n", RunUser, curUser)
os.Exit(2)
}
- InstallLock = Cfg.MustBool("security", "INSTALL_LOCK", false)
-
LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS")
CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME")
CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
diff --git a/modules/base/template.go b/modules/base/template.go
index dca76faf..dfcae931 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -33,6 +33,13 @@ func List(l *list.List) chan interface{} {
return c
}
+func ShortSha(sha1 string) string {
+ if len(sha1) == 40 {
+ return sha1[:10]
+ }
+ return sha1
+}
+
var mailDomains = map[string]string{
"gmail.com": "gmail.com",
}
@@ -72,4 +79,5 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
},
"DiffTypeToStr": DiffTypeToStr,
"DiffLineTypeToStr": DiffLineTypeToStr,
+ "ShortSha": ShortSha,
}
diff --git a/modules/log/log.go b/modules/log/log.go
index e1bab8ae..f0067548 100644
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -15,13 +15,14 @@ var (
)
func init() {
- logger = logs.NewLogger(10000)
- logger.SetLogger("console", `{"level": 0}`)
+ NewLogger(10000, "console", `{"level": 0}`)
}
func NewLogger(bufLen int64, mode, config string) {
Mode, Config = mode, config
logger = logs.NewLogger(bufLen)
+ logger.EnableFuncCallDepth(true)
+ logger.SetLogFuncCallDepth(4)
logger.SetLogger(mode, config)
}
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index d81ab999..a6aa58ee 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -18,6 +18,7 @@ import (
"github.com/codegangsta/martini"
"github.com/gogits/cache"
+ "github.com/gogits/git"
"github.com/gogits/session"
"github.com/gogits/gogs/models"
@@ -41,11 +42,18 @@ type Context struct {
csrfToken string
Repo struct {
- IsValid bool
IsOwner bool
IsWatching bool
+ IsBranch bool
+ IsTag bool
+ IsCommit bool
Repository *models.Repository
Owner *models.User
+ Commit *git.Commit
+ GitRepo *git.Repository
+ BranchName string
+ CommitId string
+ RepoLink string
CloneLink struct {
SSH string
HTTPS string
@@ -98,6 +106,10 @@ func (ctx *Context) Handle(status int, title string, err error) {
ctx.HTML(status, fmt.Sprintf("status/%d", status))
}
+func (ctx *Context) Debug(msg string, args ...interface{}) {
+ log.Debug(msg, args...)
+}
+
func (ctx *Context) GetCookie(name string) string {
cookie, err := ctx.Req.Cookie(name)
if err != nil {
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 54b735af..d1b68b05 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -11,6 +11,8 @@ import (
"github.com/codegangsta/martini"
+ "github.com/gogits/git"
+
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
)
@@ -25,8 +27,12 @@ func RepoAssignment(redirect bool) martini.Handler {
err error
)
+ userName := params["username"]
+ repoName := params["reponame"]
+ branchName := params["branchname"]
+
// get repository owner
- ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == strings.ToLower(params["username"])
+ ctx.Repo.IsOwner = ctx.IsSigned && ctx.User.LowerName == strings.ToLower(userName)
if !ctx.Repo.IsOwner {
user, err = models.GetUserByName(params["username"])
@@ -51,10 +57,8 @@ func RepoAssignment(redirect bool) martini.Handler {
return
}
- ctx.Repo.Owner = user
-
// get repository
- repo, err := models.GetRepositoryByName(user.Id, params["reponame"])
+ repo, err := models.GetRepositoryByName(user.Id, repoName)
if err != nil {
if err == models.ErrRepoNotExist {
ctx.Handle(404, "RepoAssignment", err)
@@ -62,29 +66,69 @@ func RepoAssignment(redirect bool) martini.Handler {
ctx.Redirect("/")
return
}
- ctx.Handle(200, "RepoAssignment", err)
+ ctx.Handle(404, "RepoAssignment", err)
+ return
+ }
+ ctx.Repo.Repository = repo
+
+ gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName))
+ if err != nil {
+ ctx.Handle(404, "RepoAssignment Invalid repo", err)
return
}
+ ctx.Repo.GitRepo = gitRepo
+
+ detect:
+ if len(branchName) > 0 {
+ // TODO check tag
+ if models.IsBranchExist(user.Name, repoName, branchName) {
+ ctx.Repo.IsBranch = true
+ ctx.Repo.BranchName = branchName
+
+ ctx.Repo.Commit, err = gitRepo.GetCommitOfBranch(branchName)
+ if err != nil {
+ ctx.Handle(404, "RepoAssignment invalid branch", nil)
+ return
+ }
+
+ ctx.Repo.CommitId = ctx.Repo.Commit.Oid.String()
+
+ } else if len(branchName) == 40 {
+ ctx.Repo.IsCommit = true
+ ctx.Repo.CommitId = branchName
+ ctx.Repo.BranchName = branchName
+
+ ctx.Repo.Commit, err = gitRepo.GetCommit(branchName)
+ if err != nil {
+ ctx.Handle(404, "RepoAssignment invalid commit", nil)
+ return
+ }
+ } else {
+ ctx.Handle(404, "RepoAssignment invalid repo", nil)
+ return
+ }
+
+ } else {
+ branchName = "master"
+ goto detect
+ }
- ctx.Repo.IsValid = true
- if ctx.User != nil {
+ if ctx.IsSigned {
ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id)
}
- ctx.Repo.Repository = repo
+
+ ctx.Repo.Owner = user
ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName)
ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s%s/%s.git", base.AppUrl, user.LowerName, repo.LowerName)
+ ctx.Repo.RepoLink = "/" + user.Name + "/" + repo.Name
- if len(params["branchname"]) == 0 {
- params["branchname"] = "master"
- }
- ctx.Data["Branchname"] = params["branchname"]
-
- ctx.Data["IsRepositoryValid"] = true
+ ctx.Data["BranchName"] = ctx.Repo.BranchName
+ ctx.Data["CommitId"] = ctx.Repo.CommitId
ctx.Data["Repository"] = repo
ctx.Data["Owner"] = user
ctx.Data["Title"] = user.Name + "/" + repo.Name
ctx.Data["CloneLink"] = ctx.Repo.CloneLink
- ctx.Data["RepositoryLink"] = ctx.Data["Title"]
+ ctx.Data["RepoLink"] = ctx.Repo.RepoLink
ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner
ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching
}
Powered by cgit, Themed by Ted Yin.