diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/fix.go | 12 | ||||
| -rw-r--r-- | cmd/serve.go | 57 | ||||
| -rw-r--r-- | cmd/update.go | 7 | ||||
| -rw-r--r-- | cmd/web.go | 321 |
4 files changed, 242 insertions, 155 deletions
@@ -11,6 +11,7 @@ import ( "io/ioutil" "os" "path" + "runtime" "strings" "github.com/codegangsta/cli" @@ -93,9 +94,16 @@ func rewriteAuthorizedKeys(sshPath, oldPath, newPath string) error { } func rewriteUpdateHook(path, appPath string) error { - rp := strings.NewReplacer("\\", "/", " ", "\\ ") + if runtime.GOOS == "windows" { + rp := strings.NewReplacer("\\", "/") + appPath = "\"" + rp.Replace(appPath) + "\"" + } else { + rp := strings.NewReplacer("\\", "/", " ", "\\ ") + appPath = rp.Replace(appPath) + } + if err := ioutil.WriteFile(path, []byte(fmt.Sprintf(models.TPL_UPDATE_HOOK, - setting.ScriptType, rp.Replace(appPath))), os.ModePerm); err != nil { + setting.ScriptType, appPath)), os.ModePerm); err != nil { return err } return nil diff --git a/cmd/serve.go b/cmd/serve.go index bb1b4927..b1dffc92 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -10,9 +10,10 @@ import ( "os/exec" "path" "path/filepath" - "strconv" "strings" + "time" + "github.com/Unknwon/com" "github.com/codegangsta/cli" "github.com/gogits/gogs/models" @@ -81,22 +82,22 @@ func runServ(k *cli.Context) { keys := strings.Split(os.Args[2], "-") if len(keys) != 2 { println("Gogs: auth file format error") - log.GitLogger.Fatal("Invalid auth file format: %s", os.Args[2]) + log.GitLogger.Fatal(2, "Invalid auth file format: %s", os.Args[2]) } - keyId, err := strconv.ParseInt(keys[1], 10, 64) + keyId, err := com.StrTo(keys[1]).Int64() if err != nil { println("Gogs: auth file format error") - log.GitLogger.Fatal("Invalid auth file format: %v", err) + log.GitLogger.Fatal(2, "Invalid auth file format: %v", err) } user, err := models.GetUserByKeyId(keyId) if err != nil { if err == models.ErrUserNotKeyOwner { println("Gogs: you are not the owner of SSH key") - log.GitLogger.Fatal("Invalid owner of SSH key: %d", keyId) + log.GitLogger.Fatal(2, "Invalid owner of SSH key: %d", keyId) } println("Gogs: internal error:", err) - log.GitLogger.Fatal("Fail to get user by key ID(%d): %v", keyId, err) + log.GitLogger.Fatal(2, "Fail to get user by key ID(%d): %v", keyId, err) } cmd := os.Getenv("SSH_ORIGINAL_COMMAND") @@ -110,7 +111,7 @@ func runServ(k *cli.Context) { rr := strings.SplitN(repoPath, "/", 2) if len(rr) != 2 { println("Gogs: unavailable repository", args) - log.GitLogger.Fatal("Unavailable repository: %v", args) + log.GitLogger.Fatal(2, "Unavailable repository: %v", args) } repoUserName := rr[0] repoName := strings.TrimSuffix(rr[1], ".git") @@ -122,10 +123,10 @@ func runServ(k *cli.Context) { if err != nil { if err == models.ErrUserNotExist { println("Gogs: given repository owner are not registered") - log.GitLogger.Fatal("Unregistered owner: %s", repoUserName) + log.GitLogger.Fatal(2, "Unregistered owner: %s", repoUserName) } println("Gogs: internal error:", err) - log.GitLogger.Fatal("Fail to get repository owner(%s): %v", repoUserName, err) + log.GitLogger.Fatal(2, "Fail to get repository owner(%s): %v", repoUserName, err) } // Access check. @@ -134,20 +135,20 @@ func runServ(k *cli.Context) { has, err := models.HasAccess(user.Name, path.Join(repoUserName, repoName), models.WRITABLE) if err != nil { println("Gogs: internal error:", err) - log.GitLogger.Fatal("Fail to check write access:", err) + log.GitLogger.Fatal(2, "Fail to check write access:", err) } else if !has { println("You have no right to write this repository") - log.GitLogger.Fatal("User %s has no right to write repository %s", user.Name, repoPath) + log.GitLogger.Fatal(2, "User %s has no right to write repository %s", user.Name, repoPath) } case isRead: repo, err := models.GetRepositoryByName(repoUser.Id, repoName) if err != nil { if err == models.ErrRepoNotExist { println("Gogs: given repository does not exist") - log.GitLogger.Fatal("Repository does not exist: %s/%s", repoUser.Name, repoName) + log.GitLogger.Fatal(2, "Repository does not exist: %s/%s", repoUser.Name, repoName) } println("Gogs: internal error:", err) - log.GitLogger.Fatal("Fail to get repository: %v", err) + log.GitLogger.Fatal(2, "Fail to get repository: %v", err) } if !repo.IsPrivate { @@ -157,10 +158,10 @@ func runServ(k *cli.Context) { has, err := models.HasAccess(user.Name, path.Join(repoUserName, repoName), models.READABLE) if err != nil { println("Gogs: internal error:", err) - log.GitLogger.Fatal("Fail to check read access:", err) + log.GitLogger.Fatal(2, "Fail to check read access:", err) } else if !has { println("You have no right to access this repository") - log.GitLogger.Fatal("User %s has no right to read repository %s", user.Name, repoPath) + log.GitLogger.Fatal(2, "User %s has no right to read repository %s", user.Name, repoPath) } default: println("Unknown command") @@ -175,29 +176,37 @@ func runServ(k *cli.Context) { gitcmd.Stdout = os.Stdout gitcmd.Stdin = os.Stdin gitcmd.Stderr = os.Stderr - err = gitcmd.Run() - if err != nil { - println("Gogs: internal error:", err) - log.GitLogger.Fatal("Fail to execute git command: %v", err) + if err = gitcmd.Run(); err != nil { + println("Gogs: internal error:", err.Error()) + log.GitLogger.Fatal(2, "Fail to execute git command: %v", err) } if isWrite { tasks, err := models.GetUpdateTasksByUuid(uuid) if err != nil { - log.GitLogger.Fatal("Fail to get update task: %v", err) + log.GitLogger.Fatal(2, "GetUpdateTasksByUuid: %v", err) } for _, task := range tasks { err = models.Update(task.RefName, task.OldCommitId, task.NewCommitId, user.Name, repoUserName, repoName, user.Id) if err != nil { - log.GitLogger.Fatal("Fail to update: %v", err) + log.GitLogger.Error(2, "Fail to update: %v", err) } } - err = models.DelUpdateTasksByUuid(uuid) - if err != nil { - log.GitLogger.Fatal("Fail to del update task: %v", err) + if err = models.DelUpdateTasksByUuid(uuid); err != nil { + log.GitLogger.Fatal(2, "DelUpdateTasksByUuid: %v", err) } } + + // Update key activity. + key, err := models.GetPublicKeyById(keyId) + if err != nil { + log.GitLogger.Fatal(2, "GetPublicKeyById: %v", err) + } + key.Updated = time.Now() + if err = models.UpdatePublicKey(key); err != nil { + log.GitLogger.Fatal(2, "UpdatePublicKey: %v", err) + } } diff --git a/cmd/update.go b/cmd/update.go index bee30b89..cc55693e 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -8,6 +8,7 @@ import ( "os" "github.com/codegangsta/cli" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/log" ) @@ -30,9 +31,9 @@ func runUpdate(c *cli.Context) { args := c.Args() if len(args) != 3 { - log.GitLogger.Fatal("received less 3 parameters") + log.GitLogger.Fatal(2, "received less 3 parameters") } else if args[0] == "" { - log.GitLogger.Fatal("refName is empty, shouldn't use") + log.GitLogger.Fatal(2, "refName is empty, shouldn't use") } uuid := os.Getenv("uuid") @@ -45,6 +46,6 @@ func runUpdate(c *cli.Context) { } if err := models.AddUpdateTask(&task); err != nil { - log.GitLogger.Fatal(err.Error()) + log.GitLogger.Fatal(2, err.Error()) } } @@ -12,9 +12,16 @@ import ( "os" "path" + "github.com/Unknwon/macaron" "github.com/codegangsta/cli" - "github.com/go-martini/martini" - + "github.com/macaron-contrib/cache" + "github.com/macaron-contrib/captcha" + "github.com/macaron-contrib/csrf" + "github.com/macaron-contrib/i18n" + "github.com/macaron-contrib/session" + "github.com/macaron-contrib/toolbox" + + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth/apiv1" "github.com/gogits/gogs/modules/avatar" @@ -26,7 +33,6 @@ import ( "github.com/gogits/gogs/routers" "github.com/gogits/gogs/routers/admin" "github.com/gogits/gogs/routers/api/v1" - "github.com/gogits/gogs/routers/debug" "github.com/gogits/gogs/routers/dev" "github.com/gogits/gogs/routers/org" "github.com/gogits/gogs/routers/repo" @@ -36,53 +42,81 @@ import ( var CmdWeb = cli.Command{ Name: "web", Usage: "Start Gogs web server", - Description: `Gogs web server is the only thing you need to run, + Description: `Gogs web server is the only thing you need to run, and it takes care of all the other things for you`, Action: runWeb, Flags: []cli.Flag{}, } -// checkVersion checks if binary matches the version of temolate files. +// checkVersion checks if binary matches the version of templates files. func checkVersion() { - data, err := ioutil.ReadFile(path.Join(setting.StaticRootPath, "templates/VERSION")) + data, err := ioutil.ReadFile(path.Join(setting.StaticRootPath, "templates/.VERSION")) if err != nil { - log.Fatal("Fail to read 'templates/VERSION': %v", err) + log.Fatal(4, "Fail to read 'templates/.VERSION': %v", err) } if string(data) != setting.AppVer { - log.Fatal("Binary and template file version does not match, did you forget to recompile?") + log.Fatal(4, "Binary and template file version does not match, did you forget to recompile?") } } -func newMartini() *martini.ClassicMartini { - r := martini.NewRouter() - m := martini.New() - m.Use(middleware.Logger()) - m.Use(martini.Recovery()) - m.Use(middleware.Static("public", - middleware.StaticOptions{SkipLogging: !setting.DisableRouterLog})) - m.MapTo(r, (*martini.Routes)(nil)) - m.Action(r.Handle) - return &martini.ClassicMartini{m, r} +// newMacaron initializes Macaron instance. +func newMacaron() *macaron.Macaron { + m := macaron.New() + m.Use(macaron.Logger()) + m.Use(macaron.Recovery()) + m.Use(macaron.Static("public", + macaron.StaticOptions{ + SkipLogging: !setting.DisableRouterLog, + }, + )) + if setting.EnableGzip { + m.Use(macaron.Gzip()) + } + m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: path.Join(setting.StaticRootPath, "templates"), + Funcs: []template.FuncMap{base.TemplateFuncs}, + IndentJSON: macaron.Env != macaron.PROD, + })) + m.Use(i18n.I18n(i18n.Options{ + Langs: setting.Langs, + Names: setting.Names, + Redirect: true, + })) + m.Use(cache.Cacher(cache.Options{ + Adapter: setting.CacheAdapter, + Interval: setting.CacheInternal, + Conn: setting.CacheConn, + })) + m.Use(captcha.Captchaer()) + m.Use(session.Sessioner(session.Options{ + Provider: setting.SessionProvider, + Config: *setting.SessionConfig, + })) + m.Use(csrf.Generate(csrf.Options{ + Secret: setting.SecretKey, + SetCookie: true, + })) + m.Use(toolbox.Toolboxer(m, toolbox.Options{ + HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{ + &toolbox.HealthCheckFuncDesc{ + Desc: "Database connection", + Func: models.Ping, + }, + }, + })) + m.Use(middleware.Contexter()) + return m } func runWeb(*cli.Context) { routers.GlobalInit() checkVersion() - m := newMartini() - - // Middlewares. - m.Use(middleware.Renderer(middleware.RenderOptions{ - Directory: path.Join(setting.StaticRootPath, "templates"), - Funcs: []template.FuncMap{base.TemplateFuncs}, - IndentJSON: true, - })) - m.Use(middleware.InitContext()) + m := newMacaron() reqSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true}) ignSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: setting.Service.RequireSignInView}) ignSignInAndCsrf := middleware.Toggle(&middleware.ToggleOptions{DisableCsrf: true}) - reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true}) bindIgnErr := binding.BindIgnErr @@ -91,148 +125,182 @@ func runWeb(*cli.Context) { m.Get("/", ignSignIn, routers.Home) m.Get("/install", bindIgnErr(auth.InstallForm{}), routers.Install) m.Post("/install", bindIgnErr(auth.InstallForm{}), routers.InstallPost) - m.Group("", func(r martini.Router) { - r.Get("/issues", user.Issues) + m.Group("", func(r *macaron.Router) { r.Get("/pulls", user.Pulls) - r.Get("/stars", user.Stars) + r.Get("/issues", user.Issues) }, reqSignIn) - m.Group("/api", func(_ martini.Router) { - m.Group("/v1", func(r martini.Router) { + // API routers. + m.Group("/api", func(_ *macaron.Router) { + m.Group("/v1", func(r *macaron.Router) { // Miscellaneous. r.Post("/markdown", bindIgnErr(apiv1.MarkdownForm{}), v1.Markdown) r.Post("/markdown/raw", v1.MarkdownRaw) // Users. - r.Get("/users/search", v1.SearchUser) + m.Group("/users", func(r *macaron.Router) { + r.Get("/search", v1.SearchUsers) + }) - r.Any("**", func(ctx *middleware.Context) { + // Repositories. + m.Group("/repos", func(r *macaron.Router) { + r.Get("/search", v1.SearchRepos) + r.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), v1.Migrate) + }) + + r.Any("/*", func(ctx *middleware.Context) { ctx.JSON(404, &base.ApiJsonErr{"Not Found", v1.DOC_URL}) }) }) }) - avt := avatar.CacheServer("public/img/avatar/", "public/img/avatar_default.jpg") - os.MkdirAll("public/img/avatar/", os.ModePerm) - m.Get("/avatar/:hash", avt.ServeHTTP) - - m.Group("/user", func(r martini.Router) { + // User routers. + m.Group("/user", func(r *macaron.Router) { r.Get("/login", user.SignIn) - r.Post("/login", bindIgnErr(auth.LogInForm{}), user.SignInPost) + r.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost) r.Get("/login/:name", user.SocialSignIn) r.Get("/sign_up", user.SignUp) r.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.SignUpPost) r.Get("/reset_password", user.ResetPasswd) r.Post("/reset_password", user.ResetPasswdPost) }, reqSignOut) - m.Group("/user", func(r martini.Router) { - r.Get("/delete", user.Delete) - r.Post("/delete", user.DeletePost) - r.Get("/settings", user.Setting) - r.Post("/settings", bindIgnErr(auth.UpdateProfileForm{}), user.SettingPost) + m.Group("/user/settings", func(r *macaron.Router) { + r.Get("", user.Settings) + r.Post("", bindIgnErr(auth.UpdateProfileForm{}), user.SettingsPost) + r.Get("/password", user.SettingsPassword) + r.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost) + r.Get("/ssh", user.SettingsSSHKeys) + r.Post("/ssh", bindIgnErr(auth.AddSSHKeyForm{}), user.SettingsSSHKeysPost) + r.Get("/social", user.SettingsSocial) + r.Route("/delete", "GET,POST", user.SettingsDelete) }, reqSignIn) - m.Group("/user", func(r martini.Router) { - r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) + m.Group("/user", func(r *macaron.Router) { + // r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) r.Any("/activate", user.Activate) r.Get("/email2user", user.Email2User) r.Get("/forget_password", user.ForgotPasswd) r.Post("/forget_password", user.ForgotPasswdPost) r.Get("/logout", user.SignOut) }) - m.Group("/user/settings", func(r martini.Router) { - r.Get("/social", user.SettingSocial) - r.Get("/password", user.SettingPassword) - r.Post("/password", bindIgnErr(auth.UpdatePasswdForm{}), user.SettingPasswordPost) - r.Any("/ssh", bindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys) - r.Get("/notification", user.SettingNotification) - r.Get("/security", user.SettingSecurity) - }, reqSignIn) - m.Get("/user/:username", ignSignIn, user.Profile) + m.Get("/user/:username", ignSignIn, user.Profile) // TODO: Legacy - m.Group("/repo", func(r martini.Router) { - r.Get("/create", repo.Create) - r.Post("/create", bindIgnErr(auth.CreateRepoForm{}), repo.CreatePost) - r.Get("/migrate", repo.Migrate) - r.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), repo.MigratePost) - }, reqSignIn) + // Gravatar service. + avt := avatar.CacheServer("public/img/avatar/", "public/img/avatar_default.jpg") + os.MkdirAll("public/img/avatar/", os.ModePerm) + m.Get("/avatar/:hash", avt.ServeHTTP) adminReq := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true, AdminRequire: true}) - m.Get("/admin", adminReq, admin.Dashboard) - m.Group("/admin", func(r martini.Router) { - r.Get("/users", admin.Users) - r.Get("/repos", admin.Repositories) - r.Get("/auths", admin.Auths) + m.Group("/admin", func(r *macaron.Router) { + m.Get("", adminReq, admin.Dashboard) r.Get("/config", admin.Config) r.Get("/monitor", admin.Monitor) - }, adminReq) - m.Group("/admin/users", func(r martini.Router) { - r.Get("/new", admin.NewUser) - r.Post("/new", bindIgnErr(auth.RegisterForm{}), admin.NewUserPost) - r.Get("/:userid", admin.EditUser) - r.Post("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost) - r.Get("/:userid/delete", admin.DeleteUser) - }, adminReq) - m.Group("/admin/auths", func(r martini.Router) { - r.Get("/new", admin.NewAuthSource) - r.Post("/new", bindIgnErr(auth.AuthenticationForm{}), admin.NewAuthSourcePost) - r.Get("/:authid", admin.EditAuthSource) - r.Post("/:authid", bindIgnErr(auth.AuthenticationForm{}), admin.EditAuthSourcePost) - r.Get("/:authid/delete", admin.DeleteAuthSource) + m.Group("/users", func(r *macaron.Router) { + r.Get("", admin.Users) + r.Get("/new", admin.NewUser) + r.Post("/new", bindIgnErr(auth.RegisterForm{}), admin.NewUserPost) + r.Get("/:userid", admin.EditUser) + r.Post("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost) + r.Post("/:userid/delete", admin.DeleteUser) + }) + + m.Group("/orgs", func(r *macaron.Router) { + r.Get("", admin.Organizations) + }) + + m.Group("/repos", func(r *macaron.Router) { + r.Get("", admin.Repositories) + }) + + m.Group("/auths", func(r *macaron.Router) { + r.Get("", admin.Authentications) + r.Get("/new", admin.NewAuthSource) + r.Post("/new", bindIgnErr(auth.AuthenticationForm{}), admin.NewAuthSourcePost) + r.Get("/:authid", admin.EditAuthSource) + r.Post("/:authid", bindIgnErr(auth.AuthenticationForm{}), admin.EditAuthSourcePost) + r.Post("/:authid/delete", admin.DeleteAuthSource) + }) }, adminReq) - if martini.Env == martini.Dev { - m.Get("/template/**", dev.TemplatePreview) + m.Get("/:username", ignSignIn, user.Profile) + + if macaron.Env == macaron.DEV { + m.Get("/template/*", dev.TemplatePreview) } reqTrueOwner := middleware.RequireTrueOwner() - m.Group("/org", func(r martini.Router) { - r.Get("/create", org.New) - r.Post("/create", bindIgnErr(auth.CreateOrgForm{}), org.NewPost) - r.Get("/:org", org.Home) - r.Get("/:org/dashboard", org.Dashboard) - r.Get("/:org/members", org.Members) - - r.Get("/:org/teams", org.Teams) - r.Get("/:org/teams/new", org.NewTeam) - r.Post("/:org/teams/new", bindIgnErr(auth.CreateTeamForm{}), org.NewTeamPost) - r.Get("/:org/teams/:team/edit", org.EditTeam) + // Organization routers. + m.Group("/org", func(r *macaron.Router) { + r.Get("/create", org.Create) + r.Post("/create", bindIgnErr(auth.CreateOrgForm{}), org.CreatePost) + + m.Group("/:org", func(r *macaron.Router) { + r.Get("/dashboard", user.Dashboard) + r.Get("/members", org.Members) + r.Get("/members/action/:action", org.MembersAction) + + r.Get("/teams", org.Teams) + r.Get("/teams/:team", org.TeamMembers) + r.Get("/teams/:team/repositories", org.TeamRepositories) + r.Get("/teams/:team/action/:action", org.TeamsAction) + r.Get("/teams/:team/action/repo/:action", org.TeamsRepoAction) + }, middleware.OrgAssignment(true, true)) + + m.Group("/:org", func(r *macaron.Router) { + r.Get("/teams/new", org.NewTeam) + r.Post("/teams/new", bindIgnErr(auth.CreateTeamForm{}), org.NewTeamPost) + r.Get("/teams/:team/edit", org.EditTeam) + r.Post("/teams/:team/edit", bindIgnErr(auth.CreateTeamForm{}), org.EditTeamPost) + r.Post("/teams/:team/delete", org.DeleteTeam) + + m.Group("/settings", func(r *macaron.Router) { + r.Get("", org.Settings) + r.Post("", bindIgnErr(auth.UpdateOrgSettingForm{}), org.SettingsPost) + r.Route("/delete", "GET,POST", org.SettingsDelete) + }) - r.Get("/:org/settings", org.Settings) - r.Post("/:org/settings", bindIgnErr(auth.OrgSettingForm{}), org.SettingsPost) - r.Post("/:org/settings/delete", org.DeletePost) + r.Route("/invitations/new", "GET,POST", org.Invitation) + }, middleware.OrgAssignment(true, true, true)) }, reqSignIn) + m.Group("/org", func(r *macaron.Router) { + r.Get("/:org", org.Home) + }, middleware.OrgAssignment(true)) - debug.RegisterRoutes(m) - - m.Group("/:username/:reponame", func(r martini.Router) { - r.Get("/settings", repo.Setting) - r.Post("/settings", bindIgnErr(auth.RepoSettingForm{}), repo.SettingPost) + // Repository routers. + m.Group("/repo", func(r *macaron.Router) { + r.Get("/create", repo.Create) + r.Post("/create", bindIgnErr(auth.CreateRepoForm{}), repo.CreatePost) + r.Get("/migrate", repo.Migrate) + r.Post("/migrate", bindIgnErr(auth.MigrateRepoForm{}), repo.MigratePost) + }, reqSignIn) - m.Group("/settings", func(r martini.Router) { - r.Get("/collaboration", repo.Collaboration) - r.Post("/collaboration", repo.CollaborationPost) - r.Get("/hooks", repo.WebHooks) - r.Get("/hooks/add", repo.WebHooksAdd) - r.Post("/hooks/add", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksAddPost) + m.Group("/:username/:reponame", func(r *macaron.Router) { + r.Get("/settings", repo.Settings) + r.Post("/settings", bindIgnErr(auth.RepoSettingForm{}), repo.SettingsPost) + m.Group("/settings", func(r *macaron.Router) { + r.Route("/collaboration", "GET,POST", repo.SettingsCollaboration) + r.Get("/hooks", repo.Webhooks) + r.Get("/hooks/new", repo.WebHooksNew) + r.Post("/hooks/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost) r.Get("/hooks/:id", repo.WebHooksEdit) r.Post("/hooks/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) }) }, reqSignIn, middleware.RepoAssignment(true), reqTrueOwner) - m.Group("/:username/:reponame", func(r martini.Router) { + m.Group("/:username/:reponame", func(r *macaron.Router) { r.Get("/action/:action", repo.Action) - m.Group("/issues", func(r martini.Router) { + m.Group("/issues", func(r *macaron.Router) { r.Get("/new", repo.CreateIssue) r.Post("/new", bindIgnErr(auth.CreateIssueForm{}), repo.CreateIssuePost) r.Post("/:index", bindIgnErr(auth.CreateIssueForm{}), repo.UpdateIssue) r.Post("/:index/label", repo.UpdateIssueLabel) r.Post("/:index/milestone", repo.UpdateIssueMilestone) r.Post("/:index/assignee", repo.UpdateAssignee) + r.Get("/:index/attachment/:id", repo.IssueGetAttachment) r.Post("/labels/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel) r.Post("/labels/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel) r.Post("/labels/delete", repo.DeleteLabel) @@ -249,35 +317,36 @@ func runWeb(*cli.Context) { r.Get("/releases/edit/:tagname", repo.EditRelease) }, reqSignIn, middleware.RepoAssignment(true)) - m.Group("/:username/:reponame", func(r martini.Router) { + m.Group("/:username/:reponame", func(r *macaron.Router) { r.Post("/releases/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost) r.Post("/releases/edit/:tagname", bindIgnErr(auth.EditReleaseForm{}), repo.EditReleasePost) }, reqSignIn, middleware.RepoAssignment(true, true)) - m.Group("/:username/:reponame", func(r martini.Router) { + m.Group("/:username/:reponame", func(r *macaron.Router) { r.Get("/issues", repo.Issues) r.Get("/issues/:index", repo.ViewIssue) r.Get("/pulls", repo.Pulls) r.Get("/branches", repo.Branches) }, ignSignIn, middleware.RepoAssignment(true)) - m.Group("/:username/:reponame", func(r martini.Router) { - r.Get("/src/:branchname", repo.Single) - r.Get("/src/:branchname/**", repo.Single) - r.Get("/raw/:branchname/**", repo.SingleDownload) + m.Group("/:username/:reponame", func(r *macaron.Router) { + r.Get("/src/:branchname", repo.Home) + r.Get("/src/:branchname/*", repo.Home) + r.Get("/raw/:branchname/*", repo.SingleDownload) r.Get("/commits/:branchname", repo.Commits) r.Get("/commits/:branchname/search", repo.SearchCommits) - r.Get("/commits/:branchname/**", repo.FileHistory) + r.Get("/commits/:branchname/*", repo.FileHistory) r.Get("/commit/:branchname", repo.Diff) - r.Get("/commit/:branchname/**", repo.Diff) + r.Get("/commit/:branchname/*", repo.Diff) r.Get("/releases", repo.Releases) - r.Get("/archive/:branchname/:reponame.zip", repo.ZipDownload) - r.Get("/archive/:branchname/:reponame.tar.gz", repo.TarGzDownload) + r.Get("/archive/*.*", repo.Download) }, ignSignIn, middleware.RepoAssignment(true, true)) - m.Group("/:username", func(r martini.Router) { - r.Get("/:reponame", middleware.RepoAssignment(true, true, true), repo.Single) - r.Any("/:reponame/**", repo.Http) + m.Group("/:username", func(r *macaron.Router) { + r.Get("/:reponame", middleware.RepoAssignment(true, true, true), repo.Home) + m.Group("/:reponame", func(r *macaron.Router) { + r.Any("/*", repo.Http) + }) }, ignSignInAndCsrf) // Not found handler. @@ -292,10 +361,10 @@ func runWeb(*cli.Context) { case setting.HTTPS: err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m) default: - log.Fatal("Invalid protocol: %s", setting.Protocol) + log.Fatal(4, "Invalid protocol: %s", setting.Protocol) } if err != nil { - log.Fatal("Fail to start server: %v", err) + log.Fatal(4, "Fail to start server: %v", err) } } |